Skip to content

The open alternative to Salesforce, designed for AI.

Migrate independent Dropdown action menus (#26432)

Raphaël Bosif4dc41541c52
diff --git a/packages/twenty-docs/ui/components/dropdown.mdx b/packages/twenty-docs/ui/components/dropdown.mdx
index 879d8168e9b..0bce362ed96 100644
--- a/packages/twenty-docs/ui/components/dropdown.mdx
+++ b/packages/twenty-docs/ui/components/dropdown.mdx
@@ -176,7 +176,7 @@ Use `type="panel"` for form inputs. Input interaction keeps the panel open; a sa
height={380}
/>
-Escape dismisses the popup and restores focus to its trigger. Outside interaction also dismisses it. `Content` accepts focus and portal options from Popover, including an explicit return-focus target for editor workflows.
+Escape dismisses the popup and restores focus to its trigger. Outside interaction also dismisses it, and the click that dismisses it doesn't activate what it lands on. Keys pressed inside the popup stay inside it, except Ctrl or Cmd shortcuts the dropdown doesn't handle, so page-level shortcuts keep working. `Content` accepts focus and portal options from Popover, including an explicit return-focus target for editor workflows.
## Props
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
index eff51ba2113..af91554cf0f 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
@@ -1,7 +1,7 @@
import { type EmailRecipientResolution } from '@/activities/emails/recipients/hooks/useEmailRecipientsResolution';
import { type EmailRecipient } from '@/activities/emails/recipients/types/EmailRecipient';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -87,7 +87,7 @@ export const EmailRecipientChipMenuContent = ({
!isDefined(person) && !isDefined(workspaceMember) && !isInvalid;
return (
- <DropdownContent widthInPixels={280}>
+ <LegacyDropdownContent widthInPixels={280}>
{(isDefined(person) || isDefined(workspaceMember) || showAddAsPerson) && (
<>
<DropdownMenuItemsContainer>
@@ -152,6 +152,6 @@ export const EmailRecipientChipMenuContent = ({
onClick={handleRemove}
>{t`Remove`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientSuggestionsDropdownContent.tsx b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientSuggestionsDropdownContent.tsx
index cbae58268e0..02d82730db9 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientSuggestionsDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientSuggestionsDropdownContent.tsx
@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react/macro';
import { EmailRecipientSuggestionMenuItem } from '@/activities/emails/recipients/components/EmailRecipientSuggestionMenuItem';
import { type EmailRecipientSuggestion } from '@/activities/emails/recipients/types/EmailRecipientSuggestion';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
@@ -24,7 +24,7 @@ export const EmailRecipientSuggestionsDropdownContent = ({
return (
<div onMouseDown={(event) => event.preventDefault()}>
- <DropdownContent widthInPixels={340}>
+ <LegacyDropdownContent widthInPixels={340}>
<DropdownMenuItemsContainer hasMaxHeight>
{suggestions.length === 0 ? (
<ListItem disabled>{t`No results`}</ListItem>
@@ -47,7 +47,7 @@ export const EmailRecipientSuggestionsDropdownContent = ({
</SelectableList>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</div>
);
};
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
index 3f135a0860c..e58f1d8a69a 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
@@ -1,9 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import {
IconDotsVertical,
@@ -11,72 +5,62 @@ import {
IconPencil,
IconTrash,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
type AttachmentDropdownProps = {
+ attachmentId: string;
onDownload: () => void;
onDelete: () => void;
onRename: () => void;
- attachmentId: string;
hasDownloadPermission: boolean;
};
export const AttachmentDropdown = ({
+ attachmentId,
onDownload,
onDelete,
onRename,
- attachmentId,
hasDownloadPermission,
}: AttachmentDropdownProps) => {
const { t } = useLingui();
- const dropdownId = `${attachmentId}-attachment-dropdown`;
-
- const { closeDropdown } = useCloseDropdown();
-
- const handleDownload = () => {
- onDownload();
- closeDropdown(dropdownId);
- };
-
- const handleDelete = () => {
- onDelete();
- closeDropdown(dropdownId);
- };
-
- const handleRename = () => {
- onRename();
- closeDropdown(dropdownId);
- };
return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
- <DropdownMenuItemsContainer>
- {hasDownloadPermission && (
- <ListItem
- startIcon={<IconDownload />}
- onClick={handleDownload}
- >{t`Download`}</ListItem>
- )}
- <ListItem
- startIcon={<IconPencil />}
- onClick={handleRename}
- >{t`Rename`}</ListItem>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={handleDelete}
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot
+ dropdownId={`${attachmentId}-attachment-dropdown`}
+ type="menu"
+ >
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent align="end" width={GenericDropdownContentWidth.Narrow}>
+ <Dropdown.Section>
+ {hasDownloadPermission && (
+ <Dropdown.ActionItem
+ startIcon={<IconDownload />}
+ onClick={onDownload}
+ >
+ {t`Download`}
+ </Dropdown.ActionItem>
+ )}
+ <Dropdown.ActionItem startIcon={<IconPencil />} onClick={onRename}>
+ {t`Rename`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={onDelete}
+ >
+ {t`Delete`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/activities/files/components/__stories__/AttachmentDropdown.stories.tsx b/packages/twenty-front/src/modules/activities/files/components/__stories__/AttachmentDropdown.stories.tsx
new file mode 100644
index 00000000000..3a59400ebfd
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/files/components/__stories__/AttachmentDropdown.stories.tsx
@@ -0,0 +1,113 @@
+import { AttachmentDropdown } from '@/activities/files/components/AttachmentDropdown';
+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type ComponentProps } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { Button } from 'twenty-ui/primitives/input';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const ATTACHMENT_PARENT_CLICK_OUTSIDE_ID = 'attachment-parent';
+
+type AttachmentDropdownStoryProps = ComponentProps<
+ typeof AttachmentDropdown
+> & {
+ onRowClick: () => void;
+ onOutside: () => void;
+};
+
+const AttachmentDropdownStory = ({
+ onRowClick,
+ onOutside,
+ ...attachmentProps
+}: AttachmentDropdownStoryProps) => {
+ useListenClickOutside({
+ listenerId: 'attachment-background-board',
+ excludedClickOutsideIds: [ATTACHMENT_PARENT_CLICK_OUTSIDE_ID],
+ refs: [],
+ callback: onOutside,
+ });
+
+ return (
+ <>
+ <ParentClickOutsideIdContext.Provider
+ value={ATTACHMENT_PARENT_CLICK_OUTSIDE_ID}
+ >
+ <div
+ onClick={onRowClick}
+ data-click-outside-id={ATTACHMENT_PARENT_CLICK_OUTSIDE_ID}
+ >
+ <AttachmentDropdown {...attachmentProps} />
+ </div>
+ </ParentClickOutsideIdContext.Provider>
+ <Button>Outside attachment</Button>
+ </>
+ );
+};
+
+const meta: Meta<typeof AttachmentDropdownStory> = {
+ title: 'Modules/Activities/Files/AttachmentDropdown',
+ component: AttachmentDropdownStory,
+ decorators: [ComponentDecorator],
+ args: {
+ attachmentId: 'attachment',
+ hasDownloadPermission: true,
+ onDownload: fn(),
+ onDelete: fn(),
+ onRename: fn(),
+ onRowClick: fn(),
+ onOutside: fn(),
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof AttachmentDropdownStory>;
+
+export const DownloadPreservesSelection: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+
+ await userEvent.click(trigger);
+ await expect(
+ (await canvas.findAllByRole('menuitem')).map((item) => item.textContent),
+ ).toEqual(['Download', 'Rename', 'Delete']);
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Download' }));
+
+ await expect(args.onDownload).toHaveBeenCalledTimes(1);
+ await expect(args.onOutside).not.toHaveBeenCalled();
+ await expect(args.onRowClick).not.toHaveBeenCalled();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside attachment' }),
+ );
+ await expect(args.onOutside).toHaveBeenCalledTimes(1);
+ },
+};
+
+export const KeyboardDeletionWithoutDownloadPermission: Story = {
+ args: { hasDownloadPermission: false },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+ trigger.focus();
+
+ await userEvent.keyboard('{ArrowDown}');
+ const rename = await canvas.findByRole('menuitem', { name: 'Rename' });
+ await waitFor(() => expect(rename).toHaveFocus());
+ await expect(
+ canvas.queryByRole('menuitem', { name: 'Download' }),
+ ).not.toBeInTheDocument();
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+
+ await expect(args.onDelete).toHaveBeenCalledTimes(1);
+ await expect(args.onRename).not.toHaveBeenCalled();
+ await expect(args.onRowClick).not.toHaveBeenCalled();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ },
+};
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
index 06f0df261ca..03a34cd6ef8 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
@@ -2,7 +2,7 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useTurnIntoBlockOptions } from '@/advanced-text-editor/hooks/useTurnIntoBlockOptions';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
import { styled } from '@linaria/react';
@@ -57,7 +57,7 @@ export const TurnIntoBlockDropdown = ({
return (
<Dropdown
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{options.map(({ id, title, icon, onClick }) => (
<ListItem
@@ -74,7 +74,7 @@ export const TurnIntoBlockDropdown = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownId={dropdownId}
clickableComponent={
diff --git a/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
index aae0050ef26..33833f1733b 100644
--- a/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelTierDropdown.tsx
@@ -11,7 +11,7 @@ import { useIsWorkspaceSetupChat } from '@/ai/hooks/useIsWorkspaceSetupChat';
import { useWorkspaceAiModelTiers } from '@/ai/hooks/useWorkspaceAiModelTiers';
import { agentChatUserSelectedModelTierState } from '@/ai/states/agentChatUserSelectedModelTierState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
const SLIDER_DROPDOWN_WIDTH_PX = 240;
@@ -64,7 +64,7 @@ export const AiModelTierDropdown = ({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={SLIDER_DROPDOWN_WIDTH_PX}>
+ <LegacyDropdownContent widthInPixels={SLIDER_DROPDOWN_WIDTH_PX}>
<StyledSliderContainer
role="group"
aria-label={t`Choose a model mode`}
@@ -75,7 +75,7 @@ export const AiModelTierDropdown = ({
disabled={disabled}
/>
</StyledSliderContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/applications/components/AppMenuItem.tsx b/packages/twenty-front/src/modules/applications/components/AppMenuItem.tsx
index 1af5e2df468..1d59432d021 100644
--- a/packages/twenty-front/src/modules/applications/components/AppMenuItem.tsx
+++ b/packages/twenty-front/src/modules/applications/components/AppMenuItem.tsx
@@ -1,16 +1,7 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
-import { AppChip } from '@/applications/components/AppChip';
+import { AppMenuItemIcon } from '@/applications/components/AppMenuItemIcon';
import { useApplicationChipData } from '@/applications/hooks/useApplicationChipData';
-import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledAppIconContainer = styled.span`
- background: ${themeCssVariables.background.transparent.light};
- border-radius: ${themeCssVariables.border.radius.sm};
- display: flex;
- padding: ${themeCssVariables.spacing[1]};
-`;
type AppMenuItemProps = {
applicationId?: string | null;
@@ -35,11 +26,7 @@ export const AppMenuItem = ({
return (
<ListItem
- startIcon={
- <StyledAppIconContainer>
- <AppChip applicationId={applicationId} size="md" chipOnly />
- </StyledAppIconContainer>
- }
+ startIcon={<AppMenuItemIcon applicationId={applicationId} />}
description={applicationChipData.name}
onClick={onClick}
focused={focused}
diff --git a/packages/twenty-front/src/modules/applications/components/AppMenuItemIcon.tsx b/packages/twenty-front/src/modules/applications/components/AppMenuItemIcon.tsx
new file mode 100644
index 00000000000..7bfda669333
--- /dev/null
+++ b/packages/twenty-front/src/modules/applications/components/AppMenuItemIcon.tsx
@@ -0,0 +1,20 @@
+import { AppChip } from '@/applications/components/AppChip';
+import { styled } from '@linaria/react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledAppIconContainer = styled.span`
+ background: ${themeCssVariables.background.transparent.light};
+ border-radius: ${themeCssVariables.border.radius.sm};
+ display: flex;
+ padding: ${themeCssVariables.spacing[1]};
+`;
+
+type AppMenuItemIconProps = {
+ applicationId?: string | null;
+};
+
+export const AppMenuItemIcon = ({ applicationId }: AppMenuItemIconProps) => (
+ <StyledAppIconContainer>
+ <AppChip applicationId={applicationId} size="md" chipOnly />
+ </StyledAppIconContainer>
+);
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
index 2ef358b2a1b..d1c09d8e87d 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
@@ -10,7 +10,7 @@ import {
type CustomMentionMenuProps,
type MentionItem,
} from '@/blocknote-editor/types/types';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { isDefined } from 'twenty-shared/utils';
@@ -64,7 +64,7 @@ export const CustomMentionMenu = ({
style={floatingStyles}
data-click-outside-id={MENTION_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
- <DropdownContent widthInPixels={MenuPixelWidth}>
+ <LegacyDropdownContent widthInPixels={MenuPixelWidth}>
<DropdownMenuItemsContainer hasMaxHeight>
{filteredItems.map((item, index) => (
<MentionMenuListItem
@@ -79,7 +79,7 @@ export const CustomMentionMenu = ({
/>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</OverlayContainer>
</motion.div>,
document.body,
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
index ae5e46a4659..c06bfa63544 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
@@ -12,7 +12,7 @@ import type {
CustomSlashMenuProps,
SuggestionItem,
} from '@/blocknote-editor/types/types';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
@@ -74,7 +74,7 @@ export const CustomSlashMenu = ({
style={floatingStyles}
data-click-outside-id={SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer hasMaxHeight>
<SelectableList
focusId={SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
@@ -86,7 +86,7 @@ export const CustomSlashMenu = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</OverlayContainer>
</motion.div>,
document.body,
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
index 19db8e31d47..f78f72fb18d 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
@@ -7,7 +7,7 @@ import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/u
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
@@ -78,7 +78,7 @@ export const RecordIndexCommandMenuDropdown = () => {
y: recordIndexCommandMenuDropdownPosition.y ?? 0,
}}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<StyledDropdownMenuContainer
data-click-outside-id={COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
@@ -113,7 +113,7 @@ export const RecordIndexCommandMenuDropdown = () => {
</SelectableList>
</DropdownMenuItemsContainer>
</StyledDropdownMenuContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
index 3c4436e8db2..a243e8f46ba 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
@@ -1,18 +1,17 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
-import { CommandMenuItemRenderer } from '@/command-menu-item/display/components/CommandMenuItemRenderer';
import { usePinnedCommandMenuItemsInlineLayout } from '@/command-menu-item/display/hooks/usePinnedCommandMenuItemsInlineLayout';
import { useSidePanelFooterPinnedItemsAvailableWidth } from '@/command-menu-item/hooks/useSidePanelFooterPinnedItemsAvailableWidth';
-import { getSidePanelCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getSidePanelCommandMenuDropdownIdFromCommandMenuId';
-import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
-import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { sidePanelWidgetFooterCommandMenuItemsState } from '@/ui/layout/side-panel/states/sidePanelWidgetFooterCommandMenuItemsState';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext, useMemo } from 'react';
-import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components';
+import { SidePanelOptionsDropdown } from '@/side-panel/components/SidePanelOptionsDropdown';
+import { getSidePanelCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getSidePanelCommandMenuDropdownIdFromCommandMenuId';
+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
+import { CommandMenuDropdownActionItem } from '@/command-menu-item/display/components/CommandMenuDropdownActionItem';
import { CommandMenuItemAvailabilityType } from '~/generated-metadata/graphql';
export const RecordPageSidePanelCommandMenuDropdown = () => {
@@ -21,12 +20,9 @@ export const RecordPageSidePanelCommandMenuDropdown = () => {
const commandMenuId = useAvailableComponentInstanceIdOrThrow(
CommandMenuComponentInstanceContext,
);
-
const dropdownId =
getSidePanelCommandMenuDropdownIdFromCommandMenuId(commandMenuId);
- const { closeDropdown } = useCloseDropdown();
-
const sidePanelWidgetFooterCommandMenuItems = useAtomStateValue(
sidePanelWidgetFooterCommandMenuItemsState,
);
@@ -81,36 +77,22 @@ export const RecordPageSidePanelCommandMenuDropdown = () => {
pinnedOverflowCommandMenuItemIds.has(item.id),
);
- const selectableItemIdArray = [
- ...dropdownWidgetCommandMenuItems.map(
- (commandMenuItem) => commandMenuItem.id,
- ),
- ...listedCommandMenuItems.map((item) => item.id),
- ];
-
return (
- <OptionsDropdownMenu
- dropdownId={dropdownId}
- selectableListId={commandMenuId}
- selectableItemIdArray={selectableItemIdArray}
- >
+ <SidePanelOptionsDropdown dropdownId={dropdownId}>
{dropdownWidgetCommandMenuItems.map((commandMenuItem) => (
- <ListItem
+ <Dropdown.ActionItem
key={commandMenuItem.id}
startIcon={<SelectOptionIcon Icon={commandMenuItem.Icon} />}
- onClick={() => {
- closeDropdown(dropdownId);
- commandMenuItem.onClick();
- }}
+ onClick={() => commandMenuItem.onClick()}
>
{commandMenuItem.label}
- </ListItem>
+ </Dropdown.ActionItem>
))}
- {dropdownWidgetCommandMenuItems.length > 0 &&
- listedCommandMenuItems.length > 0 && <HorizontalSeparator noMargin />}
+ {isNonEmptyArray(dropdownWidgetCommandMenuItems) &&
+ isNonEmptyArray(listedCommandMenuItems) && <Dropdown.Separator />}
{listedCommandMenuItems.map((item) => (
- <CommandMenuItemRenderer item={item} key={item.id} />
+ <CommandMenuDropdownActionItem item={item} key={item.id} />
))}
- </OptionsDropdownMenu>
+ </SidePanelOptionsDropdown>
);
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
index f0bc0c8ec9d..3dc06a94d1e 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
@@ -1,61 +1,70 @@
-import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Provider as JotaiProvider } from 'jotai';
-import { userEvent, within } from 'storybook/test';
-
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { RecordPageSidePanelCommandMenuDropdown } from '@/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown';
import { EMPTY_COMMAND_MENU_CONTEXT_API } from '@/command-menu-item/constants/EmptyCommandMenuContextApi';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
+import { headlessCommandContextApisState } from '@/command-menu-item/engine-command/states/headlessCommandContextApisState';
import { createMockCommandMenuItems } from '@/command-menu-item/mock/command-menu-items.mock';
+import { commandMenuItemProgressFamilyState } from '@/command-menu-item/states/commandMenuItemProgressFamilyState';
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
+import { getSidePanelCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getSidePanelCommandMenuDropdownIdFromCommandMenuId';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { JestContextStoreSetter } from '~/testing/jest/JestContextStoreSetter';
-import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { mockCurrentWorkspace } from '~/testing/mock-data/users';
+
+const COMMAND_MENU_ID = 'story-command-menu';
+const EXPORT_COMMAND_ID = 'mock-export';
const meta: Meta<typeof RecordPageSidePanelCommandMenuDropdown> = {
title: 'Modules/CommandMenu/RecordPageSidePanelCommandMenuDropdown',
component: RecordPageSidePanelCommandMenuDropdown,
decorators: [
(Story) => (
- <JotaiProvider store={jotaiStore}>
- <ContextStoreComponentInstanceContext.Provider
- value={{ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID }}
+ <ContextStoreComponentInstanceContext.Provider
+ value={{ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID }}
+ >
+ <JestContextStoreSetter
+ contextStoreTargetedRecordsRule={{
+ mode: 'selection',
+ selectedRecordIds: ['1'],
+ }}
+ contextStoreNumberOfSelectedRecords={1}
>
- <JestContextStoreSetter
- contextStoreTargetedRecordsRule={{
- mode: 'selection',
- selectedRecordIds: ['1'],
- }}
- contextStoreNumberOfSelectedRecords={1}
+ <CommandMenuComponentInstanceContext.Provider
+ value={{ instanceId: COMMAND_MENU_ID }}
>
- <CommandMenuComponentInstanceContext.Provider
- value={{ instanceId: 'story-command-menu' }}
+ <CommandMenuContext.Provider
+ value={{
+ displayType: 'dropdownItem',
+ containerType:
+ CommandMenuItemContainerType.CommandMenuShowPageDropdown,
+ commandMenuItems: createMockCommandMenuItems().map((item) => ({
+ ...item,
+ isPinned: false,
+ })),
+ commandMenuContextApi: {
+ ...EMPTY_COMMAND_MENU_CONTEXT_API,
+ isInSidePanel: true,
+ },
+ isInPreviewMode: false,
+ }}
>
- <CommandMenuContext.Provider
- value={{
- displayType: 'dropdownItem',
- containerType:
- CommandMenuItemContainerType.CommandMenuShowPageDropdown,
- commandMenuItems: createMockCommandMenuItems(),
- commandMenuContextApi: {
- ...EMPTY_COMMAND_MENU_CONTEXT_API,
- isInSidePanel: true,
- },
- isInPreviewMode: false,
- }}
- >
- <Story />
- </CommandMenuContext.Provider>
- </CommandMenuComponentInstanceContext.Provider>
- </JestContextStoreSetter>
- </ContextStoreComponentInstanceContext.Provider>
- </JotaiProvider>
+ <Story />
+ </CommandMenuContext.Provider>
+ </CommandMenuComponentInstanceContext.Provider>
+ </JestContextStoreSetter>
+ </ContextStoreComponentInstanceContext.Provider>
),
ComponentDecorator,
ContextStoreDecorator,
@@ -63,44 +72,98 @@ const meta: Meta<typeof RecordPageSidePanelCommandMenuDropdown> = {
ToastDecorator,
MemoryRouterDecorator,
],
- args: {
- commandMenuId: 'story-command-menu',
+ beforeEach: () => {
+ jotaiStore.set(currentWorkspaceState.atom, {
+ ...mockCurrentWorkspace,
+ featureFlags: [
+ {
+ key: FeatureFlagKey.IS_ASYNC_CSV_EXPORT_ENABLED,
+ value: true,
+ },
+ ],
+ });
},
};
export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
-type Story = StoryObj<typeof RecordPageSidePanelCommandMenuDropdown>;
+export const OrdinaryCommandClosesDropdown: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = await canvas.findByRole('button', { name: 'Options' });
-export const Default: Story = {
- args: {
- commandMenuId: 'story-command-menu',
+ await userEvent.click(trigger);
+ expect(
+ canvas.queryByRole('menuitem', { name: 'Go to People' }),
+ ).not.toBeInTheDocument();
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Add to favorites' }),
+ );
+
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+ expect(
+ jotaiStore
+ .get(headlessCommandContextApisState.atom)
+ .has('mock-add-to-favorites'),
+ ).toBe(true);
+ expect(jotaiStore.get(headlessCommandContextApisState.atom).size).toBe(1);
+ expect(
+ jotaiStore.get(
+ isDropdownOpenComponentState.atomFamily({
+ instanceId:
+ getSidePanelCommandMenuDropdownIdFromCommandMenuId(COMMAND_MENU_ID),
+ }),
+ ),
+ ).toBe(false);
},
};
-export const WithButtonClicks: Story = {
- args: {
- commandMenuId: 'story-command-menu',
- },
+export const AsyncExportShowsProgressAndPreventsRepeatedExecution: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement.ownerDocument.body);
- let actionButton = await canvas.findByRole('button', { name: 'Options' });
- await userEvent.click(actionButton);
-
- const deleteButton = await canvas.findByText('Delete');
- await userEvent.click(deleteButton);
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Options' }),
+ );
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Export' }),
+ );
- actionButton = await canvas.findByRole('button', { name: 'Options' });
- await userEvent.click(actionButton);
+ const mountedCommands = jotaiStore.get(
+ headlessCommandContextApisState.atom,
+ );
+ expect(mountedCommands.has(EXPORT_COMMAND_ID)).toBe(true);
+ expect(mountedCommands.size).toBe(1);
+ expect(canvas.getByRole('menu')).toBeVisible();
+ expect(
+ jotaiStore.get(
+ isDropdownOpenComponentState.atomFamily({
+ instanceId:
+ getSidePanelCommandMenuDropdownIdFromCommandMenuId(COMMAND_MENU_ID),
+ }),
+ ),
+ ).toBe(true);
- const addToFavoritesButton = await canvas.findByText('Add to favorites');
- await userEvent.click(addToFavoritesButton);
+ jotaiStore.set(
+ commandMenuItemProgressFamilyState.atomFamily(EXPORT_COMMAND_ID),
+ 37,
+ );
- actionButton = await canvas.findByRole('button', { name: 'Options' });
- await userEvent.click(actionButton);
+ const exportAction = await canvas.findByRole('menuitem', {
+ name: /Export 37%/,
+ });
+ expect(exportAction).toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(exportAction);
- const exportButton = await canvas.findByText('Export');
- await userEvent.click(exportButton);
+ expect(jotaiStore.get(headlessCommandContextApisState.atom)).toBe(
+ mountedCommands,
+ );
+ expect(canvas.getByRole('menu')).toBeVisible();
},
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandListItemLoader.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandListItemLoader.tsx
index 643dbb7cb8a..4d36d9d71b9 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandListItemLoader.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandListItemLoader.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
import { getCommandMenuItemProgressLabel } from '@/command-menu-item/utils/getCommandMenuItemProgressLabel';
+import { isDefined } from 'twenty-shared/utils';
import { Loader } from 'twenty-ui/primitives/feedback';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -15,7 +16,11 @@ const StyledProgressText = styled.span`
white-space: nowrap;
`;
-export const CommandListItemLoader = ({ progress }: { progress: number }) => {
+export const CommandListItemLoader = ({ progress }: { progress?: number }) => {
+ if (!isDefined(progress)) {
+ return <Loader />;
+ }
+
return (
<StyledContainer>
<StyledProgressText>
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuDropdownActionItem.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuDropdownActionItem.tsx
new file mode 100644
index 00000000000..a226d81a8b0
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuDropdownActionItem.tsx
@@ -0,0 +1,41 @@
+import { AppMenuItemIcon } from '@/applications/components/AppMenuItemIcon';
+import { useApplicationChipData } from '@/applications/hooks/useApplicationChipData';
+import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';
+import { CommandListItemLoader } from '@/command-menu-item/display/components/CommandListItemLoader';
+import { useCommandMenuItemDisplay } from '@/command-menu-item/display/hooks/useCommandMenuItemDisplay';
+import { type CommandMenuItemDefinition } from '@/command-menu-item/types/CommandMenuItemDefinition';
+import { Dropdown } from 'twenty-ui/components';
+
+export const CommandMenuDropdownActionItem = ({
+ item,
+}: {
+ item: CommandMenuItemDefinition;
+}) => {
+ const { Icon, label, handleClick, disabled, progress, isLoading } =
+ useCommandMenuItemDisplay(item);
+ const isThirdPartyApp = useIsThirdPartyApplication(item.applicationId);
+ const { applicationChipData } = useApplicationChipData({
+ applicationId: item.applicationId,
+ });
+
+ return (
+ <Dropdown.ActionItem
+ disabled={disabled}
+ onClick={handleClick}
+ closeOnClick={false}
+ startIcon={
+ isThirdPartyApp ? (
+ <AppMenuItemIcon applicationId={item.applicationId} />
+ ) : (
+ <Icon />
+ )
+ }
+ description={isThirdPartyApp ? applicationChipData.name : undefined}
+ endIcon={
+ isLoading ? <CommandListItemLoader progress={progress} /> : undefined
+ }
+ >
+ {label}
+ </Dropdown.ActionItem>
+ );
+};
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
index 533eeda805c..4521aae281f 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
@@ -1,12 +1,10 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { type CommandMenuItemDefinition } from '@/command-menu-item/types/CommandMenuItemDefinition';
import { AppMenuItem } from '@/applications/components/AppMenuItem';
import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { CommandListItemLoader } from '@/command-menu-item/display/components/CommandListItemLoader';
-import { interpolateCommandMenuItemFields } from '@/command-menu-item/display/utils/interpolateCommandMenuItemFields';
-import { useCommandMenuItemClick } from '@/command-menu-item/hooks/useCommandMenuItemClick';
+import { useCommandMenuItemDisplay } from '@/command-menu-item/display/hooks/useCommandMenuItemDisplay';
import { CommandMenuButton } from '@/command-menu/components/CommandMenuButton';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -14,13 +12,9 @@ import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-l
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants/CommandMenuDefaultIcon';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { assertUnreachable, isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/icon';
-import { Loader } from 'twenty-ui/primitives/feedback';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
+import { assertUnreachable } from 'twenty-shared/utils';
const StyledPreviewWrapper = styled.div`
cursor: not-allowed;
@@ -43,26 +37,16 @@ const CommandMenuItemButtonRenderer = ({
isPrimaryAction = false,
shouldHideLabel = false,
}: CommandMenuItemButtonRendererProps) => {
- const isAsyncCsvExportEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_ASYNC_CSV_EXPORT_ENABLED,
- );
- const { commandMenuContextApi, isInPreviewMode } =
- useContext(CommandMenuContext);
- const { getIcon } = useIcons();
-
- const { iconKey, label, shortLabel } = interpolateCommandMenuItemFields(
- item,
- commandMenuContextApi,
- );
-
- const Icon = getIcon(iconKey, COMMAND_MENU_DEFAULT_ICON);
-
- const { handleClick, disabled, progress, showDisabledLoader } =
- useCommandMenuItemClick({
- item,
- Icon,
- label,
- });
+ const { isInPreviewMode } = useContext(CommandMenuContext);
+ const {
+ Icon,
+ label,
+ shortLabel,
+ handleClick,
+ disabled,
+ progress,
+ isLoading,
+ } = useCommandMenuItemDisplay(item);
const command = {
key: item.id,
@@ -89,8 +73,8 @@ const CommandMenuItemButtonRenderer = ({
command={command}
onClick={disabled ? undefined : handleClick}
disabled={disabled}
- progress={isAsyncCsvExportEnabled ? progress : undefined}
- loading={isAsyncCsvExportEnabled && showDisabledLoader}
+ progress={progress}
+ loading={isLoading}
isPrimaryAction={isPrimaryAction}
shouldHideLabel={shouldHideLabel}
/>
@@ -103,21 +87,8 @@ const CommandMenuItemSelectableRenderer = ({
}: CommandMenuItemRendererProps & {
displayType: 'listItem' | 'dropdownItem';
}) => {
- const isAsyncCsvExportEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_ASYNC_CSV_EXPORT_ENABLED,
- );
- const { commandMenuContextApi } = useContext(CommandMenuContext);
- const { getIcon } = useIcons();
-
- const { iconKey, label } = interpolateCommandMenuItemFields(
- item,
- commandMenuContextApi,
- );
-
- const Icon = getIcon(iconKey, COMMAND_MENU_DEFAULT_ICON);
-
- const { handleClick, disabled, progress, showDisabledLoader } =
- useCommandMenuItemClick({ item, Icon, label });
+ const { Icon, label, handleClick, disabled, progress, isLoading } =
+ useCommandMenuItemDisplay(item);
const selectableListInstanceId = useAvailableComponentInstanceIdOrThrow(
SelectableListComponentInstanceContext,
@@ -138,14 +109,9 @@ const CommandMenuItemSelectableRenderer = ({
handleClick();
};
- const loaderComponent =
- isAsyncCsvExportEnabled && disabled && showDisabledLoader ? (
- isDefined(progress) ? (
- <CommandListItemLoader progress={progress} />
- ) : (
- <Loader />
- )
- ) : undefined;
+ const loaderComponent = isLoading ? (
+ <CommandListItemLoader progress={progress} />
+ ) : undefined;
if (isThirdPartyApp) {
return (
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuItemDisplay.ts b/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuItemDisplay.ts
new file mode 100644
index 00000000000..2167cda4d3a
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuItemDisplay.ts
@@ -0,0 +1,37 @@
+import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
+import { interpolateCommandMenuItemFields } from '@/command-menu-item/display/utils/interpolateCommandMenuItemFields';
+import { useCommandMenuItemClick } from '@/command-menu-item/hooks/useCommandMenuItemClick';
+import { type CommandMenuItemDefinition } from '@/command-menu-item/types/CommandMenuItemDefinition';
+import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants/CommandMenuDefaultIcon';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { useContext } from 'react';
+import { useIcons } from 'twenty-ui/icon';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
+
+export const useCommandMenuItemDisplay = (item: CommandMenuItemDefinition) => {
+ const isAsyncCsvExportEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_ASYNC_CSV_EXPORT_ENABLED,
+ );
+ const { commandMenuContextApi } = useContext(CommandMenuContext);
+ const { getIcon } = useIcons();
+
+ const { iconKey, label, shortLabel } = interpolateCommandMenuItemFields(
+ item,
+ commandMenuContextApi,
+ );
+
+ const Icon = getIcon(iconKey, COMMAND_MENU_DEFAULT_ICON);
+
+ const { handleClick, disabled, progress, showDisabledLoader } =
+ useCommandMenuItemClick({ item, Icon, label });
+
+ return {
+ Icon,
+ label,
+ shortLabel,
+ handleClick,
+ disabled,
+ progress: isAsyncCsvExportEnabled ? progress : undefined,
+ isLoading: isAsyncCsvExportEnabled && showDisabledLoader,
+ };
+};
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
index bf7bbf97428..61c66be92bf 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
@@ -5,7 +5,7 @@ import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainCo
import { mainContextStoreHasSelectedRecordsSelector } from '@/context-store/states/selectors/mainContextStoreHasSelectedRecordsSelector';
import { useResetRecordIndexSelection } from '@/object-record/record-index/hooks/useResetRecordIndexSelection';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -107,7 +107,9 @@ export const CommandMenuItemEditRecordSelectionDropdown = ({
dropdownPlacement="bottom-start"
dropdownOffset={{ y: 4 }}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Medium}
+ >
<StyledDropdownMenuContainer
data-click-outside-id={COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
@@ -130,7 +132,7 @@ export const CommandMenuItemEditRecordSelectionDropdown = ({
>{t`Records selected`}</ListItem>
</DropdownMenuItemsContainer>
</StyledDropdownMenuContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
index 6002bf41164..be0de2cd00e 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
@@ -2,7 +2,7 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { useResetCommandMenuItemToDefault } from '@/command-menu-item/edit/hooks/useResetCommandMenuItemToDefault';
import { useUpdateCommandMenuItemInDraft } from '@/command-menu-item/edit/hooks/useUpdateCommandMenuItemInDraft';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -61,7 +61,9 @@ export const CommandMenuItemOptionsDropdown = ({
clickableComponent={iconButton}
dropdownPlacement="bottom-end"
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Medium}
+ >
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconTag />}
@@ -74,7 +76,7 @@ export const CommandMenuItemOptionsDropdown = ({
onClick={handleResetToDefault}
>{t`Reset to default`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
index a0514dfddb1..cd69a060bc7 100644
--- a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
+++ b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
@@ -1,5 +1,5 @@
import { type PlaceAutocompleteResult } from '@/geo-map/types/placeApi';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -42,7 +42,7 @@ export const PlaceAutocompleteSelect = ({
selectableItemIdArray={selectableItemIdArray}
focusId={dropdownId}
>
- <DropdownContent
+ <LegacyDropdownContent
ref={selectContainerRef}
selectDisabled
widthInPixels={345}
@@ -75,7 +75,7 @@ export const PlaceAutocompleteSelect = ({
);
})}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</SelectableList>
</StyledContainer>
);
diff --git a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
index a09f8fbe413..1f4593f100e 100644
--- a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
@@ -1,18 +1,15 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { LAYOUT_CUSTOMIZATION_BAR_DROPDOWN_ID } from '@/layout-customization/constants/LayoutCustomizationBarDropdownId';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { IconDotsVertical, IconReload } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
import { GRAY_SCALE_LIGHT } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { LAYOUT_CUSTOMIZATION_BAR_DROPDOWN_ID } from '@/layout-customization/constants/LayoutCustomizationBarDropdownId';
import { RESET_RECORD_PAGE_LAYOUT_MODAL_ID } from '@/layout-customization/constants/ResetRecordPageLayoutModalId';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
const StyledInvertedIconButtonWrapper = styled.span`
@@ -30,38 +27,36 @@ const StyledInvertedIconButtonWrapper = styled.span`
export const LayoutCustomizationBarMenuDropdown = () => {
const { t } = useLingui();
- const { closeDropdown } = useCloseDropdown();
const { openDialog } = useDialog();
const handleResetClick = () => {
- closeDropdown(LAYOUT_CUSTOMIZATION_BAR_DROPDOWN_ID);
openDialog(RESET_RECORD_PAGE_LAYOUT_MODAL_ID);
};
return (
- <Dropdown
- dropdownId={LAYOUT_CUSTOMIZATION_BAR_DROPDOWN_ID}
- dropdownPlacement="bottom-start"
- clickableComponent={
- <StyledInvertedIconButtonWrapper>
- <LightIconButton
- emphasis="subtle"
- aria-label={t`Layout customization menu`}
+ <DropdownRoot dropdownId={LAYOUT_CUSTOMIZATION_BAR_DROPDOWN_ID} type="menu">
+ <StyledInvertedIconButtonWrapper>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ emphasis="subtle"
+ aria-label={t`Layout customization menu`}
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ </StyledInvertedIconButtonWrapper>
+ <DropdownContent width={GenericDropdownContentWidth.Large}>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconReload />}
+ onClick={handleResetClick}
>
- <IconDotsVertical />
- </LightIconButton>
- </StyledInvertedIconButtonWrapper>
- }
- dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconReload />}
- onClick={handleResetClick}
- >{t`Reset record page layout`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ {t`Reset record page layout`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
index f1220a621ed..3cb1a428e42 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
@@ -9,7 +9,7 @@ import {
import { LightIconButton } from 'twenty-ui/components';
import { NavigationMenuItemMenu } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -40,7 +40,9 @@ export const NavigationMenuItemFolderNavigationDrawerItemDropdown = ({
}
dropdownPlacement="bottom-start"
renderMenu={({ onClose, onAdd }) => (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Large}
+ >
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconEdit />}
@@ -62,7 +64,7 @@ export const NavigationMenuItemFolderNavigationDrawerItemDropdown = ({
color="danger"
>{t`Remove from sidebar`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
)}
/>
);
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx
index cbe50dbe9d4..ff9c9fa5b5b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx
@@ -17,7 +17,7 @@ import {
} from 'twenty-ui/icon';
import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -128,7 +128,7 @@ export const NavigationMenuItemActions = ({
];
const options = page === 'folders' ? folders : actions;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
{page === 'folders' && (
<DropdownMenuHeader
StartComponent={
@@ -153,6 +153,6 @@ export const NavigationMenuItemActions = ({
))}
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx
index a60e17db1f4..35ad2879022 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx
@@ -20,7 +20,7 @@ import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { IconChevronLeft, IconX } from 'twenty-ui/icon';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
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';
@@ -175,7 +175,9 @@ export const NavigationMenuItemAddDropdownContent = ({
const emptyMessage = getEmptyMessage();
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<NavigationMenuItemInsertionPreviewEffect
dropdownId={dropdownId}
section={section}
@@ -223,6 +225,6 @@ export const NavigationMenuItemAddDropdownContent = ({
{items.length === 0 && <ListItem disabled>{emptyMessage}</ListItem>}
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx
index e0385ea87cc..7c43ffcfa2f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx
@@ -14,7 +14,7 @@ import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { NavigationMenuItemMenu } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -144,7 +144,7 @@ export const NavigationMenuItemEditable = ({
}
renderMenu={({ onClose, onAdd }) =>
mode === 'edit' && item.type === NavigationMenuItemType.LINK ? (
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.ExtraLarge}
>
<NavigationMenuItemLinkEditor
@@ -152,7 +152,7 @@ export const NavigationMenuItemEditable = ({
dropdownId={dropdownId}
onClose={onClose}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
) : (
<NavigationMenuItemActions
item={item}
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx
index f1618acf4f7..6554dfcb425 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx
@@ -6,7 +6,7 @@ import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectCol
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { ThemeColorPickerMenu } from '@/ui/input/components/ThemeColorPickerMenu';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -79,7 +79,7 @@ export const NavigationMenuItemObjectColorEditor = ({
</StyledIconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<ThemeColorPickerMenu
selectedColor={getObjectColorWithFallback(object)}
onSelectColor={(color) => {
@@ -98,7 +98,7 @@ export const NavigationMenuItemObjectColorEditor = ({
closeDropdown(dropdownId);
}}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
),
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemSelectableItem.stories.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemSelectableItem.stories.tsx
new file mode 100644
index 00000000000..9bc4f6e619c
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemSelectableItem.stories.tsx
@@ -0,0 +1,75 @@
+import { NavigationMenuItemSelectableItem } from '@/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem';
+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';
+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const FOCUS_ID = 'navigation-menu-item-selectable-item-story';
+const onChooseUnavailableDestination = fn();
+const onChooseDestination = fn();
+
+const NavigationMenuItemSelectableItems = () => (
+ <SelectableList
+ selectableListInstanceId={FOCUS_ID}
+ focusId={FOCUS_ID}
+ selectableItemIdArray={['unavailable-destination', 'destination']}
+ >
+ <NavigationMenuItemSelectableItem
+ item={{
+ id: 'unavailable-destination',
+ label: 'Unavailable destination',
+ isDisabled: true,
+ onClick: onChooseUnavailableDestination,
+ }}
+ />
+ <NavigationMenuItemSelectableItem
+ item={{
+ id: 'destination',
+ label: 'Choose destination',
+ onClick: onChooseDestination,
+ }}
+ />
+ </SelectableList>
+);
+
+const meta: Meta<typeof NavigationMenuItemSelectableItems> = {
+ title: 'Modules/NavigationMenuItem/NavigationMenuItemSelectableItem',
+ component: NavigationMenuItemSelectableItems,
+ decorators: [ComponentDecorator],
+ beforeEach: () => {
+ onChooseUnavailableDestination.mockClear();
+ onChooseDestination.mockClear();
+ jotaiStore.set(focusStackState.atom, [
+ {
+ focusId: FOCUS_ID,
+ componentInstance: {
+ componentType: FocusComponentType.DROPDOWN,
+ componentInstanceId: FOCUS_ID,
+ },
+ globalHotkeysConfig: {
+ enableGlobalHotkeysWithModifiers: true,
+ enableGlobalHotkeysConflictingWithKeyboard: true,
+ },
+ },
+ ]);
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof NavigationMenuItemSelectableItems>;
+
+export const IgnoresDisabledDestination: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await userEvent.keyboard('{Enter}');
+ await userEvent.click(await canvas.findByText('Unavailable destination'));
+ await expect(onChooseUnavailableDestination).not.toHaveBeenCalled();
+
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+ await expect(onChooseDestination).toHaveBeenCalledTimes(1);
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
index 80eec9761e8..5eca951495c 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
@@ -12,7 +12,7 @@ import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUp
import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { getDefaultSubFieldNameForCompositeFilterableFieldType } from '@/object-record/record-filter/utils/getDefaultSubFieldNameForCompositeFilterableFieldType';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
@@ -169,7 +169,7 @@ export const AdvancedFilterAddFilterRuleSelect = ({
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconPlus />}
@@ -182,7 +182,7 @@ export const AdvancedFilterAddFilterRuleSelect = ({
>{t`Add rule group`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={{ y: 8, x: 0 }}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
index ff9b42d4878..1dc2512dc34 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
@@ -11,7 +11,7 @@ import { isCompositeTypeNonFilterableByAnySubField } from '@/object-record/recor
import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';
import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -114,7 +114,9 @@ export const AdvancedFilterCompositeSubFieldSelectMenu = ({
const fieldLabel = fieldMetadataItemUsedInDropdown?.label;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -204,6 +206,6 @@ export const AdvancedFilterCompositeSubFieldSelectMenu = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx
index d484a39b096..6f1c51ae1f4 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx
@@ -17,7 +17,7 @@ import { subFieldNameUsedInDropdownComponentState } from '@/object-record/object
import { isFilterOnActorSourceSubField } from '@/object-record/object-filter-dropdown/utils/isFilterOnActorSourceSubField';
import { isFilterOnActorWorkspaceMemberSubField } from '@/object-record/object-filter-dropdown/utils/isFilterOnActorWorkspaceMemberSubField';
import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { FieldMetadataType } from 'twenty-shared/types';
@@ -57,35 +57,39 @@ export const AdvancedFilterDropdownFilterInput = ({
{filterType === 'DATE_TIME' && <ObjectFilterDropdownDateTimeInput />}
{filterType === 'DATE' && <ObjectFilterDropdownDateInput />}
{filterType === 'RELATION' && (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<ObjectFilterDropdownSearchInput />
<DropdownMenuSeparator />
<ObjectFilterDropdownRecordSelect
recordFilterId={recordFilter.id}
dropdownId={filterDropdownId}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
)}
{filterType === 'ACTOR' &&
(isActorSourceCompositeFilter ? (
<ObjectFilterDropdownSourceSelect dropdownId={filterDropdownId} />
) : isActorWorkspaceMemberCompositeFilter ? (
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.ExtraLarge}
>
<ObjectFilterDropdownSearchInput />
<DropdownMenuSeparator />
<ObjectFilterDropdownActorSelect dropdownId={filterDropdownId} />
- </DropdownContent>
+ </LegacyDropdownContent>
) : (
<ObjectFilterDropdownTextInput filterDropdownId={filterDropdownId} />
))}
{['SELECT', 'MULTI_SELECT'].includes(filterType) && (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<ObjectFilterDropdownSearchInput />
<DropdownMenuSeparator />
<ObjectFilterDropdownOptionSelect focusId={filterDropdownId} />
- </DropdownContent>
+ </LegacyDropdownContent>
)}
{filterType === 'BOOLEAN' && <ObjectFilterDropdownBooleanSelect />}
{filterType === 'CURRENCY' &&
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx
index 619b99092e3..b44fa1bf83c 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx
@@ -22,7 +22,7 @@ import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dr
import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-filter/hooks/usePushFocusForLeafFieldValuePicker';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -179,7 +179,9 @@ export const AdvancedFilterFieldSelectMenu = ({
const { t } = useLingui();
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<AdvancedFilterFieldSelectSearchInput />
<SelectableList
focusId={advancedFilterFieldSelectDropdownId}
@@ -236,6 +238,6 @@ export const AdvancedFilterFieldSelectMenu = ({
</>
)}
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
index b7c65aa82ab..c8c63827692 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
@@ -5,7 +5,7 @@ import { useRemoveRootRecordFilterGroupIfEmpty } from '@/object-record/record-fi
import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
@@ -53,7 +53,7 @@ export const AdvancedFilterRecordFilterGroupOptionsDropdown = ({
</IconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={handleRemove}
@@ -61,7 +61,7 @@ export const AdvancedFilterRecordFilterGroupOptionsDropdown = ({
color="danger"
>{t`Remove rule group`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={{ y: 2, x: 0 }}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx
index 3fe0bea3a7b..cc12636f349 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx
@@ -11,7 +11,7 @@ import { type RecordFilterOperand } from '@/object-record/record-filter/types/Re
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -87,7 +87,9 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Narrow}
+ >
<DropdownMenuItemsContainer>
<SelectableList
focusId={dropdownId}
@@ -116,7 +118,7 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
index 54bfccb4997..6189229a1dc 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
@@ -8,7 +8,7 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filte
import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -73,7 +73,7 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({
</IconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={handleRemove}
@@ -81,7 +81,7 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({
color="danger"
>{t`Remove rule`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
index dfaf68898bd..030d6081734 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
@@ -10,7 +10,7 @@ import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-fi
import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';
import { objectFilterDropdownIsSelectingRelationTargetFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState';
import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -126,7 +126,9 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({
];
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -188,6 +190,6 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx
index ce544c42030..270f6e6b0db 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx
@@ -9,7 +9,7 @@ import { useChildRecordFiltersAndRecordFilterGroups } from '@/object-record/adva
import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';
import { rootLevelRecordFilterGroupComponentSelector } from '@/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector';
import { isRecordFilterGroupChildARecordFilterGroup } from '@/object-record/advanced-filter/utils/isRecordFilterGroupChildARecordFilterGroup';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { styled } from '@linaria/react';
@@ -45,7 +45,9 @@ export const AdvancedFilterRootRecordFilterGroup = () => {
<ScrollWrapper
componentInstanceId={`scroll-wrapper-dropdown-menu-${rootRecordFilterGroup.id}`}
>
- <DropdownContent widthInPixels={ADVANCED_FILTER_DROPDOWN_CONTENT_WIDTH}>
+ <LegacyDropdownContent
+ widthInPixels={ADVANCED_FILTER_DROPDOWN_CONTENT_WIDTH}
+ >
<AdvancedFilterContext.Provider value={{ objectMetadataItem }}>
<AdvancedFilterSSEEffect />
<StyledContainer>
@@ -74,7 +76,7 @@ export const AdvancedFilterRootRecordFilterGroup = () => {
/>
</StyledContainer>
</AdvancedFilterContext.Provider>
- </DropdownContent>
+ </LegacyDropdownContent>
</ScrollWrapper>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
index 9151515c5e0..5d7184f6883 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
@@ -6,7 +6,7 @@ import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useApplyObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue';
import { useObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue';
import { BooleanDisplay } from '@/ui/field/display/components/BooleanDisplay';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -60,7 +60,9 @@ export const ObjectFilterDropdownBooleanSelect = () => {
};
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<SelectableList
selectableListInstanceId={`${objectFilterDropdownComponentInstanceId}-boolean-select`}
selectableItemIdArray={options.map((option) => option.toString())}
@@ -83,6 +85,6 @@ export const ObjectFilterDropdownBooleanSelect = () => {
))}
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx
index 863335a0543..9329cda0b8e 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx
@@ -1,7 +1,7 @@
import { DATE_FILTER_TYPES } from '@/object-record/object-filter-dropdown/constants/DateFilterTypes';
import { DATE_PICKER_DROPDOWN_CONTENT_WIDTH } from '@/object-record/object-filter-dropdown/constants/DatePickerDropdownContentWidth';
import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
@@ -24,7 +24,7 @@ export const ObjectFilterDropdownContentWrapper = ({
const isDateFilter = DATE_FILTER_TYPES.includes(filterType);
return (
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={
isDateFilter
? DATE_PICKER_DROPDOWN_CONTENT_WIDTH
@@ -32,6 +32,6 @@ export const ObjectFilterDropdownContentWrapper = ({
}
>
{children}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx
index 90a8e64a21f..3d1212e0aee 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx
@@ -6,7 +6,7 @@ import { getCountryFlagMenuItemAvatar } from '@/object-record/object-filter-drop
import { turnCountryIntoSelectableItem } from '@/object-record/object-filter-dropdown/utils/turnCountryIntoSelectableItem';
import { type SelectableItem } from '@/object-record/select/types/SelectableItem';
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -102,7 +102,9 @@ export const ObjectFilterDropdownCountrySelect = () => {
const { t } = useLingui();
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuSearchInput
autoFocus
type="text"
@@ -152,6 +154,6 @@ export const ObjectFilterDropdownCountrySelect = () => {
})}
{showNoResult && <ListItem disabled>{t`No results`}</ListItem>}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx
index 8ba26ab5147..65cbf19bc56 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx
@@ -5,7 +5,7 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-
import { turnCurrencyIntoSelectableItem } from '@/object-record/object-filter-dropdown/utils/turnCurrencyIntoSelectableItem';
import { type SelectableItem } from '@/object-record/select/types/SelectableItem';
import { CURRENCIES } from '@/settings/data-model/constants/Currencies';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -101,7 +101,9 @@ export const ObjectFilterDropdownCurrencySelect = () => {
searchText !== '';
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuSearchInput
autoFocus
type="text"
@@ -151,6 +153,6 @@ export const ObjectFilterDropdownCurrencySelect = () => {
})}
{showNoResult && <ListItem disabled>{t`No results`}</ListItem>}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
index 508db9d7b6d..6a4f2e0f31d 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
@@ -5,7 +5,7 @@ import { objectFilterDropdownSearchInputComponentState } from '@/object-record/o
import { getActorSourceMultiSelectOptions } from '@/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions';
import { MultipleSelectDropdown } from '@/object-record/select/components/MultipleSelectDropdown';
import { type SelectableItem } from '@/object-record/select/types/SelectableItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -85,7 +85,9 @@ export const ObjectFilterDropdownSourceSelect = ({
};
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<MultipleSelectDropdown
selectableListId="object-filter-source-select-id"
focusId={dropdownId}
@@ -99,6 +101,6 @@ export const ObjectFilterDropdownSourceSelect = ({
searchFilter={objectFilterDropdownSearchInput}
loadingItems={false}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx
index 4d91c394e04..23f106a9608 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx
@@ -5,7 +5,7 @@ import { SingleRecordPickerMenuItemsWithSearch } from '@/object-record/record-pi
import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext';
import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -64,7 +64,7 @@ export const ObjectOptionsDropdownAddRecordGroupContent = () => {
<SingleRecordPickerComponentInstanceContext.Provider
value={{ instanceId: addRecordGroupPickerInstanceId }}
>
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -82,7 +82,7 @@ export const ObjectOptionsDropdownAddRecordGroupContent = () => {
objectNameSingulars={[targetObjectNameSingular]}
excludedRecordIds={excludedRecordIds}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
</SingleRecordPickerComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
index 8bac2bea3f2..411926cf4be 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
@@ -3,7 +3,7 @@ import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -61,7 +61,7 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -106,6 +106,6 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {
}}
>{t`Create date field`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
index ca2470eb87d..b8b380b2dc1 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
@@ -1,7 +1,7 @@
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -63,7 +63,7 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -143,6 +143,6 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {
</SelectableListItem>
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
index 245a81ad688..aeadc65446c 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
@@ -6,7 +6,7 @@ import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdow
import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';
import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -136,7 +136,7 @@ export const ObjectOptionsDropdownCustomView = ({
}
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
<ObjectOptionsDropdownMenuViewName currentView={customViewData} />
<DropdownMenuSeparator />
<SelectableList
@@ -308,6 +308,6 @@ export const ObjectOptionsDropdownCustomView = ({
</Tooltip>
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
index 20cd09183fd..34ba75f96ae 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
@@ -2,7 +2,7 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -63,7 +63,7 @@ export const ObjectOptionsDropdownDefaultView = () => {
const MainIcon = getIcon(currentView?.icon);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer scrollable={false}>
<ListItem
startIcon={<SelectOptionIcon Icon={MainIcon} />}
@@ -122,6 +122,6 @@ export const ObjectOptionsDropdownDefaultView = () => {
</SelectableListItem>
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
index 34d2efba362..39ed2bed624 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
@@ -1,5 +1,5 @@
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -20,7 +20,7 @@ export const ObjectOptionsDropdownFieldsContent = () => {
const { onContentChange, resetContent } = useObjectOptionsDropdown();
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -54,6 +54,6 @@ export const ObjectOptionsDropdownFieldsContent = () => {
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
index 18e6036f797..f3e5cda08c3 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
@@ -1,6 +1,6 @@
import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -35,7 +35,7 @@ export const ObjectOptionsDropdownHiddenFieldsContent = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -59,6 +59,6 @@ export const ObjectOptionsDropdownHiddenFieldsContent = () => {
<ListItem startIcon={<IconSettings />}>{t`Edit Fields`}</ListItem>
</DropdownMenuItemsContainer>
</UndecoratedLink>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
index 86d12f6a186..7bdc5eb146b 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
@@ -5,7 +5,7 @@ import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/use
import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -78,7 +78,7 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
}, [hiddenRecordGroupIds, currentContentId, onContentChange]);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -112,6 +112,6 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
>{t`Edit field values`}</ListItem>
</DropdownMenuItemsContainer>
</UndecoratedLink>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
index 31e7157cf19..a0728f9ea56 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
@@ -3,7 +3,7 @@ import { useSetViewTypeFromLayoutOptionsMenu } from '@/object-record/object-opti
import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -132,7 +132,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -344,6 +344,6 @@ export const ObjectOptionsDropdownLayoutContent = () => {
</DropdownMenuItemsContainer>
</SelectableList>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
index 2ad40d9c9df..2cfede81ca0 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
@@ -7,7 +7,7 @@ import { isRecordGroupingOptionalForViewType } from '@/object-record/record-grou
import { useHandleRecordGroupField } from '@/object-record/record-index/hooks/useHandleRecordGroupField';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -100,7 +100,7 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
}, [hiddenRecordGroupIds, currentContentId, onContentChange]);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -166,6 +166,6 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
>{t`Create select field`}</ListItem>
</UndecoratedLink>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupLoadLimitContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupLoadLimitContent.tsx
index 9913c08cbda..faead6ece43 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupLoadLimitContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupLoadLimitContent.tsx
@@ -1,7 +1,7 @@
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';
import { recordIndexGroupLoadLimitComponentState } from '@/object-record/record-index/states/recordIndexGroupLoadLimitComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -32,7 +32,7 @@ export const ObjectOptionsDropdownRecordGroupLoadLimitContent = () => {
const selectableItemIdArray = VIEW_GROUP_LOAD_LIMIT_OPTIONS.map(String);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -69,6 +69,6 @@ export const ObjectOptionsDropdownRecordGroupLoadLimitContent = () => {
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
index 5cc1f9deeb8..656d1200482 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
@@ -5,7 +5,7 @@ import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupS
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -72,7 +72,7 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {
];
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -171,6 +171,6 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {
)}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
index 2d81fba9fc3..cb82be1e705 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
@@ -12,7 +12,7 @@ import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record
import { recordIndexGroupLoadLimitComponentState } from '@/object-record/record-index/states/recordIndexGroupLoadLimitComponentState';
import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
import { recordIndexShouldHideEmptyRecordGroupsComponentState } from '@/object-record/record-index/states/recordIndexShouldHideEmptyRecordGroupsComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -127,7 +127,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
const hiddenGroupsSelectableListId = `${dropdownId}-hidden-groups`;
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -260,6 +260,6 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
index 2a7a86e28df..755c01d35b5 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
@@ -1,7 +1,7 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -69,7 +69,7 @@ export const ObjectOptionsDropdownVisibilityContent = () => {
const currentVisibility = currentView?.visibility ?? ViewVisibility.WORKSPACE;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Large}>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -153,6 +153,6 @@ export const ObjectOptionsDropdownVisibilityContent = () => {
)}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
index 1bcb8826dad..5eb520047bf 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
@@ -18,7 +18,7 @@ import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { recordIndexGroupLoadLimitComponentState } from '@/object-record/record-index/states/recordIndexGroupLoadLimitComponentState';
import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
@@ -135,9 +135,9 @@ const createContentDecorator =
dropdownId: OBJECT_OPTIONS_DROPDOWN_ID,
}}
>
- <DropdownContent>
+ <LegacyDropdownContent>
<Story />
- </DropdownContent>
+ </LegacyDropdownContent>
</ObjectOptionsDropdownContext.Provider>
</DropdownComponentInstanceContext.Provider>
</RecordIndexContextProvider>
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx
index 1ea33995d54..53cec86faf9 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx
@@ -43,8 +43,9 @@ jest.mock(
})),
}),
);
-jest.mock('@/ui/layout/dropdown/components/DropdownContent', () => ({
- DropdownContent: ({ children }: { children: React.ReactNode }) => children,
+jest.mock('@/ui/layout/dropdown/components/LegacyDropdownContent', () => ({
+ LegacyDropdownContent: ({ children }: { children: React.ReactNode }) =>
+ children,
}));
jest.mock(
'@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader',
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 02b2fc5c7ac..e8af2f32c74 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -13,7 +13,7 @@ import { visibleRecordFieldsComponentSelector } from '@/object-record/record-fie
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useUpsertRecordSort } from '@/object-record/record-sort/hooks/useUpsertRecordSort';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuInnerSelect } from '@/ui/layout/dropdown/components/DropdownMenuInnerSelect';
@@ -172,7 +172,9 @@ export const ObjectSortDropdownButton = () => {
</StyledHeaderDropdownButton>
}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -286,7 +288,7 @@ export const ObjectSortDropdownButton = () => {
</>
)}
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
}
onClose={handleDropdownButtonClose}
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
index 8af4ca79cbe..50c0035562c 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
@@ -1,7 +1,7 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useRecordGroupActions } from '@/object-record/record-group/hooks/useRecordGroupActions';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { ViewType } from '@/views/types/ViewType';
@@ -11,7 +11,7 @@ export const RecordBoardColumnDropdownMenu = () => {
});
return (
- <DropdownContent selectDisabled>
+ <LegacyDropdownContent selectDisabled>
<DropdownMenuItemsContainer>
{recordGroupActions.map((action) => (
<ListItem
@@ -23,6 +23,6 @@ export const RecordBoardColumnDropdownMenu = () => {
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
index 0126cce558e..e6de6106e8d 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
@@ -11,7 +11,7 @@ import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/compon
import { Select } from '@/ui/input/components/Select';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';
import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';
@@ -184,7 +184,7 @@ export const RecordCalendarTopBar = () => {
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={280}>
+ <LegacyDropdownContent widthInPixels={280}>
<DatePickerWithoutCalendar
instanceId={recordCalendarId}
date={recordCalendarSelectedDate.toString()}
@@ -193,7 +193,7 @@ export const RecordCalendarTopBar = () => {
onEnter={handleDateChange}
onEscape={handleDateChange}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={dropdownContentOffset}
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
index eca7a57dc0b..1f1f1ae8768 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
@@ -17,7 +17,7 @@ import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/ge
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
@@ -243,7 +243,7 @@ export const RecordDetailRelationRecordsListItem = ({
</LightIconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconUnlink />}
@@ -258,7 +258,7 @@ export const RecordDetailRelationRecordsListItem = ({
>{t`Delete`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
index faf24f60873..b94fbc25447 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
@@ -12,7 +12,7 @@ import { ArrayDisplay } from '@/ui/field/display/components/ArrayDisplay';
import { TextInput } from '@/ui/field/input/components/TextInput';
import { Field } from 'twenty-ui/primitives/input';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -356,7 +356,7 @@ export const FormArrayFieldInput = ({
}
clickableComponentWidth="100%"
dropdownComponents={
- <DropdownContent ref={containerRef}>
+ <LegacyDropdownContent ref={containerRef}>
<DropdownMenuItemsContainer hasMaxHeight>
{draftValue.type === 'static' &&
draftValue.value.map((value, index) => (
@@ -397,7 +397,7 @@ export const FormArrayFieldInput = ({
>{t`Add item`}</ListItem>
</DropdownMenuItemsContainer>
) : null}
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx
index 894780536d0..4a754b3c46e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx
@@ -3,7 +3,7 @@ import { type ChangeEvent } from 'react';
import { ObjectFilterDropdownRecordPinnedItems } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems';
import { MultipleSelectDropdown } from '@/object-record/select/components/MultipleSelectDropdown';
import { type SelectableItem } from '@/object-record/select/types/SelectableItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -33,7 +33,7 @@ export const FormWorkspaceMemberFilterValueInputDropdownContent = ({
loading,
onSelectChange,
}: FormWorkspaceMemberFilterValueInputDropdownContentProps) => (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
<DropdownMenuSearchInput
autoFocus
type="text"
@@ -60,5 +60,5 @@ export const FormWorkspaceMemberFilterValueInputDropdownContent = ({
searchFilter={searchFilter}
loadingItems={loading}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
index 8a127c8cd58..721651bdfa0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
@@ -6,7 +6,7 @@ import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/
import { sanitizeAndValidateInput } from '@/object-record/record-field/ui/meta-types/input/utils/sanitizeAndValidateInput';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { type PhoneRecord } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -313,7 +313,7 @@ export const MultiItemFieldInput = <T,>({
});
return (
- <DropdownContent ref={containerRef}>
+ <LegacyDropdownContent ref={containerRef}>
{shouldShowSearch && !isInputDisplayed && (
<>
<DropdownMenuSearchInput
@@ -386,6 +386,6 @@ export const MultiItemFieldInput = <T,>({
</ListItem>
</DropdownMenuItemsContainer>
) : null}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
index 9cb4fe914ea..76ebb12ac07 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
@@ -1,6 +1,6 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { t } from '@lingui/core/macro';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
@@ -85,7 +85,7 @@ export const MultiItemFieldMenuItem = <T,>({
RightIcon={!isHovered && showPrimaryIcon ? IconBookmark : null}
dropdownId={dropdownId}
dropdownContent={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{showSetAsPrimaryButton && (
<ListItem
@@ -109,7 +109,7 @@ export const MultiItemFieldMenuItem = <T,>({
>{t`Copy`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownFieldsContent.tsx
index b2e85bb7586..5388da4f44c 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownFieldsContent.tsx
@@ -7,7 +7,7 @@ import { aggregateOperationComponentState } from '@/object-record/record-group/s
import { availableFieldIdsForAggregateOperationComponentState } from '@/object-record/record-group/states/availableFieldIdsForAggregateOperationComponentState';
import { recordIndexGroupAggregateFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupAggregateFieldMetadataItemComponentState';
import { recordIndexGroupAggregateOperationComponentState } from '@/object-record/record-index/states/recordIndexGroupAggregateOperationComponentState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -52,7 +52,7 @@ export const RecordGroupAggregateDropdownFieldsContent = () => {
}
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -105,6 +105,6 @@ export const RecordGroupAggregateDropdownFieldsContent = () => {
);
})}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownMenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownMenuContent.tsx
index 78149dc88eb..cc62d888507 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownMenuContent.tsx
@@ -3,7 +3,7 @@ import { useDropdownContextStateManagement } from '@/dropdown-context-state-mana
import { RecordGroupAggregateDropdownContext } from '@/object-record/record-group/states/context/RecordGroupAggregateDropdownContext';
import { type RecordGroupAggregateDropdownContextValue } from '@/object-record/record-group/types/RecordGroupAggregateDropdownContextValue';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useLingui } from '@lingui/react/macro';
@@ -18,7 +18,7 @@ export const RecordGroupAggregateDropdownMenuContent = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={() => {
@@ -45,6 +45,6 @@ export const RecordGroupAggregateDropdownMenuContent = () => {
hasSubmenu
>{t`More options`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownOptionsContent.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownOptionsContent.tsx
index 29eca7e139b..637c3506df4 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownOptionsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownOptionsContent.tsx
@@ -9,7 +9,7 @@ import { recordIndexGroupAggregateOperationComponentState } from '@/object-recor
import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
import { type ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
import { type AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -48,7 +48,7 @@ export const RecordGroupAggregateDropdownOptionsContent = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -111,6 +111,6 @@ export const RecordGroupAggregateDropdownOptionsContent = ({
),
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
index 172ee892f4b..d5af67e4741 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
@@ -19,7 +19,7 @@ import { getMultipleRecordPickerSelectableListId } from '@/object-record/record-
import { upsertMorphItem } from '@/object-record/record-picker/multiple-record-picker/utils/upsertMorphItem';
import { type RecordPickerLayoutDirection } from '@/object-record/record-picker/types/RecordPickerLayoutDirection';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
@@ -241,7 +241,7 @@ export const MultipleRecordPicker = ({
containerRef={containerRef}
onClickOutside={handleClickOutside}
/>
- <DropdownContent ref={containerRef} widthInPixels={dropdownWidth}>
+ <LegacyDropdownContent ref={containerRef} widthInPixels={dropdownWidth}>
{isSelectingCreateTarget ? (
<MultipleRecordPickerCreateTargetSelect
objectMetadataItems={creatableObjectMetadataItems}
@@ -276,7 +276,7 @@ export const MultipleRecordPicker = ({
)}
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
</MultipleRecordPickerComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx
index 4dcf253674a..50d65532bbc 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx
@@ -5,7 +5,7 @@ import { SingleRecordPickerMenuItemsWithSearch } from '@/object-record/record-pi
import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext';
import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -72,7 +72,7 @@ export const SingleRecordPicker = ({
<SingleRecordPickerComponentInstanceContext.Provider
value={{ instanceId: componentInstanceId }}
>
- <DropdownContent ref={containerRef} widthInPixels={dropdownWidth}>
+ <LegacyDropdownContent ref={containerRef} widthInPixels={dropdownWidth}>
<SingleRecordPickerMenuItemsWithSearch
focusId={focusId}
{...{
@@ -86,7 +86,7 @@ export const SingleRecordPicker = ({
layoutDirection,
}}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
</SingleRecordPickerComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
index bb67b5e285a..1dc49ada49b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
@@ -2,7 +2,7 @@ import { RecordPickerLoadingSkeletonList } from '@/object-record/record-picker/c
import { RecordPickerNoRecordFoundMenuItem } from '@/object-record/record-picker/components/RecordPickerNoRecordFoundMenuItem';
import { RecordTableWidgetRelationPickerMenuItem } from '@/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem';
import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -39,7 +39,7 @@ export const RecordTableWidgetRelationPickerDropdownContent = ({
});
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuSearchInput
autoFocus
type="text"
@@ -74,6 +74,6 @@ export const RecordTableWidgetRelationPickerDropdownContent = ({
)}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
index 25fc13901e6..b8976e90d1f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
@@ -1,7 +1,7 @@
import { RecordTableColumnAggregateFooterAggregateOperationMenuItems } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems';
import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
import { type ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -20,7 +20,7 @@ export const RecordTableColumnAggregateFooterDropdownSubmenuContent = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -36,6 +36,6 @@ export const RecordTableColumnAggregateFooterDropdownSubmenuContent = ({
aggregateOperations={aggregateOperations}
/>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
index 57af2c5f7fa..31c6f4ca529 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
@@ -5,7 +5,7 @@ import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record
import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/nonStandardAggregateOperationsOptions';
import { useViewFieldAggregateOperation } from '@/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation';
import { getAvailableAggregateOperationsForFieldMetadataType } from '@/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
@@ -53,7 +53,7 @@ export const RecordTableColumnAggregateFooterMenuContent = () => {
} = useViewFieldAggregateOperation();
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={() => {
@@ -95,6 +95,6 @@ export const RecordTableColumnAggregateFooterMenuContent = () => {
selected={!isDefined(currentViewFieldAggregateOperation)}
>{t`None`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
index 6fa4acb9cef..e90d17e2935 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
@@ -10,7 +10,7 @@ import { useHandleToggleColumnSort } from '@/object-record/record-index/hooks/us
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { useMoveTableColumn } from '@/object-record/record-table/hooks/useMoveTableColumn';
import { useOpenRecordFilterChipFromTableHeader } from '@/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useToggleScrollWrapper } from '@/ui/utilities/scroll/hooks/useToggleScrollWrapper';
import { styled } from '@linaria/react';
@@ -131,7 +131,7 @@ export const RecordTableColumnHeadDropdownMenu = ({
const canHide = isLabelIdentifier !== true;
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<StyledDropdownMenuItemsContainerWrapper>
<DropdownMenuItemsContainer>
{isFilterable && (
@@ -167,6 +167,6 @@ export const RecordTableColumnHeadDropdownMenu = ({
)}
</DropdownMenuItemsContainer>
</StyledDropdownMenuItemsContainerWrapper>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
index ff9ac66e6a3..fcb2f4be10b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
@@ -5,7 +5,7 @@ import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldM
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { type ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -80,7 +80,7 @@ export const RecordTableHeaderPlusButtonContent = () => {
const hasAvailableFields = availableFieldMetadataItemsToShow.length > 0;
return (
- <DropdownContent>
+ <LegacyDropdownContent>
{hasAvailableFields && (
<>
<DropdownMenuSearchInput
@@ -131,6 +131,6 @@ export const RecordTableHeaderPlusButtonContent = () => {
>{t`Customize fields`}</ListItem>
</UndecoratedLink>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
index 979f5278d19..4e66479249a 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
@@ -6,7 +6,7 @@ import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/stat
import { isReactivatableTab } from '@/page-layout/utils/isReactivatableTab';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
@@ -73,7 +73,7 @@ export const PageLayoutTabListNewTabDropdownContent = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader>{t`New tab`}</DropdownMenuHeader>
<DropdownMenuItemsContainer>
<ListItem
@@ -102,6 +102,6 @@ export const PageLayoutTabListNewTabDropdownContent = ({
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx
index 381bbda7ab9..c5a3ad02824 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx
@@ -12,7 +12,7 @@ import { type PageLayoutTabDragData } from '@/page-layout/types/PageLayoutTabDra
import { shouldEnableTabEditingFeatures } from '@/page-layout/utils/shouldEnableTabEditingFeatures';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext';
@@ -124,7 +124,9 @@ export const PageLayoutTabListReorderableOverflowDropdown = ({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Medium}
+ >
<DropdownMenuItemsContainer>
{hiddenTabs.map((tab, index) => {
const disabled = tab.disabled ?? loading;
@@ -176,7 +178,7 @@ export const PageLayoutTabListReorderableOverflowDropdown = ({
compact
/>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
index 8166f31d2a6..d684716ebc1 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
@@ -10,7 +10,7 @@ import { LightIconButton } from 'twenty-ui/components';
import { getFieldsConfigurationGroupEditDropdownId } from '@/page-layout/widgets/fields/utils/getFieldsConfigurationGroupEditDropdownId';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -59,7 +59,9 @@ export const FieldsConfigurationGroupDropdown = ({
}
dropdownPlacement="bottom-start"
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Narrow}
+ >
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconPencil />}
@@ -75,7 +77,7 @@ export const FieldsConfigurationGroupDropdown = ({
onClick={handleAddGroup}
>{t`Add a Group`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx
index 1de6b690e27..b8da6f694e6 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx
@@ -12,7 +12,7 @@ import { type FieldsConfigurationFieldDragData } from '@/page-layout/widgets/fie
import { type FieldsWidgetGroup } from '@/page-layout/widgets/fields/types/FieldsWidgetGroup';
import { getFieldsConfigurationGroupRenameDropdownId } from '@/page-layout/widgets/fields/utils/getFieldsConfigurationGroupRenameDropdownId';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
@@ -136,7 +136,7 @@ export const FieldsConfigurationGroupEditor = ({
dropdownOffset={{ x: 32 }}
onClose={handleCancelRename}
dropdownComponents={
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.Large}
>
<FieldsConfigurationGroupRenameInput
@@ -148,7 +148,7 @@ export const FieldsConfigurationGroupEditor = ({
}
onCancel={handleCancelRename}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</DragDropItemSortableHandle>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
index 2d17c223dc3..565dce4fd8f 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
@@ -6,7 +6,7 @@ import { DashboardColorIcon } from '@/page-layout/widgets/standalone-rich-text/c
import { BLOCKNOTE_COLOR_DISPLAY_NAMES } from '@/page-layout/widgets/standalone-rich-text/constants/BlockNoteColorDisplayNames';
import { BLOCKNOTE_COLORS } from '@/page-layout/widgets/standalone-rich-text/constants/BlockNoteColors';
import { type BlockNoteColor } from '@/page-layout/widgets/standalone-rich-text/types/BlockNoteColor';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -58,7 +58,7 @@ export const DashboardColorSelectionMenu = ({
const { t } = useLingui();
const { theme } = useContext(ThemeContext);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer hasMaxHeight>
<DropdownMenuSectionLabel label={t`Text Colors`} />
@@ -99,6 +99,6 @@ export const DashboardColorSelectionMenu = ({
</StyledColorMenuItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
index db9db67dd51..1a35f86dbd3 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
@@ -5,7 +5,7 @@ import { timelineActivityTypeUniversalIdentifiersFilterFamilyState } from '@/act
import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -78,7 +78,9 @@ export const WidgetActionTimelineFilter = () => {
dropdownPlacement="bottom-end"
onClose={() => setSearchInputValue('')}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuSearchInput
value={searchInputValue}
onChange={(event) => setSearchInputValue(event.target.value)}
@@ -136,7 +138,7 @@ export const WidgetActionTimelineFilter = () => {
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index 3b5998f673c..29b37518213 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -1,4 +1,5 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
import { useApolloClient, useMutation } from '@apollo/client/react';
import {
@@ -7,13 +8,9 @@ import {
MessageChannelSyncStage,
SettingsPath,
} from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { Trans, useLingui } from '@lingui/react/macro';
@@ -27,8 +24,8 @@ import {
IconTrash,
IconUnlink,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
+import { Link } from 'react-router-dom';
import { DELETE_CONNECTED_ACCOUNT } from '../graphql/mutations/deleteConnectedAccount';
import { DISCONNECT_CONNECTED_ACCOUNT } from '../graphql/mutations/disconnectConnectedAccount';
import { isConnectedAccountEligibleForProviderReconnect } from '../constants/isConnectedAccountEligibleForProviderReconnect.const';
@@ -48,9 +45,6 @@ export const SettingsAccountsRowDropdownMenu = ({
const { t } = useLingui();
const { openDialog } = useDialog();
- const navigate = useNavigateSettings();
- const { closeDropdown } = useCloseDropdown();
-
const apolloClient = useApolloClient();
const [deleteConnectedAccountMutation] = useMutation(
DELETE_CONNECTED_ACCOUNT,
@@ -89,86 +83,83 @@ export const SettingsAccountsRowDropdownMenu = ({
return (
<>
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- {hasPendingConfiguration && (
- <ListItem
- startIcon={<IconPlayerPlay />}
- onClick={() => {
- navigate(SettingsPath.AccountsConfiguration, {
- connectedAccountId: account.id,
- });
- closeDropdown(dropdownId);
- }}
- >{t`Complete setup`}</ListItem>
- )}
- {account.provider ===
- ConnectedAccountProvider.IMAP_SMTP_CALDAV && (
- <ListItem
- startIcon={<IconAt />}
- onClick={() => {
- navigate(SettingsPath.EditImapSmtpCaldavConnection, {
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ {hasPendingConfiguration && (
+ <Dropdown.ActionItem
+ startIcon={<IconPlayerPlay />}
+ render={
+ <Link
+ to={getSettingsPath(SettingsPath.AccountsConfiguration, {
connectedAccountId: account.id,
- });
- closeDropdown(dropdownId);
- }}
- >{t`Connection settings`}</ListItem>
- )}
- <ListItem
- startIcon={<IconMail />}
+ })}
+ />
+ }
+ >{t`Complete setup`}</Dropdown.ActionItem>
+ )}
+ {account.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV && (
+ <Dropdown.ActionItem
+ startIcon={<IconAt />}
+ render={
+ <Link
+ to={getSettingsPath(
+ SettingsPath.EditImapSmtpCaldavConnection,
+ {
+ connectedAccountId: account.id,
+ },
+ )}
+ />
+ }
+ >{t`Connection settings`}</Dropdown.ActionItem>
+ )}
+ <Dropdown.ActionItem
+ startIcon={<IconMail />}
+ render={
+ <Link to={getSettingsPath(SettingsPath.AccountsEmails)} />
+ }
+ >{t`Emails settings`}</Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ startIcon={<IconCalendarEvent />}
+ render={
+ <Link to={getSettingsPath(SettingsPath.AccountsCalendars)} />
+ }
+ >{t`Calendar settings`}</Dropdown.ActionItem>
+ {isEligibleForProviderReconnect && (
+ <Dropdown.ActionItem
+ startIcon={<IconRefresh />}
onClick={() => {
- navigate(SettingsPath.AccountsEmails);
- closeDropdown(dropdownId);
+ triggerProviderReconnect(account.provider, account.id, {
+ loginHint: account.handle,
+ });
}}
- >{t`Emails settings`}</ListItem>
- <ListItem
- startIcon={<IconCalendarEvent />}
+ >{t`Reconnect`}</Dropdown.ActionItem>
+ )}
+ {!isDefined(account.archivedAt) && (
+ <Dropdown.ActionItem
+ startIcon={<IconUnlink />}
onClick={() => {
- navigate(SettingsPath.AccountsCalendars);
- closeDropdown(dropdownId);
+ openDialog(disconnectAccountModalId);
}}
- >{t`Calendar settings`}</ListItem>
- {isEligibleForProviderReconnect && (
- <ListItem
- startIcon={<IconRefresh />}
- onClick={() => {
- triggerProviderReconnect(account.provider, account.id, {
- loginHint: account.handle,
- });
- closeDropdown(dropdownId);
- }}
- >{t`Reconnect`}</ListItem>
- )}
- {!isDefined(account.archivedAt) && (
- <ListItem
- startIcon={<IconUnlink />}
- onClick={() => {
- closeDropdown(dropdownId);
- openDialog(disconnectAccountModalId);
- }}
- >{t`Disconnect account`}</ListItem>
- )}
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- closeDropdown(dropdownId);
- openDialog(deleteAccountModalId);
- }}
- >{t`Delete account and synced data`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ >{t`Disconnect account`}</Dropdown.ActionItem>
+ )}
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={() => {
+ openDialog(deleteAccountModalId);
+ }}
+ >{t`Delete account and synced data`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
<ConfirmationDialog
dialogId={disconnectAccountModalId}
title={t`Disconnect account`}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsRowDropdownMenu.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsRowDropdownMenu.stories.tsx
new file mode 100644
index 00000000000..d25a4da1824
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsRowDropdownMenu.stories.tsx
@@ -0,0 +1,212 @@
+import { SettingsAccountsRowDropdownMenu } from '@/settings/accounts/components/SettingsAccountsRowDropdownMenu';
+import { mockedDropdownConnectedAccount } from '@/settings/accounts/components/__stories__/mockedDropdownConnectedAccount';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { MemoryRouter, useLocation } from 'react-router-dom';
+import { expect, fn, spyOn, userEvent, waitFor, within } from 'storybook/test';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { Text } from 'twenty-ui/primitives/typography';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { REACT_APP_SERVER_BASE_URL } from '~/config';
+
+const onRowClick = fn();
+
+const CurrentLocation = () => {
+ const location = useLocation();
+
+ return (
+ <Text role="status" aria-label="Current location">
+ {location.pathname}
+ </Text>
+ );
+};
+
+const meta: Meta<typeof SettingsAccountsRowDropdownMenu> = {
+ title: 'Modules/Settings/Accounts/SettingsAccountsRowDropdownMenu',
+ component: SettingsAccountsRowDropdownMenu,
+ args: { account: mockedDropdownConnectedAccount },
+ decorators: [
+ ComponentDecorator,
+ (Story) => (
+ <MemoryRouter
+ basename="/workspace"
+ initialEntries={['/workspace/settings/accounts']}
+ >
+ <CurrentLocation />
+ <TableRow onClick={onRowClick}>
+ <Story />
+ </TableRow>
+ </MemoryRouter>
+ ),
+ ],
+ beforeEach: () => {
+ onRowClick.mockClear();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsAccountsRowDropdownMenu>;
+
+export const KeyboardNavigation: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+ trigger.focus();
+ await userEvent.keyboard('{ArrowDown}');
+
+ const completeSetup = await canvas.findByRole('menuitem', {
+ name: 'Complete setup',
+ });
+ await waitFor(() => expect(completeSetup).toHaveFocus());
+
+ for (const { label, destination } of [
+ {
+ label: 'Complete setup',
+ destination: 'configuration/connected-account',
+ },
+ {
+ label: 'Connection settings',
+ destination: 'edit-imap-smtp-caldav-connection/connected-account',
+ },
+ { label: 'Emails settings', destination: 'emails' },
+ { label: 'Calendar settings', destination: 'calendars' },
+ ]) {
+ const item = canvas.getByRole('menuitem', { name: label });
+ await expect(item.tagName).toBe('A');
+ await expect(item).toHaveAttribute(
+ 'href',
+ `/workspace/settings/accounts/${destination}`,
+ );
+ }
+
+ await userEvent.keyboard('{Enter}');
+
+ await expect(
+ canvas.getByRole('status', { name: 'Current location' }),
+ ).toHaveTextContent('/settings/accounts/configuration/connected-account');
+ await expect(onRowClick).not.toHaveBeenCalled();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const DisconnectConfirmation: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ await userEvent.click(canvas.getByRole('button', { name: 'More options' }));
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Disconnect account' }),
+ );
+
+ const dialog = await canvas.findByRole('dialog', {
+ name: 'Disconnect account',
+ });
+ await expect(dialog).toHaveTextContent(
+ 'Your emails and events will be retained',
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await expect(onRowClick).not.toHaveBeenCalled();
+ await userEvent.click(
+ within(dialog).getByRole('button', { name: 'Cancel' }),
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('dialog')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const DeleteConfirmation: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ await userEvent.click(canvas.getByRole('button', { name: 'More options' }));
+ await userEvent.click(
+ await canvas.findByRole('menuitem', {
+ name: 'Delete account and synced data',
+ }),
+ );
+
+ const dialog = await canvas.findByRole('dialog', {
+ name: 'Delete account and synced data?',
+ });
+ await expect(dialog).toHaveTextContent(
+ `This permanently deletes ${mockedDropdownConnectedAccount.handle}`,
+ );
+ await expect(
+ within(dialog).getByRole('button', { name: 'Delete account and data' }),
+ ).toBeVisible();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await expect(onRowClick).not.toHaveBeenCalled();
+ await userEvent.click(
+ within(dialog).getByRole('button', { name: 'Cancel' }),
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('dialog')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const ReconnectArchivedAccount: Story = {
+ args: {
+ account: {
+ ...mockedDropdownConnectedAccount,
+ provider: ConnectedAccountProvider.GOOGLE,
+ archivedAt: '2026-09-23T00:00:00.000Z',
+ },
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.mutation('generateTransientToken', () =>
+ HttpResponse.json({
+ data: {
+ generateTransientToken: {
+ transientToken: { token: 'reconnect-token' },
+ },
+ },
+ }),
+ ),
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const openWindow = spyOn(window, 'open').mockImplementation(() => null);
+
+ try {
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'More options' }),
+ );
+ const reconnect = await canvas.findByRole('menuitem', {
+ name: 'Reconnect',
+ });
+ await expect(
+ canvas.queryByRole('menuitem', { name: 'Disconnect account' }),
+ ).not.toBeInTheDocument();
+ await expect(
+ canvas.getByRole('menuitem', {
+ name: 'Delete account and synced data',
+ }),
+ ).toBeVisible();
+ await userEvent.click(reconnect);
+
+ await waitFor(() =>
+ expect(openWindow).toHaveBeenCalledWith(
+ `${REACT_APP_SERVER_BASE_URL}/auth/google-apis?transientToken=reconnect-token&redirectLocation=%2Fsettings%2Faccounts&loginHint=${mockedDropdownConnectedAccount.handle}`,
+ '_self',
+ ),
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await expect(onRowClick).not.toHaveBeenCalled();
+ } finally {
+ openWindow.mockRestore();
+ }
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts
new file mode 100644
index 00000000000..43be30f1501
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts
@@ -0,0 +1,46 @@
+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import {
+ CalendarChannelContactAutoCreationPolicy,
+ CalendarChannelSyncStage,
+ CalendarChannelSyncStatus,
+ ConnectedAccountProvider,
+} from 'twenty-shared/types';
+import { CalendarChannelVisibility } from '~/generated/graphql';
+
+export const mockedDropdownConnectedAccount: ConnectedAccount = {
+ id: 'connected-account',
+ handle: '[email protected]',
+ provider: ConnectedAccountProvider.IMAP_SMTP_CALDAV,
+ authFailedAt: null,
+ archivedAt: null,
+ scopes: null,
+ handleAliases: null,
+ lastSignedInAt: null,
+ userWorkspaceId: 'user-workspace',
+ connectionProviderId: null,
+ name: null,
+ visibility: 'user',
+ lastCredentialsRefreshedAt: null,
+ connectionParameters: null,
+ createdAt: '2026-09-23T00:00:00.000Z',
+ updatedAt: '2026-09-23T00:00:00.000Z',
+ messageChannels: [],
+ calendarChannels: [
+ {
+ id: 'calendar-channel',
+ handle: '[email protected]',
+ visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
+ isContactAutoCreationEnabled: false,
+ contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy.NONE,
+ isSyncEnabled: true,
+ syncStatus: CalendarChannelSyncStatus.NOT_SYNCED,
+ syncStage: CalendarChannelSyncStage.PENDING_CONFIGURATION,
+ syncStageStartedAt: null,
+ connectedAccountId: 'connected-account',
+ createdAt: '2026-09-23T00:00:00.000Z',
+ updatedAt: '2026-09-23T00:00:00.000Z',
+ __typename: 'CalendarChannel',
+ },
+ ],
+ __typename: 'ConnectedAccount',
+};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
index 6fee8b7c577..7f2b70515d1 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
@@ -3,7 +3,7 @@ import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApo
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { Table } from '@/ui/layout/table/components/Table';
@@ -219,7 +219,7 @@ export const SettingsAdminApps = () => {
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconPinned />}
@@ -275,7 +275,7 @@ export const SettingsAdminApps = () => {
checked={isConfiguredFilter === false}
>{t`Not configured`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
index 03e7d8ad356..548c4d38ee0 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
@@ -6,7 +6,7 @@ import { IconAlertTriangle, IconMessage, IconSparkles } from 'twenty-ui/icon';
import { type AdminChatsFilterState } from '@/settings/admin-panel/chats/types/AdminChatsFilterState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
type SettingsAdminChatsFilterDropdownProps = {
@@ -27,7 +27,7 @@ export const SettingsAdminChatsFilterDropdown = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconSparkles />}
@@ -60,7 +60,7 @@ export const SettingsAdminChatsFilterDropdown = ({
checked={filters.userNeverEngagedOnly}
>{t`No user reply`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
index 385ad56ffe5..a0e9f9d0b21 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
@@ -1,23 +1,20 @@
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { TwoFactorAuthenticationVerificationCodeDash } from '@/settings/two-factor-authentication/components/TwoFactorAuthenticationVerificationCodeDash';
import { TwoFactorAuthenticationVerificationCodeSlot } from '@/settings/two-factor-authentication/components/TwoFactorAuthenticationVerificationCodeSlot';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation, useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { OTPInput } from 'input-otp';
import { useState } from 'react';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetServerAdminsDocument,
@@ -78,7 +75,6 @@ export const SettingsAdminServerAdminAccess = ({
const dropdownId = `server-admin-access-${userId}`;
const apolloAdminClient = useApolloAdminClient();
const { openDialog } = useDialog();
- const { closeDropdown } = useCloseDropdown();
const { enqueueToast } = useToast();
const [pendingChange, setPendingChange] =
@@ -107,7 +103,6 @@ export const SettingsAdminServerAdminAccess = ({
const hasFullAccess = canAccessFullAdminPanel && canImpersonate;
const requestChange = (change: PendingServerAdminChange) => {
- closeDropdown(dropdownId);
setOtp('');
setPendingChange(change);
openDialog(SERVER_ADMIN_ACCESS_CONFIRMATION_MODAL_ID);
@@ -161,64 +156,62 @@ export const SettingsAdminServerAdminAccess = ({
) : (
<StyledNoAccess>{t`No access`}</StyledNoAccess>
)}
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- disabled={isLastFullAdmin}
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ disabled={isLastFullAdmin}
+ onClick={() =>
+ requestChange({
+ description: t`full admin panel access`,
+ isRevoking: canAccessFullAdminPanel,
+ update: {
+ canAccessFullAdminPanel: !canAccessFullAdminPanel,
+ },
+ })
+ }
+ >
+ {canAccessFullAdminPanel
+ ? t`Revoke admin panel access`
+ : t`Grant admin panel access`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ onClick={() =>
+ requestChange({
+ description: t`impersonation`,
+ isRevoking: canImpersonate,
+ update: { canImpersonate: !canImpersonate },
+ })
+ }
+ >
+ {canImpersonate
+ ? t`Disable impersonation`
+ : t`Enable impersonation`}
+ </Dropdown.ActionItem>
+ {!hasFullAccess && (
+ <Dropdown.ActionItem
onClick={() =>
requestChange({
- description: t`full admin panel access`,
- isRevoking: canAccessFullAdminPanel,
+ description: t`full server access`,
+ isRevoking: false,
update: {
- canAccessFullAdminPanel: !canAccessFullAdminPanel,
+ canAccessFullAdminPanel: true,
+ canImpersonate: true,
},
})
}
- >
- {canAccessFullAdminPanel
- ? t`Revoke admin panel access`
- : t`Grant admin panel access`}
- </ListItem>
- <ListItem
- onClick={() =>
- requestChange({
- description: t`impersonation`,
- isRevoking: canImpersonate,
- update: { canImpersonate: !canImpersonate },
- })
- }
- >
- {canImpersonate
- ? t`Disable impersonation`
- : t`Enable impersonation`}
- </ListItem>
- {!hasFullAccess && (
- <ListItem
- onClick={() =>
- requestChange({
- description: t`full server access`,
- isRevoking: false,
- update: {
- canAccessFullAdminPanel: true,
- canImpersonate: true,
- },
- })
- }
- >{t`Grant full access`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ >{t`Grant full access`}</Dropdown.ActionItem>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</StyledValue>
<ConfirmationDialog
dialogId={SERVER_ADMIN_ACCESS_CONFIRMATION_MODAL_ID}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantRowDropdownMenu.tsx
index bf8dfdfd505..c818d4db91d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantRowDropdownMenu.tsx
@@ -1,12 +1,8 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { t } from '@lingui/core/macro';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
type SettingsAdminWorkspaceCreditGrantRowDropdownMenuProps = {
creditGrantId: string;
@@ -18,32 +14,24 @@ export const SettingsAdminWorkspaceCreditGrantRowDropdownMenu = ({
onRevoke,
}: SettingsAdminWorkspaceCreditGrantRowDropdownMenuProps) => {
const dropdownId = `settings-admin-credit-grant-row-${creditGrantId}`;
-
- const { closeDropdown } = useCloseDropdown();
-
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- onRevoke();
- closeDropdown(dropdownId);
- }}
- >{t`Revoke`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={onRevoke}
+ >{t`Revoke`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/__stories__/SettingsAdminServerAdminAccess.stories.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/__stories__/SettingsAdminServerAdminAccess.stories.tsx
new file mode 100644
index 00000000000..d6e7d7a6414
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/__stories__/SettingsAdminServerAdminAccess.stories.tsx
@@ -0,0 +1,84 @@
+import { ApolloAdminClientContext } from '@/settings/admin-panel/apollo/contexts/ApolloAdminClientContext';
+import { SettingsAdminServerAdminAccess } from '@/settings/admin-panel/components/SettingsAdminServerAdminAccess';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+
+const meta: Meta<typeof SettingsAdminServerAdminAccess> = {
+ title: 'Modules/Settings/AdminPanel/SettingsAdminServerAdminAccess',
+ component: SettingsAdminServerAdminAccess,
+ args: { userId: 'last-admin', userLabel: 'Last admin' },
+ decorators: [
+ ComponentDecorator,
+ ToastDecorator,
+ (Story) => (
+ <ApolloAdminClientContext.Provider value={mockedApolloClient}>
+ <Story />
+ </ApolloAdminClientContext.Provider>
+ ),
+ ],
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query('GetServerAdmins', () =>
+ HttpResponse.json({
+ data: {
+ getServerAdmins: [
+ {
+ id: 'last-admin',
+ email: '[email protected]',
+ firstName: 'Last',
+ lastName: 'admin',
+ canAccessFullAdminPanel: true,
+ canImpersonate: true,
+ },
+ ],
+ },
+ }),
+ ),
+ ],
+ },
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsAdminServerAdminAccess>;
+
+export const LastAdministratorProtection: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ await canvas.findByText('Admin panel');
+ await userEvent.click(canvas.getByRole('button', { name: 'More options' }));
+ const revokeAdminAccess = await canvas.findByRole('menuitem', {
+ name: 'Revoke admin panel access',
+ });
+
+ await expect(revokeAdminAccess).toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(revokeAdminAccess);
+ await expect(canvas.queryByRole('dialog')).not.toBeInTheDocument();
+ await expect(canvas.getByRole('menu')).toBeVisible();
+
+ await userEvent.click(
+ canvas.getByRole('menuitem', { name: 'Disable impersonation' }),
+ );
+
+ const confirmation = await canvas.findByRole('dialog', {
+ name: 'Revoke access',
+ });
+ await expect(confirmation).toHaveTextContent(
+ 'This will revoke impersonation for Last admin.',
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await userEvent.click(
+ within(confirmation).getByRole('button', { name: 'Cancel' }),
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('dialog')).not.toBeInTheDocument(),
+ );
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
index 7ef7bdcb20a..967a4271269 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
@@ -3,7 +3,7 @@ import { SelectControl } from '@/ui/input/components/SelectControl';
import { TextArea } from '@/ui/input/components/TextArea';
import { TextInput } from '@/ui/input/components/TextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -135,7 +135,7 @@ export const ConfigVariableDatabaseInput = ({
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer isMultiSelect>
{selectOptions.map((option) => (
<ListItem
@@ -152,7 +152,7 @@ export const ConfigVariableDatabaseInput = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
) : (
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
index 27f994aa15f..1898387597a 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
@@ -5,7 +5,7 @@ import { CONFIG_VARIABLE_SOURCE_OPTIONS } from '@/settings/admin-panel/config-va
import { type ConfigVariableFilterCategory } from '@/settings/admin-panel/config-variables/types/ConfigVariableFilterCategory';
import { type ConfigVariableGroupFilter } from '@/settings/admin-panel/config-variables/types/ConfigVariableGroupFilter';
import { type ConfigVariableSourceFilter } from '@/settings/admin-panel/config-variables/types/ConfigVariableSourceFilter';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -46,7 +46,7 @@ export const ConfigVariableOptionsDropdownContent = ({
if (!selectedCategory) {
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={() => onSelectCategory('source')}
@@ -86,12 +86,12 @@ export const ConfigVariableOptionsDropdownContent = ({
: t`Show hidden groups`}
</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
}
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -151,6 +151,6 @@ export const ConfigVariableOptionsDropdownContent = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
index 20ef3649a56..169c25c4811 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
@@ -1,11 +1,9 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import { IconDotsVertical, IconRefresh, IconTrash } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
+import { isDefined } from 'twenty-shared/utils';
import { JobState } from '~/generated-admin/graphql';
type SettingsAdminQueueJobRowDropdownMenuProps = {
@@ -22,44 +20,30 @@ export const SettingsAdminQueueJobRowDropdownMenu = ({
onDelete,
}: SettingsAdminQueueJobRowDropdownMenuProps) => {
const dropdownId = `queue-job-row-${jobId}`;
- const { closeDropdown } = useCloseDropdown();
-
- const handleRetry = () => {
- onRetry?.();
- closeDropdown(dropdownId);
- };
-
- const handleDelete = () => {
- onDelete();
- closeDropdown(dropdownId);
- };
-
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton aria-label={t`Job Actions`} emphasis="subtle">
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- {jobState === JobState.FAILED && onRetry && (
- <ListItem
- startIcon={<IconRefresh />}
- onClick={handleRetry}
- >{t`Retry`}</ListItem>
- )}
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={handleDelete}
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton aria-label={t`Job Actions`} emphasis="subtle">
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ {jobState === JobState.FAILED && isDefined(onRetry) && (
+ <Dropdown.ActionItem
+ startIcon={<IconRefresh />}
+ onClick={onRetry}
+ >{t`Retry`}</Dropdown.ActionItem>
+ )}
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={onDelete}
+ >{t`Delete`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/__stories__/SettingsAdminQueueJobRowDropdownMenu.stories.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/__stories__/SettingsAdminQueueJobRowDropdownMenu.stories.tsx
new file mode 100644
index 00000000000..902fe8dc6af
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/__stories__/SettingsAdminQueueJobRowDropdownMenu.stories.tsx
@@ -0,0 +1,52 @@
+import { SettingsAdminQueueJobRowDropdownMenu } from '@/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { JobState } from '~/generated-admin/graphql';
+
+const onRowClick = fn();
+
+const meta: Meta<typeof SettingsAdminQueueJobRowDropdownMenu> = {
+ title: 'Modules/Settings/AdminPanel/SettingsAdminQueueJobRowDropdownMenu',
+ component: SettingsAdminQueueJobRowDropdownMenu,
+ args: {
+ jobId: 'failed-job',
+ jobState: JobState.FAILED,
+ onRetry: fn(),
+ onDelete: fn(),
+ },
+ decorators: [
+ ComponentDecorator,
+ (Story) => (
+ <TableRow onClick={onRowClick}>
+ <Story />
+ </TableRow>
+ ),
+ ],
+ beforeEach: () => {
+ onRowClick.mockClear();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsAdminQueueJobRowDropdownMenu>;
+
+export const RetryWithoutExpandingRow: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Job Actions' });
+ await userEvent.click(trigger);
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Retry' }),
+ );
+
+ await expect(args.onRetry).toHaveBeenCalledTimes(1);
+ await expect(args.onDelete).not.toHaveBeenCalled();
+ await expect(onRowClick).not.toHaveBeenCalled();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
index 20f46d85f85..98c8e220da0 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
@@ -11,7 +11,7 @@ import {
import { type UsageLimitSpenderType } from '@/settings/billing/types/UsageLimitSpenderType';
import { getUsageLimitSpenderGroups } from '@/settings/billing/utils/getUsageLimitSpenderGroups';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -224,21 +224,21 @@ export const SettingsBillingLimitSpenderSelect = ({
);
const renderSubSpenderContent = (kind: UsageLimitSpenderType) => (
- <DropdownContent>
+ <LegacyDropdownContent>
{renderBackHeader(t(USAGE_LIMIT_SPENDER_TYPE_LABELS[kind]), () =>
setBrowsedSpenderType(null),
)}
<DropdownMenuItemsContainer>
{renderOptionList(kind)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
const workspaceGroup = groups.find((group) => group.id === 'workspace');
const otherGroups = groups.filter((group) => group.id !== 'workspace');
const renderRootContent = () => (
- <DropdownContent>
+ <LegacyDropdownContent>
{isDefined(workspaceGroup) && (
<DropdownMenuItemsContainer>
<ListItem
@@ -298,7 +298,7 @@ export const SettingsBillingLimitSpenderSelect = ({
)}
</DropdownMenuItemsContainer>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
const renderContent = () => {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
index 2fff9e34a7d..e9a18bc8ab6 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
@@ -5,7 +5,7 @@ import { USAGE_LIMIT_RESOURCE_TYPE_LABELS } from '@/settings/billing/constants/U
import { getUsageLimitOperationTypes } from '@/settings/billing/utils/getUsageLimitOperationTypes';
import { USAGE_OPERATION_TYPE_LABELS } from '@/settings/usage/constants/UsageOperationTypeLabels';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -83,7 +83,7 @@ export const SettingsBillingLimitUsageSelect = ({
onClose={() => setBrowsedResourceType(null)}
dropdownComponents={
isDefined(browsedResourceType) && isDefined(browsedDefinition) ? (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -121,9 +121,9 @@ export const SettingsBillingLimitUsageSelect = ({
),
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
) : (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{definitions.definitions.map((definition) => (
<ListItem
@@ -148,7 +148,7 @@ export const SettingsBillingLimitUsageSelect = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
)
}
/>
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsFilterDropdown.tsx
index ecb92f6e350..d3938eea855 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsFilterDropdown.tsx
@@ -18,7 +18,7 @@ import { USAGE_LIMIT_SPENDER_TYPE_LABELS } from '@/settings/billing/constants/Us
import { getUsageLimitLabel } from '@/settings/billing/utils/getUsageLimitLabel';
import { isKeyOfRecord } from '@/settings/billing/utils/isKeyOfRecord';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -80,7 +80,7 @@ export const SettingsBillingLimitsFilterDropdown = ({
);
const renderUsageContent = () => (
- <DropdownContent>
+ <LegacyDropdownContent>
{renderBackHeader(t`Usage`)}
<DropdownMenuItemsContainer>
<ListItem
@@ -109,11 +109,11 @@ export const SettingsBillingLimitsFilterDropdown = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
const renderSpenderContent = () => (
- <DropdownContent>
+ <LegacyDropdownContent>
{renderBackHeader(t`Spender`)}
<DropdownMenuItemsContainer>
<ListItem
@@ -146,11 +146,11 @@ export const SettingsBillingLimitsFilterDropdown = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
const renderMenuContent = () => (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconCoins />}
@@ -188,7 +188,7 @@ export const SettingsBillingLimitsFilterDropdown = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
const renderContent = () => {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
index fd7523bd73a..d97cef19cfb 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
@@ -15,7 +15,7 @@ import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjec
import { isAdvancedRelationTargetObjectMetadata } from '@/object-metadata/utils/isAdvancedRelationTargetObjectMetadata';
import { isObjectMetadataEligibleAsRelationTarget } from '@/object-metadata/utils/isObjectMetadataEligibleAsRelationTarget';
import { MultiSelectControl } from '@/ui/input/components/MultiSelectControl';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';
@@ -233,7 +233,7 @@ export const SettingsMorphRelationMultiSelect = ({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={dropDownMenuWidth}>
+ <LegacyDropdownContent widthInPixels={dropDownMenuWidth}>
{!!withSearchInput && (
<DropdownMenuSearchInput
autoFocus
@@ -332,7 +332,7 @@ export const SettingsMorphRelationMultiSelect = ({
</ListItem>
</DropdownMenuItemsContainer>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
index 1a03854ebcc..6c0b86124d1 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
@@ -24,7 +24,7 @@ import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetada
import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
import { TextArea } from '@/ui/input/components/TextArea';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -376,7 +376,7 @@ export const SettingsDataModelFieldSelectForm = ({
</LightIconButton>
}
dropdownComponents={
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.Narrow}
>
<DropdownMenuItemsContainer>
@@ -405,7 +405,7 @@ export const SettingsDataModelFieldSelectForm = ({
}}
>{t`Remove all`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index 856628ca575..7a64425f379 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -3,7 +3,7 @@ import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsW
import { OPTION_VALUE_MAXIMUM_LENGTH } from '@/settings/data-model/constants/OptionValueMaximumLength';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
@@ -165,7 +165,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
</StyledColorSampleContainer>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{MAIN_COLOR_NAMES.map((colorName) => (
<ListItem
@@ -184,7 +184,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
<StyledOptionInputContainer>
@@ -226,7 +226,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
}
dropdownComponents={
shouldForbidRemoveAsDefault ? null : (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{isDefault ? (
<ListItem
@@ -256,7 +256,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
>{t`Remove option`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
)
}
/>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
index d0dd192cbaa..66d2f01a3fa 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
@@ -1,9 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import {
IconArchiveOff,
@@ -12,86 +6,73 @@ import {
IconPencil,
IconTrash,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
+
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { type FieldMetadataType } from '~/generated-metadata/graphql';
type SettingsObjectFieldInactiveActionDropdownProps = {
isCustomField?: boolean;
isSystemField?: boolean;
fieldType?: FieldMetadataType;
+ fieldMetadataItemId: string;
onActivate: () => void;
onEdit: () => void;
onDelete: () => void;
- fieldMetadataItemId: string;
readonly?: boolean;
};
export const SettingsObjectFieldInactiveActionDropdown = ({
+ fieldMetadataItemId,
onActivate,
readonly = false,
- fieldMetadataItemId,
onDelete,
onEdit,
isCustomField,
isSystemField,
}: SettingsObjectFieldInactiveActionDropdownProps) => {
- const dropdownId = `${fieldMetadataItemId}-settings-field-disabled-action-dropdown`;
-
- const { closeDropdown } = useCloseDropdown();
-
- const handleActivate = () => {
- onActivate();
- closeDropdown(dropdownId);
- };
-
- const handleDelete = () => {
- onDelete();
- closeDropdown(dropdownId);
- };
-
- const handleEdit = () => {
- onEdit();
- closeDropdown(dropdownId);
- };
-
const isDeletable = isCustomField && !isSystemField;
return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
- <LightIconButton
- aria-label={t`Inactive Field Options`}
- emphasis="subtle"
- >
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={isCustomField ? <IconPencil /> : <IconEye />}
- onClick={handleEdit}
- >
- {isCustomField && !readonly ? t`Edit` : t`View`}
- </ListItem>
- {!readonly && (
- <ListItem
- startIcon={<IconArchiveOff />}
- onClick={handleActivate}
- >{t`Activate`}</ListItem>
- )}
- {isDeletable && !readonly && (
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={handleDelete}
- >{t`Delete`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot
+ type="menu"
+ dropdownId={`${fieldMetadataItemId}-settings-field-disabled-action-dropdown`}
+ >
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ aria-label={t`Inactive Field Options`}
+ emphasis="subtle"
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent align="end" width={GenericDropdownContentWidth.Narrow}>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={isCustomField ? <IconPencil /> : <IconEye />}
+ onClick={onEdit}
+ >
+ {isCustomField && !readonly ? t`Edit` : t`View`}
+ </Dropdown.ActionItem>
+ {!readonly && (
+ <Dropdown.ActionItem
+ startIcon={<IconArchiveOff />}
+ onClick={onActivate}
+ >{t`Activate`}</Dropdown.ActionItem>
+ )}
+ {isDeletable && !readonly && (
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={onDelete}
+ >{t`Delete`}</Dropdown.ActionItem>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
index 61f785e3108..75e8e5dba44 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
@@ -5,7 +5,7 @@ import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField
import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
import { Table } from '@/ui/layout/table/components/Table';
@@ -214,7 +214,7 @@ export const SettingsObjectRelationsTable = ({
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconArchive />}
@@ -222,7 +222,7 @@ export const SettingsObjectRelationsTable = ({
checked={showInactive}
>{t`Inactive`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</StyledSearchAndFilterContainer>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/__stories__/SettingsObjectFieldInactiveActionDropdown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/__stories__/SettingsObjectFieldInactiveActionDropdown.stories.tsx
new file mode 100644
index 00000000000..a53e1e3b73d
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/__stories__/SettingsObjectFieldInactiveActionDropdown.stories.tsx
@@ -0,0 +1,89 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import { SettingsObjectFieldInactiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+
+const onRowClick = fn();
+
+const meta: Meta<typeof SettingsObjectFieldInactiveActionDropdown> = {
+ title: 'Modules/Settings/DataModel/SettingsObjectFieldInactiveActionDropdown',
+ component: SettingsObjectFieldInactiveActionDropdown,
+ decorators: [ComponentDecorator],
+ args: {
+ fieldMetadataItemId: 'inactive-custom-field',
+ isCustomField: true,
+ onActivate: fn(),
+ onEdit: fn(),
+ onDelete: fn(),
+ },
+ beforeEach: () => {
+ onRowClick.mockClear();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsObjectFieldInactiveActionDropdown>;
+
+export const ActivateWhilePending: Story = {
+ args: {
+ onActivate: fn(() => new Promise<void>(() => {})),
+ },
+ render: (args) => (
+ <TableRow onClick={onRowClick}>
+ <SettingsObjectFieldInactiveActionDropdown {...args} />
+ </TableRow>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', {
+ name: 'Inactive Field Options',
+ });
+
+ await userEvent.click(trigger);
+
+ await expect(
+ canvas.getAllByRole('menuitem').map((item) => item.textContent),
+ ).toEqual(['Edit', 'Activate', 'Delete']);
+
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Activate' }));
+
+ await expect(args.onActivate).toHaveBeenCalledTimes(1);
+ await expect(onRowClick).not.toHaveBeenCalled();
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
+
+export const ReadOnly: Story = {
+ args: { readonly: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Inactive Field Options' }),
+ );
+
+ await expect(
+ canvas.getAllByRole('menuitem').map((item) => item.textContent),
+ ).toEqual(['View']);
+ },
+};
+
+export const SystemField: Story = {
+ args: { isSystemField: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Inactive Field Options' }),
+ );
+
+ await expect(
+ canvas.getAllByRole('menuitem').map((item) => item.textContent),
+ ).toEqual(['Edit', 'Activate']);
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
index b4bf01e58d5..3c7d6290126 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
@@ -8,7 +8,7 @@ import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -171,7 +171,7 @@ export const SettingsObjectIndexesSection = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconEyeOff />}
@@ -181,7 +181,7 @@ export const SettingsObjectIndexesSection = ({
checked={hideSystemIndexes}
>{t`Hide system indexes`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
index ed8896a9e63..3b6a2553d66 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
@@ -9,7 +9,7 @@ import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFiel
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { Table } from '@/ui/layout/table/components/Table';
@@ -267,7 +267,7 @@ export const SettingsObjectSearchSection = ({
>{t`Add field`}</Button>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer hasMaxHeight>
{addableFields.map((field) => {
const FieldIcon = getIcon(field.icon);
@@ -286,7 +286,7 @@ export const SettingsObjectSearchSection = ({
);
})}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</StyledButtonContainer>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
index 2062012ec30..83c5f3afdea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
@@ -1,9 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import {
IconArchiveOff,
@@ -12,82 +6,69 @@ import {
IconPencil,
IconTrash,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
+
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
type SettingsObjectInactiveMenuDropDownProps = {
isCustomObject: boolean;
+ objectMetadataItemNamePlural: string;
onActivate: () => void;
onDelete: () => void;
onEdit: () => void;
- objectMetadataItemNamePlural: string;
isReadOnly?: boolean;
};
export const SettingsObjectInactiveMenuDropDown = ({
- onActivate,
objectMetadataItemNamePlural,
+ onActivate,
onDelete,
onEdit,
isCustomObject,
isReadOnly = false,
}: SettingsObjectInactiveMenuDropDownProps) => {
- const dropdownId = `${objectMetadataItemNamePlural}-settings-object-inactive-menu-dropdown`;
-
- const { closeDropdown } = useCloseDropdown();
-
- const handleActivate = () => {
- onActivate();
- closeDropdown(dropdownId);
- };
-
- const handleDelete = () => {
- onDelete();
- closeDropdown(dropdownId);
- };
-
- const handleEdit = () => {
- onEdit();
- closeDropdown(dropdownId);
- };
-
const isEditable = isCustomObject && !isReadOnly;
return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
- <LightIconButton
- aria-label={t`Inactive Object Options`}
- emphasis="subtle"
- >
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={isEditable ? <IconPencil /> : <IconEye />}
- onClick={handleEdit}
- >
- {isEditable ? t`Edit` : t`View`}
- </ListItem>
- {!isReadOnly && (
- <ListItem
- startIcon={<IconArchiveOff />}
- onClick={handleActivate}
- >{t`Activate`}</ListItem>
- )}
- {isCustomObject && !isReadOnly && (
- <ListItem
- startIcon={<IconTrash />}
- color="danger"
- onClick={handleDelete}
- >{t`Delete`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot
+ type="menu"
+ dropdownId={`${objectMetadataItemNamePlural}-settings-object-inactive-menu-dropdown`}
+ >
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ aria-label={t`Inactive Object Options`}
+ emphasis="subtle"
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent align="end" width={GenericDropdownContentWidth.Narrow}>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={isEditable ? <IconPencil /> : <IconEye />}
+ onClick={onEdit}
+ >
+ {isEditable ? t`Edit` : t`View`}
+ </Dropdown.ActionItem>
+ {!isReadOnly && (
+ <Dropdown.ActionItem
+ startIcon={<IconArchiveOff />}
+ onClick={onActivate}
+ >{t`Activate`}</Dropdown.ActionItem>
+ )}
+ {isCustomObject && !isReadOnly && (
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ color="danger"
+ onClick={onDelete}
+ >{t`Delete`}</Dropdown.ActionItem>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
index 34dd6f01728..16a84df340b 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
@@ -3,7 +3,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
@@ -123,7 +123,9 @@ export const WebhookEntitySelect = ({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.Medium}
+ >
<DropdownMenuSearchInput
autoFocus
value={searchInput}
@@ -193,7 +195,7 @@ export const WebhookEntitySelect = ({
)}
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
index 8d2ed458248..c9846b18860 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
@@ -1,13 +1,10 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useMutation, useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import {
type PublicDomain,
DeletePublicDomainDocument,
@@ -24,8 +21,6 @@ export const SettingPublicDomainRowDropdownMenu = ({
const { enqueueToast } = useToast();
- const { closeDropdown } = useCloseDropdown();
-
const { refetch: refetchPublicDomains } = useQuery(
FindManyPublicDomainsDocument,
);
@@ -33,43 +28,42 @@ export const SettingPublicDomainRowDropdownMenu = ({
const [deletePublicDomain] = useMutation(DeletePublicDomainDocument);
const handleDeletePublicDomain = async () => {
- await deletePublicDomain({
- variables: {
- domain: publicDomain.domain,
- },
- onCompleted: () =>
- enqueueToast({
- variant: 'success',
- children: t`Custom domain successfully deleted`,
- }),
- onError: (error) => enqueueToast(getToastOptionsFromError({ error })),
- });
+ try {
+ await deletePublicDomain({
+ variables: {
+ domain: publicDomain.domain,
+ },
+ });
+
+ enqueueToast({
+ variant: 'success',
+ children: t`Custom domain successfully deleted`,
+ });
+
+ await refetchPublicDomains();
+ } catch (error) {
+ enqueueToast(getToastOptionsFromError({ error }));
+ }
};
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={async () => {
- await handleDeletePublicDomain();
- closeDropdown(dropdownId);
- await refetchPublicDomains();
- }}
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={handleDeletePublicDomain}
+ >{t`Delete`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/domains/components/__stories__/SettingPublicDomainRowDropdownMenu.stories.tsx b/packages/twenty-front/src/modules/settings/domains/components/__stories__/SettingPublicDomainRowDropdownMenu.stories.tsx
new file mode 100644
index 00000000000..2f8d8e3eb43
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/domains/components/__stories__/SettingPublicDomainRowDropdownMenu.stories.tsx
@@ -0,0 +1,155 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { Toaster } from 'twenty-ui/components';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import { SettingPublicDomainRowDropdownMenu } from '@/settings/domains/components/SettingPublicDomainRowDropdownMenu';
+import {
+ type DeletePublicDomainMutation,
+ type DeletePublicDomainMutationVariables,
+ type FindManyPublicDomainsQuery,
+} from '~/generated-metadata/graphql';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+
+const publicDomain = {
+ id: 'public-domain',
+ domain: 'crm.example.com',
+ createdAt: '2026-09-23T00:00:00.000Z',
+ isValidated: true,
+ applicationId: null,
+};
+const DELETE_FAILURE_MESSAGE = 'Domain deletion failed';
+const onDeletePublicDomain = fn();
+const onFindManyPublicDomains = fn();
+let pendingDeletion = Promise.resolve();
+let completeDeletion = () => {};
+
+const findManyPublicDomainsHandler = graphql.query<FindManyPublicDomainsQuery>(
+ 'FindManyPublicDomains',
+ () => {
+ onFindManyPublicDomains();
+ return HttpResponse.json({
+ data: { findManyPublicDomains: [publicDomain] },
+ });
+ },
+);
+
+const meta: Meta<typeof SettingPublicDomainRowDropdownMenu> = {
+ title: 'Modules/Settings/Domains/SettingPublicDomainRowDropdownMenu',
+ component: SettingPublicDomainRowDropdownMenu,
+ decorators: [
+ (Story) => (
+ <>
+ <Story />
+ <Toaster getToastProps={() => ({ progress: 100 })} />
+ </>
+ ),
+ ComponentDecorator,
+ ToastDecorator,
+ ],
+ args: { publicDomain },
+ beforeEach: async () => {
+ await mockedApolloClient.clearStore();
+ onDeletePublicDomain.mockClear();
+ onFindManyPublicDomains.mockClear();
+ pendingDeletion = new Promise<void>((resolve) => {
+ completeDeletion = resolve;
+ });
+ return () => completeDeletion();
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ findManyPublicDomainsHandler,
+ graphql.mutation<
+ DeletePublicDomainMutation,
+ DeletePublicDomainMutationVariables
+ >('DeletePublicDomain', async ({ variables }) => {
+ onDeletePublicDomain(variables);
+ await pendingDeletion;
+ return HttpResponse.json({ data: { deletePublicDomain: true } });
+ }),
+ ],
+ },
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingPublicDomainRowDropdownMenu>;
+
+export const DeleteClosesMenuAndRefetches: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+
+ await waitFor(() =>
+ expect(onFindManyPublicDomains).toHaveBeenCalledTimes(1),
+ );
+ await userEvent.click(trigger);
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Delete' }));
+
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() =>
+ expect(onDeletePublicDomain).toHaveBeenCalledWith({
+ domain: publicDomain.domain,
+ }),
+ );
+ await expect(onFindManyPublicDomains).toHaveBeenCalledTimes(1);
+
+ completeDeletion();
+
+ await waitFor(() =>
+ expect(onFindManyPublicDomains).toHaveBeenCalledTimes(2),
+ );
+ await expect(
+ await canvas.findByText('Custom domain successfully deleted'),
+ ).toBeVisible();
+ await expect(onDeletePublicDomain).toHaveBeenCalledTimes(1);
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
+
+export const DeleteFailureShowsOneError: Story = {
+ parameters: {
+ msw: {
+ handlers: [
+ findManyPublicDomainsHandler,
+ graphql.mutation<
+ DeletePublicDomainMutation,
+ DeletePublicDomainMutationVariables
+ >('DeletePublicDomain', ({ variables }) => {
+ onDeletePublicDomain(variables);
+ return HttpResponse.json({
+ errors: [
+ {
+ message: DELETE_FAILURE_MESSAGE,
+ extensions: { userFriendlyMessage: DELETE_FAILURE_MESSAGE },
+ },
+ ],
+ });
+ }),
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await waitFor(() =>
+ expect(onFindManyPublicDomains).toHaveBeenCalledTimes(1),
+ );
+ await userEvent.click(canvas.getByRole('button', { name: 'More options' }));
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Delete' }));
+
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await expect(await canvas.findByText(DELETE_FAILURE_MESSAGE)).toBeVisible();
+ await expect(canvas.getAllByText(DELETE_FAILURE_MESSAGE)).toHaveLength(1);
+ await expect(onDeletePublicDomain).toHaveBeenCalledTimes(1);
+ await expect(onFindManyPublicDomains).toHaveBeenCalledTimes(1);
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
index 9497e460344..92c87436fcb 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
@@ -1,12 +1,9 @@
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconLogout } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import {
CurrentUserSessionsDocument,
RevokeUserSessionDocument,
@@ -20,17 +17,13 @@ export const SettingsDeviceSessionRowDropdownMenu = ({
userSessionId,
}: SettingsDeviceSessionRowDropdownMenuProps) => {
const dropdownId = `settings-device-session-row-${userSessionId}`;
-
const { enqueueToast } = useToast();
- const { closeDropdown } = useCloseDropdown();
const [revokeUserSession] = useMutation(RevokeUserSessionDocument, {
refetchQueries: [CurrentUserSessionsDocument],
});
const handleRevokeSession = async () => {
- closeDropdown(dropdownId);
-
try {
await revokeUserSession({ variables: { userSessionId } });
enqueueToast({ variant: 'success', children: t`Device logged out` });
@@ -43,25 +36,23 @@ export const SettingsDeviceSessionRowDropdownMenu = ({
};
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="bottom-end"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- color="danger"
- startIcon={<IconLogout />}
- onClick={handleRevokeSession}
- >{t`Log out`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="bottom" align="end">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconLogout />}
+ onClick={handleRevokeSession}
+ >{t`Log out`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
index fdec830095a..c1218bc0e8c 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -3,7 +3,7 @@ import { SettingsRolesTableRow } from '@/settings/roles/components/SettingsRoles
import { useSettingsAllRoles } from '@/settings/roles/hooks/useSettingsAllRoles';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
@@ -105,7 +105,7 @@ export const SettingsRolesList = () => {
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconLego />}
@@ -118,7 +118,7 @@ export const SettingsRolesList = () => {
checked={showApiKeyRoles}
>{t`API key roles`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</StyledSearchAndFilterContainer>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown.tsx
index e3270b79581..228e3361278 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown.tsx
@@ -1,5 +1,5 @@
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -111,7 +111,7 @@ export const SettingsRoleAssignmentEntityPickerDropdown = ({
}, [entities, searchFilter, excludedIds, isAgent]);
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
<DropdownMenuSearchInput
value={searchFilter}
onChange={(event) => setSearchFilter(event.target.value)}
@@ -138,6 +138,6 @@ export const SettingsRoleAssignmentEntityPickerDropdown = ({
</SettingsEmptyPlaceholder>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
index 5c4a6e4d009..2c1334334bd 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
@@ -4,7 +4,7 @@ import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRec
import { type SearchRecord } from '~/generated/graphql';
import { SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent';
import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -51,7 +51,9 @@ export const SettingsRoleAssignmentWorkspaceMemberPickerDropdown = ({
return (
<>
<ToastOnQueryErrorEffect error={error} />
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuSearchInput
value={searchFilter}
onChange={handleSearchFilterChange}
@@ -68,7 +70,7 @@ export const SettingsRoleAssignmentWorkspaceMemberPickerDropdown = ({
onSelect={onSelect}
/>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
index c7eae039e20..5bc566381a3 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
@@ -1,6 +1,6 @@
import { useResetObjectPermission } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useResetObjectPermission';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
@@ -46,7 +46,7 @@ export const SettingsRolePermissionsObjectLevelTableRowOptionsDropdown = ({
</IconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
{isEditable && (
<DropdownMenuItemsContainer>
<UndecoratedLink
@@ -65,7 +65,7 @@ export const SettingsRolePermissionsObjectLevelTableRowOptionsDropdown = ({
color="danger"
>{t`Remove rule`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
/>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx
index 2d5b6cf114f..37f7b5e9118 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx
@@ -20,7 +20,7 @@ import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dr
import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';
import { RECORD_LEVEL_PERMISSION_PREDICATE_FIELD_TYPES } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/constants/RecordLevelPermissionPredicateFieldTypes';
import { getComparableWorkspaceMemberRelationFields } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/utils/getComparableWorkspaceMemberRelationFields';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -158,7 +158,9 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectF
);
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<AdvancedFilterFieldSelectSearchInput />
<SelectableList
focusId={advancedFilterFieldSelectDropdownId}
@@ -183,6 +185,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectF
))}
</DropdownMenuItemsContainer>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
index 56fa4985a7f..2d841d8872e 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
@@ -20,7 +20,7 @@ import { ICON_NAME_BY_SUB_FIELD } from '@/object-record/record-filter/constants/
import { areCompositeTypeSubFieldsFilterable } from '@/object-record/record-filter/utils/areCompositeTypeSubFieldsFilterable';
import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';
import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -128,7 +128,9 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectS
);
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -187,6 +189,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectS
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
index 2c9d8e8380d..98b1f8ec529 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
@@ -26,7 +26,7 @@ import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/Com
import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';
import { RECORD_LEVEL_PERMISSION_PREDICATE_FIELD_TYPES } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/constants/RecordLevelPermissionPredicateFieldTypes';
import { getComparableWorkspaceMemberRelationFields } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/utils/getComparableWorkspaceMemberRelationFields';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -283,7 +283,7 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelec
: t`Search 1 field`;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
+ <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -322,6 +322,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelec
<ListItem disabled>{t`No compatible fields`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
index 4465581a518..5c0154fd982 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
@@ -4,7 +4,7 @@ import { EDITABLE_PROFILE_FIELDS_DROPDOWN_ID } from '@/settings/security/constan
import { SelectControl } from '@/ui/input/components/SelectControl';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
@@ -127,7 +127,7 @@ export const SettingsSecurityEditableProfileFields = () => {
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer isMultiSelect>
{profileFieldOptions.map((option) => (
<ListItem
@@ -145,7 +145,7 @@ export const SettingsSecurityEditableProfileFields = () => {
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</StyledDropdownContainer>
diff --git a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
index 23356547aa1..4e575b1aa82 100644
--- a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
@@ -1,15 +1,12 @@
-import { approvedAccessDomainsState } from '@/settings/security/states/ApprovedAccessDomainsState';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { approvedAccessDomainsState } from '@/settings/security/states/ApprovedAccessDomainsState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import {
type ApprovedAccessDomain,
DeleteApprovedAccessDomainDocument,
@@ -23,13 +20,10 @@ export const SettingsSecurityApprovedAccessDomainRowDropdownMenu = ({
approvedAccessDomain,
}: SettingsSecurityApprovedAccessDomainRowDropdownMenuProps) => {
const dropdownId = `settings-approved-access-domain-row-${approvedAccessDomain.id}`;
-
const setApprovedAccessDomains = useSetAtomState(approvedAccessDomainsState);
const { enqueueToast } = useToast();
- const { closeDropdown } = useCloseDropdown();
-
const [deleteApprovedAccessDomain] = useMutation(
DeleteApprovedAccessDomainDocument,
);
@@ -59,30 +53,25 @@ export const SettingsSecurityApprovedAccessDomainRowDropdownMenu = ({
};
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- handleDeleteApprovedAccessDomain();
- closeDropdown(dropdownId);
- }}
- >
- {'Delete'}
- </ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={handleDeleteApprovedAccessDomain}
+ >
+ {t`Delete`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
index 4d49d591b74..c6efe075672 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
@@ -1,15 +1,12 @@
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { useDeleteSsoIdentityProvider } from '@/settings/security/hooks/useDeleteSsoIdentityProvider';
import { useUpdateSsoIdentityProvider } from '@/settings/security/hooks/useUpdateSsoIdentityProvider';
import { type SsoIdentityProvider } from '@/settings/security/types/SsoIdentityProvider';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import { IconArchive, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { SsoIdentityProviderStatus } from '~/generated-metadata/graphql';
type SettingsSecuritySsoRowDropdownMenuProps = {
@@ -20,11 +17,8 @@ export const SettingsSecuritySsoRowDropdownMenu = ({
ssoIdp,
}: SettingsSecuritySsoRowDropdownMenuProps) => {
const dropdownId = `settings-account-row-${ssoIdp.id}`;
-
const { enqueueToast } = useToast();
- const { closeDropdown } = useCloseDropdown();
-
const { deleteSsoIdentityProvider } = useDeleteSsoIdentityProvider();
const { updateSsoIdentityProvider } = useUpdateSsoIdentityProvider();
@@ -65,37 +59,33 @@ export const SettingsSecuritySsoRowDropdownMenu = ({
};
return (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton emphasis="subtle" aria-label={t`More options`}>
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconArchive />}
- onClick={() => {
- toggleSsoIdentityProviderStatus(ssoIdp.id);
- closeDropdown(dropdownId);
- }}
- >
- {ssoIdp.status === 'Active' ? t`Deactivate` : t`Activate`}
- </ListItem>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- handleDeleteSsoIdentityProvider(ssoIdp.id);
- closeDropdown(dropdownId);
- }}
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId={dropdownId}>
+ <Dropdown.Trigger
+ render={
+ <LightIconButton emphasis="subtle" aria-label={t`More options`}>
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconArchive />}
+ onClick={() => {
+ toggleSsoIdentityProviderStatus(ssoIdp.id);
+ }}
+ >
+ {ssoIdp.status === 'Active' ? t`Deactivate` : t`Activate`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={() => {
+ handleDeleteSsoIdentityProvider(ssoIdp.id);
+ }}
+ >{t`Delete`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterMenuContent.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterMenuContent.tsx
index d95de45080e..44a4fcb03fe 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterMenuContent.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterMenuContent.tsx
@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react/macro';
import { IconMailCog, IconStatusChange, IconTrash } from 'twenty-ui/icon';
import { type SettingsUnsubscribersFilterContentId } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -25,7 +25,7 @@ export const SettingsUnsubscribersFilterMenuContent = ({
const { t } = useLingui();
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
startIcon={<IconStatusChange />}
@@ -52,6 +52,6 @@ export const SettingsUnsubscribersFilterMenuContent = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterOptionsContent.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterOptionsContent.tsx
index 4da192aa296..c66e7803ceb 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterOptionsContent.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterOptionsContent.tsx
@@ -2,7 +2,7 @@ import { IconChevronLeft } from 'twenty-ui/icon';
import { ListItem } from 'twenty-ui/primitives/navigation';
import { type SettingsUnsubscribersFilterOption } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterOption';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -31,7 +31,7 @@ export const SettingsUnsubscribersFilterOptionsContent = ({
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -56,6 +56,6 @@ export const SettingsUnsubscribersFilterOptionsContent = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
index c17d15927f5..fcb810476eb 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
@@ -2,7 +2,7 @@ import { SIDE_PANEL_NAVIGATION_HISTORY_DROPDOWN_ID } from '@/side-panel/constant
import { useSidePanelContextChips } from '@/side-panel/hooks/useSidePanelContextChips';
import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
@@ -60,7 +60,7 @@ export const SidePanelBackButton = () => {
</StyledNavigationIcon>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{contextChips.slice(0, -1).map((chip, index) => (
<MenuItem
@@ -74,7 +74,7 @@ export const SidePanelBackButton = () => {
/>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownId={SIDE_PANEL_NAVIGATION_HISTORY_DROPDOWN_ID}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
index fed7e158cdc..b7541f5dd0c 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
@@ -2,7 +2,7 @@ import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataI
import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';
import { OBJECT_FILTER_DROPDOWN_ID } from '@/side-panel/components/SidePanelObjectFilterDropdown';
import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
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';
@@ -72,7 +72,7 @@ export const SidePanelObjectFilterDropdownContent = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader>{t`Object`}</DropdownMenuHeader>
<DropdownMenuSearchInput
value={filterSearch}
@@ -143,6 +143,6 @@ export const SidePanelObjectFilterDropdownContent = ({
checked={sidePanelShowHiddenObjects}
>{t`Show hidden objects`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelOptionsDropdown.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelOptionsDropdown.tsx
new file mode 100644
index 00000000000..eb469467e01
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelOptionsDropdown.tsx
@@ -0,0 +1,63 @@
+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DROPDOWN_OFFSET_Y } from '@/ui/layout/dropdown/constants/DropdownOffsetY';
+import { OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG } from '@/ui/layout/dropdown/constants/OptionsDropdownGlobalHotkeysConfig';
+import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
+import { useLingui } from '@lingui/react/macro';
+import { type ReactNode } from 'react';
+import { Dropdown, IconButton } from 'twenty-ui/components';
+import { IconDotsVertical } from 'twenty-ui/icon';
+
+type SidePanelOptionsDropdownProps = {
+ dropdownId: string;
+ children: ReactNode;
+};
+
+export const SidePanelOptionsDropdown = ({
+ dropdownId,
+ children,
+}: SidePanelOptionsDropdownProps) => {
+ const { t } = useLingui();
+ const { toggleDropdown } = useToggleDropdown();
+
+ const toggleOptionsHotkeysConfig = {
+ keys: ['ctrl+o', 'meta+o'],
+ callback: () =>
+ toggleDropdown({
+ dropdownComponentInstanceIdFromProps: dropdownId,
+ globalHotkeysConfig: OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG,
+ }),
+ dependencies: [toggleDropdown, dropdownId],
+ };
+
+ useHotkeysOnFocusedElement({
+ ...toggleOptionsHotkeysConfig,
+ focusId: SIDE_PANEL_FOCUS_ID,
+ });
+
+ useHotkeysOnFocusedElement({
+ ...toggleOptionsHotkeysConfig,
+ focusId: dropdownId,
+ });
+
+ return (
+ <DropdownRoot
+ dropdownId={dropdownId}
+ type="menu"
+ globalHotkeysConfig={OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG}
+ >
+ <Dropdown.Trigger
+ render={
+ <IconButton aria-label={t`Options`} size="sm" variant="outline">
+ <IconDotsVertical />
+ </IconButton>
+ }
+ />
+ <DropdownContent side="top" align="end" sideOffset={DROPDOWN_OFFSET_Y}>
+ <Dropdown.Section>{children}</Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
+ );
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
index 86170cae711..deae5509b0e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
@@ -8,7 +8,7 @@ import { SingleWidgetTabVisibilityDropdownContent } from '@/side-panel/pages/pag
import { TAB_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/TabSettingsSelectableItemIds';
import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';
import { getTabSettingsPlacementItems } from '@/side-panel/pages/page-layout/utils/getTabSettingsPlacementItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -103,7 +103,7 @@ export const SingleWidgetTabSettingsContent = ({
TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<SingleWidgetTabVisibilityDropdownContent
widgetId={singleWidget.id}
currentExpression={
@@ -111,7 +111,7 @@ export const SingleWidgetTabSettingsContent = ({
}
pageLayoutId={pageLayoutId}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
description={visibilityLabel}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
index e550f7ccd8a..8a500df2e3a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
@@ -1,16 +1,13 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { useDeletePageLayoutWidget } from '@/page-layout/hooks/useDeletePageLayoutWidget';
import { useDuplicatePageLayoutWidget } from '@/page-layout/hooks/useDuplicatePageLayoutWidget';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
-import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
+import { SidePanelOptionsDropdown } from '@/side-panel/components/SidePanelOptionsDropdown';
import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useLingui } from '@lingui/react/macro';
import { useId } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components';
import { IconCopyPlus, IconTrash } from 'twenty-ui/icon';
export const WidgetSettingsFooter = ({
@@ -20,7 +17,6 @@ export const WidgetSettingsFooter = ({
}) => {
const dropdownId = useId();
const { t } = useLingui();
- const { closeDropdown } = useCloseDropdown();
const { duplicateWidget } = useDuplicatePageLayoutWidget(pageLayoutId);
const { deletePageLayoutWidget } = useDeletePageLayoutWidget(pageLayoutId);
const pageLayoutEditingWidgetId = useAtomComponentStateValue(
@@ -32,53 +28,32 @@ export const WidgetSettingsFooter = ({
if (isDefined(pageLayoutEditingWidgetId)) {
duplicateWidget(pageLayoutEditingWidgetId);
}
- closeDropdown(dropdownId);
};
const handleDeleteWidget = () => {
if (isDefined(pageLayoutEditingWidgetId)) {
deletePageLayoutWidget(pageLayoutEditingWidgetId);
}
- closeDropdown(dropdownId);
};
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- dropdownId,
- );
-
return (
<SidePanelFooter
actions={[
- <OptionsDropdownMenu
- key="options"
- dropdownId={dropdownId}
- selectableListId={dropdownId}
- selectableItemIdArray={['duplicate-widget', 'delete-widget']}
- >
- <SelectableListItem
- itemId="duplicate-widget"
- onEnter={handleDuplicateWidget}
+ <SidePanelOptionsDropdown key="options" dropdownId={dropdownId}>
+ <Dropdown.ActionItem
+ onClick={handleDuplicateWidget}
+ startIcon={<IconCopyPlus />}
>
- <ListItem
- focused={selectedItemId === 'duplicate-widget'}
- onClick={handleDuplicateWidget}
- startIcon={<IconCopyPlus />}
- >{t`Duplicate widget`}</ListItem>
- </SelectableListItem>
-
- <SelectableListItem
- itemId="delete-widget"
- onEnter={handleDeleteWidget}
+ {t`Duplicate widget`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ onClick={handleDeleteWidget}
+ startIcon={<IconTrash />}
+ color="danger"
>
- <ListItem
- focused={selectedItemId === 'delete-widget'}
- onClick={handleDeleteWidget}
- startIcon={<IconTrash />}
- color="danger"
- >{t`Delete widget`}</ListItem>
- </SelectableListItem>
- </OptionsDropdownMenu>,
+ {t`Delete widget`}
+ </Dropdown.ActionItem>
+ </SidePanelOptionsDropdown>,
]}
/>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
index 7fbe7f2f215..5bb6c39c244 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
@@ -10,7 +10,7 @@ import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-lay
import { useOpenReplaceWidgetPicker } from '@/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker';
import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -101,9 +101,9 @@ export const WidgetSettingsManageSection = ({
WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<WidgetVisibilityDropdownContent />
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
description={visibilityLabel}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
index 997ea5d7988..32dbf9be5c5 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
@@ -7,7 +7,7 @@ import { MoveToTabDropdownContent } from '@/side-panel/pages/page-layout/compone
import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
import { type WidgetSettingsPlacement } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useLingui } from '@lingui/react/macro';
@@ -117,9 +117,9 @@ export const WidgetSettingsPlacementSection = ({
Icon={IconArrowsVertical}
dropdownId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<MoveToTabDropdownContent />
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
/>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/WidgetSettingsFooter.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/WidgetSettingsFooter.stories.tsx
new file mode 100644
index 00000000000..ec7b6a735ba
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/WidgetSettingsFooter.stories.tsx
@@ -0,0 +1,176 @@
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';
+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
+import { WidgetSettingsFooter } from '@/side-panel/pages/page-layout/components/WidgetSettingsFooter';
+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';
+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { styled } from '@linaria/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type ReactNode } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+
+const PAGE_LAYOUT_ID = 'widget-settings-footer-story';
+const WIDGET_ID = 'revenue';
+const TAB_ID = 'overview';
+const onBackgroundClickOutside = fn();
+
+const StyledFooter = styled.div`
+ margin-top: 100px;
+ width: 320px;
+`;
+
+const BackgroundSelection = ({ children }: { children: ReactNode }) => {
+ useListenClickOutside({
+ listenerId: 'widget-footer-background',
+ excludedClickOutsideIds: [SIDE_PANEL_CLICK_OUTSIDE_ID],
+ refs: [],
+ callback: onBackgroundClickOutside,
+ });
+
+ return (
+ <ParentClickOutsideIdContext.Provider value={SIDE_PANEL_CLICK_OUTSIDE_ID}>
+ <StyledFooter data-click-outside-id={SIDE_PANEL_CLICK_OUTSIDE_ID}>
+ {children}
+ </StyledFooter>
+ </ParentClickOutsideIdContext.Provider>
+ );
+};
+
+const meta: Meta<typeof WidgetSettingsFooter> = {
+ title: 'Modules/SidePanel/PageLayout/WidgetSettingsFooter',
+ component: WidgetSettingsFooter,
+ decorators: [
+ (Story) => (
+ <BackgroundSelection>
+ <Story />
+ </BackgroundSelection>
+ ),
+ ComponentDecorator,
+ MemoryRouterDecorator,
+ ],
+ args: { pageLayoutId: PAGE_LAYOUT_ID },
+ beforeEach: () => {
+ onBackgroundClickOutside.mockClear();
+ jotaiStore.set(
+ pageLayoutDraftComponentState.atomFamily({ instanceId: PAGE_LAYOUT_ID }),
+ makeDraft([makeTab(TAB_ID, [makeWidget(WIDGET_ID, 0, TAB_ID)])]),
+ );
+ jotaiStore.set(
+ pageLayoutCurrentLayoutsComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_ID,
+ }),
+ {
+ [TAB_ID]: {
+ desktop: [{ i: WIDGET_ID, x: 0, y: 0, w: 4, h: 2 }],
+ mobile: [{ i: WIDGET_ID, x: 0, y: 0, w: 1, h: 2 }],
+ },
+ },
+ );
+ jotaiStore.set(
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_ID,
+ }),
+ WIDGET_ID,
+ );
+ jotaiStore.set(focusStackState.atom, [
+ {
+ focusId: SIDE_PANEL_FOCUS_ID,
+ componentInstance: {
+ componentType: FocusComponentType.SIDE_PANEL,
+ componentInstanceId: SIDE_PANEL_FOCUS_ID,
+ },
+ globalHotkeysConfig: {
+ enableGlobalHotkeysWithModifiers: true,
+ enableGlobalHotkeysConflictingWithKeyboard: true,
+ },
+ },
+ ]);
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const ToggleWithShortcuts: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ for (const modifier of ['Control', 'Meta']) {
+ await userEvent.keyboard(`{${modifier}>}o{/${modifier}}`);
+ const duplicateAction = await canvas.findByRole('menuitem', {
+ name: 'Duplicate widget',
+ });
+ await waitFor(() => expect(duplicateAction).toHaveFocus());
+
+ await userEvent.keyboard(`{${modifier}>}o{/${modifier}}`);
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ expect(jotaiStore.get(focusStackState.atom)).toHaveLength(1);
+ });
+ }
+
+ expect(
+ jotaiStore.get(
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_ID,
+ }),
+ ).tabs[0].widgets,
+ ).toHaveLength(1);
+ },
+};
+
+export const DuplicateAndDeletePreserveBackgroundSelection: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Options' });
+ const draftState = pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_ID,
+ });
+
+ await userEvent.click(trigger);
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Duplicate widget' }),
+ );
+
+ expect(jotaiStore.get(draftState).tabs[0].widgets).toHaveLength(2);
+ expect(
+ jotaiStore.get(draftState).tabs[0].widgets.map(({ title }) => title),
+ ).toContain('revenue (Copy)');
+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+
+ await userEvent.click(trigger);
+ const duplicateAction = await canvas.findByRole('menuitem', {
+ name: 'Duplicate widget',
+ });
+ await waitFor(() => expect(duplicateAction).toHaveFocus());
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+
+ expect(
+ jotaiStore.get(draftState).tabs[0].widgets.map(({ id }) => id),
+ ).toEqual([WIDGET_ID]);
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();
+
+ await userEvent.click(canvasElement.ownerDocument.body);
+ expect(onBackgroundClickOutside).toHaveBeenCalledTimes(1);
+ },
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
index 6c523169bfd..14df0436950 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
@@ -15,7 +15,7 @@ import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { isMinMaxRangeValid } from '@/side-panel/pages/page-layout/utils/isMinMaxRangeValid';
import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
@@ -185,9 +185,9 @@ export const ChartSettingItem = ({
id={item.id}
dropdownId={item.id}
dropdownComponents={
- <DropdownContent widthInPixels={item.dropdownWidth}>
+ <LegacyDropdownContent widthInPixels={item.dropdownWidth}>
{item.DropdownContent && <item.DropdownContent />}
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
dropdownOffset={{ y: 4 }}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
index bcad5383786..e349d5c0312 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
@@ -29,7 +29,7 @@ import { useRecordTableSettingsDescriptions } from '@/side-panel/pages/page-layo
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
@@ -248,9 +248,9 @@ export const SidePanelDashboardRecordTableSettings = () => {
id="record-table-source"
dropdownId="record-table-source"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableDataSourceDropdownContent />
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -266,14 +266,14 @@ export const SidePanelDashboardRecordTableSettings = () => {
dropdownId="object-view-layout"
dropdownComponents={
hasViewId ? (
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableLayoutDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetInEditMode.id}
objectMetadataId={widgetInEditMode.objectMetadataId!}
currentLayoutViewType={currentLayoutViewType}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
) : (
<></>
)
@@ -343,7 +343,7 @@ export const SidePanelDashboardRecordTableSettings = () => {
id="record-table-calendar-field"
dropdownId="record-table-calendar-field"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableCalendarFieldDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetInEditMode.id}
@@ -354,7 +354,7 @@ export const SidePanelDashboardRecordTableSettings = () => {
calendarFieldMetadataId
}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -371,13 +371,13 @@ export const SidePanelDashboardRecordTableSettings = () => {
id="record-table-calendar-layout"
dropdownId="record-table-calendar-layout"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableCalendarLayoutDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetInEditMode.id}
currentCalendarLayout={currentCalendarLayout}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -394,7 +394,7 @@ export const SidePanelDashboardRecordTableSettings = () => {
id="record-table-group-by"
dropdownId="record-table-group-by"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableGroupByDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetInEditMode.id}
@@ -406,7 +406,7 @@ export const SidePanelDashboardRecordTableSettings = () => {
}
isClearable={!isKanbanLayout}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
index 0e3048e563e..e31773bbf45 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
@@ -29,7 +29,7 @@ import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWid
import { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';
import { getWidgetViewLayoutSettingsItemIds } from '@/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds';
import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -217,9 +217,9 @@ export const SidePanelRecordPageFieldSettings = () => {
Icon={IconListDetails}
dropdownId="field"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<FieldWidgetFieldDropdownContent />
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
description={fieldLabel}
@@ -233,9 +233,9 @@ export const SidePanelRecordPageFieldSettings = () => {
Icon={layoutRowIcon}
dropdownId="layout"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<FieldWidgetLayoutDropdownContent />
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
description={layoutLabel}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
index 55456a8793b..919c7f64ab7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
@@ -5,7 +5,7 @@ import { useUpsertRecordField } from '@/object-record/record-field/hooks/useUpse
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
import { type RecordField } from '@/object-record/record-field/types/RecordField';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -90,7 +90,7 @@ export const RecordTableFieldsDropdownHiddenFieldsContent = ({
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -121,6 +121,6 @@ export const RecordTableFieldsDropdownHiddenFieldsContent = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
index 6a2ba6f2ff2..e08726d02dc 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
@@ -7,7 +7,7 @@ import { visibleRecordFieldsComponentSelector } from '@/object-record/record-fie
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
@@ -92,7 +92,7 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{isDefined(fieldMetadataItemLabelIdentifier) && (
<MenuItemDraggable
@@ -152,6 +152,6 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({
hasSubmenu
>{t`Hidden Fields`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx
index 9dc37ea0f78..ee057522da6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx
@@ -11,7 +11,7 @@ import { RecordTableCalendarFieldDropdownContent } from '@/side-panel/pages/page
import { RecordTableCalendarLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent';
import { RecordTableGroupByDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent';
import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
@@ -115,14 +115,14 @@ export const WidgetViewLayoutSettingsRows = ({
id="object-view-layout"
dropdownId="object-view-layout"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableLayoutDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetId}
objectMetadataId={objectMetadataId}
currentLayoutViewType={currentLayoutViewType}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -139,14 +139,14 @@ export const WidgetViewLayoutSettingsRows = ({
id="record-table-calendar-field"
dropdownId="record-table-calendar-field"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableCalendarFieldDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetId}
objectMetadataId={objectMetadataId}
currentCalendarFieldMetadataId={calendarFieldMetadataId}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -163,13 +163,13 @@ export const WidgetViewLayoutSettingsRows = ({
id="record-table-calendar-layout"
dropdownId="record-table-calendar-layout"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableCalendarLayoutDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetId}
currentCalendarLayout={currentCalendarLayout}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
@@ -186,7 +186,7 @@ export const WidgetViewLayoutSettingsRows = ({
id="record-table-group-by"
dropdownId="record-table-group-by"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<RecordTableGroupByDropdownContent
pageLayoutId={pageLayoutId}
widgetId={widgetId}
@@ -194,7 +194,7 @@ export const WidgetViewLayoutSettingsRows = ({
currentMainGroupByFieldMetadataId={mainGroupByFieldMetadataId}
isClearable={!isKanbanLayout}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownPlacement="bottom-end"
hasSubMenu
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx
index 3c6ddfeafa8..f93eeae9cef 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx
@@ -41,8 +41,9 @@ jest.mock(
'@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent',
() => ({ RecordTableLayoutDropdownContent: () => null }),
);
-jest.mock('@/ui/layout/dropdown/components/DropdownContent', () => ({
- DropdownContent: ({ children }: { children: React.ReactNode }) => children,
+jest.mock('@/ui/layout/dropdown/components/LegacyDropdownContent', () => ({
+ LegacyDropdownContent: ({ children }: { children: React.ReactNode }) =>
+ children,
}));
jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({
SelectableListItem: ({ children }: { children: React.ReactNode }) => children,
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
index ed066e42af3..a80fe8c2bf8 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
@@ -4,7 +4,7 @@ import { DO_NOT_IMPORT_OPTION_KEY } from '@/spreadsheet-import/constants/DoNotIm
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -83,7 +83,9 @@ export const MatchColumnSelectFieldSelectDropdownContent = ({
const { t } = useLingui();
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -162,6 +164,6 @@ export const MatchColumnSelectFieldSelectDropdownContent = ({
</DropdownMenuItemsContainer>
</ScrollWrapper>
</StyledContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
index 0059e3c7b62..c38b6efb0c1 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
@@ -3,7 +3,7 @@ import { type SpreadsheetImportFieldOption } from '@/spreadsheet-import/types/Sp
import { getSubFieldOptions } from '@/spreadsheet-import/utils/spreadsheetImportGetSubFieldOptions';
import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -54,7 +54,9 @@ export const MatchColumnSelectSubFieldSelectDropdownContent = ({
);
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -85,6 +87,6 @@ export const MatchColumnSelectSubFieldSelectDropdownContent = ({
),
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
index 330f3bd00b4..7ea98d8ca6a 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
@@ -1,4 +1,4 @@
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -49,7 +49,7 @@ export const SubMatchingSelectInput = ({
};
return (
- <DropdownContent ref={containerRef}>
+ <LegacyDropdownContent ref={containerRef}>
<DropdownMenuSearchInput
value={searchFilter}
onChange={(e) => setSearchFilter(e.target.value)}
@@ -79,6 +79,6 @@ export const SubMatchingSelectInput = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx
index 66b09f839bd..273d7c4dd0d 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx
@@ -11,7 +11,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { AddSelectOptionMenuItem } from '@/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
@@ -119,7 +119,7 @@ export const MultiSelectInput = ({
focusId={focusId}
shouldPreselectFirstItem={isNonEmptyString(searchFilter)}
>
- <DropdownContent
+ <LegacyDropdownContent
ref={containerRef}
selectDisabled
widthInPixels={dropdownWidth}
@@ -187,7 +187,7 @@ export const MultiSelectInput = ({
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
</SelectableList>
);
};
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index fdd4c7dd9b6..5787c338603 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -26,7 +26,7 @@ import {
iconPickerVisibleCountState,
} from '@/ui/input/states/iconPickerVisibleCountState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -125,7 +125,7 @@ const IconPickerSearchRow = ({
</LightIconButton>
}
dropdownComponents={
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={
dropdownWidth || ICON_PICKER_DROPDOWN_CONTENT_WIDTH
}
@@ -137,7 +137,7 @@ const IconPickerSearchRow = ({
closeDropdown(iconColorPickerDropdownId);
}}
/>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</ClickOutsideListenerContext.Provider>
@@ -436,7 +436,7 @@ export const IconPicker = ({
}
dropdownComponents={
<ScrollWrapper componentInstanceId="icon-picker-scroll">
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={
dropdownWidth || ICON_PICKER_DROPDOWN_CONTENT_WIDTH
}
@@ -485,7 +485,7 @@ export const IconPicker = ({
</DropdownMenuItemsContainer>
</div>
</SelectableList>
- </DropdownContent>
+ </LegacyDropdownContent>
</ScrollWrapper>
}
onClickOutside={onClickOutside}
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index 891e046a782..15afba98db0 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -12,7 +12,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
import { type SelectValue } from '@/ui/input/components/internal/select/types';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';
@@ -237,7 +237,7 @@ export const Select = <Value extends SelectValue>({
/>
}
dropdownComponents={
- <DropdownContent widthInPixels={dropDownMenuWidth}>
+ <LegacyDropdownContent widthInPixels={dropDownMenuWidth}>
{withSearchInput === true && (
<DropdownMenuSearchInput
autoFocus
@@ -371,7 +371,7 @@ export const Select = <Value extends SelectValue>({
</ListItem>
</DropdownMenuItemsContainer>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
index 7dbee43bbb6..09954734813 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
@@ -1,5 +1,5 @@
import { AddSelectOptionMenuItem } from '@/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -102,7 +102,7 @@ export const SelectInput = ({
});
return (
- <DropdownContent ref={containerRef} selectDisabled>
+ <LegacyDropdownContent ref={containerRef} selectDisabled>
<DropdownMenuSearchInput
value={searchFilter}
onChange={(e) => setSearchFilter(e.target.value)}
@@ -176,6 +176,6 @@ export const SelectInput = ({
</DropdownMenuItemsContainer>
</>
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
index 16a3662bc19..c98e813a22b 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
@@ -1,6 +1,6 @@
import { CURRENCIES } from '@/settings/data-model/constants/Currencies';
import { type Currency } from '@/ui/input/components/internal/types/Currency';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -31,7 +31,7 @@ export const CurrencyPickerDropdownSelect = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuSearchInput
value={searchFilter}
onChange={(event) => setSearchFilter(event.target.value)}
@@ -75,6 +75,6 @@ export const CurrencyPickerDropdownSelect = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
index 4490697a860..67c565bf373 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
@@ -1,5 +1,5 @@
import { type Country } from '@/ui/input/components/internal/types/Country';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -48,7 +48,7 @@ export const PhoneCountryPickerDropdownSelect = ({
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuSearchInput
value={searchFilter}
onChange={(event) => setSearchFilter(event.currentTarget.value)}
@@ -104,6 +104,6 @@ export const PhoneCountryPickerDropdownSelect = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
index 4a86a855f85..979332a3a61 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
@@ -1,37 +1,49 @@
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { styled } from '@linaria/react';
-import { type Ref, forwardRef } from 'react';
+import { type ComponentProps, useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components';
-const StyledInternalBaseDropdownContent = styled.div<{
- widthInPixels: number;
-}>`
- display: flex;
+import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
- flex-direction: column;
- height: 100%;
- width: ${({ widthInPixels }) => widthInPixels}px;
+const StyledClickOutsideListenerExclusion = styled.div`
+ display: contents;
`;
-export const DropdownContent = forwardRef(
- (
- {
- children,
- widthInPixels = GenericDropdownContentWidth.Medium,
- selectDisabled = false,
- }: React.PropsWithChildren<{
- widthInPixels?: number;
- selectDisabled?: boolean;
- }>,
- ref: Ref<HTMLDivElement>,
- ) => {
- return (
- <StyledInternalBaseDropdownContent
- data-select-disable={selectDisabled}
- widthInPixels={widthInPixels}
- ref={ref}
- >
- {children}
- </StyledInternalBaseDropdownContent>
- );
- },
-);
+type DropdownContentProps = Pick<
+ ComponentProps<typeof Dropdown.Content>,
+ 'children' | 'side' | 'align' | 'sideOffset' | 'width' | 'aria-label'
+>;
+
+export const DropdownContent = ({
+ children,
+ side,
+ align,
+ sideOffset,
+ width,
+ 'aria-label': ariaLabel,
+}: DropdownContentProps) => {
+ const parentClickOutsideId = useContext(ParentClickOutsideIdContext);
+ const { excludedClickOutsideId } = useContext(ClickOutsideListenerContext);
+
+ return (
+ <Dropdown.Content
+ data-click-outside-id={parentClickOutsideId}
+ side={side}
+ align={align}
+ sideOffset={sideOffset}
+ width={width}
+ aria-label={ariaLabel}
+ >
+ {isDefined(excludedClickOutsideId) ? (
+ <StyledClickOutsideListenerExclusion
+ data-click-outside-id={excludedClickOutsideId}
+ >
+ {children}
+ </StyledClickOutsideListenerExclusion>
+ ) : (
+ children
+ )}
+ </Dropdown.Content>
+ );
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
index 25b5b0af4ed..c9e076184db 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
@@ -1,5 +1,5 @@
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
@@ -55,7 +55,7 @@ export const DropdownMenuInnerSelect = ({
</StyledDropdownMenuInnerSelectDropdownButton>
}
dropdownComponents={
- <DropdownContent widthInPixels={widthInPixels}>
+ <LegacyDropdownContent widthInPixels={widthInPixels}>
<DropdownMenuItemsContainer>
{options.map((selectOption) => (
<ListItem
@@ -74,7 +74,7 @@ export const DropdownMenuInnerSelect = ({
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
globalHotkeysConfig={{
enableGlobalHotkeysWithModifiers: false,
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownRoot.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownRoot.tsx
index 027582c01d7..f7f5b3709cf 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownRoot.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownRoot.tsx
@@ -6,6 +6,7 @@ import { DropdownCleanupEffect } from '@/ui/layout/dropdown/components/DropdownC
import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
+import { type GlobalHotkeysConfig } from '@/ui/utilities/hotkey/types/GlobalHotkeysConfig';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
type DropdownRootProps = Pick<
@@ -13,6 +14,7 @@ type DropdownRootProps = Pick<
'children' | 'type' | 'multiple' | 'defaultPage' | 'onOpenChange'
> & {
dropdownId: string;
+ globalHotkeysConfig?: Partial<GlobalHotkeysConfig>;
};
export const DropdownRoot = ({
@@ -21,6 +23,7 @@ export const DropdownRoot = ({
multiple,
defaultPage,
dropdownId,
+ globalHotkeysConfig,
onOpenChange,
}: DropdownRootProps) => {
const store = useStore();
@@ -52,7 +55,10 @@ export const DropdownRoot = ({
return;
}
- openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });
+ openDropdown({
+ dropdownComponentInstanceIdFromProps: dropdownId,
+ globalHotkeysConfig,
+ });
};
return (
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/LegacyDropdownContent.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/LegacyDropdownContent.tsx
new file mode 100644
index 00000000000..4d8b08cab4f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/LegacyDropdownContent.tsx
@@ -0,0 +1,37 @@
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { styled } from '@linaria/react';
+import { type Ref, forwardRef } from 'react';
+
+const StyledInternalBaseDropdownContent = styled.div<{
+ widthInPixels: number;
+}>`
+ display: flex;
+
+ flex-direction: column;
+ height: 100%;
+ width: ${({ widthInPixels }) => widthInPixels}px;
+`;
+
+export const LegacyDropdownContent = forwardRef(
+ (
+ {
+ children,
+ widthInPixels = GenericDropdownContentWidth.Medium,
+ selectDisabled = false,
+ }: React.PropsWithChildren<{
+ widthInPixels?: number;
+ selectDisabled?: boolean;
+ }>,
+ ref: Ref<HTMLDivElement>,
+ ) => {
+ return (
+ <StyledInternalBaseDropdownContent
+ data-select-disable={selectDisabled}
+ widthInPixels={widthInPixels}
+ ref={ref}
+ >
+ {children}
+ </StyledInternalBaseDropdownContent>
+ );
+ },
+);
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx
deleted file mode 100644
index ce9e1c76304..00000000000
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
-import {
- Dropdown,
- type DropdownProps,
-} from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { useLingui } from '@lingui/react/macro';
-import { type ReactNode, useId } from 'react';
-import { IconDotsVertical } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/components';
-
-type OptionsDropdownMenuProps = {
- dropdownId?: string;
- selectableListId?: string;
- selectableItemIdArray?: string[];
- clickableComponent?: ReactNode;
- dropdownPlacement?: DropdownProps['dropdownPlacement'];
- dropdownOffset?: DropdownProps['dropdownOffset'];
- shouldRegisterOptionsHotkey?: boolean;
- onOpen?: () => void;
- children: ReactNode;
-};
-
-const DEFAULT_OPTIONS_DROPDOWN_OFFSET = { y: 8 };
-
-const OptionsDropdownMenuHotkeyEffect = ({
- dropdownId,
-}: {
- dropdownId: string;
-}) => {
- const { toggleDropdown } = useToggleDropdown();
-
- const hotkeysConfig = {
- keys: ['ctrl+o', 'meta+o'],
- callback: () => {
- toggleDropdown({
- dropdownComponentInstanceIdFromProps: dropdownId,
- });
- },
- dependencies: [toggleDropdown, dropdownId],
- };
-
- useHotkeysOnFocusedElement({
- ...hotkeysConfig,
- focusId: SIDE_PANEL_FOCUS_ID,
- });
-
- useHotkeysOnFocusedElement({
- ...hotkeysConfig,
- focusId: dropdownId,
- });
-
- return null;
-};
-
-export const OptionsDropdownMenu = ({
- dropdownId: dropdownIdFromProps,
- selectableListId,
- selectableItemIdArray = [],
- clickableComponent,
- dropdownPlacement = 'top-end',
- dropdownOffset = DEFAULT_OPTIONS_DROPDOWN_OFFSET,
- shouldRegisterOptionsHotkey = true,
- onOpen,
- children,
-}: OptionsDropdownMenuProps) => {
- const generatedDropdownId = useId();
- const dropdownId = dropdownIdFromProps ?? generatedDropdownId;
- const { t } = useLingui();
-
- const listId = selectableListId ?? dropdownId;
- const { setSelectedItemId } = useSelectableList(listId);
-
- const handleOpen = () => {
- if (selectableItemIdArray.length > 0) {
- setSelectedItemId(selectableItemIdArray[0]);
- }
- onOpen?.();
- };
-
- return (
- <>
- {shouldRegisterOptionsHotkey ? (
- <OptionsDropdownMenuHotkeyEffect dropdownId={dropdownId} />
- ) : null}
- <Dropdown
- dropdownId={dropdownId}
- data-select-disable
- clickableComponent={
- clickableComponent ?? (
- <IconButton aria-label={t`Options`} size="sm" variant="outline">
- <IconDotsVertical />
- </IconButton>
- )
- }
- dropdownPlacement={dropdownPlacement}
- dropdownOffset={dropdownOffset}
- globalHotkeysConfig={{
- enableGlobalHotkeysWithModifiers: true,
- enableGlobalHotkeysConflictingWithKeyboard: false,
- }}
- onOpen={handleOpen}
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <SelectableList
- selectableListInstanceId={listId}
- focusId={dropdownId}
- selectableItemIdArray={selectableItemIdArray}
- >
- {children}
- </SelectableList>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
- </>
- );
-};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
index 98249bdb33a..7afc76c40fb 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
@@ -11,7 +11,7 @@ import { expect, userEvent, waitFor, within } from 'storybook/test';
import { DropdownMenuSkeletonItem } from '@/ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
@@ -76,9 +76,9 @@ const StyledEmptyDropdownContent = styled.div`
export const Empty: Story = {
args: {
dropdownComponents: (
- <DropdownContent>
+ <LegacyDropdownContent>
<StyledEmptyDropdownContent data-testid="dropdown-content" />
- </DropdownContent>
+ </LegacyDropdownContent>
),
},
play: async ({ canvasElement }) => {
@@ -201,7 +201,7 @@ const optionsMock = [
];
// return (
-// <DropdownContent>
+// <LegacyDropdownContent>
// <DropdownMenuItemsContainer hasMaxHeight>
// {optionsMock.map((item) => (
// <MenuItemSelectAvatar
@@ -222,7 +222,7 @@ const optionsMock = [
// />
// ))}
// </DropdownMenuItemsContainer>
-// </DropdownContent>
+// </LegacyDropdownContent>
// );
// };
@@ -233,7 +233,7 @@ const optionsMock = [
// >({});
// return (
-// <DropdownContent>
+// <LegacyDropdownContent>
// <DropdownMenuItemsContainer hasMaxHeight>
// {optionsMock.map((item) => (
// <MenuItemMultiSelectAvatar
@@ -259,7 +259,7 @@ const optionsMock = [
// />
// ))}
// </DropdownMenuItemsContainer>
-// </DropdownContent>
+// </LegacyDropdownContent>
// );
// };
@@ -278,7 +278,7 @@ export const WithHeaders: Story = {
decorators: [WithContentBelowDecorator],
args: {
dropdownComponents: (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent Icon={IconChevronLeft} />
@@ -301,7 +301,7 @@ export const WithHeaders: Story = {
<ListItem key={item.id}>{item.name}</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
),
},
play: playInteraction,
@@ -311,13 +311,13 @@ export const SearchWithLoadingMenu: Story = {
decorators: [WithContentBelowDecorator],
args: {
dropdownComponents: (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuSearchInput value="query" autoFocus />
<DropdownMenuSeparator />
<DropdownMenuItemsContainer hasMaxHeight>
<DropdownMenuSkeletonItem />
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
),
},
play: async ({ canvasElement }) => {
@@ -343,7 +343,7 @@ export const WithInput: Story = {
decorators: [WithContentBelowDecorator],
args: {
dropdownComponents: (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuInput
instanceId="dropdown-menu-input"
value="Lorem ipsum"
@@ -355,7 +355,7 @@ export const WithInput: Story = {
<ListItem key={name}>{name}</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
),
},
play: playInteraction,
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
index b30d0415721..83228d8773d 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -55,11 +55,11 @@ export const ContextDropdownAndAvatar: Story = {
<Dropdown
dropdownId="story-dropdown-id-context-menu"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem startIcon={<IconPlus />}>{'Create Workspace'}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
),
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuRows.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuRows.stories.tsx
deleted file mode 100644
index 105867972f3..00000000000
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuRows.stories.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { useState } from 'react';
-import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
-import { Button } from 'twenty-ui/primitives/input';
-import { ComponentDecorator } from 'twenty-ui/testing';
-
-import { NavigationMenuItemSelectableItem } from '@/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem';
-import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';
-import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
-
-const DROPDOWN_ID = 'dropdown-menu-rows-story';
-
-type DropdownMenuRowsProps = {
- onAction: (action: string) => void;
- onParentClick: () => void;
-};
-
-const DropdownMenuRows = ({
- onAction,
- onParentClick,
-}: DropdownMenuRowsProps) => {
- const [isSubmenuOpen, setIsSubmenuOpen] = useState(false);
- const { closeDropdown } = useCloseDropdown();
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- DROPDOWN_ID,
- );
-
- const handleDuplicate = () => {
- onAction('duplicate');
- closeDropdown(DROPDOWN_ID);
- };
-
- return (
- <>
- <div onClick={onParentClick}>
- <OptionsDropdownMenu
- dropdownId={DROPDOWN_ID}
- shouldRegisterOptionsHotkey={false}
- clickableComponent={<Button>Open actions</Button>}
- onOpen={() => setIsSubmenuOpen(false)}
- selectableItemIdArray={
- isSubmenuOpen
- ? ['disabled', 'destination']
- : [
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode,
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode,
- ]
- }
- >
- {isSubmenuOpen ? (
- <>
- <NavigationMenuItemSelectableItem
- item={{
- id: 'disabled',
- label: 'Unavailable destination',
- isDisabled: true,
- onClick: () => onAction('disabled'),
- }}
- />
- <NavigationMenuItemSelectableItem
- item={{
- id: 'destination',
- label: 'Choose destination',
- onClick: () => {
- onAction('destination');
- closeDropdown(DROPDOWN_ID);
- },
- }}
- />
- </>
- ) : (
- <WorkflowStepOptionsMenuItems
- selectedItemId={selectedItemId}
- changeNodeText="Change node"
- onChangeNode={() => setIsSubmenuOpen(true)}
- onDuplicateNode={handleDuplicate}
- />
- )}
- </OptionsDropdownMenu>
- </div>
- <Button>Outside</Button>
- </>
- );
-};
-
-const meta: Meta<typeof DropdownMenuRows> = {
- title: 'UI/Layout/Dropdown/DropdownMenuRows',
- component: DropdownMenuRows,
- decorators: [ComponentDecorator],
- args: {
- onAction: fn(),
- onParentClick: fn(),
- },
-};
-
-export default meta;
-type Story = StoryObj<typeof DropdownMenuRows>;
-
-export const ClickAction: Story = {
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement.ownerDocument.body);
-
- await userEvent.click(canvas.getByText('Open actions'));
- await userEvent.click(await canvas.findByText('Duplicate node'));
-
- expect(args.onAction).toHaveBeenCalledTimes(1);
- expect(args.onAction).toHaveBeenCalledWith('duplicate');
- expect(args.onParentClick).not.toHaveBeenCalled();
- expect(canvas.queryByText('Duplicate node')).not.toBeInTheDocument();
- },
-};
-
-export const KeyboardNavigationAndReopening: Story = {
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement.ownerDocument.body);
-
- await userEvent.click(canvas.getByText('Open actions'));
- await canvas.findByText('Change node');
- await userEvent.keyboard('{ArrowDown}{Enter}');
-
- expect(args.onAction).toHaveBeenCalledTimes(1);
- expect(args.onAction).toHaveBeenCalledWith('duplicate');
- expect(canvas.queryByText('Duplicate node')).not.toBeInTheDocument();
-
- await userEvent.click(canvas.getByText('Open actions'));
- await canvas.findByText('Change node');
- await userEvent.keyboard('{Enter}');
-
- expect(await canvas.findByText('Choose destination')).toBeVisible();
- expect(args.onAction).toHaveBeenCalledTimes(1);
- },
-};
-
-export const SubmenuAndDisabledActions: Story = {
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement.ownerDocument.body);
-
- await userEvent.click(canvas.getByText('Open actions'));
- await userEvent.click(await canvas.findByText('Change node'));
- await userEvent.click(await canvas.findByText('Unavailable destination'));
- await userEvent.keyboard('{Enter}');
-
- expect(args.onAction).not.toHaveBeenCalled();
- expect(canvas.getByText('Choose destination')).toBeVisible();
-
- await userEvent.keyboard('{ArrowDown}{Enter}');
-
- expect(args.onAction).toHaveBeenCalledTimes(1);
- expect(args.onAction).toHaveBeenCalledWith('destination');
- expect(canvas.queryByText('Choose destination')).not.toBeInTheDocument();
- },
-};
-
-export const DismissOnEscape: Story = {
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement.ownerDocument.body);
-
- await userEvent.click(canvas.getByText('Open actions'));
- await canvas.findByText('Change node');
- await userEvent.keyboard('{Escape}');
-
- await waitFor(() => {
- expect(canvas.queryByText('Change node')).not.toBeInTheDocument();
- });
- expect(args.onAction).not.toHaveBeenCalled();
- },
-};
-
-export const DismissOnOutsideClick: Story = {
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement.ownerDocument.body);
-
- await userEvent.click(canvas.getByText('Open actions'));
- await canvas.findByText('Change node');
- await userEvent.click(canvas.getByText('Outside'));
-
- await waitFor(() => {
- expect(canvas.queryByText('Change node')).not.toBeInTheDocument();
- });
- expect(args.onAction).not.toHaveBeenCalled();
- },
-};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownRoot.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownRoot.stories.tsx
new file mode 100644
index 00000000000..8ddaff82afd
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownRoot.stories.tsx
@@ -0,0 +1,64 @@
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { useGlobalHotkeys } from '@/ui/utilities/hotkey/hooks/useGlobalHotkeys';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { Dropdown } from 'twenty-ui/components';
+import { Button } from 'twenty-ui/primitives/input';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const onModifierShortcut = fn();
+
+const ModifierShortcutListener = () => {
+ useGlobalHotkeys({
+ keys: ['ctrl+k'],
+ callback: onModifierShortcut,
+ containsModifier: true,
+ });
+
+ return null;
+};
+
+const meta: Meta<typeof DropdownRoot> = {
+ title: 'UI/Layout/Dropdown/DropdownRoot',
+ component: DropdownRoot,
+ decorators: [ComponentDecorator],
+ args: {
+ dropdownId: 'options-dropdown',
+ type: 'menu',
+ globalHotkeysConfig: { enableGlobalHotkeysWithModifiers: true },
+ },
+ beforeEach: () => {
+ onModifierShortcut.mockClear();
+ },
+ render: (args) => (
+ <>
+ <ModifierShortcutListener />
+ <DropdownRoot {...args}>
+ <Dropdown.Trigger render={<Button>Options</Button>} />
+ <Dropdown.Content>
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </DropdownRoot>
+ </>
+ ),
+};
+
+export default meta;
+type Story = StoryObj<typeof DropdownRoot>;
+
+export const PreservesModifierShortcuts: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(canvas.getByRole('button', { name: 'Options' }));
+ const duplicateAction = await canvas.findByRole('menuitem', {
+ name: 'Duplicate',
+ });
+ await waitFor(() => expect(duplicateAction).toHaveFocus());
+
+ await userEvent.keyboard('{Control>}k{/Control}');
+
+ await expect(onModifierShortcut).toHaveBeenCalledTimes(1);
+ await userEvent.keyboard('{Escape}');
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/constants/OptionsDropdownGlobalHotkeysConfig.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/constants/OptionsDropdownGlobalHotkeysConfig.ts
new file mode 100644
index 00000000000..29ca54e3bc8
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/constants/OptionsDropdownGlobalHotkeysConfig.ts
@@ -0,0 +1,6 @@
+import { type GlobalHotkeysConfig } from '@/ui/utilities/hotkey/types/GlobalHotkeysConfig';
+
+export const OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG: GlobalHotkeysConfig = {
+ enableGlobalHotkeysWithModifiers: true,
+ enableGlobalHotkeysConflictingWithKeyboard: false,
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
index b1b84e5cd23..f58968cbeb1 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
@@ -1,4 +1,4 @@
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
@@ -53,11 +53,11 @@ export const ExpandedListDropdown = ({
style={floatingStyles}
>
<OverlayContainer>
- <DropdownContent widthInPixels={dropdownContentWidth}>
+ <LegacyDropdownContent widthInPixels={dropdownContentWidth}>
<StyledExpandedListContainer>
{children}
</StyledExpandedListContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</OverlayContainer>
</StyledDropdownContentContainer>
</FloatingPortal>
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListDropdown.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListDropdown.tsx
index e4147c860a6..5f95358b1cd 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListDropdown.tsx
@@ -1,5 +1,5 @@
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { TabAvatar } from '@/ui/layout/tab-list/components/TabAvatar';
import { TabMoreButton } from '@/ui/layout/tab-list/components/TabMoreButton';
@@ -41,7 +41,7 @@ export const TabListDropdown = ({
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{hiddenTabs.map((tab) => {
const isDisabled = tab.disabled ?? loading;
@@ -69,7 +69,7 @@ export const TabListDropdown = ({
);
})}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
);
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
index 7db3ed4b35c..8a7d40616c9 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
@@ -10,7 +10,7 @@ import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirect
import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -100,7 +100,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -127,7 +127,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
}
dropdownId="multi-workspace-dropdown-context-menu"
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
{isMultiWorkspaceEnabled && (
<ListItem
@@ -140,7 +140,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
onClick={signOut}
>{t`Log out`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
}
@@ -244,6 +244,6 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
>{t`Support`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx
index 426b3e70d71..cb64bf07bee 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx
@@ -1,7 +1,7 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -23,7 +23,7 @@ export const MultiWorkspaceDropdownOpenRecordInComponents = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -53,6 +53,6 @@ export const MultiWorkspaceDropdownOpenRecordInComponents = () => {
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
index 5a11b117d6f..41617ddd730 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
@@ -1,6 +1,6 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -20,7 +20,7 @@ export const MultiWorkspaceDropdownThemesComponents = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -50,6 +50,6 @@ export const MultiWorkspaceDropdownThemesComponents = () => {
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
index ca11e52cacc..58cf32ce293 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
@@ -1,4 +1,4 @@
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
@@ -25,7 +25,7 @@ export const MultiWorkspaceDropdownWorkspacesListComponents = () => {
const [searchValue, setSearchValue] = useState('');
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -48,6 +48,6 @@ export const MultiWorkspaceDropdownWorkspacesListComponents = () => {
{availableWorkspaces.availableWorkspacesForSignUp.length > 0 && (
<WorkspacesForSignUp searchValue={searchValue} />
)}
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx b/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
index 1e6b4ad4704..a6367e8f24c 100644
--- a/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
+++ b/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
@@ -17,7 +17,7 @@ import {
} from 'react';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import type { SuggestionMenuProps } from '@/ui/suggestion/types/SuggestionMenuProps';
@@ -214,7 +214,7 @@ const SuggestionMenuInner = <TItem,>(
zIndex: RootStackingContextZIndices.DropdownPortalAboveModal,
}}
>
- <DropdownContent ref={listContainerRef}>
+ <LegacyDropdownContent ref={listContainerRef}>
<DropdownMenuItemsContainer hasMaxHeight>
{items.map((item, index) => {
const isSelected = index === clampedSelectedIndex;
@@ -233,7 +233,7 @@ const SuggestionMenuInner = <TItem,>(
);
})}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
</OverlayContainer>
{shouldDisplayPreview && (
<Tooltip.Root key={getItemKey(selectedItem)} open>
diff --git a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContent.tsx b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContent.tsx
index 75c86c50274..1afaae9a720 100644
--- a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContent.tsx
@@ -1,13 +1,15 @@
import { ObjectFilterDropdownAnyFieldSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { AnyFieldSearchDropdownContentMenuHeader } from '@/views/components/AnyFieldSearchDropdownContentMenuHeader';
export const AnyFieldSearchDropdownContent = () => {
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<AnyFieldSearchDropdownContentMenuHeader />
<ObjectFilterDropdownAnyFieldSearchInput />
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
index c334cda2517..fd9b8e11b61 100644
--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
@@ -124,14 +124,14 @@ export const UpdateViewButtonGroup = () => {
</IconButton>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={handleCreateViewClick}
startIcon={<IconPlus />}
>{t`Create view`}</ListItem>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</ButtonGroup>
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInput.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInput.tsx
index e84de180674..4d5b3e8594b 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInput.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInput.tsx
@@ -1,13 +1,15 @@
import { ObjectFilterDropdownAnyFieldSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader } from '@/views/components/ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader';
export const ViewBarFilterDropdownAnyFieldSearchInput = () => {
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader />
<ObjectFilterDropdownAnyFieldSearchInput />
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
index 4b083490611..7a5d9569d49 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
@@ -7,7 +7,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { useFilterDropdownSelectableFieldMetadataItems } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { ViewBarFilterDropdownBottomMenu } from '@/views/components/ViewBarFilterDropdownBottomMenu';
@@ -92,7 +92,9 @@ export const ViewBarFilterDropdownFieldSelectMenu = () => {
const { t } = useLingui();
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -152,6 +154,6 @@ export const ViewBarFilterDropdownFieldSelectMenu = () => {
<ViewBarFilterDropdownBottomMenu />
</SelectableList>
</ScrollWrapper>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx b/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
index 9d373193211..1e8d1bcc736 100644
--- a/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
+++ b/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
@@ -5,7 +5,7 @@ import { useRemoveRecordSort } from '@/object-record/record-sort/hooks/useRemove
import { useUpsertRecordSort } from '@/object-record/record-sort/hooks/useUpsertRecordSort';
import { type RecordSort } from '@/object-record/record-sort/types/RecordSort';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -97,7 +97,7 @@ export const EditableSortChip = ({ recordSort }: EditableSortChipProps) => {
/>
}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
onClick={() => handleDirectionSelect(ViewSortDirection.ASC)}
@@ -131,7 +131,7 @@ export const EditableSortChip = ({ recordSort }: EditableSortChipProps) => {
</ListItem>
))}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
dropdownOffset={{ y: 8, x: 0 }}
dropdownPlacement="bottom-start"
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
index e6c3e957c19..03dd2230eb0 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
@@ -5,7 +5,7 @@ import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMeta
import { IconPicker } from '@/ui/input/components/IconPicker';
import { Select } from '@/ui/input/components/Select';
import { TextInput } from '@/ui/input/components/TextInput';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -153,7 +153,7 @@ export const ViewPickerContentCreateMode = () => {
const objectLabel = objectMetadataItem.labelPlural;
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent onClick={handleClose} Icon={IconX} />
@@ -264,6 +264,6 @@ export const ViewPickerContentCreateMode = () => {
<ViewPickerCreateButton />
</ViewPickerSaveButtonContainer>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
index d93662302aa..2bd2dd0bde1 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
@@ -2,7 +2,7 @@ import { Key } from 'ts-key-enum';
import { IconPicker } from '@/ui/input/components/IconPicker';
import { TextInput } from '@/ui/input/components/TextInput';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -71,7 +71,7 @@ export const ViewPickerContentEditMode = () => {
};
return (
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -104,6 +104,6 @@ export const ViewPickerContentEditMode = () => {
<ViewPickerEditButton />
</ViewPickerSaveButtonContainer>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index 88af52779c1..78ae1a0ff60 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -6,7 +6,7 @@ import { type MouseEvent, useCallback } from 'react';
import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -146,7 +146,7 @@ export const ViewPickerListContent = () => {
);
return (
- <DropdownContent>
+ <LegacyDropdownContent>
{workspaceViews.length > 0 && (
<>
{shouldShowSectionLabels && (
@@ -225,6 +225,6 @@ export const ViewPickerListContent = () => {
>{t`Add view`}</ListItem>
</DropdownMenuItemsContainer>
</StyledBoldDropdownMenuItemsContainerWrapper>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index 87184a06fb5..d86fb787969 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -3,7 +3,7 @@ import { useCreateManyNavigationMenuItems } from '@/navigation-menu-item/common/
import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';
import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { MenuItemWithOptionDropdown } from '@/ui/navigation/menu-item/components/MenuItemWithOptionDropdown';
@@ -131,7 +131,7 @@ export const ViewPickerOptionDropdown = ({
dropdownId={`view-picker-options-${view.id}`}
selected={isCurrentView}
dropdownContent={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<ListItem
startIcon={isFavorite ? <IconHeartOff /> : <IconHeart />}
@@ -158,7 +158,7 @@ export const ViewPickerOptionDropdown = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
</>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
index cd34782bb96..082b7e5b7fa 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
@@ -232,6 +232,10 @@ export const Catalog: CatalogStory<
await userEvent.click(optionsButtons[firstActionStepIndex]);
await canvasBody.findByText('Duplicate node');
+ const changeNodeAction = await canvasBody.findByRole('menuitem', {
+ name: 'Change node',
+ });
+ await waitFor(() => expect(changeNodeAction).toHaveFocus());
await userEvent.keyboard('{ArrowDown}{Enter}');
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
index e784ece26a1..dcd425dfe85 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
@@ -1,16 +1,14 @@
-import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
-import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/constants/WorkflowDiagramStepNodeClickOutsideId';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DROPDOWN_OFFSET_Y } from '@/ui/layout/dropdown/constants/DropdownOffsetY';
+import { OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG } from '@/ui/layout/dropdown/constants/OptionsDropdownGlobalHotkeysConfig';
+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';
-import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useId } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { IconButton } from 'twenty-ui/components';
+import { Dropdown, IconButton } from 'twenty-ui/components';
import { IconDotsVertical } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -34,57 +32,41 @@ export const WorkflowDiagramStepNodeOptionsDropdown = ({
onDelete: () => void;
}) => {
const { t } = useLingui();
- const { closeDropdown } = useCloseDropdown();
-
const dropdownId = useId();
- const selectableItemIds = [
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode,
- ...(isDefined(onDuplicateNode)
- ? [WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode]
- : []),
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode,
- ];
-
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- dropdownId,
- );
-
- const closeDropdownThen = (action: () => void) => () => {
- closeDropdown(dropdownId);
- action();
- };
-
- const handleChangeNode = closeDropdownThen(onChangeNode);
- const handleDeleteNode = closeDropdownThen(onDelete);
- const handleDuplicateNode = isDefined(onDuplicateNode)
- ? closeDropdownThen(onDuplicateNode)
- : undefined;
return (
<StyledOptionsButtonContainer className="nodrag nopan">
<ParentClickOutsideIdContext.Provider
value={WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID}
>
- <OptionsDropdownMenu
+ <DropdownRoot
dropdownId={dropdownId}
- selectableItemIdArray={selectableItemIds}
- clickableComponent={
- <IconButton elevated size="md" aria-label={t`Node options`}>
- <IconDotsVertical />
- </IconButton>
- }
- dropdownPlacement="right-start"
- shouldRegisterOptionsHotkey={false}
+ type="menu"
+ globalHotkeysConfig={OPTIONS_DROPDOWN_GLOBAL_HOTKEYS_CONFIG}
>
- <WorkflowStepOptionsMenuItems
- selectedItemId={selectedItemId}
- changeNodeText={t`Change node`}
- onChangeNode={handleChangeNode}
- onDuplicateNode={handleDuplicateNode}
- onDeleteNode={handleDeleteNode}
+ <Dropdown.Trigger
+ data-select-disable
+ render={
+ <IconButton elevated size="md" aria-label={t`Node options`}>
+ <IconDotsVertical />
+ </IconButton>
+ }
/>
- </OptionsDropdownMenu>
+ <DropdownContent
+ side="right"
+ align="start"
+ sideOffset={DROPDOWN_OFFSET_Y}
+ >
+ <Dropdown.Section>
+ <WorkflowStepOptionsMenuItems
+ changeNodeText={t`Change node`}
+ onChangeNode={onChangeNode}
+ onDuplicateNode={onDuplicateNode}
+ onDeleteNode={onDelete}
+ />
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</ParentClickOutsideIdContext.Provider>
</StyledOptionsButtonContainer>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/__stories__/WorkflowDiagramStepNodeOptionsDropdown.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/__stories__/WorkflowDiagramStepNodeOptionsDropdown.stories.tsx
new file mode 100644
index 00000000000..35e90329723
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/__stories__/WorkflowDiagramStepNodeOptionsDropdown.stories.tsx
@@ -0,0 +1,98 @@
+import { WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/constants/WorkflowDiagramStepNodeClickOutsideId';
+import { WorkflowDiagramStepNodeOptionsDropdown } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown';
+import { styled } from '@linaria/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const StyledNode = styled.div`
+ height: 48px;
+ position: relative;
+ width: 160px;
+`;
+
+const onNodeClick = fn();
+
+const meta: Meta<typeof WorkflowDiagramStepNodeOptionsDropdown> = {
+ title: 'Modules/Workflow/WorkflowDiagramStepNodeOptionsDropdown',
+ component: WorkflowDiagramStepNodeOptionsDropdown,
+ decorators: [
+ (Story) => (
+ <StyledNode onClick={onNodeClick}>
+ <Story />
+ </StyledNode>
+ ),
+ ComponentDecorator,
+ ],
+ args: {
+ onChangeNode: fn(),
+ onDuplicateNode: fn(),
+ onDelete: fn(),
+ },
+ beforeEach: () => {
+ onNodeClick.mockClear();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const DuplicateWithoutSelectingNode: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Node options' });
+
+ const pointer = userEvent.setup();
+
+ await pointer.pointer({ target: trigger, keys: '[MouseLeft>]' });
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ await pointer.pointer({ target: trigger, keys: '[/MouseLeft]' });
+
+ expect(await canvas.findByRole('menu')).toHaveAttribute(
+ 'data-click-outside-id',
+ WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID,
+ );
+ await userEvent.click(
+ canvas.getByRole('menuitem', { name: 'Duplicate node' }),
+ );
+
+ expect(args.onDuplicateNode).toHaveBeenCalledTimes(1);
+ expect(onNodeClick).not.toHaveBeenCalled();
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ });
+ },
+};
+
+export const KeyboardWithoutDuplicate: Story = {
+ args: { onDuplicateNode: undefined },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Node options' });
+
+ await userEvent.click(trigger);
+ const changeAction = await canvas.findByRole('menuitem', {
+ name: 'Change node',
+ });
+ await waitFor(() => expect(changeAction).toHaveFocus());
+ expect(
+ canvas.queryByRole('menuitem', { name: 'Duplicate node' }),
+ ).not.toBeInTheDocument();
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+
+ expect(args.onDelete).toHaveBeenCalledTimes(1);
+ expect(args.onChangeNode).not.toHaveBeenCalled();
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ });
+
+ await userEvent.click(trigger);
+ await canvas.findByRole('menu');
+ await userEvent.keyboard('{Escape}');
+
+ await waitFor(() => {
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
index a841bcb6363..d754dcac43b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
@@ -5,7 +5,7 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdow
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useUpdateStepFilterFromVariable } from '@/workflow/workflow-steps/filters/hooks/useUpdateStepFilterFromVariable';
@@ -129,7 +129,9 @@ export const WorkflowDropdownStepOutputItems = ({
subStepObjectDisplay?.isSelectable === true;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -222,6 +224,6 @@ export const WorkflowDropdownStepOutputItems = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
index 16ae4a44f1d..7637f935b97 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
@@ -1,20 +1,15 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { SidePanelOptionsDropdown } from '@/side-panel/components/SidePanelOptionsDropdown';
import { useSidePanelWorkflowNavigation } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation';
import { useSidePanelWorkflowIdOrThrow } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowIdOrThrow';
-import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';
-import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
import { useDuplicateStep } from '@/workflow/workflow-steps/hooks/useDuplicateStep';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { workflowAiAgentActionAgentState } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/states/workflowAiAgentActionAgentState';
import { useLingui } from '@lingui/react/macro';
import { useId } from 'react';
+import { Dropdown } from 'twenty-ui/components';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
@@ -32,7 +27,6 @@ export const WorkflowStepFooter = ({
const dropdownId = useId();
const { t } = useLingui();
const { duplicateStep } = useDuplicateStep();
- const { closeDropdown } = useCloseDropdown();
const workflowId = useSidePanelWorkflowIdOrThrow();
const {
openWorkflowEditStepTypeInSidePanel,
@@ -51,55 +45,34 @@ export const WorkflowStepFooter = ({
const hasViewAgentOption = isDefined(agentId);
const hasViewRoleOption = isDefined(workflowAiAgentActionAgent?.roleId);
- const selectableItemIdArray = [
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode,
- ...(stepId !== TRIGGER_STEP_ID
- ? [
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode,
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.nodeSettings,
- ]
- : []),
- ...(hasViewAgentOption ? ['view-agent'] : []),
- ...(hasViewRoleOption ? ['view-role'] : []),
- ...(!shouldPinDeleteButton
- ? [WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode]
- : []),
- ];
-
const handleChangeNodeType = () => {
- closeDropdown(dropdownId);
-
if (stepId === TRIGGER_STEP_ID) {
openWorkflowTriggerTypeInSidePanel(workflowId);
- } else {
- openWorkflowEditStepTypeInSidePanel(workflowId);
+ return;
}
+
+ openWorkflowEditStepTypeInSidePanel(workflowId);
};
const handleDuplicateNode = () => {
- closeDropdown(dropdownId);
duplicateStep({ stepId });
};
const handleDeleteNode = () => {
- closeDropdown(dropdownId);
deleteStep(stepId);
};
const handleNodeSettings = () => {
- closeDropdown(dropdownId);
openWorkflowStepSettingsInSidePanel({ workflowId, stepId });
};
const handleViewAgent = () => {
- closeDropdown(dropdownId);
if (isDefined(agentId)) {
navigateSettings(SettingsPath.AiAgentDetail, { agentId });
}
};
const handleViewRole = () => {
- closeDropdown(dropdownId);
if (isDefined(workflowAiAgentActionAgent?.roleId)) {
navigateSettings(SettingsPath.RoleDetail, {
roleId: workflowAiAgentActionAgent.roleId,
@@ -107,18 +80,9 @@ export const WorkflowStepFooter = ({
}
};
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- dropdownId,
- );
-
const OptionsDropdown = (
- <OptionsDropdownMenu
- dropdownId={dropdownId}
- selectableItemIdArray={selectableItemIdArray}
- >
+ <SidePanelOptionsDropdown dropdownId={dropdownId}>
<WorkflowStepOptionsMenuItems
- selectedItemId={selectedItemId}
changeNodeText={t`Change node type`}
onChangeNode={handleChangeNodeType}
onDuplicateNode={
@@ -127,40 +91,31 @@ export const WorkflowStepFooter = ({
onDeleteNode={!shouldPinDeleteButton ? handleDeleteNode : undefined}
>
{stepId !== TRIGGER_STEP_ID ? (
- <SelectableListItem
- itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.nodeSettings}
- onEnter={handleNodeSettings}
+ <Dropdown.ActionItem
+ onClick={handleNodeSettings}
+ startIcon={<IconSettings />}
>
- <ListItem
- focused={
- selectedItemId ===
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.nodeSettings
- }
- onClick={handleNodeSettings}
- startIcon={<IconSettings />}
- >{t`Node settings`}</ListItem>
- </SelectableListItem>
+ {t`Node settings`}
+ </Dropdown.ActionItem>
) : null}
{hasViewAgentOption ? (
- <SelectableListItem itemId="view-agent" onEnter={handleViewAgent}>
- <ListItem
- focused={selectedItemId === 'view-agent'}
- onClick={handleViewAgent}
- startIcon={<IconLego />}
- >{t`View Agent`}</ListItem>
- </SelectableListItem>
+ <Dropdown.ActionItem
+ onClick={handleViewAgent}
+ startIcon={<IconLego />}
+ >
+ {t`View Agent`}
+ </Dropdown.ActionItem>
) : null}
{hasViewRoleOption ? (
- <SelectableListItem itemId="view-role" onEnter={handleViewRole}>
- <ListItem
- focused={selectedItemId === 'view-role'}
- onClick={handleViewRole}
- startIcon={<IconUsers />}
- >{t`View Role`}</ListItem>
- </SelectableListItem>
+ <Dropdown.ActionItem
+ onClick={handleViewRole}
+ startIcon={<IconUsers />}
+ >
+ {t`View Role`}
+ </Dropdown.ActionItem>
) : null}
</WorkflowStepOptionsMenuItems>
- </OptionsDropdownMenu>
+ </SidePanelOptionsDropdown>
);
const deleteButton = (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx
index 0424dcea06c..93c5bb21060 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx
@@ -1,13 +1,10 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
-import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components';
import { IconCopyPlus, IconPencil, IconTrash } from 'twenty-ui/icon';
type WorkflowStepOptionsMenuItemsProps = {
- selectedItemId: string | null;
changeNodeText: string;
onChangeNode: () => void;
onDuplicateNode?: () => void;
@@ -16,7 +13,6 @@ type WorkflowStepOptionsMenuItemsProps = {
};
export const WorkflowStepOptionsMenuItems = ({
- selectedItemId,
changeNodeText,
onChangeNode,
onDuplicateNode,
@@ -27,50 +23,22 @@ export const WorkflowStepOptionsMenuItems = ({
return (
<>
- <SelectableListItem
- itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode}
- onEnter={onChangeNode}
- >
- <ListItem
- startIcon={<IconPencil />}
- focused={
- selectedItemId === WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode
- }
- onClick={onChangeNode}
- >
- {changeNodeText}
- </ListItem>
- </SelectableListItem>
+ <Dropdown.ActionItem startIcon={<IconPencil />} onClick={onChangeNode}>
+ {changeNodeText}
+ </Dropdown.ActionItem>
{isDefined(onDuplicateNode) ? (
- <SelectableListItem
- itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode}
- onEnter={onDuplicateNode}
- >
- <ListItem
- startIcon={<IconCopyPlus />}
- focused={
- selectedItemId ===
- WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode
- }
- onClick={onDuplicateNode}
- >{t`Duplicate node`}</ListItem>
- </SelectableListItem>
+ <Dropdown.ActionItem
+ startIcon={<IconCopyPlus />}
+ onClick={onDuplicateNode}
+ >{t`Duplicate node`}</Dropdown.ActionItem>
) : null}
{children}
{isDefined(onDeleteNode) ? (
- <SelectableListItem
- itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode}
- onEnter={onDeleteNode}
- >
- <ListItem
- startIcon={<IconTrash />}
- color="danger"
- focused={
- selectedItemId === WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode
- }
- onClick={onDeleteNode}
- >{t`Delete node`}</ListItem>
- </SelectableListItem>
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ color="danger"
+ onClick={onDeleteNode}
+ >{t`Delete node`}</Dropdown.ActionItem>
) : null}
</>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts
deleted file mode 100644
index 28b2aa84bcb..00000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS = {
- changeNode: 'change-node',
- duplicateNode: 'duplicate-node',
- nodeSettings: 'node-settings',
- deleteNode: 'delete-node',
-} as const;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
index b0b2c28e80f..7ca7a107e10 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
@@ -1,10 +1,9 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { CommandMenuButton } from '@/command-menu/components/CommandMenuButton';
import { getAdvancedFilterAddFilterRuleSelectDropdownId } from '@/object-record/advanced-filter/utils/getAdvancedFilterAddFilterRuleSelectDropdownId';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { Dropdown } from 'twenty-ui/components';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+import { CommandMenuButton } from '@/command-menu/components/CommandMenuButton';
import { useAddStepFilterToGroup } from '@/workflow/workflow-steps/filters/hooks/useAddStepFilterToGroup';
import { useChildStepFiltersAndChildStepFilterGroups } from '@/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups';
import { useUpsertStepFilterSettings } from '@/workflow/workflow-steps/filters/hooks/useUpsertStepFilterSettings';
@@ -24,31 +23,17 @@ export const WorkflowStepFilterAddFilterRuleSelect = ({
}: WorkflowStepFilterAddFilterRuleSelectProps) => {
const { upsertStepFilterSettings } = useUpsertStepFilterSettings();
- const dropdownId = getAdvancedFilterAddFilterRuleSelectDropdownId(
- stepFilterGroup.id,
- );
-
const { lastChildPosition } = useChildStepFiltersAndChildStepFilterGroups({
stepFilterGroupId: stepFilterGroup.id,
});
const newPositionInStepFilterGroup = lastChildPosition + 1;
- const { closeDropdown } = useCloseDropdown();
-
const { addStepFilterToGroup } = useAddStepFilterToGroup({
stepFilterGroup,
});
- const handleAddFilter = () => {
- closeDropdown(dropdownId);
-
- addStepFilterToGroup();
- };
-
const handleAddFilterGroup = () => {
- closeDropdown(dropdownId);
-
const newStepFilterGroupId = v4();
const newStepFilterGroup: StepFilterGroup = {
@@ -80,41 +65,47 @@ export const WorkflowStepFilterAddFilterRuleSelect = ({
shortLabel: t`Add rule`,
key: 'add-rule',
}}
- onClick={handleAddFilter}
+ onClick={addStepFilterToGroup}
/>
);
}
return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
- <CommandMenuButton
- command={{
- Icon: IconPlus,
- label: t`Add filter rule`,
- shortLabel: t`Add filter rule`,
- key: 'add-filter-rule',
- }}
- />
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconPlus />}
- onClick={handleAddFilter}
- >{t`Add rule`}</ListItem>
- {isFilterRuleGroupOptionVisible && (
- <ListItem
- startIcon={<IconLibraryPlus />}
- onClick={handleAddFilterGroup}
- >{t`Add rule group`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- dropdownPlacement="bottom-start"
- />
+ <DropdownRoot
+ dropdownId={getAdvancedFilterAddFilterRuleSelectDropdownId(
+ stepFilterGroup.id,
+ )}
+ type="menu"
+ >
+ <Dropdown.Trigger
+ render={
+ <NavigationButton
+ size="sm"
+ variant="outline"
+ color="neutral"
+ startIcon={<IconPlus />}
+ aria-label={t`Add filter rule`}
+ >
+ {t`Add filter rule`}
+ </NavigationButton>
+ }
+ />
+ <DropdownContent>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconPlus />}
+ onClick={addStepFilterToGroup}
+ >
+ {t`Add rule`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ startIcon={<IconLibraryPlus />}
+ onClick={handleAddFilterGroup}
+ >
+ {t`Add rule group`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
index f40a9ae73cf..c97a7160810 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
@@ -1,14 +1,12 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useRemoveStepFilterGroup } from '@/workflow/workflow-steps/filters/hooks/useRemoveStepFilterGroup';
import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { useContext } from 'react';
import { t } from '@lingui/core/macro';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/components';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { Dropdown, IconButton } from 'twenty-ui/components';
type WorkflowStepFilterGroupOptionsDropdownProps = {
stepFilterGroupId: string;
@@ -22,29 +20,36 @@ export const WorkflowStepFilterGroupOptionsDropdown = ({
const { removeStepFilterGroup } = useRemoveStepFilterGroup();
return (
- <Dropdown
+ <DropdownRoot
dropdownId={`step-filter-group-options-${stepFilterGroupId}`}
- clickableComponent={
- <IconButton
- aria-label={t`Step filter group options`}
- variant="ghost"
- disabled={readonly}
- >
- <IconDotsVertical />
- </IconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconTrash />}
- onClick={() => removeStepFilterGroup(stepFilterGroupId)}
- color="danger"
- >{t`Delete group`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}
- />
+ type="menu"
+ >
+ <Dropdown.Trigger
+ disabled={readonly}
+ render={
+ <IconButton
+ aria-label={t`Step filter group options`}
+ variant="ghost"
+ disabled={readonly}
+ >
+ <IconDotsVertical />
+ </IconButton>
+ }
+ />
+ <DropdownContent
+ align="end"
+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET.y}
+ >
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ onClick={() => removeStepFilterGroup(stepFilterGroupId)}
+ color="danger"
+ >
+ {t`Delete group`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
index 723c06a71ec..586bd35fc74 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
@@ -1,14 +1,12 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useRemoveStepFilter } from '@/workflow/workflow-steps/filters/hooks/useRemoveStepFilter';
import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { useContext } from 'react';
import { t } from '@lingui/core/macro';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/components';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { Dropdown, IconButton } from 'twenty-ui/components';
type WorkflowStepFilterOptionsDropdownProps = {
stepFilterId: string;
@@ -22,30 +20,36 @@ export const WorkflowStepFilterOptionsDropdown = ({
const { removeStepFilter } = useRemoveStepFilter();
return (
- <Dropdown
+ <DropdownRoot
dropdownId={`step-filter-options-${stepFilterId}`}
- clickableComponent={
- <IconButton
- aria-label={t`Step filter options`}
- variant="ghost"
- disabled={readonly}
- >
- <IconDotsVertical />
- </IconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconTrash />}
- onClick={() => removeStepFilter(stepFilterId)}
- color="danger"
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}
- dropdownPlacement="bottom-start"
- />
+ type="menu"
+ >
+ <Dropdown.Trigger
+ disabled={readonly}
+ render={
+ <IconButton
+ aria-label={t`Step filter options`}
+ variant="ghost"
+ disabled={readonly}
+ >
+ <IconDotsVertical />
+ </IconButton>
+ }
+ />
+ <DropdownContent
+ align="start"
+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET.y}
+ >
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ onClick={() => removeStepFilter(stepFilterId)}
+ color="danger"
+ >
+ {t`Delete`}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterMenus.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterMenus.stories.tsx
new file mode 100644
index 00000000000..cadca492a3a
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterMenus.stories.tsx
@@ -0,0 +1,155 @@
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { WorkflowStepFilterAddFilterRuleSelect } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect';
+import { WorkflowStepFilterGroupOptionsDropdown } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown';
+import { WorkflowStepFilterOptionsDropdown } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown';
+import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
+import { currentStepFilterGroupsComponentState } from '@/workflow/workflow-steps/filters/states/currentStepFilterGroupsComponentState';
+import { currentStepFiltersComponentState } from '@/workflow/workflow-steps/filters/states/currentStepFiltersComponentState';
+import { type FilterSettings } from '@/workflow/workflow-steps/filters/types/FilterSettings';
+import { WorkflowStepFilterDecorator } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/decorators/WorkflowStepFilterDecorator';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, mocked, userEvent, waitFor, within } from 'storybook/test';
+import {
+ type StepFilter,
+ type StepFilterGroup,
+ StepLogicalOperator,
+ ViewFilterOperand,
+} from 'twenty-shared/types';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const STEP_ID = 'step-id';
+const FILTER_GROUP: StepFilterGroup = {
+ id: 'filter-group',
+ logicalOperator: StepLogicalOperator.AND,
+ positionInStepFilterGroup: 0,
+};
+const FILTER: StepFilter = {
+ id: 'filter',
+ type: 'unknown',
+ value: '',
+ operand: ViewFilterOperand.IS,
+ stepOutputKey: '',
+ stepFilterGroupId: FILTER_GROUP.id,
+ positionInStepFilterGroup: 3,
+};
+
+type WorkflowStepFilterMenusProps = {
+ readonly: boolean;
+ onFilterSettingsUpdate: (filterSettings: FilterSettings) => void;
+};
+
+const WorkflowStepFilterMenus = ({
+ readonly,
+ onFilterSettingsUpdate,
+}: WorkflowStepFilterMenusProps) => (
+ <WorkflowStepFilterContext.Provider
+ value={{ stepId: STEP_ID, readonly, onFilterSettingsUpdate }}
+ >
+ <WorkflowStepFilterOptionsDropdown stepFilterId={FILTER.id} />
+ <WorkflowStepFilterGroupOptionsDropdown
+ stepFilterGroupId={FILTER_GROUP.id}
+ />
+ <WorkflowStepFilterAddFilterRuleSelect stepFilterGroup={FILTER_GROUP} />
+ </WorkflowStepFilterContext.Provider>
+);
+
+const meta: Meta<typeof WorkflowStepFilterMenus> = {
+ title: 'Modules/Workflow/Filters/WorkflowStepFilterMenus',
+ component: WorkflowStepFilterMenus,
+ decorators: [ComponentDecorator, WorkflowStepFilterDecorator],
+ args: { readonly: false, onFilterSettingsUpdate: fn() },
+ beforeEach: () => {
+ jotaiStore.set(
+ currentStepFilterGroupsComponentState.atomFamily({ instanceId: STEP_ID }),
+ [FILTER_GROUP],
+ );
+ jotaiStore.set(
+ currentStepFiltersComponentState.atomFamily({ instanceId: STEP_ID }),
+ [FILTER],
+ );
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof WorkflowStepFilterMenus>;
+
+export const ReadOnly: Story = {
+ args: { readonly: true },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const filterTrigger = canvas.getByRole('button', {
+ name: 'Step filter options',
+ });
+ const groupTrigger = canvas.getByRole('button', {
+ name: 'Step filter group options',
+ });
+
+ await expect(filterTrigger).toBeDisabled();
+ await expect(groupTrigger).toBeDisabled();
+ await userEvent.click(filterTrigger);
+ await userEvent.click(groupTrigger);
+ await expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ await expect(args.onFilterSettingsUpdate).not.toHaveBeenCalled();
+ },
+};
+
+export const DeleteFilter: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Step filter options' }),
+ );
+ await userEvent.click(
+ await canvas.findByRole('menuitem', { name: 'Delete' }),
+ );
+
+ await expect(args.onFilterSettingsUpdate).toHaveBeenCalledTimes(1);
+ await expect(args.onFilterSettingsUpdate).toHaveBeenCalledWith({
+ stepFilters: [],
+ stepFilterGroups: [],
+ });
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const AddNestedGroup: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Add filter rule' });
+
+ await userEvent.click(trigger);
+ await expect(
+ (await canvas.findAllByRole('menuitem')).map((item) => item.textContent),
+ ).toEqual(['Add rule', 'Add rule group']);
+ await userEvent.click(
+ canvas.getByRole('menuitem', { name: 'Add rule group' }),
+ );
+
+ await expect(args.onFilterSettingsUpdate).toHaveBeenCalledTimes(1);
+ const [{ stepFilters = [], stepFilterGroups = [] }] = mocked(
+ args.onFilterSettingsUpdate,
+ ).mock.calls[0];
+
+ await expect(stepFilterGroups).toHaveLength(2);
+ await expect(stepFilters).toHaveLength(2);
+ const [rootGroup, nestedGroup] = stepFilterGroups;
+ const [existingFilter, nestedFilter] = stepFilters;
+
+ await expect(rootGroup).toEqual(FILTER_GROUP);
+ await expect(existingFilter).toEqual(FILTER);
+ await expect(nestedGroup).toMatchObject({
+ parentStepFilterGroupId: FILTER_GROUP.id,
+ positionInStepFilterGroup: 4,
+ logicalOperator: StepLogicalOperator.AND,
+ });
+ await expect(nestedFilter.positionInStepFilterGroup).toBe(1);
+ await expect(nestedFilter.stepFilterGroupId).toBe(nestedGroup.id);
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index 89629ced613..26ae7bccdf6 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -11,7 +11,7 @@ import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnected
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -326,7 +326,7 @@ export const WorkflowEditActionEmailBase = ({
>{t`Advanced options`}</Button>
}
dropdownComponents={
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.Medium}
>
<DropdownMenuItemsContainer>
@@ -364,7 +364,7 @@ export const WorkflowEditActionEmailBase = ({
>{t`Add In-Reply-To`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
index 8b58da11ddb..899c9b838ef 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
@@ -1,7 +1,7 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -85,7 +85,9 @@ export const WorkflowObjectDropdownContent = ({
};
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuSearchInput
autoFocus
value={searchInputValue}
@@ -117,6 +119,6 @@ export const WorkflowObjectDropdownContent = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowIfElseBranchEditor.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowIfElseBranchEditor.tsx
index 3f6d4257735..d16bcbf4c3e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowIfElseBranchEditor.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowIfElseBranchEditor.tsx
@@ -14,6 +14,7 @@ import { type StepIfElseBranch } from 'twenty-shared/workflow';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledBranchContainer = styled.div`
+ align-items: start;
display: flex;
flex-direction: column;
gap: ${themeCssVariables.spacing[2]};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
index 511909ce6d5..29d6586570a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
@@ -5,7 +5,7 @@ import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjec
import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -220,7 +220,7 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
dropdownComponents={
<>
{!triggerOptions.readonly && (
- <DropdownContent
+ <LegacyDropdownContent
widthInPixels={GenericDropdownContentWidth.ExtraLarge}
>
<DropdownMenuSearchInput
@@ -256,7 +256,7 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
))}
</SelectableList>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
)}
</>
}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
index d0c275d6b88..edfe56da571 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
@@ -5,7 +5,7 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdow
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';
@@ -129,7 +129,9 @@ export const WorkflowVariablesDropdownStepItems = ({
displayedSubStepObjectDisplay?.isSelectable === true;
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -237,6 +239,6 @@ export const WorkflowVariablesDropdownStepItems = ({
</>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
index a09380afbe4..144fff41317 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
@@ -1,6 +1,6 @@
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -71,7 +71,9 @@ export const WorkflowVariablesDropdownSteps = ({
};
return (
- <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>
+ <LegacyDropdownContent
+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}
+ >
<DropdownMenuHeader
StartComponent={
<DropdownMenuHeaderLeftComponent
@@ -120,6 +122,6 @@ export const WorkflowVariablesDropdownSteps = ({
<ListItem disabled>{t`No variables available`}</ListItem>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index d06d375b76c..6a70e666d40 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -4,10 +4,8 @@ import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { TextInput } from '@/ui/input/components/TextInput';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useMutation } from '@apollo/client/react';
@@ -15,7 +13,12 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { LightIconButton, Section, useToast } from 'twenty-ui/components';
+import {
+ Dropdown,
+ LightIconButton,
+ Section,
+ useToast,
+} from 'twenty-ui/components';
import {
IconDotsVertical,
IconMessage,
@@ -24,9 +27,7 @@ import {
IconTrash,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { v4 as uuidv4 } from 'uuid';
import { SETTINGS_AGENT_DETAIL_TABS } from '~/pages/settings/ai/constants/SettingsAgentDetailTabs';
import { getOperationName } from '~/utils/getOperationName';
@@ -65,7 +66,6 @@ export const SettingsAgentEvalsTab = ({
const [newInput, setNewInput] = useState('');
const [inputToDelete, setInputToDelete] = useState<string | null>(null);
const { openDialog } = useDialog();
- const { closeDropdown } = useCloseDropdown();
const { enqueueToast } = useToast();
const navigate = useNavigate();
@@ -91,8 +91,8 @@ export const SettingsAgentEvalsTab = ({
awaitRefetchQueries: false,
});
- const evalInputs: EvalInput[] = evaluationInputs.map((text) => ({
- id: uuidv4(),
+ const evalInputs: EvalInput[] = evaluationInputs.map((text, index) => ({
+ id: index.toString(),
text,
}));
@@ -120,11 +120,10 @@ export const SettingsAgentEvalsTab = ({
openDialog(DELETE_EVAL_INPUT_MODAL_ID);
};
- const handleRunInput = (text: string, itemId: string) => {
+ const handleRunInput = (text: string) => {
runEvaluationInput({
variables: { agentId, input: text },
});
- closeDropdown(`eval-input-dropdown-${itemId}`);
};
return (
@@ -160,34 +159,36 @@ export const SettingsAgentEvalsTab = ({
getItemLabel={(item) => item.text}
RowIcon={IconMessage}
RowRightComponent={({ item }) => (
- <Dropdown
+ <DropdownRoot
+ type="menu"
dropdownId={`eval-input-dropdown-${item.id}`}
- dropdownPlacement="right-start"
- clickableComponent={
- <LightIconButton
- emphasis="subtle"
- disabled={disabled}
- aria-label={t`More options`}
- >
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconPlayerPlay />}
- onClick={() => handleRunInput(item.text, item.id)}
- >{t`Run`}</ListItem>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => openDeleteModal(item.id)}
- >{t`Delete`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ >
+ <Dropdown.Trigger
+ disabled={disabled}
+ render={
+ <LightIconButton
+ emphasis="subtle"
+ disabled={disabled}
+ aria-label={t`More options`}
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent side="right">
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconPlayerPlay />}
+ onClick={() => handleRunInput(item.text)}
+ >{t`Run`}</Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={() => openDeleteModal(item.id)}
+ >{t`Delete`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
)}
hasFooter={false}
/>
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
index fdaddaa6007..5f2b0cbcdab 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
@@ -1,7 +1,7 @@
import { getApplicationDisplayName } from '@/applications/utils/getApplicationDisplayName';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
@@ -138,7 +138,7 @@ export const SettingsAgentSkillsTab = () => {
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconArchive />}
@@ -153,7 +153,7 @@ export const SettingsAgentSkillsTab = () => {
>{t`System skills`}</SettingsRow>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
index 9cb7e7d3d52..493d93f2e3d 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
@@ -1,5 +1,5 @@
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -89,7 +89,7 @@ export const SettingsAgentToolsTab = () => {
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconTool />}
@@ -107,7 +107,7 @@ export const SettingsAgentToolsTab = () => {
checked={showStandardTools}
>{t`Standard`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
index 1d79ed481f5..8f70a351cfc 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
@@ -1,44 +1,30 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
type SettingsSkillInactiveMenuDropDownProps = {
isCustomSkill: boolean;
+ skillId: string;
onActivate: () => void;
onDelete: () => void;
- skillId: string;
};
export const SettingsSkillInactiveMenuDropDown = ({
- onActivate,
skillId,
+ onActivate,
onDelete,
isCustomSkill,
-}: SettingsSkillInactiveMenuDropDownProps) => {
- const dropdownId = `${skillId}-settings-skill-inactive-menu-dropdown`;
-
- const { closeDropdown } = useCloseDropdown();
-
- const handleActivate = () => {
- onActivate();
- closeDropdown(dropdownId);
- };
-
- const handleDelete = () => {
- onDelete();
- closeDropdown(dropdownId);
- };
-
- return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
+}: SettingsSkillInactiveMenuDropDownProps) => (
+ <DropdownRoot
+ type="menu"
+ dropdownId={`${skillId}-settings-skill-inactive-menu-dropdown`}
+ >
+ <Dropdown.Trigger
+ render={
<LightIconButton
aria-label={t`Inactive Skill Options`}
emphasis="subtle"
@@ -46,23 +32,21 @@ export const SettingsSkillInactiveMenuDropDown = ({
<IconDotsVertical />
</LightIconButton>
}
- dropdownComponents={
- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconArchiveOff />}
- onClick={handleActivate}
- >{t`Activate`}</ListItem>
- {isCustomSkill && (
- <ListItem
- startIcon={<IconTrash />}
- color="danger"
- onClick={handleDelete}
- >{t`Delete`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
/>
- );
-};
+ <DropdownContent align="end" width={GenericDropdownContentWidth.Narrow}>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconArchiveOff />}
+ onClick={onActivate}
+ >{t`Activate`}</Dropdown.ActionItem>
+ {isCustomSkill && (
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ color="danger"
+ onClick={onDelete}
+ >{t`Delete`}</Dropdown.ActionItem>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
+);
diff --git a/packages/twenty-front/src/pages/settings/ai/components/__stories__/SettingsAgentEvalsTab.stories.tsx b/packages/twenty-front/src/pages/settings/ai/components/__stories__/SettingsAgentEvalsTab.stories.tsx
new file mode 100644
index 00000000000..97d2e0fdc01
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/__stories__/SettingsAgentEvalsTab.stories.tsx
@@ -0,0 +1,119 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import {
+ type RunEvaluationInputMutation,
+ type RunEvaluationInputMutationVariables,
+} from '~/generated-metadata/graphql';
+import { SettingsAgentEvalsTab } from '~/pages/settings/ai/components/SettingsAgentEvalsTab';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+
+const onRunEvaluationInput = fn();
+const evaluationInput = 'Find all customers in Paris';
+let pendingEvaluation = Promise.resolve();
+let completeEvaluation = () => {};
+
+const meta: Meta<typeof SettingsAgentEvalsTab> = {
+ title: 'Pages/Settings/AI/SettingsAgentEvalsTab',
+ component: SettingsAgentEvalsTab,
+ decorators: [ComponentDecorator, MemoryRouterDecorator, ToastDecorator],
+ args: {
+ agentId: 'test-agent',
+ evaluationInputs: [evaluationInput],
+ onEvaluationInputsChange: fn(),
+ },
+ beforeEach: () => {
+ onRunEvaluationInput.mockClear();
+ pendingEvaluation = new Promise<void>((resolve) => {
+ completeEvaluation = resolve;
+ });
+ return () => completeEvaluation();
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.mutation<
+ RunEvaluationInputMutation,
+ RunEvaluationInputMutationVariables
+ >('RunEvaluationInput', async ({ variables }) => {
+ onRunEvaluationInput(variables);
+ await pendingEvaluation;
+ return HttpResponse.json({
+ data: {
+ runEvaluationInput: {
+ id: 'evaluation-turn',
+ threadId: 'evaluation-thread',
+ agentId: variables.agentId,
+ createdAt: '2026-09-23T00:00:00.000Z',
+ evaluations: [],
+ },
+ },
+ });
+ }),
+ ],
+ },
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsAgentEvalsTab>;
+
+export const RunWhilePending: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+
+ await userEvent.click(trigger);
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Run' }));
+
+ await waitFor(() =>
+ expect(onRunEvaluationInput).toHaveBeenCalledWith({
+ agentId: args.agentId,
+ input: evaluationInput,
+ }),
+ );
+ await waitFor(() =>
+ expect(canvas.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await expect(
+ canvas.getByRole('button', { name: 'More options' }),
+ ).toHaveAttribute('aria-expanded', 'false');
+ },
+};
+
+export const DeleteInput: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(canvas.getByRole('button', { name: 'More options' }));
+ await userEvent.click(canvas.getByRole('menuitem', { name: 'Delete' }));
+
+ const dialog = await canvas.findByRole('dialog', {
+ name: 'Delete Evaluation Input',
+ });
+ await userEvent.click(
+ within(dialog).getByRole('button', { name: 'Delete' }),
+ );
+
+ await waitFor(() =>
+ expect(args.onEvaluationInputsChange).toHaveBeenCalledWith([]),
+ );
+ },
+};
+
+export const Disabled: Story = {
+ args: { disabled: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'More options' });
+
+ await expect(trigger).toBeDisabled();
+ await userEvent.click(trigger);
+
+ await expect(canvas.queryByRole('menu')).not.toBeInTheDocument();
+ await expect(onRunEvaluationInput).not.toHaveBeenCalled();
+ },
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
index 1da38d892b0..0899d1577dd 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
@@ -1,6 +1,6 @@
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -106,7 +106,7 @@ export const SettingsApplicationsAvailableTab = () => {
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconSparkles />}
@@ -114,7 +114,7 @@ export const SettingsApplicationsAvailableTab = () => {
checked={showVettedOnly}
>{t`Vetted only`}</SettingsRow>
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
index e87e60646d7..ba7e3a8080c 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
@@ -8,7 +8,7 @@ import {
import { useMostlyEmptyFieldMetadataIds } from '@/settings/data-model/object-details/hooks/useMostlyEmptyFieldMetadataIds';
import { settingsObjectFieldsFamilyState } from '@/settings/data-model/object-details/states/settingsObjectFieldsFamilyState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
import { Table } from '@/ui/layout/table/components/Table';
@@ -180,7 +180,7 @@ export const SettingsObjectFieldTable = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconArchive />}
@@ -207,7 +207,7 @@ export const SettingsObjectFieldTable = ({
>{t`System fields`}</SettingsRow>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
index d24cacbfb79..ded37333ffe 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
@@ -15,7 +15,7 @@ import {
} from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
import { Table } from '@/ui/layout/table/components/Table';
@@ -173,7 +173,7 @@ export const SettingsObjectTable = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
- <DropdownContent>
+ <LegacyDropdownContent>
<DropdownMenuItemsContainer>
<SettingsRow
startIcon={<IconArchive />}
@@ -192,7 +192,7 @@ export const SettingsObjectTable = ({
>{t`System objects`}</SettingsRow>
)}
</DropdownMenuItemsContainer>
- </DropdownContent>
+ </LegacyDropdownContent>
}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index be0df06404d..c86bec837cf 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -1,9 +1,8 @@
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DROPDOWN_OFFSET_Y } from '@/ui/layout/dropdown/constants/DropdownOffsetY';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
@@ -21,7 +20,7 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { generateILikeFiltersForCompositeFields } from 'twenty-shared/utils';
-import { SearchInput, Section } from 'twenty-ui/components';
+import { Dropdown, SearchInput, Section } from 'twenty-ui/components';
import {
IconArrowUpRight,
IconChevronRight,
@@ -30,7 +29,6 @@ import {
} from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebounce } from 'use-debounce';
@@ -85,7 +83,6 @@ export const SettingsWorkspaceMembersTeamTab = () => {
const { t } = useLingui();
const navigateApp = useNavigateApp();
const navigateSettings = useNavigateSettings();
- const { closeDropdown } = useCloseDropdown();
const [isFetchingMore, setIsFetchingMore] = useState(false);
const [searchFilter, setSearchFilter] = useState('');
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
@@ -173,42 +170,37 @@ export const SettingsWorkspaceMembersTeamTab = () => {
onChange={handleSearchChange}
placeholder={t`Search a team member...`}
/>
- <Dropdown
- dropdownId="workspace-members-open-dropdown"
- clickableComponent={
- <Button
- startIcon={<IconArrowUpRight />}
- size="md"
- variant="outline"
- >{t`Open`}</Button>
- }
- dropdownPlacement="bottom-end"
- dropdownOffset={{ y: 8 }}
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconListDetails />}
- onClick={() => {
- navigateApp(AppPath.RecordIndexPage, {
- objectNamePlural: 'workspaceMembers',
- });
- closeDropdown('workspace-members-open-dropdown');
- }}
- >{t`See records`}</ListItem>
- <ListItem
- startIcon={<IconHierarchy />}
- onClick={() => {
- navigateSettings(SettingsPath.ObjectDetail, {
- objectNamePlural: 'workspaceMembers',
- });
- closeDropdown('workspace-members-open-dropdown');
- }}
- >{t`See data model settings`}</ListItem>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <DropdownRoot type="menu" dropdownId="workspace-members-open-dropdown">
+ <Dropdown.Trigger
+ render={
+ <Button
+ startIcon={<IconArrowUpRight />}
+ size="md"
+ variant="outline"
+ >{t`Open`}</Button>
+ }
+ />
+ <DropdownContent align="end" sideOffset={DROPDOWN_OFFSET_Y}>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconListDetails />}
+ onClick={() => {
+ navigateApp(AppPath.RecordIndexPage, {
+ objectNamePlural: 'workspaceMembers',
+ });
+ }}
+ >{t`See records`}</Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ startIcon={<IconHierarchy />}
+ onClick={() => {
+ navigateSettings(SettingsPath.ObjectDetail, {
+ objectNamePlural: 'workspaceMembers',
+ });
+ }}
+ >{t`See data model settings`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</StyledSearchContainer>
<StyledTableContainer hasMoreRows={hasNextPage}>
<Table>
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
index a975132340c..655c43c6875 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
@@ -398,4 +398,130 @@ describe('Dropdown menu', () => {
expect(duplicate).toHaveBeenCalledOnce();
expect(activateRow).not.toHaveBeenCalled();
});
+
+ it('opens from a trigger nested in a link without following the link', async () => {
+ const user = userEvent.setup();
+ const clickEvents: MouseEvent[] = [];
+ const recordClick = (event: MouseEvent) => clickEvents.push(event);
+
+ render(
+ <a href="#record">
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ </a>,
+ );
+
+ document.addEventListener('click', recordClick, true);
+
+ try {
+ await user.click(screen.getByRole('button', { name: 'Record actions' }));
+ } finally {
+ document.removeEventListener('click', recordClick, true);
+ }
+
+ expect(screen.getByRole('menu')).toBeVisible();
+ expect(clickEvents).toHaveLength(1);
+ expect(clickEvents[0].defaultPrevented).toBe(true);
+ });
+
+ it('lets unhandled modifier shortcuts leave the menu and keeps other keys inside', async () => {
+ const user = userEvent.setup();
+ const documentKeyDown = vi.fn();
+
+ render(
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ <Dropdown.ActionItem>Delete</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Record actions' }));
+ await waitFor(() =>
+ expect(screen.getByRole('menuitem', { name: 'Duplicate' })).toHaveFocus(),
+ );
+
+ document.addEventListener('keydown', documentKeyDown);
+
+ try {
+ await user.keyboard('{ArrowDown}x');
+ expect(screen.getByRole('menuitem', { name: 'Delete' })).toHaveFocus();
+ expect(documentKeyDown).not.toHaveBeenCalled();
+
+ await user.keyboard('{Control>}k{/Control}');
+ } finally {
+ document.removeEventListener('keydown', documentKeyDown);
+ }
+
+ expect(documentKeyDown).toHaveBeenCalledWith(
+ expect.objectContaining({ key: 'k', ctrlKey: true }),
+ );
+ expect(screen.getByRole('menu')).toBeVisible();
+ });
+
+ it('dismisses on an outside click without activating the clicked control', async () => {
+ const user = userEvent.setup();
+ const clickOutsideControl = vi.fn();
+
+ render(
+ <>
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ <Button onClick={clickOutsideControl}>Outside</Button>
+ </>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Record actions' }));
+ expect(screen.getByRole('menu')).toBeVisible();
+
+ await user.click(screen.getByRole('button', { name: 'Outside' }));
+ await waitFor(() =>
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ expect(clickOutsideControl).not.toHaveBeenCalled();
+
+ await user.click(screen.getByRole('button', { name: 'Outside' }));
+ expect(clickOutsideControl).toHaveBeenCalledOnce();
+ });
+
+ it('dismisses on an outside row click without activating the row', async () => {
+ const user = userEvent.setup();
+ const activateRow = vi.fn();
+
+ render(
+ <>
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ <div role="row" onClick={activateRow} onKeyDown={activateRow}>
+ Attachment row
+ </div>
+ </>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Record actions' }));
+ expect(screen.getByRole('menu')).toBeVisible();
+
+ await user.click(screen.getByRole('row'));
+ await waitFor(() =>
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ expect(activateRow).not.toHaveBeenCalled();
+
+ await user.click(screen.getByRole('row'));
+ expect(activateRow).toHaveBeenCalledOnce();
+ });
});
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
index 95dafede3df..58809540505 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
@@ -10,6 +10,7 @@ import styles from '../Dropdown.module.scss';
import { type DropdownContentProps } from '../types/DropdownContentProps';
import { DropdownPageFocusEffect } from './DropdownPageFocusEffect';
import { getDropdownFocusTarget } from './getDropdownFocusTarget';
+import { isUnhandledModifierShortcut } from './isUnhandledModifierShortcut';
import { useDropdownContext } from './useDropdownContext';
import { useDropdownKeyboardNavigation } from './useDropdownKeyboardNavigation';
@@ -82,9 +83,12 @@ export const DropdownContent = ({
})
}
onKeyDown={(event) => {
- event.stopPropagation();
onKeyDown?.(event);
handleNavigation(event);
+
+ if (!isUnhandledModifierShortcut(event)) {
+ event.stopPropagation();
+ }
}}
onClick={(event) => {
event.stopPropagation();
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
index 4e9cfed3946..c96451a0c2f 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
@@ -8,6 +8,7 @@ import { type DropdownType } from '../types/DropdownType';
import { DropdownContext } from './DropdownContext';
import { type DropdownFocusTarget } from './DropdownFocusTarget';
import { type DropdownPageFocusRequest } from './DropdownPageFocusRequest';
+import { preventDismissingClickActivation } from './preventDismissingClickActivation';
type PageHistoryEntry = { id?: string; trigger?: DropdownFocusTarget };
@@ -116,6 +117,13 @@ export const DropdownRoot = ({
<Popover.Root
open={open}
onOpenChange={(nextOpen, eventDetails) => {
+ if (
+ eventDetails.reason === 'outside-press' ||
+ eventDetails.reason === 'focus-out'
+ ) {
+ preventDismissingClickActivation(eventDetails.event);
+ }
+
setFocusOnOpen(eventDetails.reason !== 'trigger-hover');
setOpen(nextOpen);
}}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
index 23102ec67a1..30d7bd3fb3f 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
@@ -17,6 +17,7 @@ export const DropdownTrigger = ({
aria-haspopup={type === 'menu' ? 'menu' : 'dialog'}
onClick={(event) => {
event.stopPropagation();
+ event.preventDefault();
onClick?.(event);
}}
onKeyDown={(event) => {
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/isUnhandledModifierShortcut.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/isUnhandledModifierShortcut.ts
new file mode 100644
index 00000000000..8a0017e76d9
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/isUnhandledModifierShortcut.ts
@@ -0,0 +1,4 @@
+import { type KeyboardEvent } from 'react';
+
+export const isUnhandledModifierShortcut = (event: KeyboardEvent) =>
+ (event.ctrlKey || event.metaKey) && !event.defaultPrevented;
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts
new file mode 100644
index 00000000000..d36291b34d7
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts
@@ -0,0 +1,51 @@
+const DISMISSING_EVENT_TYPES_FOLLOWED_BY_CLICK = [
+ 'mousedown',
+ 'touchend',
+ 'focusout',
+];
+
+const stopActivation = (event: Event) => {
+ event.preventDefault();
+ event.stopPropagation();
+};
+
+export const preventDismissingClickActivation = (event: Event) => {
+ if (event.type === 'click') {
+ stopActivation(event);
+ return;
+ }
+
+ if (!DISMISSING_EVENT_TYPES_FOLLOWED_BY_CLICK.includes(event.type)) {
+ return;
+ }
+
+ const ownerDocument =
+ event.target instanceof Node
+ ? (event.target.ownerDocument ?? document)
+ : document;
+ const followingClickListeners = new AbortController();
+ const stopListeningForFollowingClick = () => followingClickListeners.abort();
+ const listenerOptions = {
+ capture: true,
+ signal: followingClickListeners.signal,
+ };
+
+ ownerDocument.addEventListener(
+ 'click',
+ (clickEvent) => {
+ stopActivation(clickEvent);
+ stopListeningForFollowingClick();
+ },
+ listenerOptions,
+ );
+ ownerDocument.addEventListener(
+ 'pointerdown',
+ stopListeningForFollowingClick,
+ listenerOptions,
+ );
+ ownerDocument.addEventListener(
+ 'keydown',
+ stopListeningForFollowingClick,
+ listenerOptions,
+ );
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
index 7f9498fd8fe..5279f6c19d7 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
@@ -22,6 +22,7 @@
padding-inline: var(--t-spacing-1);
position: relative;
text-align: start;
+ text-decoration: none;
transition: background duration(instant) ease;
user-select: none;
diff --git a/packages/twenty-ui/src/styles/abstracts/_mixins.scss b/packages/twenty-ui/src/styles/abstracts/_mixins.scss
index ce02040c230..4a3abbb0f7b 100644
--- a/packages/twenty-ui/src/styles/abstracts/_mixins.scss
+++ b/packages/twenty-ui/src/styles/abstracts/_mixins.scss
@@ -9,6 +9,7 @@
--tw-button-padding-inline: 0;
inline-size: var(--tw-button-size, var(--t-spacing-8));
+ max-inline-size: none;
&[data-size='sm'] {
inline-size: var(--tw-button-size, var(--t-spacing-6));