perf: menu

vueComponent · Jun 9, 2021 · 6ae707e · 6ae707e
1 parent 791ae38
commit 6ae707e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components/menu/src/Menu.tsx b/components/menu/src/Menu.tsx
@@ -372,7 +372,7 @@ export default defineComponent({
       siderCollapsed,
       defaultMotions: computed(() => (isMounted.value ? defaultMotions : null)),
       motion: computed(() => (isMounted.value ? props.motion : null)),
-      overflowDisabled: computed(() => props.disabledOverflow),
+      overflowDisabled: computed(() => undefined),
       onOpenChange: onInternalOpenChange,
       onItemClick: onInternalClick,
       registerMenuInfo,

diff --git a/components/menu/src/SubMenu.tsx b/components/menu/src/SubMenu.tsx
@@ -260,13 +260,13 @@ export default defineComponent({
         </div>
       );
 
-      if (!overflowDisabled.value) {
+      if (!overflowDisabled.value && mode.value !== 'inline') {
         const triggerMode = triggerModeRef.value;
         titleNode = (
           <PopupTrigger
             mode={triggerMode}
             prefixCls={subMenuPrefixClsValue}
-            visible={!props.internalPopupClose && open.value && mode.value !== 'inline'}
+            visible={!props.internalPopupClose && open.value}
             popupClassName={popupClassName.value}
             popupOffset={props.popupOffset}
             disabled={mergedDisabled.value}

diff --git a/v2-doc b/v2-doc
+4 −4		src/docs/avatar/index.en-US.md
+5 −5		src/docs/avatar/index.zh-CN.md
+2 −2		src/docs/form/demo/custom-validation.vue
+7 −9		src/docs/menu/demo/horizontal.vue
+13 −15		src/docs/menu/demo/inline-collapsed.vue
+17 −11		src/docs/menu/demo/inline.vue
+14 −9		src/docs/menu/demo/sider-current.vue
+14 −15		src/docs/menu/demo/switch-mode.vue
+10 −11		src/docs/menu/demo/template.vue
+12 −12		src/docs/menu/demo/theme.vue
+12 −12		src/docs/menu/demo/vertical.vue
+5 −7		src/docs/menu/index.zh-CN.md
+10 −10		src/docs/slider/demo/index.vue
+1 −1		src/docs/steps/demo/index.vue
+1 −1		src/docs/table/demo/expand-children.vue