Fix dropdown menu header (#4835)

Fix an issue I add introduced by removing "position:static" and an other regression from #4366
twentyhq · Apr 5, 2024 · 3df4b78 · 3df4b78
1 parent b825193
commit 3df4b78
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 25 deletions.
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
@@ -1,4 +1,5 @@
 import { ComponentProps, MouseEvent } from 'react';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
@@ -7,25 +8,38 @@ import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 const StyledHeader = styled.li`
   align-items: center;
   color: ${({ theme }) => theme.font.color.primary};
-  cursor: pointer;
+  cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
   display: flex;
   font-size: ${({ theme }) => theme.font.size.sm};
   font-weight: ${({ theme }) => theme.font.weight.medium};
-  border-radius: ${({ theme }) => theme.border.radius.sm};
+  border-top-left-radius: ${({ theme }) => theme.border.radius.sm};
+  border-top-right-radius: ${({ theme }) => theme.border.radius.sm};
 
   padding: ${({ theme }) => theme.spacing(1)};
 
   user-select: none;
-`;
 
-const StyledChildrenWrapper = styled.span`
-  padding: 0 ${({ theme }) => theme.spacing(1)};
+  &:hover {
+    background: ${({ theme, onClick }) =>
+      onClick ? theme.background.transparent.light : 'none'};
+  }
 `;
 
-const StyledLightIconButton = styled(LightIconButton)`
+const StyledEndIcon = styled.div`
   display: inline-flex;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  padding: ${({ theme }) => theme.spacing(1)};
   margin-left: auto;
   margin-right: 0;
+
+  & > svg {
+    height: ${({ theme }) => theme.icon.size.md}px;
+    width: ${({ theme }) => theme.icon.size.md}px;
+  }
+`;
+
+const StyledChildrenWrapper = styled.span`
+  padding: 0 ${({ theme }) => theme.spacing(1)};
 `;
 
 type DropdownMenuHeaderProps = ComponentProps<'li'> & {
@@ -42,27 +56,29 @@ export const DropdownMenuHeader = ({
   onClick,
   testId,
 }: DropdownMenuHeaderProps) => {
+  const theme = useTheme();
   return (
-    <StyledHeader data-testid={testId}>
-      {StartIcon && (
-        <LightIconButton
-          onClick={onClick}
-          testId="dropdown-menu-header-end-icon"
-          Icon={StartIcon}
-          accent="tertiary"
-          size="small"
-        />
-      )}
-      <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+    <>
       {EndIcon && (
-        <StyledLightIconButton
-          onClick={onClick}
-          testId="dropdown-menu-header-end-icon"
-          Icon={EndIcon}
-          accent="tertiary"
-          size="small"
-        />
+        <StyledHeader data-testid={testId} onClick={onClick}>
+          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+          <StyledEndIcon>
+            <EndIcon size={theme.icon.size.md} />
+          </StyledEndIcon>
+        </StyledHeader>
+      )}
+      {StartIcon && (
+        <StyledHeader data-testid={testId}>
+          <LightIconButton
+            testId="dropdown-menu-header-end-icon"
+            Icon={StartIcon}
+            accent="tertiary"
+            size="small"
+            onClick={onClick}
+          />
+          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+        </StyledHeader>
       )}
-    </StyledHeader>
+    </>
   );
 };
diff --git a/...nty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx b/...nty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
@@ -117,6 +117,7 @@ export const StyledHoverableMenuItemBase = styled(StyledMenuItemBase)<{
     & .hoverable-buttons {
       opacity: 1;
       pointer-events: auto;
+      position: static;
     }
   }
 `;