fix(ui:menu): fix popup in vertical mode

DevCloudFE · Mar 15, 2022 · 686ef7e · 686ef7e
1 parent c9f6702
commit 686ef7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/ui/src/components/menu/Menu.tsx b/packages/ui/src/components/menu/Menu.tsx
@@ -273,7 +273,7 @@ export function DMenu<ID extends DId, T extends DMenuOption<ID>>(props: DMenuPro
                 const index = sameLevelOptions.findIndex((o) => o.id === optionId);
                 const o = nth(sameLevelOptions, index - 1);
                 focusOption(o);
-                if (o && nth(popupIds, -1)?.id === optionId) {
+                if (dMode !== 'vertical' && o && nth(popupIds, -1)?.id === optionId) {
                   setPopupIds(popupIds.slice(0, -1));
                 }
                 break;
@@ -284,7 +284,7 @@ export function DMenu<ID extends DId, T extends DMenuOption<ID>>(props: DMenuPro
                 const index = sameLevelOptions.findIndex((o) => o.id === optionId);
                 const o = nth(sameLevelOptions, (index + 1) % sameLevelOptions.length);
                 focusOption(o);
-                if (o && nth(popupIds, -1)?.id === optionId) {
+                if (dMode !== 'vertical' && o && nth(popupIds, -1)?.id === optionId) {
                   setPopupIds(popupIds.slice(0, -1));
                 }
                 break;

diff --git a/packages/ui/src/components/menu/MenuSub.tsx b/packages/ui/src/components/menu/MenuSub.tsx
@@ -168,7 +168,7 @@ export function DMenuSub(props: DMenuSubProps): JSX.Element | null {
 
               return (
                 <DPopup
-                  disabled={disabled}
+                  disabled={disabled || dMode === 'vertical'}
                   dVisible={dPopupState}
                   dPopup={({ pOnClick, pOnMouseEnter, pOnMouseLeave, ...restPCProps }) => (
                     <ul