Merge pull request #147 from element-hq/florianduros/fix-menu-focus

Fix `Menu` focus after closing
element-hq · Feb 7, 2024 · 20c6f91 · 20c6f91
2 parents 3942474 + 7ad68aa
commit 20c6f91
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
@@ -119,7 +119,17 @@ export const Menu: FC<Props> = ({
     <Root open={open} onOpenChange={onOpenChange}>
       <Trigger asChild>{trigger}</Trigger>
       <Portal>
-        <Content asChild side={side} align={align} sideOffset={8}>
+        <Content
+          asChild
+          side={side}
+          align={align}
+          sideOffset={8}
+          onCloseAutoFocus={(event) => {
+            // https://www.radix-ui.com/primitives/docs/components/dropdown-menu#content => onCloseAutoFocus
+            // Prevent the default behavior of focusing the trigger when the menu closes
+            event.preventDefault();
+          }}
+        >
           <FloatingMenu title={title}>{children}</FloatingMenu>
         </Content>
       </Portal>