diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx index 73149fb6eb..c93c8bfdad 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx @@ -132,6 +132,7 @@ export const RecordIndexOptionsDropdownContent = ({ onClick={() => handleSelectMenu('fields')} LeftIcon={IconTag} text="Fields" + hasSubMenu /> openRecordSpreadsheetImport()} diff --git a/packages/twenty-front/src/modules/ui/input/button/components/LightIconButton.tsx b/packages/twenty-front/src/modules/ui/input/button/components/LightIconButton.tsx index 5f03c700e0..868ed0c534 100644 --- a/packages/twenty-front/src/modules/ui/input/button/components/LightIconButton.tsx +++ b/packages/twenty-front/src/modules/ui/input/button/components/LightIconButton.tsx @@ -105,7 +105,7 @@ export const LightIconButton = ({ active={active} title={title} > - {Icon && } + {Icon && } ); }; diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx index 4e40759f97..a857128072 100644 --- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx @@ -1,5 +1,6 @@ import { FunctionComponent, MouseEvent, ReactElement, ReactNode } from 'react'; -import { IconComponent } from 'twenty-ui'; +import { useTheme } from '@emotion/react'; +import { IconChevronRight, IconComponent } from 'twenty-ui'; import { LightIconButtonProps } from '@/ui/input/button/components/LightIconButton'; import { LightIconButtonGroup } from '@/ui/input/button/components/LightIconButtonGroup'; @@ -30,6 +31,7 @@ export type MenuItemProps = { onMouseLeave?: (event: MouseEvent) => void; testId?: string; text: ReactNode; + hasSubMenu?: boolean; }; export const MenuItem = ({ @@ -43,7 +45,9 @@ export const MenuItem = ({ onMouseLeave, testId, text, + hasSubMenu = false, }: MenuItemProps) => { + const theme = useTheme(); const showIconButtons = Array.isArray(iconButtons) && iconButtons.length > 0; const handleMenuItemClick = (event: MouseEvent) => { @@ -72,6 +76,13 @@ export const MenuItem = ({ )} + + {hasSubMenu && ( + + )} ); }; diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx index 07f5ff1e03..dd847b3048 100644 --- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx @@ -27,7 +27,10 @@ export const MenuItemNavigate = ({ - + ); };