fix(menu): fix arrow key navigation when onClose is called but not cl…

…osed (#13195) * fix(menu): only clear registered items when root is closing * fix(menu): auto-cleanup registered items --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
carbon-design-system · Mar 2, 2023 · 22d87ca · 22d87ca
1 parent f5b9a13
commit 22d87ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/packages/react/src/components/Menu/Menu.js b/packages/react/src/components/Menu/Menu.js
@@ -93,8 +93,6 @@ const Menu = React.forwardRef(function Menu(
       returnFocus();
     }
 
-    childDispatch({ type: 'clearRegisteredItems' });
-
     if (onClose) {
       onClose();
     }

diff --git a/packages/react/src/components/Menu/MenuContext.js b/packages/react/src/components/Menu/MenuContext.js
@@ -25,12 +25,9 @@ function menuReducer(state, action) {
     case 'registerItem':
       return {
         ...state,
-        items: [...state.items, action.payload],
-      };
-    case 'clearRegisteredItems':
-      return {
-        ...state,
-        items: [],
+        items: [...state.items, action.payload].filter(
+          (item) => item.ref.current !== null
+        ),
       };
   }
 }