Skip to content

The open alternative to Salesforce, designed for AI.

Add Menu to twenty-ui (#25610)

Raphaël Bosi3af9f5d04d83
diff --git a/packages/twenty-ui/src/navigation/ListItem/ListItem.tsx b/packages/twenty-ui/src/navigation/ListItem/ListItem.tsx
index 334d0a24197..ab08a91f327 100644
--- a/packages/twenty-ui/src/navigation/ListItem/ListItem.tsx
+++ b/packages/twenty-ui/src/navigation/ListItem/ListItem.tsx
@@ -23,7 +23,7 @@ export const ListItem = ({
descriptionPlacement = 'inline',
actions,
hotkeys,
- submenu = false,
+ hasSubmenu = false,
className,
children,
render,
@@ -88,7 +88,7 @@ export const ListItem = ({
{indicator === 'check' && selected && (
<IconCheck className={styles.checkIndicator} aria-hidden />
)}
- {submenu && (
+ {hasSubmenu && (
<IconChevronRight className={styles.submenuIcon} aria-hidden />
)}
</>
diff --git a/packages/twenty-ui/src/navigation/ListItem/__stories__/ListItem.stories.tsx b/packages/twenty-ui/src/navigation/ListItem/__stories__/ListItem.stories.tsx
index 505b5bbfc6e..0c04f974033 100644
--- a/packages/twenty-ui/src/navigation/ListItem/__stories__/ListItem.stories.tsx
+++ b/packages/twenty-ui/src/navigation/ListItem/__stories__/ListItem.stories.tsx
@@ -144,7 +144,7 @@ const LIST_ITEM_CATALOG_SLOT_PROPS: Record<
endDescription: { description: '3 selected', descriptionPlacement: 'end' },
hotkeys: { hotkeys: ['⌘', 'K'] },
actions: { actions: ACTIONS },
- submenu: { submenu: true },
+ submenu: { hasSubmenu: true },
};
export const SlotsCatalog: CatalogStory<Story, typeof ListItem> = {
diff --git a/packages/twenty-ui/src/navigation/ListItem/__tests__/ListItem.test.tsx b/packages/twenty-ui/src/navigation/ListItem/__tests__/ListItem.test.tsx
index 9b449d9140c..7d0a03df20f 100644
--- a/packages/twenty-ui/src/navigation/ListItem/__tests__/ListItem.test.tsx
+++ b/packages/twenty-ui/src/navigation/ListItem/__tests__/ListItem.test.tsx
@@ -56,7 +56,7 @@ describe('ListItem', () => {
expect(container.querySelector('svg')).toBeNull();
- rerender(<ListItem submenu>Item</ListItem>);
+ rerender(<ListItem hasSubmenu>Item</ListItem>);
expect(container.querySelectorAll('svg')).toHaveLength(1);
});
diff --git a/packages/twenty-ui/src/navigation/ListItem/types/ListItemProps.ts b/packages/twenty-ui/src/navigation/ListItem/types/ListItemProps.ts
index 7fa21f209b5..5dc76968c41 100644
--- a/packages/twenty-ui/src/navigation/ListItem/types/ListItemProps.ts
+++ b/packages/twenty-ui/src/navigation/ListItem/types/ListItemProps.ts
@@ -21,5 +21,5 @@ export type ListItemProps = Omit<
descriptionPlacement?: ListItemDescriptionPlacement;
actions?: ReactNode;
hotkeys?: string[];
- submenu?: boolean;
+ hasSubmenu?: boolean;
};
diff --git a/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss b/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss
new file mode 100644
index 00000000000..0cc36d7d408
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss
@@ -0,0 +1,64 @@
+.positioner {
+ z-index: var(--t-last-layer-z-index);
+}
+
+.popup {
+ --tw-menu-popup-inline-size: 200px;
+
+ backdrop-filter: var(--t-blur-medium);
+ background: var(--t-background-transparent-primary);
+ border: 1px solid var(--t-border-color-medium);
+ border-radius: var(--t-border-radius-md);
+ box-shadow: var(--t-box-shadow-strong);
+ color: var(--t-font-color-primary);
+ outline: none;
+ padding: var(--t-spacing-1);
+ display: flex;
+ flex-direction: column;
+ gap: var(--t-between-siblings-gap);
+ inline-size: var(--tw-menu-popup-inline-size);
+ max-block-size: var(--available-height);
+ overflow-y: auto;
+ box-sizing: border-box;
+ transition: opacity duration(fast) ease-out;
+
+ [role='menuitem'],
+ [role='menuitemcheckbox'],
+ [role='menuitemradio'] {
+ box-sizing: border-box;
+ }
+
+ &[data-starting-style],
+ &[data-ending-style] {
+ opacity: 0;
+ }
+
+ &[data-ending-style] {
+ transition-timing-function: ease-in;
+ }
+}
+
+.group {
+ display: flex;
+ flex-direction: column;
+ gap: var(--t-between-siblings-gap);
+}
+
+.groupLabel {
+ background: var(--t-background-transparent-lighter);
+ color: var(--t-font-color-tertiary);
+ font-size: var(--t-font-size-xxs);
+ padding-inline: var(--t-spacing-2);
+ margin-inline: calc(-1 * var(--t-spacing-1));
+ min-block-size: 20px;
+ display: flex;
+ align-items: center;
+ user-select: none;
+}
+
+.separator {
+ block-size: 1px;
+ flex: none;
+ background: var(--t-border-color-light);
+ margin-inline: calc(-1 * var(--t-spacing-1));
+}
diff --git a/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss.d.ts b/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss.d.ts
new file mode 100644
index 00000000000..59e6e48c772
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/Menu.module.scss.d.ts
@@ -0,0 +1,8 @@
+declare const classNames: {
+ readonly positioner: 'positioner';
+ readonly popup: 'popup';
+ readonly group: 'group';
+ readonly groupLabel: 'groupLabel';
+ readonly separator: 'separator';
+};
+export default classNames;
diff --git a/packages/twenty-ui/src/surfaces/Menu/Menu.tsx b/packages/twenty-ui/src/surfaces/Menu/Menu.tsx
new file mode 100644
index 00000000000..1744409d145
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/Menu.tsx
@@ -0,0 +1,27 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { MenuCheckboxItem } from './internal/MenuCheckboxItem';
+import { MenuGroup } from './internal/MenuGroup';
+import { MenuGroupLabel } from './internal/MenuGroupLabel';
+import { MenuItem } from './internal/MenuItem';
+import { MenuPopup } from './internal/MenuPopup';
+import { MenuRadioGroup } from './internal/MenuRadioGroup';
+import { MenuRadioItem } from './internal/MenuRadioItem';
+import { MenuSeparator } from './internal/MenuSeparator';
+import { MenuSubmenuRoot } from './internal/MenuSubmenuRoot';
+import { MenuSubmenuTrigger } from './internal/MenuSubmenuTrigger';
+
+export const Menu = {
+ Root: MenuPrimitive.Root,
+ Trigger: MenuPrimitive.Trigger,
+ Popup: MenuPopup,
+ Item: MenuItem,
+ CheckboxItem: MenuCheckboxItem,
+ RadioGroup: MenuRadioGroup,
+ RadioItem: MenuRadioItem,
+ Group: MenuGroup,
+ GroupLabel: MenuGroupLabel,
+ Separator: MenuSeparator,
+ SubmenuRoot: MenuSubmenuRoot,
+ SubmenuTrigger: MenuSubmenuTrigger,
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.interactions.stories.tsx b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.interactions.stories.tsx
new file mode 100644
index 00000000000..71d5fc9a9cf
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.interactions.stories.tsx
@@ -0,0 +1,482 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type ReactNode, useId, useState } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+
+import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
+
+import { Menu } from '../Menu';
+import { type MenuPopupProps } from '../types/MenuPopupProps';
+import { type MenuRootProps } from '../types/MenuRootProps';
+
+type MenuExampleProps = Omit<MenuRootProps, 'children'> & {
+ children?: ReactNode;
+ popupProps?: MenuPopupProps;
+};
+
+const MenuExample = ({ children, popupProps, ...props }: MenuExampleProps) => {
+ const triggerId = useId();
+
+ return (
+ <>
+ <Menu.Root defaultTriggerId={triggerId} {...props}>
+ <Menu.Trigger id={triggerId}>Options</Menu.Trigger>
+ <Menu.Popup {...popupProps}>
+ {children ?? (
+ <>
+ <Menu.Item>Duplicate</Menu.Item>
+ <Menu.Item>Archive</Menu.Item>
+ <Menu.Item>Delete</Menu.Item>
+ </>
+ )}
+ </Menu.Popup>
+ </Menu.Root>
+ <button type="button">Outside</button>
+ </>
+ );
+};
+
+const meta: Meta<typeof MenuExample> = {
+ title: 'UI/Surfaces/Menu/Interactions',
+ component: MenuExample,
+ decorators: [ComponentDecorator],
+ parameters: { container: { width: 260, height: 320 } },
+};
+
+export default meta;
+type Story = StoryObj<typeof MenuExample>;
+
+export const Keyboard: Story = {
+ play: async ({ canvasElement, step }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Options' });
+ await userEvent.tab();
+ expect(trigger).toHaveFocus();
+ await userEvent.keyboard('{ArrowDown}');
+ const menu = await body.findByRole('menu');
+ const first = within(menu).getByRole('menuitem', { name: 'Duplicate' });
+ const middle = within(menu).getByRole('menuitem', { name: 'Archive' });
+ const last = within(menu).getByRole('menuitem', { name: 'Delete' });
+ await waitFor(() => expect(first).toHaveFocus());
+ expect(first).toHaveAttribute('data-highlighted');
+ await step('Navigate, wrap, and jump with Home and End', async () => {
+ for (const [key, item] of [
+ ['{ArrowDown}', middle],
+ ['{ArrowUp}', first],
+ ['{ArrowUp}', last],
+ ['{ArrowDown}', first],
+ ['{End}', last],
+ ['{Home}', first],
+ ] as const) {
+ await userEvent.keyboard(key);
+ await waitFor(() => expect(item).toHaveFocus());
+ }
+ });
+ await step('Escape closes and restores trigger focus', async () => {
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ });
+ },
+};
+
+export const Typeahead: Story = {
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.Item>Duplicate</Menu.Item>
+ <Menu.Item description="Delete old records">Archive</Menu.Item>
+ <Menu.Item description="Remove this record">Delete</Menu.Item>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ await waitFor(() =>
+ expect(body.getByRole('menuitem', { name: 'Duplicate' })).toHaveFocus(),
+ );
+ await userEvent.keyboard('de');
+ await waitFor(() =>
+ expect(
+ body.getByRole('menuitem', { name: 'Delete Remove this record' }),
+ ).toHaveFocus(),
+ );
+ expect(
+ body.getByRole('menuitem', { name: 'Archive Delete old records' }),
+ ).not.toHaveFocus();
+ },
+};
+
+export const ExplicitTypeaheadLabel: Story = {
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.Item>Duplicate</Menu.Item>
+ <Menu.Item label="Delete" startIcon={<span>Prefix</span>}>
+ Remove
+ </Menu.Item>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ await waitFor(() =>
+ expect(body.getByRole('menuitem', { name: 'Duplicate' })).toHaveFocus(),
+ );
+ await userEvent.keyboard('de');
+ await waitFor(() =>
+ expect(
+ body.getByRole('menuitem', { name: 'Prefix Remove' }),
+ ).toHaveFocus(),
+ );
+ },
+};
+
+const onActivate = fn();
+
+export const Activation: Story = {
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.Item onClick={onActivate}>Run</Menu.Item>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement, step }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ onActivate.mockClear();
+ await userEvent.tab();
+ let activationCount = 0;
+ for (const activation of ['Click', 'Enter', 'Space']) {
+ await step(`Activate with ${activation}`, async () => {
+ await userEvent.keyboard('{ArrowDown}');
+ const item = await body.findByRole('menuitem', { name: 'Run' });
+ await waitFor(() => expect(item).toHaveFocus());
+ if (activation === 'Click') await userEvent.click(item);
+ else await userEvent.keyboard(activation === 'Enter' ? '{Enter}' : ' ');
+ activationCount += 1;
+ expect(onActivate).toHaveBeenCalledTimes(activationCount);
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() =>
+ expect(
+ within(canvasElement).getByRole('button', { name: 'Options' }),
+ ).toHaveFocus(),
+ );
+ });
+ }
+ },
+};
+
+export const KeepOpenOnActivation: Story = {
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.Item closeOnClick={false} onClick={onActivate}>
+ Run
+ </Menu.Item>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ onActivate.mockClear();
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ const item = await body.findByRole('menuitem', { name: 'Run' });
+ await waitFor(() => expect(item).toHaveFocus());
+ await waitFor(() => {
+ expect(body.getByRole('menu')).toBeVisible();
+ expect(body.getByRole('menu')).toHaveStyle({ opacity: '1' });
+ });
+ await userEvent.keyboard('{Enter}');
+ expect(onActivate).toHaveBeenCalledTimes(1);
+ expect(body.getByRole('menu')).toBeVisible();
+ await userEvent.click(item);
+ expect(onActivate).toHaveBeenCalledTimes(2);
+ expect(body.getByRole('menu')).toBeVisible();
+ },
+};
+
+export const OutsideDismissal: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.click(canvas.getByRole('button', { name: 'Options' }));
+ await waitFor(() => expect(body.getByRole('menu')).toBeVisible());
+ await userEvent.click(canvas.getByRole('button', { name: 'Outside' }));
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const NonModalTabbing: Story = {
+ args: { modal: false },
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ await waitFor(() =>
+ expect(body.getByRole('menuitem', { name: 'Duplicate' })).toHaveFocus(),
+ );
+ await userEvent.tab();
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ await waitFor(() =>
+ expect(
+ within(canvasElement).getByRole('button', { name: 'Outside' }),
+ ).toHaveFocus(),
+ );
+ },
+};
+
+export const DisabledItem: Story = {
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.Item>Duplicate</Menu.Item>
+ <Menu.Item disabled onClick={onActivate}>
+ Delete
+ </Menu.Item>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ onActivate.mockClear();
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ await waitFor(() =>
+ expect(body.getByRole('menuitem', { name: 'Duplicate' })).toHaveFocus(),
+ );
+ await userEvent.keyboard('{ArrowDown}');
+ const item = body.getByRole('menuitem', { name: 'Delete' });
+ await waitFor(() => expect(item).toHaveFocus());
+ expect(item).toHaveAttribute('aria-disabled', 'true');
+ expect(item).toHaveAttribute('data-disabled');
+ expect(item).toHaveAttribute('data-highlighted');
+ await userEvent.keyboard('{Enter}');
+ await userEvent.click(item);
+ expect(onActivate).not.toHaveBeenCalled();
+ expect(body.getByRole('menu')).toBeVisible();
+ },
+};
+
+const ControlledMenu = (props: MenuExampleProps) => {
+ const [open, setOpen] = useState(true);
+ return (
+ <>
+ <MenuExample {...props} open={open} />
+ <button type="button" onClick={() => setOpen(false)}>
+ Apply closed state
+ </button>
+ </>
+ );
+};
+
+export const Controlled: Story = {
+ args: { onOpenChange: fn() },
+ render: (args) => <ControlledMenu {...args} />,
+ play: async ({ canvasElement, args }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const menu = await body.findByRole('menu');
+ await userEvent.keyboard('{Escape}');
+ expect(args.onOpenChange).toHaveBeenCalledWith(
+ false,
+ expect.objectContaining({ reason: 'escape-key' }),
+ );
+ expect(menu).toBeVisible();
+ await userEvent.click(
+ within(menu).getByRole('menuitem', { name: 'Duplicate' }),
+ );
+ expect(args.onOpenChange).toHaveBeenCalledWith(
+ false,
+ expect.objectContaining({ reason: 'item-press' }),
+ );
+ expect(menu).toBeVisible();
+ await userEvent.click(
+ within(canvasElement).getByRole('button', { name: 'Apply closed state' }),
+ );
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ },
+};
+
+const onCheckedChange = fn();
+const onValueChange = fn();
+
+export const UncontrolledSelection: Story = {
+ args: { defaultOpen: true },
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.CheckboxItem onCheckedChange={onCheckedChange}>
+ Notifications
+ </Menu.CheckboxItem>
+ <Menu.CheckboxItem defaultChecked>Pinned</Menu.CheckboxItem>
+ <Menu.RadioGroup defaultValue="list" onValueChange={onValueChange}>
+ <Menu.RadioItem value="list">List view</Menu.RadioItem>
+ <Menu.RadioItem value="board">Board view</Menu.RadioItem>
+ </Menu.RadioGroup>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const menu = await within(canvasElement.ownerDocument.body).findByRole(
+ 'menu',
+ );
+ const item = within(menu).getByRole('menuitemcheckbox', {
+ name: 'Notifications',
+ });
+ expect(item).toHaveAttribute('aria-checked', 'false');
+ expect(item).toHaveAttribute('data-indicator', 'checkbox');
+ expect(item).not.toHaveAttribute('data-selected');
+ expect(
+ within(menu).getByRole('menuitemcheckbox', { name: 'Pinned' }),
+ ).toHaveAttribute('data-selected');
+ await userEvent.click(item);
+ expect(onCheckedChange).toHaveBeenLastCalledWith(true, expect.anything());
+ expect(item).toHaveAttribute('aria-checked', 'true');
+ expect(item).toHaveAttribute('data-selected');
+ await userEvent.click(item);
+ expect(item).toHaveAttribute('aria-checked', 'false');
+ expect(item).not.toHaveAttribute('data-selected');
+ const first = within(menu).getByRole('menuitemradio', {
+ name: 'List view',
+ });
+ const second = within(menu).getByRole('menuitemradio', {
+ name: 'Board view',
+ });
+ await userEvent.click(second);
+ expect(onValueChange).toHaveBeenLastCalledWith('board', expect.anything());
+ expect(first).toHaveAttribute('aria-checked', 'false');
+ expect(first).not.toHaveAttribute('data-selected');
+ expect(second).toHaveAttribute('aria-checked', 'true');
+ expect(second).toHaveAttribute('data-selected');
+ expect(second).toHaveAttribute('data-indicator', 'check');
+ expect(first.querySelector('svg')).not.toBeInTheDocument();
+ expect(second.querySelectorAll('svg')).toHaveLength(1);
+ expect(menu).toBeVisible();
+ },
+};
+
+const SubmenuExample = ({ popupProps, ...props }: MenuExampleProps) => (
+ <MenuExample {...props}>
+ <Menu.SubmenuRoot>
+ <Menu.SubmenuTrigger>More</Menu.SubmenuTrigger>
+ <Menu.Popup {...popupProps}>
+ <Menu.Item>Export</Menu.Item>
+ <Menu.Item>Share</Menu.Item>
+ </Menu.Popup>
+ </Menu.SubmenuRoot>
+ </MenuExample>
+);
+
+export const KeyboardSubmenu: Story = {
+ render: (args) => <SubmenuExample {...args} />,
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.tab();
+ await userEvent.keyboard('{ArrowDown}');
+ const trigger = await body.findByRole('menuitem', { name: 'More' });
+ await waitFor(() => expect(trigger).toHaveFocus());
+ expect(trigger).toHaveAttribute('aria-haspopup', 'menu');
+ expect(trigger.querySelector('svg')).toBeInTheDocument();
+ await userEvent.keyboard('{ArrowRight}');
+ const submenu = await body.findByRole('menu', { name: 'More' });
+ expect(trigger).toHaveAttribute('data-popup-open');
+ await waitFor(() =>
+ expect(submenu).toHaveAttribute('data-side', 'inline-end'),
+ );
+ expect(submenu).toHaveAttribute('data-align', 'start');
+ expect(body.getByRole('menu', { name: 'Options' })).toHaveAttribute(
+ 'data-side',
+ 'bottom',
+ );
+ await waitFor(() =>
+ expect(
+ within(submenu).getByRole('menuitem', { name: 'Export' }),
+ ).toHaveFocus(),
+ );
+ await userEvent.keyboard('{ArrowLeft}');
+ await waitFor(() =>
+ expect(
+ body.queryByRole('menu', { name: 'More' }),
+ ).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
+
+export const HoverSubmenu: Story = {
+ parameters: { container: { width: 480, height: 400 } },
+ args: { popupProps: { side: 'top', align: 'end' } },
+ render: (args) => (
+ <div style={{ paddingTop: 160, paddingInlineStart: 160 }}>
+ <SubmenuExample {...args} />
+ </div>
+ ),
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ await userEvent.click(
+ within(canvasElement).getByRole('button', { name: 'Options' }),
+ );
+ await userEvent.hover(await body.findByRole('menuitem', { name: 'More' }));
+ const submenu = await body.findByRole('menu', { name: 'More' });
+ await waitFor(() => expect(submenu).toHaveAttribute('data-side', 'top'));
+ expect(submenu).toHaveAttribute('data-align', 'end');
+ },
+};
+
+export const RenderState: Story = {
+ args: { defaultOpen: true },
+ render: (args) => (
+ <MenuExample {...args}>
+ <Menu.CheckboxItem
+ className={(state) => (state.checked ? 'checked' : 'unchecked')}
+ style={(state) => ({ marginTop: state.checked ? 7 : 3 })}
+ render={(props, state) => (
+ <div {...props} data-render-checked={state.checked} />
+ )}
+ >
+ Notifications
+ </Menu.CheckboxItem>
+ </MenuExample>
+ ),
+ play: async ({ canvasElement }) => {
+ const item = await within(canvasElement.ownerDocument.body).findByRole(
+ 'menuitemcheckbox',
+ { name: 'Notifications' },
+ );
+ expect(item).toHaveClass('unchecked');
+ expect(item).toHaveAttribute('data-render-checked', 'false');
+ await userEvent.click(item);
+ expect(item).toHaveClass('checked');
+ expect(item).toHaveStyle({ marginTop: '7px' });
+ expect(item).toHaveAttribute('data-render-checked', 'true');
+ },
+};
+
+export const DisabledRoot: Story = {
+ args: { disabled: true },
+ play: async ({ canvasElement }) => {
+ await userEvent.click(
+ within(canvasElement).getByRole('button', { name: 'Options' }),
+ );
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('menu'),
+ ).not.toBeInTheDocument();
+ },
+};
+
+export const KeepMounted: Story = {
+ args: { defaultOpen: true, popupProps: { keepMounted: true } },
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ expect(await body.findByRole('menu')).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ expect(body.getByRole('menu', { hidden: true })).not.toBeVisible();
+ },
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.portals.stories.tsx b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.portals.stories.tsx
new file mode 100644
index 00000000000..1f343fb6b1b
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.portals.stories.tsx
@@ -0,0 +1,133 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useId, useState } from 'react';
+import { expect, userEvent, within } from 'storybook/test';
+
+import { ComponentDecorator } from '@ui/testing';
+import { ThemeProvider } from '@ui/theme-constants/ThemeProvider';
+
+import { Menu } from '../Menu';
+import { type MenuPopupProps } from '../types/MenuPopupProps';
+
+const PortalMenu = ({ container }: Pick<MenuPopupProps, 'container'>) => {
+ const triggerId = useId();
+
+ return (
+ <Menu.Root open triggerId={triggerId}>
+ <Menu.Trigger id={triggerId}>Options</Menu.Trigger>
+ <Menu.Popup container={container}>
+ <Menu.Item>Export</Menu.Item>
+ <Menu.Item>Share</Menu.Item>
+ </Menu.Popup>
+ </Menu.Root>
+ );
+};
+
+const meta: Meta<typeof PortalMenu> = {
+ title: 'UI/Surfaces/Menu/Portals',
+ component: PortalMenu,
+ decorators: [ComponentDecorator],
+ parameters: { container: { width: 260, height: 240 } },
+};
+
+export default meta;
+type Story = StoryObj<typeof PortalMenu>;
+
+export const Body: Story = {
+ play: async ({ canvasElement }) => {
+ const menu = await within(canvasElement.ownerDocument.body).findByRole(
+ 'menu',
+ { name: 'Options' },
+ );
+ expect(menu).toBeVisible();
+ expect(canvasElement).not.toContainElement(menu);
+ },
+};
+
+const ExplicitContainerMenu = () => {
+ const [container, setContainer] = useState<HTMLDivElement | null>(null);
+
+ return (
+ <>
+ <PortalMenu container={container} />
+ <div ref={setContainer} role="region" aria-label="Menu portal" />
+ </>
+ );
+};
+
+export const ExplicitContainer: Story = {
+ render: () => <ExplicitContainerMenu />,
+ play: async ({ canvasElement }) => {
+ const container = within(canvasElement).getByRole('region', {
+ name: 'Menu portal',
+ });
+ expect(
+ await within(container).findByRole('menu', { name: 'Options' }),
+ ).toBeVisible();
+ },
+};
+
+export const ScopedTheme: Story = {
+ render: () => (
+ <section aria-label="Scoped theme">
+ <ThemeProvider colorScheme="dark" applyToRoot={false}>
+ <div
+ style={{
+ background: 'var(--t-background-primary)',
+ width: 260,
+ height: 240,
+ }}
+ >
+ <PortalMenu />
+ </div>
+ </ThemeProvider>
+ </section>
+ ),
+ play: async ({ canvasElement }) => {
+ const scope = within(canvasElement).getByRole('region', {
+ name: 'Scoped theme',
+ });
+ expect(
+ await within(scope).findByRole('menu', { name: 'Options' }),
+ ).toBeVisible();
+ },
+};
+
+const DeferredContainerMenu = () => {
+ const [showContainer, setShowContainer] = useState(false);
+ const [container, setContainer] = useState<HTMLDivElement | null>(null);
+
+ return (
+ <ThemeProvider colorScheme="light" applyToRoot={false}>
+ <PortalMenu container={container} />
+ <button type="button" onClick={() => setShowContainer(true)}>
+ Create portal container
+ </button>
+ {showContainer && (
+ <div
+ ref={setContainer}
+ role="region"
+ aria-label="Deferred menu portal"
+ />
+ )}
+ </ThemeProvider>
+ );
+};
+
+export const DeferredContainer: Story = {
+ render: () => <DeferredContainerMenu />,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('menu'),
+ ).not.toBeInTheDocument();
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Create portal container' }),
+ );
+ const container = canvas.getByRole('region', {
+ name: 'Deferred menu portal',
+ });
+ expect(
+ await within(container).findByRole('menu', { name: 'Options' }),
+ ).toBeVisible();
+ },
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.stories.tsx b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.stories.tsx
new file mode 100644
index 00000000000..6285b0eebd6
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/__stories__/Menu.stories.tsx
@@ -0,0 +1,291 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type ReactNode, useId, useState } from 'react';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import {
+ IconArchive,
+ IconCopy,
+ IconDownload,
+ IconShare,
+ IconTrash,
+} from '@ui/icon';
+import {
+ A11Y_DEFER_COLOR_CONTRAST,
+ CatalogDecorator,
+ type CatalogStory,
+ ComponentDecorator,
+} from '@ui/testing';
+
+import { Menu } from '../Menu';
+import { type MenuRootProps } from '../types/MenuRootProps';
+
+type MenuCatalogContent = 'basic' | 'selection' | 'groups' | 'submenu';
+type MenuStoryProps = MenuRootProps & { content?: MenuCatalogContent };
+
+const BASIC_ITEMS = (
+ <>
+ <Menu.Item startIcon={<IconCopy />} hotkeys={['⌘', 'D']}>
+ Duplicate
+ </Menu.Item>
+ <Menu.Item startIcon={<IconDownload />} description="CSV">
+ Export
+ </Menu.Item>
+ <Menu.Item startIcon={<IconShare />}>Share</Menu.Item>
+ <Menu.Separator />
+ <Menu.Item startIcon={<IconArchive />} disabled>
+ Archive
+ </Menu.Item>
+ <Menu.Item startIcon={<IconTrash />} color="danger">
+ Delete
+ </Menu.Item>
+ </>
+);
+
+const MenuSelectionContent = () => {
+ const [notifications, setNotifications] = useState(true);
+ const [pinned, setPinned] = useState(false);
+ const [view, setView] = useState('list');
+
+ return (
+ <>
+ <Menu.CheckboxItem
+ checked={notifications}
+ onCheckedChange={setNotifications}
+ >
+ Notifications
+ </Menu.CheckboxItem>
+ <Menu.CheckboxItem checked={pinned} onCheckedChange={setPinned}>
+ Pinned
+ </Menu.CheckboxItem>
+ <Menu.Separator />
+ <Menu.RadioGroup value={view} onValueChange={setView}>
+ <Menu.RadioItem value="list">List view</Menu.RadioItem>
+ <Menu.RadioItem value="board">Board view</Menu.RadioItem>
+ </Menu.RadioGroup>
+ </>
+ );
+};
+
+const GROUPED_ITEMS = (
+ <>
+ <Menu.Group>
+ <Menu.GroupLabel>Record</Menu.GroupLabel>
+ <Menu.Item startIcon={<IconCopy />}>Duplicate</Menu.Item>
+ <Menu.Item startIcon={<IconShare />}>Share</Menu.Item>
+ </Menu.Group>
+ <Menu.Separator />
+ <Menu.Group>
+ <Menu.GroupLabel>Manage</Menu.GroupLabel>
+ <Menu.Item startIcon={<IconArchive />}>Archive</Menu.Item>
+ <Menu.Item startIcon={<IconTrash />} color="danger">
+ Delete
+ </Menu.Item>
+ </Menu.Group>
+ </>
+);
+
+const MenuSubmenuContent = ({
+ container,
+ open,
+}: {
+ container?: HTMLElement | null;
+ open?: boolean;
+}) => (
+ <>
+ <Menu.Item startIcon={<IconCopy />}>Duplicate</Menu.Item>
+ <Menu.SubmenuRoot defaultOpen open={open}>
+ <Menu.SubmenuTrigger startIcon={<IconDownload />}>
+ Export
+ </Menu.SubmenuTrigger>
+ <Menu.Popup container={container}>
+ <Menu.Item>CSV file</Menu.Item>
+ <Menu.Item>Excel file</Menu.Item>
+ </Menu.Popup>
+ </Menu.SubmenuRoot>
+ <Menu.Item startIcon={<IconShare />}>Share</Menu.Item>
+ </>
+);
+
+const MENU_STORY_CONTENT: Record<MenuCatalogContent, ReactNode> = {
+ basic: BASIC_ITEMS,
+ selection: <MenuSelectionContent />,
+ groups: GROUPED_ITEMS,
+ submenu: <MenuSubmenuContent />,
+};
+
+const MenuStory = ({ content = 'basic', ...props }: MenuStoryProps) => {
+ const triggerId = useId();
+
+ return (
+ <Menu.Root defaultOpen defaultTriggerId={triggerId} {...props}>
+ <Menu.Trigger id={triggerId} style={{ alignSelf: 'flex-start' }}>
+ Options
+ </Menu.Trigger>
+ <Menu.Popup>{MENU_STORY_CONTENT[content]}</Menu.Popup>
+ </Menu.Root>
+ );
+};
+
+const meta: Meta<typeof MenuStory> = {
+ title: 'UI/Surfaces/Menu',
+ component: MenuStory,
+};
+export default meta;
+type Story = StoryObj<typeof MenuStory>;
+
+export const Default: Story = {
+ decorators: [ComponentDecorator],
+ parameters: {
+ a11y: A11Y_DEFER_COLOR_CONTRAST,
+ container: { width: 240, height: 320 },
+ },
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const menu = await body.findByRole('menu', { name: 'Options' });
+ expect(menu).toBeVisible();
+ expect(canvasElement).not.toContainElement(menu);
+ const item = within(menu).getByRole('menuitem', { name: /Duplicate/ });
+ await userEvent.hover(item);
+ await waitFor(() => expect(item).toHaveAttribute('data-highlighted'));
+ },
+};
+export const Selection: Story = {
+ decorators: [ComponentDecorator],
+ parameters: { container: { width: 240, height: 320 } },
+ args: { content: 'selection' },
+ play: async ({ canvasElement }) => {
+ const menu = await within(canvasElement.ownerDocument.body).findByRole(
+ 'menu',
+ );
+ const notifications = within(menu).getByRole('menuitemcheckbox', {
+ name: 'Notifications',
+ });
+ expect(notifications).toHaveAttribute('aria-checked', 'true');
+ await userEvent.click(notifications);
+ expect(notifications).toHaveAttribute('aria-checked', 'false');
+ expect(notifications).not.toHaveAttribute('data-selected');
+ await userEvent.click(notifications);
+ expect(notifications).toHaveAttribute('data-selected');
+ const listView = within(menu).getByRole('menuitemradio', {
+ name: 'List view',
+ });
+ const boardView = within(menu).getByRole('menuitemradio', {
+ name: 'Board view',
+ });
+ await userEvent.click(boardView);
+ expect(listView).toHaveAttribute('aria-checked', 'false');
+ expect(boardView).toHaveAttribute('aria-checked', 'true');
+ expect(boardView).toHaveAttribute('data-selected');
+ expect(menu).toBeVisible();
+ },
+};
+export const Groups: Story = {
+ ...Default,
+ args: { content: 'groups' },
+ play: async ({ canvasElement }) => {
+ const menu = await within(canvasElement.ownerDocument.body).findByRole(
+ 'menu',
+ );
+ for (const label of ['Record', 'Manage']) {
+ expect(within(menu).getByRole('group', { name: label })).toHaveAttribute(
+ 'aria-labelledby',
+ within(menu).getByText(label).id,
+ );
+ }
+ expect(within(menu).getByRole('separator')).toBeVisible();
+ },
+};
+export const Submenu: Story = {
+ decorators: [ComponentDecorator],
+ parameters: { container: { width: 240, height: 320 } },
+ args: { content: 'submenu' },
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const submenu = await body.findByRole('menu', { name: 'Export' });
+ expect(
+ within(submenu).getByRole('menuitem', { name: 'CSV file' }),
+ ).toBeVisible();
+ expect(body.getByRole('menuitem', { name: 'Export' })).toHaveAttribute(
+ 'aria-haspopup',
+ 'menu',
+ );
+ },
+};
+
+const MenuCatalogCell = ({ content = 'basic' }: MenuStoryProps) => {
+ const [cellElement, setCellElement] = useState<HTMLDivElement | null>(null);
+ const triggerId = useId();
+ const contentByType: Record<MenuCatalogContent, ReactNode> = {
+ ...MENU_STORY_CONTENT,
+ submenu: <MenuSubmenuContent container={cellElement} open />,
+ };
+
+ return (
+ <div
+ ref={setCellElement}
+ data-menu-catalog=""
+ style={{ position: 'relative', width: 220, height: 230 }}
+ >
+ <Menu.Root open triggerId={triggerId} modal={false}>
+ <Menu.Trigger id={triggerId} aria-label={`${content} options`}>
+ Options
+ </Menu.Trigger>
+ <Menu.Popup container={cellElement} side="bottom" align="start">
+ {contentByType[content]}
+ </Menu.Popup>
+ </Menu.Root>
+ </div>
+ );
+};
+
+export const Catalog: CatalogStory<Story, typeof MenuStory> = {
+ render: (args) => <MenuCatalogCell {...args} />,
+ decorators: [CatalogDecorator],
+ parameters: {
+ a11y: {
+ ...A11Y_DEFER_COLOR_CONTRAST,
+ config: {
+ rules: [
+ ...A11Y_DEFER_COLOR_CONTRAST.config.rules,
+ {
+ id: 'aria-hidden-focus',
+ // Simultaneously open non-modal menus keep Base UI's focus sentinels active.
+ // Limit this exception to catalog sentinels; menu content stays audited.
+ selector:
+ '[aria-hidden="true"]:not([data-menu-catalog] [data-base-ui-focus-guard])',
+ },
+ ],
+ },
+ },
+ catalog: {
+ dimensions: [
+ { name: 'menu', values: ['menu'], labels: () => '', props: () => ({}) },
+ {
+ name: 'content',
+ values: [
+ 'basic',
+ 'selection',
+ 'groups',
+ 'submenu',
+ ] satisfies MenuCatalogContent[],
+ props: (content: MenuCatalogContent) => ({ content }),
+ },
+ ],
+ options: { elementContainer: { style: { width: 220, height: 230 } } },
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ for (const content of ['basic', 'selection', 'groups', 'submenu']) {
+ expect(
+ await canvas.findByRole('menu', { name: `${content} options` }),
+ ).toBeVisible();
+ }
+ expect(await canvas.findByRole('menu', { name: 'Export' })).toBeVisible();
+ },
+};
+export const CatalogDark: CatalogStory<Story, typeof MenuStory> = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/__tests__/Menu.test.tsx b/packages/twenty-ui/src/surfaces/Menu/__tests__/Menu.test.tsx
new file mode 100644
index 00000000000..0823f7dfe7e
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/__tests__/Menu.test.tsx
@@ -0,0 +1,105 @@
+import { type ReactNode } from 'react';
+
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+import listItemStyles from '@ui/navigation/ListItem/ListItem.module.scss';
+
+import { Menu } from '../Menu';
+import styles from '../Menu.module.scss';
+
+const MenuRootWrapper = ({ children }: { children: ReactNode }) => (
+ <Menu.Root>{children}</Menu.Root>
+);
+const OpenMenuWrapper = ({ children }: { children: ReactNode }) => (
+ <Menu.Root open>{children}</Menu.Root>
+);
+const MenuPopupWrapper = ({ children }: { children: ReactNode }) => (
+ <Menu.Root open>
+ <Menu.Popup>{children}</Menu.Popup>
+ </Menu.Root>
+);
+const MenuRadioGroupWrapper = ({ children }: { children: ReactNode }) => (
+ <MenuPopupWrapper>
+ <Menu.RadioGroup>{children}</Menu.RadioGroup>
+ </MenuPopupWrapper>
+);
+const MenuGroupWrapper = ({ children }: { children: ReactNode }) => (
+ <MenuPopupWrapper>
+ <Menu.Group>{children}</Menu.Group>
+ </MenuPopupWrapper>
+);
+const MenuSubmenuWrapper = ({ children }: { children: ReactNode }) => (
+ <MenuPopupWrapper>
+ <Menu.SubmenuRoot>{children}</Menu.SubmenuRoot>
+ </MenuPopupWrapper>
+);
+
+runComponentConformance({
+ name: 'Menu.Trigger',
+ element: <Menu.Trigger>Options</Menu.Trigger>,
+ refInstanceOf: HTMLButtonElement,
+ wrapper: MenuRootWrapper,
+ renderPropTagName: 'button',
+});
+runComponentConformance({
+ name: 'Menu.Popup',
+ element: <Menu.Popup />,
+ refInstanceOf: HTMLDivElement,
+ wrapper: OpenMenuWrapper,
+ ownClassName: styles.popup,
+});
+runComponentConformance({
+ name: 'Menu.Item',
+ element: <Menu.Item>Item</Menu.Item>,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuPopupWrapper,
+ ownClassName: listItemStyles.root,
+});
+runComponentConformance({
+ name: 'Menu.CheckboxItem',
+ element: <Menu.CheckboxItem>Item</Menu.CheckboxItem>,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuPopupWrapper,
+ ownClassName: listItemStyles.root,
+});
+runComponentConformance({
+ name: 'Menu.RadioItem',
+ element: <Menu.RadioItem value="a">Item</Menu.RadioItem>,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuRadioGroupWrapper,
+ ownClassName: listItemStyles.root,
+});
+runComponentConformance({
+ name: 'Menu.SubmenuTrigger',
+ element: <Menu.SubmenuTrigger>More</Menu.SubmenuTrigger>,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuSubmenuWrapper,
+ ownClassName: listItemStyles.root,
+});
+runComponentConformance({
+ name: 'Menu.RadioGroup',
+ element: <Menu.RadioGroup />,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuPopupWrapper,
+ ownClassName: styles.group,
+});
+runComponentConformance({
+ name: 'Menu.Group',
+ element: <Menu.Group />,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuPopupWrapper,
+ ownClassName: styles.group,
+});
+runComponentConformance({
+ name: 'Menu.GroupLabel',
+ element: <Menu.GroupLabel>Group</Menu.GroupLabel>,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuGroupWrapper,
+ ownClassName: styles.groupLabel,
+});
+runComponentConformance({
+ name: 'Menu.Separator',
+ element: <Menu.Separator />,
+ refInstanceOf: HTMLDivElement,
+ wrapper: MenuPopupWrapper,
+ ownClassName: styles.separator,
+});
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuCheckboxItem.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuCheckboxItem.tsx
new file mode 100644
index 00000000000..607bd6118d6
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuCheckboxItem.tsx
@@ -0,0 +1,14 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuCheckboxItemProps } from '../types/MenuCheckboxItemProps';
+
+import { getMenuListItemProps } from './getMenuListItemProps';
+
+export const MenuCheckboxItem = (props: MenuCheckboxItemProps) => (
+ <MenuPrimitive.CheckboxItem
+ {...getMenuListItemProps<
+ MenuPrimitive.CheckboxItem.State,
+ MenuCheckboxItemProps
+ >(props, (state) => ({ indicator: 'checkbox', selected: state.checked }))}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroup.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroup.tsx
new file mode 100644
index 00000000000..191dc459e3e
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroup.tsx
@@ -0,0 +1,13 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+
+import styles from '../Menu.module.scss';
+import { type MenuGroupProps } from '../types/MenuGroupProps';
+
+export const MenuGroup = ({ className, ...props }: MenuGroupProps) => (
+ <MenuPrimitive.Group
+ {...props}
+ className={mergeFieldPartClassName(styles.group, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroupLabel.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroupLabel.tsx
new file mode 100644
index 00000000000..e357009730d
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuGroupLabel.tsx
@@ -0,0 +1,16 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+
+import styles from '../Menu.module.scss';
+import { type MenuGroupLabelProps } from '../types/MenuGroupLabelProps';
+
+export const MenuGroupLabel = ({
+ className,
+ ...props
+}: MenuGroupLabelProps) => (
+ <MenuPrimitive.GroupLabel
+ {...props}
+ className={mergeFieldPartClassName(styles.groupLabel, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuItem.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuItem.tsx
new file mode 100644
index 00000000000..ad7d76301a3
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuItem.tsx
@@ -0,0 +1,13 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuActionItemProps } from '../types/MenuActionItemProps';
+
+import { getMenuListItemProps } from './getMenuListItemProps';
+
+export const MenuItem = (props: MenuActionItemProps) => (
+ <MenuPrimitive.Item
+ {...getMenuListItemProps<MenuPrimitive.Item.State, MenuActionItemProps>(
+ props,
+ )}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuNestingContext.ts b/packages/twenty-ui/src/surfaces/Menu/internal/MenuNestingContext.ts
new file mode 100644
index 00000000000..070562f129c
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuNestingContext.ts
@@ -0,0 +1,3 @@
+import { createContext } from 'react';
+
+export const MenuNestingContext = createContext<boolean>(false);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopup.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopup.tsx
new file mode 100644
index 00000000000..c4eb91b42cd
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopup.tsx
@@ -0,0 +1,47 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+import { useContext } from 'react';
+
+import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { useThemeContainer } from '@ui/theme-constants';
+
+import styles from '../Menu.module.scss';
+import { type MenuPopupProps } from '../types/MenuPopupProps';
+import { MenuNestingContext } from './MenuNestingContext';
+import { MENU_POPUP_POSITION_DEFAULTS } from './MenuPopupPositionDefaults';
+
+export const MenuPopup = ({
+ side,
+ align,
+ sideOffset,
+ alignOffset,
+ anchor,
+ keepMounted,
+ className,
+ children,
+ ...props
+}: MenuPopupProps) => {
+ const themeContainer = useThemeContainer();
+ const { container = themeContainer ?? undefined, ...popupProps } = props;
+ const isNested = useContext(MenuNestingContext);
+ const defaults = MENU_POPUP_POSITION_DEFAULTS[isNested ? 'submenu' : 'root'];
+
+ return (
+ <MenuPrimitive.Portal container={container} keepMounted={keepMounted}>
+ <MenuPrimitive.Positioner
+ side={side ?? defaults.side}
+ align={align ?? defaults.align}
+ sideOffset={sideOffset ?? defaults.sideOffset}
+ alignOffset={alignOffset ?? defaults.alignOffset}
+ anchor={anchor}
+ className={styles.positioner}
+ >
+ <MenuPrimitive.Popup
+ {...popupProps}
+ className={mergeFieldPartClassName(styles.popup, className)}
+ >
+ {children}
+ </MenuPrimitive.Popup>
+ </MenuPrimitive.Positioner>
+ </MenuPrimitive.Portal>
+ );
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopupPositionDefaults.ts b/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopupPositionDefaults.ts
new file mode 100644
index 00000000000..8091ef7418e
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuPopupPositionDefaults.ts
@@ -0,0 +1,15 @@
+import { type MenuAlign } from '../types/MenuAlign';
+import { type MenuSide } from '../types/MenuSide';
+
+export const MENU_POPUP_POSITION_DEFAULTS: Record<
+ 'root' | 'submenu',
+ { side: MenuSide; align: MenuAlign; sideOffset: number; alignOffset: number }
+> = {
+ root: { side: 'bottom', align: 'start', sideOffset: 8, alignOffset: 0 },
+ submenu: {
+ side: 'inline-end',
+ align: 'start',
+ sideOffset: 0,
+ alignOffset: -4,
+ },
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioGroup.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioGroup.tsx
new file mode 100644
index 00000000000..5e9ef094bf9
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioGroup.tsx
@@ -0,0 +1,16 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+
+import styles from '../Menu.module.scss';
+import { type MenuRadioGroupProps } from '../types/MenuRadioGroupProps';
+
+export const MenuRadioGroup = ({
+ className,
+ ...props
+}: MenuRadioGroupProps) => (
+ <MenuPrimitive.RadioGroup
+ {...props}
+ className={mergeFieldPartClassName(styles.group, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioItem.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioItem.tsx
new file mode 100644
index 00000000000..a351ac695b4
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuRadioItem.tsx
@@ -0,0 +1,14 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuRadioItemProps } from '../types/MenuRadioItemProps';
+
+import { getMenuListItemProps } from './getMenuListItemProps';
+
+export const MenuRadioItem = (props: MenuRadioItemProps) => (
+ <MenuPrimitive.RadioItem
+ {...getMenuListItemProps<MenuPrimitive.RadioItem.State, MenuRadioItemProps>(
+ props,
+ (state) => ({ indicator: 'check', selected: state.checked }),
+ )}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuSeparator.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSeparator.tsx
new file mode 100644
index 00000000000..40fc3af7a93
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSeparator.tsx
@@ -0,0 +1,13 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+
+import styles from '../Menu.module.scss';
+import { type MenuSeparatorProps } from '../types/MenuSeparatorProps';
+
+export const MenuSeparator = ({ className, ...props }: MenuSeparatorProps) => (
+ <MenuPrimitive.Separator
+ {...props}
+ className={mergeFieldPartClassName(styles.separator, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuRoot.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuRoot.tsx
new file mode 100644
index 00000000000..458e4ed35d1
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuRoot.tsx
@@ -0,0 +1,13 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuSubmenuRootProps } from '../types/MenuSubmenuRootProps';
+import { MenuNestingContext } from './MenuNestingContext';
+
+export const MenuSubmenuRoot = ({
+ children,
+ ...props
+}: MenuSubmenuRootProps) => (
+ <MenuNestingContext.Provider value={true}>
+ <MenuPrimitive.SubmenuRoot {...props}>{children}</MenuPrimitive.SubmenuRoot>
+ </MenuNestingContext.Provider>
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuTrigger.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuTrigger.tsx
new file mode 100644
index 00000000000..8c754aa0e60
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/MenuSubmenuTrigger.tsx
@@ -0,0 +1,14 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuSubmenuTriggerProps } from '../types/MenuSubmenuTriggerProps';
+
+import { getMenuListItemProps } from './getMenuListItemProps';
+
+export const MenuSubmenuTrigger = (props: MenuSubmenuTriggerProps) => (
+ <MenuPrimitive.SubmenuTrigger
+ {...getMenuListItemProps<
+ MenuPrimitive.SubmenuTrigger.State,
+ MenuSubmenuTriggerProps
+ >(props, () => ({ hasSubmenu: true }))}
+ />
+);
diff --git a/packages/twenty-ui/src/surfaces/Menu/internal/getMenuListItemProps.tsx b/packages/twenty-ui/src/surfaces/Menu/internal/getMenuListItemProps.tsx
new file mode 100644
index 00000000000..fb20cc838bc
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/internal/getMenuListItemProps.tsx
@@ -0,0 +1,58 @@
+import { type ComponentRenderFn, type HTMLProps } from '@base-ui/react/types';
+import { isFunction } from '@sniptt/guards';
+import { type ReactElement, type ReactNode } from 'react';
+
+import { ListItem } from '@ui/navigation/ListItem/ListItem';
+import { type ListItemProps } from '@ui/navigation/ListItem/types/ListItemProps';
+
+import { type MenuItemSlotProps } from '../types/MenuItemSlotProps';
+
+type MenuListItemProps<TState> = MenuItemSlotProps & {
+ children?: ReactNode;
+ disabled?: boolean;
+ render?: ReactElement | ComponentRenderFn<HTMLProps, TState>;
+};
+
+export const getMenuListItemProps = <
+ TState,
+ TProps extends MenuListItemProps<TState>,
+>(
+ {
+ color = 'neutral',
+ startIcon,
+ endIcon,
+ description,
+ descriptionPlacement,
+ hotkeys,
+ disabled = false,
+ children,
+ render,
+ ...props
+ }: TProps,
+ getListItemState?: (
+ state: TState,
+ ) => Pick<ListItemProps, 'indicator' | 'selected' | 'hasSubmenu'>,
+) => ({
+ ...props,
+ disabled,
+ render: (renderProps: HTMLProps, state: TState) => (
+ <ListItem
+ {...renderProps}
+ render={
+ isFunction(render)
+ ? (listItemProps) => render(listItemProps, state)
+ : render
+ }
+ color={color}
+ disabled={disabled}
+ startIcon={startIcon}
+ endIcon={endIcon}
+ description={description}
+ descriptionPlacement={descriptionPlacement}
+ hotkeys={hotkeys}
+ {...getListItemState?.(state)}
+ >
+ {children}
+ </ListItem>
+ ),
+});
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuActionItemProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuActionItemProps.ts
new file mode 100644
index 00000000000..289eb32f2dc
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuActionItemProps.ts
@@ -0,0 +1,5 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuItemSlotProps } from './MenuItemSlotProps';
+
+export type MenuActionItemProps = MenuPrimitive.Item.Props & MenuItemSlotProps;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuAlign.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuAlign.ts
new file mode 100644
index 00000000000..80b44b41318
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuAlign.ts
@@ -0,0 +1 @@
+export type MenuAlign = 'start' | 'center' | 'end';
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuCheckboxItemProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuCheckboxItemProps.ts
new file mode 100644
index 00000000000..8487ef4fd3f
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuCheckboxItemProps.ts
@@ -0,0 +1,6 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuItemSlotProps } from './MenuItemSlotProps';
+
+export type MenuCheckboxItemProps = MenuPrimitive.CheckboxItem.Props &
+ MenuItemSlotProps;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupLabelProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupLabelProps.ts
new file mode 100644
index 00000000000..307fb1d4d04
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupLabelProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuGroupLabelProps = MenuPrimitive.GroupLabel.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupProps.ts
new file mode 100644
index 00000000000..df36433fa01
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuGroupProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuGroupProps = MenuPrimitive.Group.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuItemSlotProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuItemSlotProps.ts
new file mode 100644
index 00000000000..d6532e20af2
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuItemSlotProps.ts
@@ -0,0 +1,11 @@
+import { type ListItemProps } from '@ui/navigation/ListItem/types/ListItemProps';
+
+export type MenuItemSlotProps = Pick<
+ ListItemProps,
+ | 'color'
+ | 'startIcon'
+ | 'endIcon'
+ | 'description'
+ | 'descriptionPlacement'
+ | 'hotkeys'
+>;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuPopupProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuPopupProps.ts
new file mode 100644
index 00000000000..98a2d3ff4aa
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuPopupProps.ts
@@ -0,0 +1,14 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuAlign } from './MenuAlign';
+import { type MenuSide } from './MenuSide';
+
+export type MenuPopupProps = MenuPrimitive.Popup.Props & {
+ side?: MenuSide;
+ align?: MenuAlign;
+ sideOffset?: number;
+ alignOffset?: number;
+ anchor?: MenuPrimitive.Positioner.Props['anchor'];
+ container?: MenuPrimitive.Portal.Props['container'];
+ keepMounted?: boolean;
+};
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioGroupProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioGroupProps.ts
new file mode 100644
index 00000000000..77a0cf551ad
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioGroupProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuRadioGroupProps = MenuPrimitive.RadioGroup.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioItemProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioItemProps.ts
new file mode 100644
index 00000000000..f8ca268f6c3
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuRadioItemProps.ts
@@ -0,0 +1,6 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuItemSlotProps } from './MenuItemSlotProps';
+
+export type MenuRadioItemProps = MenuPrimitive.RadioItem.Props &
+ MenuItemSlotProps;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuRootProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuRootProps.ts
new file mode 100644
index 00000000000..48029970529
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuRootProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuRootProps = MenuPrimitive.Root.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuSeparatorProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuSeparatorProps.ts
new file mode 100644
index 00000000000..e3eee569519
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuSeparatorProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuSeparatorProps = MenuPrimitive.Separator.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuSide.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuSide.ts
new file mode 100644
index 00000000000..16c31d7c808
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuSide.ts
@@ -0,0 +1,7 @@
+export type MenuSide =
+ | 'top'
+ | 'bottom'
+ | 'left'
+ | 'right'
+ | 'inline-start'
+ | 'inline-end';
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuRootProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuRootProps.ts
new file mode 100644
index 00000000000..08619173c11
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuRootProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuSubmenuRootProps = MenuPrimitive.SubmenuRoot.Props;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuTriggerProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuTriggerProps.ts
new file mode 100644
index 00000000000..4351eee20b5
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuSubmenuTriggerProps.ts
@@ -0,0 +1,6 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+import { type MenuItemSlotProps } from './MenuItemSlotProps';
+
+export type MenuSubmenuTriggerProps = MenuPrimitive.SubmenuTrigger.Props &
+ MenuItemSlotProps;
diff --git a/packages/twenty-ui/src/surfaces/Menu/types/MenuTriggerProps.ts b/packages/twenty-ui/src/surfaces/Menu/types/MenuTriggerProps.ts
new file mode 100644
index 00000000000..300235f2a31
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/Menu/types/MenuTriggerProps.ts
@@ -0,0 +1,3 @@
+import { type Menu as MenuPrimitive } from '@base-ui/react/menu';
+
+export type MenuTriggerProps = MenuPrimitive.Trigger.Props;
diff --git a/packages/twenty-ui/src/surfaces/index.ts b/packages/twenty-ui/src/surfaces/index.ts
index 9bab711ad79..9eee0aa84db 100644
--- a/packages/twenty-ui/src/surfaces/index.ts
+++ b/packages/twenty-ui/src/surfaces/index.ts
@@ -17,6 +17,22 @@ export { Card } from './Card/Card';
export { CardContent } from './CardContent/CardContent';
export { CardFooter } from './CardFooter/CardFooter';
export { CardHeader } from './CardHeader/CardHeader';
+export { Menu } from './Menu/Menu';
+export type { MenuActionItemProps } from './Menu/types/MenuActionItemProps';
+export type { MenuAlign } from './Menu/types/MenuAlign';
+export type { MenuCheckboxItemProps } from './Menu/types/MenuCheckboxItemProps';
+export type { MenuGroupLabelProps } from './Menu/types/MenuGroupLabelProps';
+export type { MenuGroupProps } from './Menu/types/MenuGroupProps';
+export type { MenuItemSlotProps } from './Menu/types/MenuItemSlotProps';
+export type { MenuPopupProps } from './Menu/types/MenuPopupProps';
+export type { MenuRadioGroupProps } from './Menu/types/MenuRadioGroupProps';
+export type { MenuRadioItemProps } from './Menu/types/MenuRadioItemProps';
+export type { MenuRootProps } from './Menu/types/MenuRootProps';
+export type { MenuSeparatorProps } from './Menu/types/MenuSeparatorProps';
+export type { MenuSide } from './Menu/types/MenuSide';
+export type { MenuSubmenuRootProps } from './Menu/types/MenuSubmenuRootProps';
+export type { MenuSubmenuTriggerProps } from './Menu/types/MenuSubmenuTriggerProps';
+export type { MenuTriggerProps } from './Menu/types/MenuTriggerProps';
export { Modal } from './Modal/Modal';
export type { ModalOverlay } from './Modal/types/ModalOverlay';
export type { ModalPadding } from './Modal/types/ModalPadding';