fix: menu trigger updated to accomodate children

strapi · Jul 18, 2024 · df1472e · df1472e
1 parent f16575e
commit df1472e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docs/stories/SimpleMenu.mdx b/docs/stories/SimpleMenu.mdx
@@ -94,7 +94,7 @@ import { Menu } from '@strapi/design-system';
 const MyMenu = () => {
   return (
     <Menu.Root>
-      <Menu.Trigger label="Actions" />
+      <Menu.Trigger>Actions</Menu.Trigger>
       <Menu.Content>
         <Menu.Item onSelect={() => console.log('opening')}>Open</MenuItem>
         <Menu.Item disabled onSelect={() => console.log('cloning')}>

diff --git a/packages/design-system/src/components/SimpleMenu/Menu.test.tsx b/packages/design-system/src/components/SimpleMenu/Menu.test.tsx
@@ -9,7 +9,7 @@ interface ComponentProps {
 
 const Component = ({ onAction1Select, onSubmenuAction1Select }: ComponentProps) => (
   <Menu.Root>
-    <Menu.Trigger label="Actions" />
+    <Menu.Trigger>Actions</Menu.Trigger>
     <Menu.Content>
       <Menu.Item onSelect={onAction1Select}>Action 1</Menu.Item>
       <Menu.Item isLink href="/home">

diff --git a/packages/design-system/src/components/SimpleMenu/Menu.tsx b/packages/design-system/src/components/SimpleMenu/Menu.tsx
@@ -25,7 +25,7 @@ const MenuRoot = DropdownMenu.Root;
  * MenuTrigger
  * -----------------------------------------------------------------------------------------------*/
 
-type TriggerPropsBase = Omit<ButtonProps, 'tag' | 'children'> & {
+type TriggerPropsBase = Omit<ButtonProps, 'tag'> & {
   endIcon?: React.ReactNode;
   label?: React.ReactNode | string;
 };
@@ -65,9 +65,7 @@ const MenuTrigger = React.forwardRef<HTMLButtonElement, TriggerProps>(
             {icon}
           </IconButton>
         ) : (
-          <Button endIcon={endIcon} {...props}>
-            {label}
-          </Button>
+          <Button endIcon={endIcon} {...props} />
         )}
       </DropdownMenu.Trigger>
     );

diff --git a/packages/design-system/src/components/SimpleMenu/SimpleMenu.tsx b/packages/design-system/src/components/SimpleMenu/SimpleMenu.tsx
@@ -63,7 +63,9 @@ const SimpleMenu = React.forwardRef<HTMLButtonElement, SimpleMenuProps>(
 
     return (
       <Menu.Root onOpenChange={handleOpenChange}>
-        <Menu.Trigger ref={composedRef} {...props} />
+        <Menu.Trigger ref={composedRef} {...props}>
+          {props.label}
+        </Menu.Trigger>
         <Menu.Content ref={contentRef} intersectionId={intersectionId} popoverPlacement={popoverPlacement}>
           {children}
         </Menu.Content>