feat(twenty-front): improve dropdown menu header (#10672)

packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu.tsx

@@ -20,7 +20,7 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filte
 import { findDuplicateRecordFilterInNonAdvancedRecordFilters } from '@/object-record/record-filter/utils/findDuplicateRecordFilterInNonAdvancedRecordFilters';
 import { getRecordFilterOperands } from '@/object-record/record-filter/utils/getRecordFilterOperands';
 import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -188,7 +188,7 @@ export const ObjectFilterDropdownFilterSelectCompositeFieldSubMenu = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={handleSubMenuBack}
+        onStartIconClick={handleSubMenuBack}
       >
         {getFilterableFieldTypeLabel(objectFilterDropdownSubMenuFieldType)}
       </DropdownMenuHeader>

packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandDropdown.tsx

@@ -1,6 +1,6 @@
 import { IconChevronDown } from 'twenty-ui';
 
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 
 import { ObjectFilterDropdownOperandSelect } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect';
 import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx

@@ -3,7 +3,7 @@ import { IconChevronLeft, IconEyeOff, MenuItemNavigate } from 'twenty-ui';
 import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
 import { useObjectOptionsForTable } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForTable';
 import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useOptionsDropdown';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { ViewFieldsVisibilityDropdownSection } from '@/views/components/ViewFieldsVisibilityDropdownSection';
@@ -51,7 +51,10 @@ export const ObjectOptionsDropdownFieldsContent = () => {
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={resetContent}
+      >
         {t`Fields`}
       </DropdownMenuHeader>
       <ViewFieldsVisibilityDropdownSection

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx

@@ -13,7 +13,7 @@ import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdow
 import { useObjectOptionsForTable } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForTable';
 import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useOptionsDropdown';
 import { SettingsPath } from '@/types/SettingsPath';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
@@ -67,7 +67,7 @@ export const ObjectOptionsDropdownHiddenFieldsContent = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={() => onContentChange('fields')}
+        onStartIconClick={() => onContentChange('fields')}
       >
         {t`Hidden Fields`}
       </DropdownMenuHeader>

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx

@@ -14,7 +14,7 @@ import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/use
 import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState';
 import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
 import { SettingsPath } from '@/types/SettingsPath';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
@@ -75,7 +75,7 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
       <DropdownMenuItemsContainer>
         <DropdownMenuHeader
           StartIcon={IconChevronLeft}
-          onClick={() => onContentChange('recordGroups')}
+          onStartIconClick={() => onContentChange('recordGroups')}
         >
           Hidden {recordGroupFieldMetadata?.label}
         </DropdownMenuHeader>

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx

@@ -10,7 +10,7 @@ import {
 import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
 import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useOptionsDropdown';
 import { recordIndexOpenRecordInState } from '@/object-record/record-index/states/recordIndexOpenRecordInState';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
 import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType';
@@ -41,7 +41,10 @@ export const ObjectOptionsDropdownLayoutContent = () => {
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={resetContent}
+      >
         {t`Layout`}
       </DropdownMenuHeader>
       <DropdownMenuItemsContainer>

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx

@@ -8,7 +8,7 @@ import {
 import { useObjectOptions } from '@/object-record/object-options-dropdown/hooks/useObjectOptions';
 import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useOptionsDropdown';
 import { recordIndexOpenRecordInState } from '@/object-record/record-index/states/recordIndexOpenRecordInState';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
 import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType';
@@ -25,7 +25,7 @@ export const ObjectOptionsDropdownLayoutOpenInContent = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={() => onContentChange('layout')}
+        onStartIconClick={() => onContentChange('layout')}
       >
         {t`Open in`}
       </DropdownMenuHeader>

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx

@@ -19,7 +19,7 @@ import { recordGroupFieldMetadataComponentState } from '@/object-record/record-g
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx

@@ -18,7 +18,7 @@ import { recordGroupFieldMetadataComponentState } from '@/object-record/record-g
 import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
 import { useHandleRecordGroupField } from '@/object-record/record-index/hooks/useHandleRecordGroupField';
 import { SettingsPath } from '@/types/SettingsPath';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
@@ -107,7 +107,7 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={() =>
+        onStartIconClick={() =>
           isDefined(recordGroupFieldMetadata)
             ? onContentChange('recordGroups')
             : resetContent()

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx

@@ -11,7 +11,7 @@ import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hook
 import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
 import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';
 import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -44,7 +44,7 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={() => onContentChange('recordGroups')}
+        onStartIconClick={() => onContentChange('recordGroups')}
       >
         Sort
       </DropdownMenuHeader>

packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx

@@ -20,7 +20,7 @@ import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-gr
 import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
 import { recordIndexRecordGroupHideComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState';
 import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
@@ -88,7 +88,10 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={resetContent}
+      >
         Group by
       </DropdownMenuHeader>
       <DropdownMenuItemsContainer>

packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx

@@ -20,7 +20,7 @@ import {
 import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';

packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx

@@ -4,7 +4,7 @@ import { aggregateOperationComponentState } from '@/object-record/record-board/r
 import { availableFieldIdsForAggregateOperationComponentState } from '@/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState';
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
 import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate';
@@ -50,7 +50,7 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={() =>
+        onStartIconClick={() =>
           previousContentId
             ? onContentChange(previousContentId)
             : resetContent()

packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx

@@ -12,7 +12,7 @@ import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/Agg
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
@@ -58,7 +58,10 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={resetContent}
+      >
         {title}
       </DropdownMenuHeader>
       <DropdownMenuItemsContainer>

packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx

@@ -2,7 +2,7 @@ import { RecordTableColumnAggregateFooterAggregateOperationMenuItems } from '@/o
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -32,7 +32,10 @@ export const RecordTableColumnAggregateFooterDropdownSubmenuContent = ({
   );
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={resetContent}
+      >
         {title}
       </DropdownMenuHeader>
       <DropdownMenuItemsContainer>

packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx

@@ -28,7 +28,7 @@ const StyledDropdownFallbackAnchor = styled.div`
   top: 0;
 `;
 
-type DropdownProps = {
+export type DropdownProps = {
   className?: string;
   clickableComponent?: ReactNode;
   dropdownComponents: ReactNode;

packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader.tsx

@@ -1,8 +1,13 @@
-import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { ComponentProps, MouseEvent } from 'react';
+import { ComponentProps, MouseEvent, ReactElement } from 'react';
+import { Avatar, AvatarProps, IconComponent } from 'twenty-ui';
+import { DropdownMenuHeaderStartIcon } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderStartIcon';
 import { isDefined } from 'twenty-shared';
-import { IconComponent, LightIconButton } from 'twenty-ui';
+import { useTheme } from '@emotion/react';
+import {
+  Dropdown,
+  DropdownProps,
+} from '@/ui/layout/dropdown/components/Dropdown';
 
 const StyledHeader = styled.li`
   align-items: center;
@@ -26,6 +31,13 @@ const StyledHeader = styled.li`
   }
 `;
 
+const StyledChildrenWrapper = styled.span`
+  overflow: hidden;
+  padding: 0 ${({ theme }) => theme.spacing(1)};
+  white-space: nowrap;
+  text-overflow: ellipsis;
+`;
+
 const StyledEndIcon = styled.div`
   display: inline-flex;
   color: ${({ theme }) => theme.font.color.tertiary};
@@ -39,83 +51,53 @@ const StyledEndIcon = styled.div`
   }
 `;
 
-const StyledChildrenWrapper = styled.span`
-  overflow: hidden;
-  padding: 0 ${({ theme }) => theme.spacing(1)};
-  white-space: nowrap;
-  text-overflow: ellipsis;
-`;
-
-const StyledNonClickableStartIcon = styled.div`
-  align-items: center;
-  background: transparent;
-  border: none;
-
-  display: flex;
-  flex-direction: row;
-
-  font-family: ${({ theme }) => theme.font.family};
-  font-weight: ${({ theme }) => theme.font.weight.regular};
-  gap: ${({ theme }) => theme.spacing(1)};
-  justify-content: center;
-
-  white-space: nowrap;
-  height: 24px;
-  width: 24px;
-`;
-
 type DropdownMenuHeaderProps = ComponentProps<'li'> & {
-  StartIcon?: IconComponent;
   EndIcon?: IconComponent;
-  onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
+  onClick?: (event: MouseEvent<HTMLLIElement>) => void;
+  onStartIconClick?: (event: MouseEvent<HTMLButtonElement>) => void;
   testId?: string;
   className?: string;
-};
+  DropdownOnEndIcon?: ReactElement<DropdownProps, typeof Dropdown>;
-
+} & (
+    | { StartIcon?: IconComponent }
+    | { StartAvatar?: ReactElement<AvatarProps, typeof Avatar> }
+  );
 export const DropdownMenuHeader = ({
   children,
-  StartIcon,
   EndIcon,
+  onStartIconClick,
   onClick,
   testId,
   className,
+  ...props
 }: DropdownMenuHeaderProps) => {
   const theme = useTheme();
+
   return (
-    <>
+    <StyledHeader data-testid={testId} className={className} onClick={onClick}>
-      {EndIcon && (
+      {'StartIcon' in props && isDefined(props.StartIcon) && (
-        <StyledHeader
+        <DropdownMenuHeaderStartIcon
-          data-testid={testId}
+          onClick={onStartIconClick}
-          onClick={onClick}
+          StartIcon={props.StartIcon}
-          className={className}
+        />
-        >
-          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
-          <StyledEndIcon>
-            <EndIcon size={theme.icon.size.md} />
-          </StyledEndIcon>
-        </StyledHeader>
       )}
-      {StartIcon && (
+      {!('StartIcon' in props) &&
-        <StyledHeader data-testid={testId} className={className}>
+        'StartAvatar' in props &&
-          {isDefined(onClick) ? (
+        isDefined(props.StartAvatar) && (
-            <LightIconButton
+          <DropdownMenuHeaderStartIcon
-              testId="dropdown-menu-header-end-icon"
+            onClick={onStartIconClick}
-              Icon={StartIcon}
+            StartAvatar={props.StartAvatar}
-              accent="tertiary"
+          />
-              size="small"
+        )}
-              onClick={onClick}
+      <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
-            />
+      {'DropdownOnEndIcon' in props && (
-          ) : (
+        <StyledEndIcon>{props.DropdownOnEndIcon}</StyledEndIcon>
-            <StyledNonClickableStartIcon>
-              <StartIcon
-                size={theme.icon.size.sm}
-                color={theme.font.color.tertiary}
-              />
-            </StyledNonClickableStartIcon>
-          )}
-          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
-        </StyledHeader>
       )}
-    </>
+      {!('DropdownOnEndIcon' in props) && EndIcon && (
+        <StyledEndIcon>
+          <EndIcon size={theme.icon.size.md} />
+        </StyledEndIcon>
+      )}
+    </StyledHeader>
   );
 };

packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderStartIcon.tsx

@@ -0,0 +1,64 @@
+import { Avatar, AvatarProps, IconComponent, LightIconButton } from 'twenty-ui';
+import { MouseEvent, ReactElement } from 'react';
+import styled from '@emotion/styled';
+import { useTheme } from '@emotion/react';
+
+const StyledNonClickableStartIcon = styled.div`
+  align-items: center;
+  background: transparent;
+  border: none;
+
+  display: flex;
+  flex-direction: row;
+
+  font-family: ${({ theme }) => theme.font.family};
+  font-weight: ${({ theme }) => theme.font.weight.regular};
+  gap: ${({ theme }) => theme.spacing(1)};
+  justify-content: center;
+
+  white-space: nowrap;
+  height: ${({ theme }) => theme.spacing(6)};
+  width: ${({ theme }) => theme.spacing(6)};
+`;
+
+const StyledAvatarWrapper = styled.div`
+  padding: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const DropdownMenuHeaderStartIcon = ({
+  onClick,
+  ...props
+}: { onClick?: (event: MouseEvent<HTMLButtonElement>) => void } & (
+  | { StartIcon: IconComponent }
+  | {
+      StartAvatar: ReactElement<AvatarProps, typeof Avatar>;
+    }
+  | Record<never, never>
+)) => {
+  const theme = useTheme();
+
+  return (
+    <>
+      {'StartIcon' in props &&
+        (onClick ? (
+          <LightIconButton
+            Icon={props.StartIcon}
+            accent="tertiary"
+            size="small"
+            onClick={onClick}
+          />
+        ) : (
+          <StyledNonClickableStartIcon>
+            <props.StartIcon
+              size={theme.icon.size.sm}
+              color={theme.font.color.tertiary}
+            />
+          </StyledNonClickableStartIcon>
+        ))}
+
+      {'StartAvatar' in props && (
+        <StyledAvatarWrapper>{props.StartAvatar}</StyledAvatarWrapper>
+      )}
+    </>
+  );
+};

packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderWithDropdownMenu.tsx

@@ -0,0 +1,34 @@
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { IconComponent, IconDotsVertical, LightIconButton } from 'twenty-ui';
+import { SelectHotkeyScope } from '@/ui/input/types/SelectHotkeyScope';
+import { Placement } from '@floating-ui/react';
+import { ReactNode } from 'react';
+
+export type DropdownMenuHeaderWithDropdownMenuProps = {
+  EndIcon?: IconComponent;
+  dropdownPlacement?: Placement;
+  dropdownComponents: ReactNode;
+  dropdownId: string;
+};
+
+export const DropdownMenuHeaderWithDropdownMenu = (
+  props: DropdownMenuHeaderWithDropdownMenuProps,
+) => {
+  return (
+    <div className="hoverable-buttons">
+      <Dropdown
+        clickableComponent={
+          <LightIconButton
+            Icon={props.EndIcon ?? IconDotsVertical}
+            size="small"
+            accent="tertiary"
+          />
+        }
+        dropdownPlacement={props.dropdownPlacement ?? 'bottom-end'}
+        dropdownComponents={props.dropdownComponents}
+        dropdownId={props.dropdownId}
+        dropdownHotkeyScope={{ scope: SelectHotkeyScope.Select }}
+      />
+    </div>
+  );
+};

packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx

@@ -7,6 +7,7 @@ import {
   Avatar,
   Button,
   ComponentDecorator,
+  IconChevronLeft,
   MenuItem,
   MenuItemMultiSelectAvatar,
   MenuItemSelectAvatar,
@@ -15,7 +16,7 @@ import {
 import { DropdownMenuSkeletonItem } from '@/ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem';
 
 import { Dropdown } from '../Dropdown';
-import { DropdownMenuHeader } from '../DropdownMenuHeader';
+import { DropdownMenuHeader } from '../DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuInput } from '../DropdownMenuInput';
 import { DropdownMenuItemsContainer } from '../DropdownMenuItemsContainer';
 import { DropdownMenuSearchInput } from '../DropdownMenuSearchInput';
@@ -218,8 +219,9 @@ export const WithHeaders: Story = {
   args: {
     dropdownComponents: (
       <>
-        <DropdownMenuHeader>Header</DropdownMenuHeader>
+        <DropdownMenuHeader StartIcon={IconChevronLeft}>
-        <DropdownMenuSeparator />
+          Header
+        </DropdownMenuHeader>
         <StyledDropdownMenuSubheader>Subheader 1</StyledDropdownMenuSubheader>
         <DropdownMenuItemsContainer hasMaxHeight>
           <>

packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx

@@ -0,0 +1,81 @@
+import { Meta, StoryObj } from '@storybook/react';
+import {
+  Avatar,
+  AVATAR_URL_MOCK,
+  ComponentDecorator,
+  IconChevronLeft,
+  IconChevronRight,
+  IconPlus,
+  MenuItem,
+} from 'twenty-ui';
+
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
+import { SelectHotkeyScope } from '@/ui/input/types/SelectHotkeyScope';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+
+const meta: Meta<typeof DropdownMenuHeader> = {
+  title: 'UI/Layout/Dropdown/DropdownMenuHeader',
+  component: DropdownMenuHeader,
+  decorators: [ComponentDecorator],
+  args: {},
+};
+
+export default meta;
+type Story = StoryObj<typeof DropdownMenuHeader>;
+
+export const Text: Story = {
+  args: {
+    children: 'Text only',
+  },
+};
+export const StartIcon: Story = {
+  args: {
+    StartIcon: IconChevronLeft,
+    children: 'Start Icon',
+  },
+};
+
+export const EndIcon: Story = {
+  args: {
+    EndIcon: IconChevronRight,
+    children: 'End Icon',
+  },
+};
+
+export const StartAndEndIcon: Story = {
+  args: {
+    StartIcon: IconChevronLeft,
+    EndIcon: IconChevronRight,
+    children: 'Start and End Icon',
+  },
+};
+
+export const StartAvatar: Story = {
+  args: {
+    StartAvatar: (
+      <Avatar placeholder="placeholder" avatarUrl={AVATAR_URL_MOCK} />
+    ),
+    children: 'Avatar',
+  },
+};
+
+export const ContextDropdownAndAvatar: Story = {
+  args: {
+    children: 'Context Dropdown',
+    StartAvatar: (
+      <Avatar placeholder="placeholder" avatarUrl={AVATAR_URL_MOCK} />
+    ),
+    DropdownOnEndIcon: (
+      <Dropdown
+        dropdownId={'story-dropdown-id-context-menu'}
+        dropdownHotkeyScope={{ scope: SelectHotkeyScope.Select }}
+        dropdownComponents={
+          <DropdownMenuItemsContainer>
+            <MenuItem LeftIcon={IconPlus} text={`Create Workspace`} />
+          </DropdownMenuItemsContainer>
+        }
+      />
+    ),
+  },
+};

packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx

@@ -6,7 +6,7 @@ import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMeta
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { Select } from '@/ui/input/components/Select';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -130,7 +130,7 @@ export const ViewPickerContentCreateMode = () => {
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconX} onClick={handleClose}>
+      <DropdownMenuHeader StartIcon={IconX} onStartIconClick={handleClose}>
         {t`Create view`}
       </DropdownMenuHeader>
       <DropdownMenuSeparator />

packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx

@@ -3,7 +3,7 @@ import { IconChevronLeft } from 'twenty-ui';
 
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -67,7 +67,10 @@ export const ViewPickerContentEditMode = () => {
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={handleClose}>
+      <DropdownMenuHeader
+        StartIcon={IconChevronLeft}
+        onStartIconClick={handleClose}
+      >
         Edit view
       </DropdownMenuHeader>
       <DropdownMenuSeparator />

packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx

@@ -1,4 +1,4 @@
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -117,7 +117,7 @@ export const WorkflowVariablesDropdownFieldItems = ({
     <>
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
-        onClick={goBack}
+        onStartIconClick={goBack}
         style={{ position: 'fixed' }}
       >
         <OverflowingTextWithTooltip

packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownObjectItems.tsx

@@ -1,4 +1,4 @@
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -98,7 +98,7 @@ export const WorkflowVariablesDropdownObjectItems = ({
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={goBack}>
+      <DropdownMenuHeader StartIcon={IconChevronLeft} onStartIconClick={goBack}>
         <OverflowingTextWithTooltip
           text={getStepHeaderLabel(step, currentPath)}
         />

packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownWorkflowStepItems.tsx

@@ -1,4 +1,4 @@
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -37,7 +37,7 @@ export const WorkflowVariablesDropdownWorkflowStepItems = ({
 
   return (
     <>
-      <DropdownMenuHeader StartIcon={IconX} onClick={closeDropdown}>
+      <DropdownMenuHeader StartIcon={IconX} onStartIconClick={closeDropdown}>
         <OverflowingTextWithTooltip text={'Select Step'} />
       </DropdownMenuHeader>
       <DropdownMenuSearchInput

packages/twenty-ui/src/input/button/components/LightIconButton.tsx

@@ -54,14 +54,17 @@ const StyledButton = styled.button<
   font-family: ${({ theme }) => theme.font.family};
   font-weight: ${({ theme }) => theme.font.weight.regular};
   gap: ${({ theme }) => theme.spacing(1)};
-  height: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+  height: ${({ size, theme }) =>
+    size === 'small' ? theme.spacing(6) : theme.spacing(8)};
   justify-content: center;
   padding: ${({ theme }) => theme.spacing(1)};
   transition: background 0.1s ease;
 
   white-space: nowrap;
-  width: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+  width: ${({ size, theme }) =>
-  min-width: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+    size === 'small' ? theme.spacing(6) : theme.spacing(8)};
+  min-width: ${({ size, theme }) =>
+    size === 'small' ? theme.spacing(6) : theme.spacing(8)};
 
   &:hover {
     background: ${({ theme, disabled }) =>