fix(index-bar): remove useless prop and dont trigger click after call…

… scrollTo method
varletjs · May 7, 2021 · bba5152 · bba5152
1 parent ffc0ba8
commit bba5152
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/packages/varlet-ui/src/index-anchor/IndexAnchor.vue b/packages/varlet-ui/src/index-anchor/IndexAnchor.vue
@@ -39,6 +39,7 @@ export default defineComponent({
     const { active, sticky, stickyOffsetTop, zIndex } = indexBar
 
     const setOwnTop = () => {
+      if (!anchorEl.value) return
       ownTop.value = (anchorEl.value as RendererNode).$el
         ? (anchorEl.value as RendererNode).$el.offsetTop
         : (anchorEl.value as HTMLDivElement).offsetTop

diff --git a/packages/varlet-ui/src/index-bar/IndexBar.vue b/packages/varlet-ui/src/index-bar/IndexBar.vue
@@ -71,8 +71,8 @@ export default defineComponent({
       })
     }
 
-    const anchorClick = (anchorName: string | number) => {
-      props.onClick?.(anchorName)
+    const anchorClick = (anchorName: string | number, manualCall?: boolean) => {
+      if (manualCall) props.onClick?.(anchorName)
       if (anchorName === active.value) return
       const indexAnchor = indexAnchors.find(({ name }: IndexAnchorProvider) => anchorName === name.value)
       if (!indexAnchor) return
@@ -84,7 +84,7 @@ export default defineComponent({
 
     // expose
     const scrollTo = (index: number | string) => {
-      requestAnimationFrame(() => anchorClick(index))
+      requestAnimationFrame(() => anchorClick(index, true))
     }
 
     watch(

diff --git a/packages/varlet-ui/src/index-bar/props.ts b/packages/varlet-ui/src/index-bar/props.ts
@@ -14,9 +14,6 @@ export const props = {
   highlightColor: {
     type: String,
   },
-  'onUpdate:active': {
-    type: Function,
-  },
   onClick: {
     type: Function,
   },