From e305a0ee15f0130585fa5a0f594f95a371a40772 Mon Sep 17 00:00:00 2001
From: Udi Silvestre <udi.silvestre@strapi.io>
Date: Wed, 25 Oct 2023 13:05:15 -0300
Subject: [PATCH] fix: v2/SimpleMenu - IconButton trigger style props

---
 .../src/IconButton/IconButton.tsx                  |  4 ++++
 .../src/v2/SimpleMenu/Menu.tsx                     | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/strapi-design-system/src/IconButton/IconButton.tsx b/packages/strapi-design-system/src/IconButton/IconButton.tsx
index dce7f40f4..2fdec4c2c 100644
--- a/packages/strapi-design-system/src/IconButton/IconButton.tsx
+++ b/packages/strapi-design-system/src/IconButton/IconButton.tsx
@@ -106,6 +106,8 @@ export const IconButton = React.forwardRef<HTMLButtonElement, IconButtonProps>(
   },
 );
 
+IconButton.displayName = 'IconButton';
+
 const IconButtonWrapper = styled(BaseButton)<Required<Pick<IconButtonProps, 'size' | 'variant'>>>`
   background-color: ${({ theme, variant }) => {
     if (variant === VARIANT_SECONDARY) {
@@ -210,3 +212,5 @@ export const IconButtonGroup = styled(Flex)`
     }
   }
 `;
+
+IconButtonGroup.displayName = 'IconButtonGroup';
diff --git a/packages/strapi-design-system/src/v2/SimpleMenu/Menu.tsx b/packages/strapi-design-system/src/v2/SimpleMenu/Menu.tsx
index e76637069..7f11fb806 100644
--- a/packages/strapi-design-system/src/v2/SimpleMenu/Menu.tsx
+++ b/packages/strapi-design-system/src/v2/SimpleMenu/Menu.tsx
@@ -29,6 +29,11 @@ interface TriggerProps extends ButtonProps {}
 
 const MenuTrigger = forwardRef<HTMLButtonElement, TriggerProps>(
   ({ size, endIcon = <CarretDown width={`${6 / 16}rem`} height={`${4 / 16}rem`} aria-hidden />, ...props }, ref) => {
+    const isSizeS = size === 'S';
+    const isIconButton = (props.as as any)?.displayName === 'IconButton';
+    const paddingY = isSizeS ? 1 : 2;
+    const paddingX = isSizeS ? 3 : 4;
+
     return (
       <DropdownMenu.Trigger asChild>
         <Button
@@ -36,10 +41,11 @@ const MenuTrigger = forwardRef<HTMLButtonElement, TriggerProps>(
           type="button"
           variant="ghost"
           endIcon={endIcon}
-          paddingTop={size === 'S' ? 1 : 2}
-          paddingBottom={size === 'S' ? 1 : 2}
-          paddingLeft={size === 'S' ? 3 : 4}
-          paddingRight={size === 'S' ? 3 : 4}
+          paddingTop={isIconButton ? '0' : paddingY}
+          paddingBottom={isIconButton ? '0' : paddingY}
+          paddingLeft={isIconButton ? '0' : paddingX}
+          paddingRight={isIconButton ? '0' : paddingX}
+          justifyContent={isIconButton ? 'center' : undefined}
           {...props}
         />
       </DropdownMenu.Trigger>