feat: add onCloseAutoFocus to Menu.Content (#1845)

strapi · Feb 3, 2025 · ef9cd18 · ef9cd18
1 parent a511ac5
commit ef9cd18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.changeset/little-turtles-wait.md b/.changeset/little-turtles-wait.md
@@ -0,0 +1,5 @@
+---
+'@strapi/design-system': patch
+---
+
+feat: add onCloseAutoFocus to Menu.Content
diff --git a/packages/design-system/src/components/SimpleMenu/Menu.tsx b/packages/design-system/src/components/SimpleMenu/Menu.tsx
@@ -69,21 +69,22 @@ const MenuTrigger = React.forwardRef<HTMLButtonElement, TriggerProps>(
  * MenuContent
  * -----------------------------------------------------------------------------------------------*/
 
-interface ContentProps extends FlexProps<'div'> {
-  intersectionId?: string;
-  popoverPlacement?: `${NonNullable<DropdownMenu.DropdownMenuContentProps['side']>}-${NonNullable<DropdownMenu.DropdownMenuContentProps['align']>}`;
-}
+type ContentProps = FlexProps<'div'> &
+  Pick<DropdownMenu.DropdownMenuContentProps, 'onCloseAutoFocus'> & {
+    intersectionId?: string;
+    popoverPlacement?: `${NonNullable<DropdownMenu.DropdownMenuContentProps['side']>}-${NonNullable<DropdownMenu.DropdownMenuContentProps['align']>}`;
+  };
 
 const MenuContent = React.forwardRef<HTMLDivElement, ContentProps>(
-  ({ children, intersectionId, popoverPlacement = 'bottom-start', ...props }, ref) => {
+  ({ children, intersectionId, onCloseAutoFocus, popoverPlacement = 'bottom-start', ...props }, ref) => {
     const [side, align] = popoverPlacement.split('-') as [
       DropdownMenu.DropdownMenuContentProps['side'],
       DropdownMenu.DropdownMenuContentProps['align'],
     ];
 
     return (
       <DropdownMenu.Portal>
-        <DropdownMenuContent align={align} side={side} loop asChild>
+        <DropdownMenuContent align={align} side={side} loop onCloseAutoFocus={onCloseAutoFocus} asChild>
           <Viewport
             ref={ref}
             direction="column"