fix keyboard shortcuts in new commandbar

Azure · Aug 13, 2024 · 157ed55 · 157ed55
1 parent cc7ff45
commit 157ed55
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Explorer/Menus/CommandBarV2/CommandBarV2.tsx b/src/Explorer/Menus/CommandBarV2/CommandBarV2.tsx
@@ -2,6 +2,7 @@ import { makeStyles, Menu, MenuItem, MenuList, MenuPopover, MenuTrigger, Toolbar
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
 import Explorer from "Explorer/Explorer";
 import { createPlatformButtons, createStaticCommandBarButtons } from "Explorer/Menus/CommandBar/CommandBarComponentButtonFactory";
+import { createKeyboardHandlers } from "Explorer/Menus/CommandBar/CommandBarUtil";
 import { useCommandBar } from "Explorer/Menus/CommandBar/useCommandBar";
 import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/ThemeUtil";
 import { useSelectedNode } from "Explorer/useSelectedNode";
@@ -33,9 +34,14 @@ export const CommandBarV2: React.FC<CommandBarV2Props> = ({ explorer }: CommandB
   const platformButtons = createPlatformButtons();
 
   if (isHidden) {
+    setKeyboardHandlers({});
     return null;
   }
 
+  const allButtons = staticButtons.concat(contextButtons).concat(platformButtons);
+  const keyboardHandlers = createKeyboardHandlers(allButtons, explorer);
+  setKeyboardHandlers(keyboardHandlers);
+
   return <CosmosFluentProvider>
     <Toolbar className={styles.toolbar}>
       <ToolbarGroup role="presentation" className={styles.toolbarGroup}>