Skip to content

The open alternative to Salesforce, designed for AI.

Migrate settings filters, menus and pickers (#26794)

Raphaël Bosic84ddae5cdb2
diff --git a/packages/twenty-docs/ui/components/dropdown.mdx b/packages/twenty-docs/ui/components/dropdown.mdx
index bd2472215f1..fc812ef006b 100644
--- a/packages/twenty-docs/ui/components/dropdown.mdx
+++ b/packages/twenty-docs/ui/components/dropdown.mdx
@@ -24,7 +24,9 @@ Set `type` on `Dropdown.Root` to match the popup's contents.
| `picker` | Search, selectable values, and optional commands | A dialog containing a search field and selectable toggle buttons. Arrow keys navigate result rows. |
| `panel` | Inputs, forms, and supporting actions | A dialog with native input behavior and Tab navigation. |
-Pickers allow creation actions and selectable values in the same list, in any order. Options expose their selected state with `aria-pressed`; commands keep their button semantics. Name `Content` with `aria-label`, or with a `Title` inside a `Header`, and give `Search` an accessible name.
+Pickers allow creation actions and selectable values in the same list, in any order. Options expose their selected state with `aria-pressed`; commands keep their button semantics. Give `Search` an accessible name.
+
+`Content` takes its accessible name from `Trigger`, or from `SubmenuTrigger` in a submenu. Pass `aria-label` on `Content` when the trigger shows a value, such as the selected option, or when the root has no trigger. An explicit `aria-label` or `aria-labelledby`, and a `Title` inside a `Header`, take precedence over the trigger name.
The underlying [Menu](/ui/primitives/surfaces/menu), [Select](/ui/primitives/input/select), and [Popover](/ui/primitives/surfaces/popover) remain available for direct composition.
@@ -43,7 +45,7 @@ Dropdown.Root
└── Dropdown.OptionItem
```
-`Content` includes the portal and positioner. Use `width`, `side`, `align`, `sideOffset`, and `alignOffset` to control placement. `Section` groups rows with shared spacing, and `Separator` divides sections. Rows use [ListItem](/ui/primitives/navigation/list-item) for their appearance.
+`Content` includes the portal and positioner. Use `width`, `side`, `align`, `sideOffset`, and `alignOffset` to control placement. `Section` groups rows with shared spacing, and `Separator` divides sections. A `scrollable` Section caps its height and scrolls; nest labelled sections inside it to scroll them as one list. Rows use [ListItem](/ui/primitives/navigation/list-item) for their appearance.
```tsx
import { Dropdown } from 'twenty-ui/components';
@@ -53,7 +55,7 @@ import { Button } from 'twenty-ui/primitives/input';
export const RecordActions = ({ onDuplicate }: { onDuplicate: () => void }) => (
<Dropdown.Root type="menu">
<Dropdown.Trigger render={<Button>Record actions</Button>} />
- <Dropdown.Content aria-label="Record actions">
+ <Dropdown.Content>
<Dropdown.Section>
<Dropdown.ActionItem startIcon={<IconCopy />} onClick={onDuplicate}>
Duplicate
@@ -68,7 +70,7 @@ Pass custom trigger elements through `render` so the trigger remains one interac
## Headers
-`Header` lays out a row at the top of the popup. Put a `Title` in it to name the popup: the title labels `Content` for assistive technology, so `Content` no longer needs `aria-label`. `Close` closes the popup the same way an outside press does. It renders an icon button with an X by default, so give it an `aria-label`, or pass `render` and children for another control. Other controls, such as a button that returns to a previous step, can sit in the same row. Use `Dropdown.Back` when navigating the root's page history.
+`Header` lays out a row at the top of the popup. Put a `Title` in it to name the popup after the title instead of the trigger. `Close` closes the popup the same way an outside press does. It renders an icon button with an X by default, so give it an `aria-label`, or pass `render` and children for another control. Other controls, such as a button that returns to a previous step, can sit in the same row. Use `Dropdown.Back` when navigating the root's page history.
## Search and selection
@@ -95,7 +97,7 @@ export const PersonPicker = () => {
return (
<Dropdown.Root type="picker">
<Dropdown.Trigger render={<Button>Choose person</Button>} />
- <Dropdown.Content aria-label="Choose person">
+ <Dropdown.Content>
<Dropdown.Search
aria-label="Search people"
value={search}
@@ -147,7 +149,7 @@ import { Button } from 'twenty-ui/primitives/input';
export const FilterMenu = () => (
<Dropdown.Root type="menu">
<Dropdown.Trigger render={<Button>Filters</Button>} />
- <Dropdown.Content aria-label="Filters">
+ <Dropdown.Content>
<Dropdown.Page id="root">
<Dropdown.Section>
<Dropdown.ActionItem page="status">Status</Dropdown.ActionItem>
@@ -165,6 +167,36 @@ export const FilterMenu = () => (
);
```
+To navigate from code, call `useDropdownPage` in a component rendered inside the root. It returns the current `page`, `goToPage(page)`, `goBack()` and `canGoBack`. For example, an option can return to the previous page after a selection while the popup stays open:
+
+```tsx
+import { Dropdown, useDropdownPage } from 'twenty-ui/components';
+
+export const StatusOptions = ({
+ status,
+ onStatusChange,
+}: {
+ status: string;
+ onStatusChange: (status: string) => void;
+}) => {
+ const { goBack } = useDropdownPage();
+
+ return ['Active', 'Archived'].map((option) => (
+ <Dropdown.OptionItem
+ key={option}
+ selected={status === option}
+ closeOnSelect={false}
+ onSelect={() => {
+ onStatusChange(option);
+ goBack();
+ }}
+ >
+ {option}
+ </Dropdown.OptionItem>
+ ));
+};
+```
+
Use `Submenu` with `SubmenuTrigger` and a nested `Content` for a side-by-side menu. Arrow Right enters the submenu; Arrow Left returns to its parent. Selecting a closing action closes the whole dropdown.
```text
diff --git a/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts
deleted file mode 100644
index 6c20ed65157..00000000000
--- a/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Locator, Page } from '@playwright/test';
-
-export class APIsSection {
- private readonly createApiKeyButton: Locator;
- private readonly regenerateApiKeyButton: Locator;
- private readonly nameOfApiKeyInput: Locator;
- private readonly expirationDateApiKeySelect: Locator;
- private readonly cancelButton: Locator;
- private readonly saveButton: Locator;
- private readonly deleteButton: Locator;
-
- constructor(public readonly page: Page) {
- this.page = page;
- this.createApiKeyButton = page.getByRole('link', {
- name: 'Create API Key',
- });
- this.nameOfApiKeyInput = page
- .getByPlaceholder('E.g. backoffice integration')
- .first();
- this.expirationDateApiKeySelect = page.locator(
- 'div[aria-controls="object-field-type-select-options"]',
- );
- this.regenerateApiKeyButton = page.getByRole('button', {
- name: 'Regenerate Key',
- });
- this.cancelButton = page.getByRole('button', { name: 'Cancel' });
- this.saveButton = page.getByRole('button', { name: 'Save' });
- this.deleteButton = page.getByRole('button', { name: 'Delete' });
- }
-
- async createApiKey() {
- await this.createApiKeyButton.click();
- }
-
- async typeApiKeyName(name: string) {
- await this.nameOfApiKeyInput.clear();
- await this.nameOfApiKeyInput.fill(name);
- }
-
- async selectApiExpirationDate(date: string) {
- await this.expirationDateApiKeySelect.click();
- await this.page.getByText(date, { exact: true }).click();
- }
-
- async regenerateApiKey() {
- await this.regenerateApiKeyButton.click();
- }
-
- async deleteApiKey() {
- await this.deleteButton.click();
- }
-
- async clickCancelButton() {
- await this.cancelButton.click();
- }
-
- async clickSaveButton() {
- await this.saveButton.click();
- }
-
- async checkApiKeyDetails(name: string) {
- await this.page.locator(`//a/div[contains(.,'${name}')][first()]`).click();
- }
-}
diff --git a/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts
deleted file mode 100644
index dace3e676a0..00000000000
--- a/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Locator, Page } from '@playwright/test';
-
-export class WebhooksSection {
- private readonly createWebhookButton: Locator;
- private readonly webhookUrlInput: Locator;
- private readonly webhookDescription: Locator;
- private readonly deleteButton: Locator;
-
- constructor(public readonly page: Page) {
- this.page = page;
- this.createWebhookButton = page.getByRole('link', {
- name: 'Create Webhook',
- });
- this.webhookUrlInput = page.getByPlaceholder('URL');
- this.webhookDescription = page.getByPlaceholder('Write a description');
- this.deleteButton = page.getByRole('button', { name: 'Delete' });
- }
-
- async deleteWebhook() {
- await this.deleteButton.click();
- }
-
- async createWebhook() {
- await this.createWebhookButton.click();
- }
-
- async typeWebhookUrl(url: string) {
- await this.webhookUrlInput.clear();
- await this.webhookUrlInput.fill(url);
- }
-
- async typeWebhookDescription(description: string) {
- await this.webhookDescription.fill(description);
- }
-
- async selectWebhookObject(index: number, object: string) {
- await this.page
- .locator(
- `//div[aria-controls="object-webhook-type-select-${index}-options"]`,
- )
- .click();
- await this.page.getByRole('option').getByText(object).click();
- }
-
- async selectWebhookAction(index: number, action: string) {
- await this.page
- .locator(
- `//div[aria-controls="operation-webhook-type-select-${index}-options"]`,
- )
- .click();
- await this.page.getByRole('option').getByText(action).click();
- }
-
- async deleteWebhookFilter(index: number) {
- await this.page
- .locator(
- `//div[aria-controls="object-webhook-type-select-${index}-options"]/../..//button`,
- )
- .click();
- }
-
- async checkWebhookDetails(name: string) {
- await this.page.locator(`//a/div[contains(.,'${name}')][first()]`).click();
- }
-}
diff --git a/packages/twenty-front/src/modules/log-console/components/LogConsoleToolbar.tsx b/packages/twenty-front/src/modules/log-console/components/LogConsoleToolbar.tsx
index 71d1f171916..d76da1ddcb1 100644
--- a/packages/twenty-front/src/modules/log-console/components/LogConsoleToolbar.tsx
+++ b/packages/twenty-front/src/modules/log-console/components/LogConsoleToolbar.tsx
@@ -253,6 +253,7 @@ export const LogConsoleToolbar = ({
</DropdownMenuHeader>
<DropdownMenuInnerSelect
dropdownId={`${dropdownId}-operand`}
+ aria-label={t`Operand`}
selectedOption={getOperandOption(filter.operand)}
options={Object.values(EventLogFilterOperand).map(getOperandOption)}
onChange={(operandOption) =>
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx
index dc048521e1e..c9765a8c1ea 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx
@@ -19,6 +19,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
+import { t } from '@lingui/core/macro';
import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
import { type SelectOption } from 'twenty-ui/primitives/input';
@@ -119,6 +120,7 @@ export const ObjectFilterDropdownInnerSelectOperandDropdown = () => {
return (
<DropdownMenuInnerSelect
dropdownId={dropdownId}
+ aria-label={t`Operand`}
selectedOption={selectedOption}
onChange={handleOperandChange}
options={options}
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 598e105bc68..2cb799152fa 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
@@ -156,6 +156,7 @@ export const ObjectSortDropdownButton = () => {
</Dropdown.Header>
<DropdownMenuInnerSelect
dropdownId={`${dropdownId}-direction`}
+ aria-label={t`Direction`}
options={[ViewSortDirection.ASC, ViewSortDirection.DESC].map(
(sortDirection) => ({
value: sortDirection,
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 78b242d596d..d3a48023ce2 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
@@ -2,10 +2,8 @@ import { ApplicationDisplay } from '@/applications/components/ApplicationDisplay
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
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 { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableCell } from '@/ui/layout/table/components/TableCell';
@@ -14,7 +12,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useMutation, useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { type ReactNode, useState } from 'react';
+import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import {
assertUnreachable,
@@ -22,6 +20,7 @@ import {
isDefined,
} from 'twenty-shared/utils';
import {
+ Dropdown,
SearchInput,
Section,
SettingsRow,
@@ -212,72 +211,71 @@ export const SettingsAdminApps = () => {
placeholder={t`Search registrations...`}
value={searchQuery}
onChange={setSearchQuery}
- filterDropdown={(filterButton: ReactNode) => (
- <Dropdown
+ filterDropdown={(filterButton) => (
+ <DropdownRoot
dropdownId="settings-admin-apps-filter-dropdown"
- dropdownPlacement="bottom-end"
- dropdownOffset={{ x: 0, y: 8 }}
- clickableComponent={filterButton}
- dropdownComponents={
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
+ type="panel"
+ >
+ <Dropdown.Trigger render={filterButton} />
+ <DropdownContent align="end" sideOffset={8}>
+ <Dropdown.Section>
+ <SettingsRow
+ startIcon={<IconPinned />}
+ onCheckedChange={() =>
+ setShowPreInstalledOnly(!showPreInstalledOnly)
+ }
+ checked={showPreInstalledOnly}
+ >{t`Pre-installed only`}</SettingsRow>
+ </Dropdown.Section>
+ <Dropdown.Section label={t`Source`}>
+ {SOURCE_TYPE_FILTER_OPTIONS.map(({ sourceType, label }) => (
<SettingsRow
- startIcon={<IconPinned />}
- onCheckedChange={() =>
- setShowPreInstalledOnly(!showPreInstalledOnly)
- }
- checked={showPreInstalledOnly}
- >{t`Pre-installed only`}</SettingsRow>
- <DropdownMenuSectionLabel label={t`Source`} />
- {SOURCE_TYPE_FILTER_OPTIONS.map(({ sourceType, label }) => (
- <SettingsRow
- key={sourceType}
- onCheckedChange={() =>
- toggleSourceTypeFilter(sourceType)
- }
- checked={sourceTypeFilters.includes(sourceType)}
- >
- {label}
- </SettingsRow>
- ))}
- <DropdownMenuSectionLabel label={t`Listed`} />
- <SettingsRow
- onCheckedChange={() =>
- setIsListedFilter(
- isListedFilter === true ? undefined : true,
- )
- }
- checked={isListedFilter === true}
- >{t`Listed`}</SettingsRow>
- <SettingsRow
- onCheckedChange={() =>
- setIsListedFilter(
- isListedFilter === false ? undefined : false,
- )
- }
- checked={isListedFilter === false}
- >{t`Not listed`}</SettingsRow>
- <DropdownMenuSectionLabel label={t`Configured`} />
- <SettingsRow
- onCheckedChange={() =>
- setIsConfiguredFilter(
- isConfiguredFilter === true ? undefined : true,
- )
- }
- checked={isConfiguredFilter === true}
- >{t`Configured`}</SettingsRow>
- <SettingsRow
- onCheckedChange={() =>
- setIsConfiguredFilter(
- isConfiguredFilter === false ? undefined : false,
- )
- }
- checked={isConfiguredFilter === false}
- >{t`Not configured`}</SettingsRow>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ key={sourceType}
+ onCheckedChange={() => toggleSourceTypeFilter(sourceType)}
+ checked={sourceTypeFilters.includes(sourceType)}
+ >
+ {label}
+ </SettingsRow>
+ ))}
+ </Dropdown.Section>
+ <Dropdown.Section label={t`Listed`}>
+ <SettingsRow
+ onCheckedChange={() =>
+ setIsListedFilter(
+ isListedFilter === true ? undefined : true,
+ )
+ }
+ checked={isListedFilter === true}
+ >{t`Listed`}</SettingsRow>
+ <SettingsRow
+ onCheckedChange={() =>
+ setIsListedFilter(
+ isListedFilter === false ? undefined : false,
+ )
+ }
+ checked={isListedFilter === false}
+ >{t`Not listed`}</SettingsRow>
+ </Dropdown.Section>
+ <Dropdown.Section label={t`Configured`}>
+ <SettingsRow
+ onCheckedChange={() =>
+ setIsConfiguredFilter(
+ isConfiguredFilter === true ? undefined : true,
+ )
+ }
+ checked={isConfiguredFilter === true}
+ >{t`Configured`}</SettingsRow>
+ <SettingsRow
+ onCheckedChange={() =>
+ setIsConfiguredFilter(
+ isConfiguredFilter === false ? undefined : false,
+ )
+ }
+ checked={isConfiguredFilter === false}
+ >{t`Not configured`}</SettingsRow>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
)}
/>
{loading && registrations.length === 0 ? (
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx
new file mode 100644
index 00000000000..e2876353964
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx
@@ -0,0 +1,135 @@
+import { ApolloAdminClientContext } from '@/settings/admin-panel/apollo/contexts/ApolloAdminClientContext';
+import { SettingsAdminApps } from '@/settings/admin-panel/apps/components/SettingsAdminApps';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ApplicationRegistrationSourceType } from '~/generated-admin/graphql';
+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+
+const findAllApplicationRegistrations = fn();
+
+const meta: Meta<typeof SettingsAdminApps> = {
+ title: 'Modules/Settings/AdminPanel/Apps/SettingsAdminApps',
+ component: SettingsAdminApps,
+ decorators: [
+ (Story) => (
+ <ApolloAdminClientContext.Provider value={mockedApolloClient}>
+ <Story />
+ </ApolloAdminClientContext.Provider>
+ ),
+ ToastDecorator,
+ ComponentWithRouterDecorator,
+ ],
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query('FindAllApplicationRegistrations', ({ variables }) => {
+ findAllApplicationRegistrations(variables);
+
+ return HttpResponse.json({
+ data: {
+ findAllApplicationRegistrations: {
+ __typename: 'PaginatedApplicationRegistrations',
+ totalCount: 1,
+ hasMore: false,
+ registrations: [
+ {
+ __typename: 'ApplicationRegistration',
+ id: 'a1b2c3d4-0000-4000-8000-000000000001',
+ universalIdentifier: 'acme-app',
+ name: 'Acme app',
+ logoUrl: null,
+ galleryImagesUrls: [],
+ oAuthClientId: 'acme-app-client',
+ oAuthRedirectUris: [],
+ oAuthScopes: [],
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: 'acme-app',
+ latestAvailableVersion: '1.0.0',
+ isListed: true,
+ isVetted: true,
+ isPreInstalled: false,
+ isConfigured: true,
+ ownerWorkspaceId: null,
+ createdAt: '2026-01-01T00:00:00.000Z',
+ updatedAt: '2026-01-01T00:00:00.000Z',
+ },
+ ],
+ },
+ },
+ });
+ }),
+ ],
+ },
+ },
+ beforeEach: async () => {
+ findAllApplicationRegistrations.mockClear();
+ await mockedApolloClient.clearStore();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsAdminApps>;
+
+export const FilterPanelTogglesStayOpen: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ expect(await canvas.findByText('Acme app')).toBeVisible();
+
+ const trigger = canvas.getByRole('button', { name: 'Filter' });
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Filter' });
+ const source = within(popup).getByRole('group', { name: 'Source' });
+
+ expect(within(source).getByRole('switch', { name: 'NPM' })).toBeChecked();
+ await userEvent.click(
+ within(source).getByRole('switch', { name: 'Tarball' }),
+ );
+ expect(
+ within(source).getByRole('switch', { name: 'Tarball' }),
+ ).toBeChecked();
+ await waitFor(() =>
+ expect(findAllApplicationRegistrations).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ sourceTypes: [
+ ApplicationRegistrationSourceType.NPM,
+ ApplicationRegistrationSourceType.TARBALL,
+ ],
+ }),
+ ),
+ );
+
+ const listed = within(popup).getByRole('group', { name: 'Listed' });
+
+ await userEvent.click(
+ within(listed).getByRole('switch', { name: 'Listed' }),
+ );
+ await userEvent.click(
+ within(listed).getByRole('switch', { name: 'Not listed' }),
+ );
+ expect(
+ within(listed).getByRole('switch', { name: 'Listed' }),
+ ).not.toBeChecked();
+ expect(
+ within(listed).getByRole('switch', { name: 'Not listed' }),
+ ).toBeChecked();
+ await waitFor(() =>
+ expect(findAllApplicationRegistrations).toHaveBeenLastCalledWith(
+ expect.objectContaining({ isListed: false }),
+ ),
+ );
+ expect(
+ within(popup).getByRole('group', { name: 'Configured' }),
+ ).toBeVisible();
+ expect(popup).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
index e09d5748577..0bf986e5381 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
@@ -1,9 +1,9 @@
-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 { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { t } from '@lingui/core/macro';
-import { useState } from 'react';
+import { Dropdown } from 'twenty-ui/components';
import { IconSettings } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { ConfigVariableOptionsDropdownContent } from './ConfigVariableOptionsDropdownContent';
@@ -27,30 +27,19 @@ export const ConfigVariableFilterDropdown = ({
onGroupFilterChange,
onShowHiddenChange,
}: ConfigVariableFilterDropdownProps) => {
- const [selectedCategory, setSelectedCategory] =
- useState<ConfigVariableFilterCategory | null>(null);
-
- const handleSelectCategory = (
- category: ConfigVariableFilterCategory | null,
- ) => {
- setSelectedCategory(category);
- };
-
return (
- <Dropdown
- clickableComponent={
- <Button
- size="md"
- startIcon={<IconSettings />}
- variant="outline"
- >{t`Options`}</Button>
- }
- dropdownId="env-var-options-dropdown"
- dropdownOffset={{ x: 0, y: 10 }}
- dropdownComponents={
+ <DropdownRoot dropdownId="env-var-options-dropdown" type="picker">
+ <Dropdown.Trigger
+ render={
+ <Button
+ size="md"
+ startIcon={<IconSettings />}
+ variant="outline"
+ >{t`Options`}</Button>
+ }
+ />
+ <DropdownContent align="end" sideOffset={10}>
<ConfigVariableOptionsDropdownContent
- selectedCategory={selectedCategory}
- onSelectCategory={handleSelectCategory}
sourceFilter={sourceFilter}
groupFilter={groupFilter}
groupOptions={groupOptions}
@@ -59,7 +48,7 @@ export const ConfigVariableFilterDropdown = ({
onGroupFilterChange={onGroupFilterChange}
onShowHiddenChange={onShowHiddenChange}
/>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
);
};
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 1898387597a..2a1a172cbf5 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
@@ -1,21 +1,14 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { Tag } from 'twenty-ui/primitives/data-display';
import { isConfigVariablesInDbEnabledState } from '@/client-config/states/isConfigVariablesInDbEnabledState';
import { CONFIG_VARIABLE_SOURCE_OPTIONS } from '@/settings/admin-panel/config-variables/constants/ConfigVariableSourceOptions';
-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 { 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';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { t } from '@lingui/core/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { IconChevronLeft, IconEye, IconEyeOff } from 'twenty-ui/icon';
+import { t } from '@lingui/core/macro';
+import { Dropdown, useDropdownPage } from 'twenty-ui/components';
+import { IconEye, IconEyeOff } from 'twenty-ui/icon';
+import { Tag } from 'twenty-ui/primitives/data-display';
+
type ConfigVariableOptionsDropdownContentProps = {
- selectedCategory: ConfigVariableFilterCategory | null;
- onSelectCategory: (category: ConfigVariableFilterCategory | null) => void;
sourceFilter: ConfigVariableSourceFilter;
groupFilter: ConfigVariableGroupFilter;
groupOptions: { value: ConfigVariableGroupFilter; label: string }[];
@@ -26,8 +19,6 @@ type ConfigVariableOptionsDropdownContentProps = {
};
export const ConfigVariableOptionsDropdownContent = ({
- selectedCategory,
- onSelectCategory,
sourceFilter,
groupFilter,
groupOptions,
@@ -36,6 +27,7 @@ export const ConfigVariableOptionsDropdownContent = ({
onGroupFilterChange,
onShowHiddenChange,
}: ConfigVariableOptionsDropdownContentProps) => {
+ const { goBack } = useDropdownPage();
const isConfigVariablesInDbEnabled = useAtomStateValue(
isConfigVariablesInDbEnabledState,
);
@@ -44,113 +36,78 @@ export const ConfigVariableOptionsDropdownContent = ({
(option) => isConfigVariablesInDbEnabled || option.value !== 'database',
);
- if (!selectedCategory) {
- return (
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- onClick={() => onSelectCategory('source')}
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- >
+ return (
+ <>
+ <Dropdown.Page id="root">
+ <Dropdown.Section>
+ <Dropdown.ActionItem page="source" hasSubmenu={false}>
<Tag
color={'transparent'}
borderStyle="dashed"
variant={'soft'}
>{t`Source`}</Tag>
- </ListItem>
- <ListItem
- onClick={() => onSelectCategory('group')}
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- >
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem page="group" hasSubmenu={false}>
<Tag
color={'transparent'}
borderStyle="dashed"
variant={'soft'}
>{t`Group`}</Tag>
- </ListItem>
- </DropdownMenuItemsContainer>
- <DropdownMenuSeparator />
- <DropdownMenuItemsContainer scrollable={false}>
- <ListItem
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ <Dropdown.Separator />
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ closeOnClick={false}
startIcon={showHiddenGroupVariables ? <IconEyeOff /> : <IconEye />}
onClick={() => onShowHiddenChange(!showHiddenGroupVariables)}
>
{showHiddenGroupVariables
? t`Hide hidden groups`
: t`Show hidden groups`}
- </ListItem>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- );
- }
-
- return (
- <LegacyDropdownContent>
- <DropdownMenuHeader
- StartComponent={
- <DropdownMenuHeaderLeftComponent
- onClick={() => onSelectCategory(null)}
- Icon={IconChevronLeft}
- />
- }
- >
- {selectedCategory === 'source' && t`Select Source`}
- {selectedCategory === 'group' && t`Select Group`}
- </DropdownMenuHeader>
- <DropdownMenuItemsContainer>
- {selectedCategory === 'source' && (
- <>
- {availableSourceOptions.map((option) => (
- <ListItem
- key={option.value}
- onClick={() => {
- onSourceFilterChange(option.value);
- onSelectCategory(null);
- }}
- role="option"
- aria-selected={option.value === sourceFilter}
- selected={option.value === sourceFilter}
- indicator="check"
- >
- <Tag color={option.color} borderStyle="dashed" variant={'soft'}>
- {option.label}
- </Tag>
- </ListItem>
- ))}
- </>
- )}
- {selectedCategory === 'group' && (
- <>
- {groupOptions.map((option) => (
- <ListItem
- key={option.value}
- onClick={() => {
- onGroupFilterChange(option.value);
- onSelectCategory(null);
- }}
- role="option"
- aria-selected={option.value === groupFilter}
- selected={option.value === groupFilter}
- indicator="check"
- >
- <Tag
- color={'transparent'}
- borderStyle="dashed"
- variant={'soft'}
- >
- {option.label}
- </Tag>
- </ListItem>
- ))}
- </>
- )}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ </Dropdown.Page>
+ <Dropdown.Page id="source">
+ <Dropdown.Back>{t`Select Source`}</Dropdown.Back>
+ <Dropdown.Section>
+ {availableSourceOptions.map((option) => (
+ <Dropdown.OptionItem
+ key={option.value}
+ selected={option.value === sourceFilter}
+ closeOnSelect={false}
+ onSelect={() => {
+ onSourceFilterChange(option.value);
+ goBack();
+ }}
+ >
+ <Tag color={option.color} borderStyle="dashed" variant={'soft'}>
+ {option.label}
+ </Tag>
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ </Dropdown.Page>
+ <Dropdown.Page id="group">
+ <Dropdown.Back>{t`Select Group`}</Dropdown.Back>
+ <Dropdown.Section>
+ {groupOptions.map((option) => (
+ <Dropdown.OptionItem
+ key={option.value}
+ selected={option.value === groupFilter}
+ closeOnSelect={false}
+ onSelect={() => {
+ onGroupFilterChange(option.value);
+ goBack();
+ }}
+ >
+ <Tag color={'transparent'} borderStyle="dashed" variant={'soft'}>
+ {option.label}
+ </Tag>
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ </Dropdown.Page>
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/__stories__/ConfigVariableFilterDropdown.stories.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/__stories__/ConfigVariableFilterDropdown.stories.tsx
new file mode 100644
index 00000000000..cb6cee0be48
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/__stories__/ConfigVariableFilterDropdown.stories.tsx
@@ -0,0 +1,120 @@
+import { isConfigVariablesInDbEnabledState } from '@/client-config/states/isConfigVariablesInDbEnabledState';
+import { ConfigVariableFilterDropdown } from '@/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown';
+import { type ConfigVariableGroupFilter } from '@/settings/admin-panel/config-variables/types/ConfigVariableGroupFilter';
+import { type ConfigVariableSourceFilter } from '@/settings/admin-panel/config-variables/types/ConfigVariableSourceFilter';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const FilterExample = () => {
+ const [sourceFilter, setSourceFilter] =
+ useState<ConfigVariableSourceFilter>('all');
+ const [groupFilter, setGroupFilter] =
+ useState<ConfigVariableGroupFilter>('all');
+ const [showHiddenGroupVariables, setShowHiddenGroupVariables] =
+ useState(false);
+
+ return (
+ <>
+ <ConfigVariableFilterDropdown
+ sourceFilter={sourceFilter}
+ groupFilter={groupFilter}
+ groupOptions={[
+ { value: 'all', label: 'All Groups' },
+ { value: 'server-config', label: 'Server Config' },
+ ]}
+ showHiddenGroupVariables={showHiddenGroupVariables}
+ onSourceFilterChange={setSourceFilter}
+ onGroupFilterChange={setGroupFilter}
+ onShowHiddenChange={setShowHiddenGroupVariables}
+ />
+ <p>{`Source: ${sourceFilter}, group: ${groupFilter}`}</p>
+ </>
+ );
+};
+
+const meta: Meta = {
+ title: 'Modules/Settings/AdminPanel/ConfigVariables/FilterDropdown',
+ decorators: [ComponentDecorator],
+ render: () => <FilterExample />,
+};
+export default meta;
+type Story = StoryObj;
+
+export const PagesReturnToRootAfterSelection: Story = {
+ beforeEach: () => {
+ jotaiStore.set(isConfigVariablesInDbEnabledState.atom, true);
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Options' });
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Options' });
+
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'Source' }),
+ );
+ await userEvent.click(
+ await within(popup).findByRole('button', { name: 'Database' }),
+ );
+ expect(
+ await canvas.findByText('Source: database, group: all'),
+ ).toBeVisible();
+ expect(popup).toBeVisible();
+ await waitFor(() =>
+ expect(
+ within(popup).getByRole('button', { name: 'Source' }),
+ ).toHaveFocus(),
+ );
+
+ await userEvent.click(within(popup).getByRole('button', { name: 'Group' }));
+ expect(
+ await within(popup).findByRole('button', { name: 'Select Group' }),
+ ).toBeVisible();
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'Server Config' }),
+ );
+ expect(
+ await canvas.findByText('Source: database, group: server-config'),
+ ).toBeVisible();
+
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'Show hidden groups' }),
+ );
+ expect(
+ await within(popup).findByRole('button', { name: 'Hide hidden groups' }),
+ ).toBeVisible();
+
+ await userEvent.click(within(popup).getByRole('button', { name: 'Group' }));
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+
+ await userEvent.click(trigger);
+ expect(await body.findByRole('button', { name: 'Source' })).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ },
+};
+
+export const DatabaseSourceHiddenWhenDisabled: Story = {
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ within(canvasElement).getByRole('button', { name: 'Options' }),
+ );
+ await userEvent.click(await body.findByRole('button', { name: 'Source' }));
+
+ expect(
+ await body.findByRole('button', { name: 'Environment' }),
+ ).toBeVisible();
+ expect(
+ body.queryByRole('button', { name: 'Database' }),
+ ).not.toBeInTheDocument();
+ await userEvent.keyboard('{Escape}');
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/types/ConfigVariableFilterCategory.ts b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/types/ConfigVariableFilterCategory.ts
deleted file mode 100644
index f49ad090514..00000000000
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/types/ConfigVariableFilterCategory.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ConfigVariableFilterCategory = 'source' | 'group';
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 98c8e220da0..9de84ab340d 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
@@ -1,30 +1,20 @@
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { SettingsBillingLimitNestedSelect } from '@/settings/billing/components/internal/SettingsBillingLimitNestedSelect';
+import { SettingsBillingLimitSpenderOptionList } from '@/settings/billing/components/internal/SettingsBillingLimitSpenderOptionList';
import { AVATAR_SPENDER_TYPES } from '@/settings/billing/constants/AvatarSpenderTypes';
import { USAGE_LIMIT_SPENDER_TYPE_ICONS } from '@/settings/billing/constants/UsageLimitSpenderTypeIcons';
import { USAGE_LIMIT_SPENDER_TYPE_LABELS } from '@/settings/billing/constants/UsageLimitSpenderTypeLabels';
import { USAGE_LIMIT_SPENDER_TYPE_POOL_LABELS } from '@/settings/billing/constants/UsageLimitSpenderTypePoolLabels';
-import {
- type UsageLimitSpenderOption,
- useUsageLimitSpenderOptions,
-} from '@/settings/billing/hooks/useUsageLimitSpenderOptions';
+import { useUsageLimitSpenderOptions } from '@/settings/billing/hooks/useUsageLimitSpenderOptions';
import { type UsageLimitSpenderType } from '@/settings/billing/types/UsageLimitSpenderType';
import { getUsageLimitSpenderGroups } from '@/settings/billing/utils/getUsageLimitSpenderGroups';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-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';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft } from 'twenty-ui/icon';
+import { Dropdown } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
const SPENDER_DROPDOWN_ID = 'usage-limit-spender';
@@ -50,22 +40,14 @@ export const SettingsBillingLimitSpenderSelect = ({
onChange,
}: SettingsBillingLimitSpenderSelectProps) => {
const { t } = useLingui();
- const { closeDropdown } = useCloseDropdown();
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const [browsedSpenderType, setBrowsedSpenderType] =
- useState<UsageLimitSpenderType | null>(null);
-
const groups = getUsageLimitSpenderGroups(allowedSpenderTypes);
- const listedSpenderType = browsedSpenderType ?? undefined;
- const { spenderOptionsByType, loading } = useUsageLimitSpenderOptions(
- [listedSpenderType, spenderType].filter(isDefined),
+ const { spenderOptionsByType } = useUsageLimitSpenderOptions(
+ [spenderType].filter(isDefined),
);
- const listedSpenderOptions = isDefined(listedSpenderType)
- ? (spenderOptionsByType[listedSpenderType] ?? [])
- : [];
const selectedSpenderOptions = isDefined(spenderType)
? (spenderOptionsByType[spenderType] ?? [])
: [];
@@ -75,15 +57,11 @@ export const SettingsBillingLimitSpenderSelect = ({
currentWorkspace?.logo ?? DEFAULT_WORKSPACE_LOGO,
);
- const resetNavigation = () => setBrowsedSpenderType(null);
-
const handleSelect = (
nextSpenderType: UsageLimitSpenderType,
nextSpenderId: string,
) => {
onChange({ spenderType: nextSpenderType, spenderId: nextSpenderId });
- resetNavigation();
- closeDropdown(SPENDER_DROPDOWN_ID);
};
const getSelectedLabel = (): string => {
@@ -139,176 +117,9 @@ export const SettingsBillingLimitSpenderSelect = ({
);
};
- const renderOption = (
- kind: UsageLimitSpenderType,
- option: UsageLimitSpenderOption,
- ) => {
- const selected = spenderType === kind && spenderId === option.id;
-
- if (AVATAR_SPENDER_TYPES.includes(kind)) {
- return (
- <ListItem
- key={option.id}
- onClick={() => handleSelect(kind, option.id)}
- role="option"
- aria-selected={selected}
- selected={selected}
- indicator="check"
- startIcon={
- <Avatar
- name={option.label}
- src={option.avatarUrl}
- shape={kind === 'userWorkspace' ? 'circle' : 'square'}
- size="md"
- />
- }
- >
- {option.label}
- </ListItem>
- );
- }
-
- return (
- <ListItem
- key={option.id}
- onClick={() => handleSelect(kind, option.id)}
- role="option"
- aria-selected={selected}
- selected={selected}
- indicator="check"
- startIcon={
- <SelectOptionIcon Icon={USAGE_LIMIT_SPENDER_TYPE_ICONS[kind]} />
- }
- >
- {option.label}
- </ListItem>
- );
- };
-
- const renderOptionList = (kind: UsageLimitSpenderType) => (
- <>
- <ListItem
- onClick={() => handleSelect(kind, '')}
- role="option"
- aria-selected={spenderType === kind && spenderId === ''}
- selected={spenderType === kind && spenderId === ''}
- indicator="check"
- >
- {t(USAGE_LIMIT_SPENDER_TYPE_POOL_LABELS[kind])}
- </ListItem>
- {loading ? (
- <ListItem
- disabled
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- >{t`Loading…`}</ListItem>
- ) : (
- listedSpenderOptions.map((option) => renderOption(kind, option))
- )}
- </>
- );
-
- const renderBackHeader = (title: string, onBack: () => void) => (
- <DropdownMenuHeader
- StartComponent={
- <DropdownMenuHeaderLeftComponent
- onClick={onBack}
- Icon={IconChevronLeft}
- />
- }
- >
- {title}
- </DropdownMenuHeader>
- );
-
- const renderSubSpenderContent = (kind: UsageLimitSpenderType) => (
- <LegacyDropdownContent>
- {renderBackHeader(t(USAGE_LIMIT_SPENDER_TYPE_LABELS[kind]), () =>
- setBrowsedSpenderType(null),
- )}
- <DropdownMenuItemsContainer>
- {renderOptionList(kind)}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- );
-
const workspaceGroup = groups.find((group) => group.id === 'workspace');
const otherGroups = groups.filter((group) => group.id !== 'workspace');
- const renderRootContent = () => (
- <LegacyDropdownContent>
- {isDefined(workspaceGroup) && (
- <DropdownMenuItemsContainer>
- <ListItem
- onClick={() => handleSelect('workspace', '')}
- role="option"
- aria-selected={spenderType === 'workspace'}
- selected={spenderType === 'workspace'}
- indicator="check"
- description={t`Workspace`}
- startIcon={
- <Avatar
- name={workspaceName}
- src={workspaceAvatarUrl}
- shape="square"
- size="md"
- />
- }
- >
- {workspaceName}
- </ListItem>
- </DropdownMenuItemsContainer>
- )}
- {isDefined(workspaceGroup) && otherGroups.length > 0 && (
- <DropdownMenuSeparator />
- )}
- {otherGroups.length > 0 && (
- <DropdownMenuItemsContainer>
- {otherGroups.map((group) =>
- isIntraWorkspaceLimitEntitled ? (
- <ListItem
- key={group.id}
- onClick={() => setBrowsedSpenderType(group.spenderType)}
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- hasSubmenu={true}
- startIcon={<SelectOptionIcon Icon={group.Icon} />}
- >
- {t(group.label)}
- </ListItem>
- ) : (
- <ListItem
- key={group.id}
- disabled
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- description={t`Organization plan`}
- descriptionPlacement={'end'}
- startIcon={<SelectOptionIcon Icon={group.Icon} />}
- >
- {t(group.label)}
- </ListItem>
- ),
- )}
- </DropdownMenuItemsContainer>
- )}
- </LegacyDropdownContent>
- );
-
- const renderContent = () => {
- if (isDefined(browsedSpenderType)) {
- return renderSubSpenderContent(browsedSpenderType);
- }
-
- return renderRootContent();
- };
-
return (
<SettingsBillingLimitNestedSelect
dropdownId={SPENDER_DROPDOWN_ID}
@@ -324,8 +135,70 @@ export const SettingsBillingLimitSpenderSelect = ({
}
SelectedAvatar={renderSelectedAvatar()}
isDisabled={isDisabled}
- onClose={resetNavigation}
- dropdownComponents={renderContent()}
- />
+ >
+ <Dropdown.Page id="root">
+ {isDefined(workspaceGroup) && (
+ <Dropdown.Section>
+ <Dropdown.OptionItem
+ selected={spenderType === 'workspace'}
+ onSelect={() => handleSelect('workspace', '')}
+ description={t`Workspace`}
+ startIcon={
+ <Avatar
+ name={workspaceName}
+ src={workspaceAvatarUrl}
+ shape="square"
+ size="md"
+ />
+ }
+ >
+ {workspaceName}
+ </Dropdown.OptionItem>
+ </Dropdown.Section>
+ )}
+ {isDefined(workspaceGroup) && otherGroups.length > 0 && (
+ <Dropdown.Separator />
+ )}
+ {otherGroups.length > 0 && (
+ <Dropdown.Section>
+ {otherGroups.map((group) =>
+ isIntraWorkspaceLimitEntitled ? (
+ <Dropdown.ActionItem
+ key={group.id}
+ page={group.spenderType}
+ startIcon={<SelectOptionIcon Icon={group.Icon} />}
+ >
+ {t(group.label)}
+ </Dropdown.ActionItem>
+ ) : (
+ <Dropdown.ActionItem
+ key={group.id}
+ disabled
+ description={t`Organization plan`}
+ descriptionPlacement="end"
+ startIcon={<SelectOptionIcon Icon={group.Icon} />}
+ >
+ {t(group.label)}
+ </Dropdown.ActionItem>
+ ),
+ )}
+ </Dropdown.Section>
+ )}
+ </Dropdown.Page>
+ {isIntraWorkspaceLimitEntitled &&
+ otherGroups.map((group) => (
+ <Dropdown.Page key={group.id} id={group.spenderType}>
+ <Dropdown.Back>
+ {t(USAGE_LIMIT_SPENDER_TYPE_LABELS[group.spenderType])}
+ </Dropdown.Back>
+ <SettingsBillingLimitSpenderOptionList
+ spenderType={group.spenderType}
+ selectedSpenderType={spenderType}
+ selectedSpenderId={spenderId}
+ onSelect={handleSelect}
+ />
+ </Dropdown.Page>
+ ))}
+ </SettingsBillingLimitNestedSelect>
);
};
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 e9a18bc8ab6..d66deb3763e 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
@@ -5,16 +5,9 @@ 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 { 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';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { Dropdown } from 'twenty-ui/components';
import {
type UsageOperationType,
type UsageQuotaDefinitionsQuery,
@@ -40,27 +33,6 @@ export const SettingsBillingLimitUsageSelect = ({
onChange,
}: SettingsBillingLimitUsageSelectProps) => {
const { t } = useLingui();
- const { closeDropdown } = useCloseDropdown();
-
- const [browsedResourceType, setBrowsedResourceType] =
- useState<UsageResourceType | null>(null);
-
- const browsedDefinition = definitions.definitions.find(
- (definition) => definition.resourceType === browsedResourceType,
- );
-
- const handleSelect = (nextOperationType: UsageOperationType) => {
- if (!isDefined(browsedResourceType)) {
- return;
- }
-
- onChange({
- resourceType: browsedResourceType,
- operationType: nextOperationType,
- });
- setBrowsedResourceType(null);
- closeDropdown(USAGE_DROPDOWN_ID);
- };
const operationLabel = isDefined(operationType)
? t(USAGE_OPERATION_TYPE_LABELS[operationType])
@@ -80,77 +52,60 @@ export const SettingsBillingLimitUsageSelect = ({
? USAGE_LIMIT_RESOURCE_TYPE_ICONS[resourceType]
: undefined
}
- onClose={() => setBrowsedResourceType(null)}
- dropdownComponents={
- isDefined(browsedResourceType) && isDefined(browsedDefinition) ? (
- <LegacyDropdownContent>
- <DropdownMenuHeader
- StartComponent={
- <DropdownMenuHeaderLeftComponent
- onClick={() => setBrowsedResourceType(null)}
- Icon={IconChevronLeft}
+ >
+ <Dropdown.Page id="root">
+ <Dropdown.Section>
+ {definitions.definitions.map((definition) => (
+ <Dropdown.ActionItem
+ key={definition.resourceType}
+ page={definition.resourceType}
+ startIcon={
+ <SelectOptionIcon
+ Icon={
+ USAGE_LIMIT_RESOURCE_TYPE_ICONS[definition.resourceType]
+ }
/>
}
>
- {t(USAGE_LIMIT_RESOURCE_TYPE_LABELS[browsedResourceType])}
- </DropdownMenuHeader>
- <DropdownMenuItemsContainer>
- {getUsageLimitOperationTypes(browsedDefinition).map(
- (candidate) => (
- <ListItem
- key={candidate}
- onClick={() => handleSelect(candidate)}
- role="option"
- aria-selected={
- resourceType === browsedResourceType &&
- operationType === candidate
- }
- selected={
- resourceType === browsedResourceType &&
- operationType === candidate
- }
- indicator="check"
- startIcon={
- <SelectOptionIcon
- Icon={USAGE_LIMIT_OPERATION_TYPE_ICONS[candidate]}
- />
- }
- >
- {t(USAGE_OPERATION_TYPE_LABELS[candidate])}
- </ListItem>
- ),
- )}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- ) : (
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- {definitions.definitions.map((definition) => (
- <ListItem
- key={definition.resourceType}
- onClick={() =>
- setBrowsedResourceType(definition.resourceType)
- }
- role="option"
- aria-selected={false}
- selected={false}
- indicator="check"
- hasSubmenu={true}
- startIcon={
- <SelectOptionIcon
- Icon={
- USAGE_LIMIT_RESOURCE_TYPE_ICONS[definition.resourceType]
- }
- />
- }
- >
- {t(USAGE_LIMIT_RESOURCE_TYPE_LABELS[definition.resourceType])}
- </ListItem>
- ))}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- )
- }
- />
+ {t(USAGE_LIMIT_RESOURCE_TYPE_LABELS[definition.resourceType])}
+ </Dropdown.ActionItem>
+ ))}
+ </Dropdown.Section>
+ </Dropdown.Page>
+ {definitions.definitions.map((definition) => (
+ <Dropdown.Page
+ key={definition.resourceType}
+ id={definition.resourceType}
+ >
+ <Dropdown.Back>
+ {t(USAGE_LIMIT_RESOURCE_TYPE_LABELS[definition.resourceType])}
+ </Dropdown.Back>
+ <Dropdown.Section>
+ {getUsageLimitOperationTypes(definition).map((candidate) => (
+ <Dropdown.OptionItem
+ key={candidate}
+ selected={
+ resourceType === definition.resourceType &&
+ operationType === candidate
+ }
+ onSelect={() =>
+ onChange({
+ resourceType: definition.resourceType,
+ operationType: candidate,
+ })
+ }
+ startIcon={
+ <SelectOptionIcon
+ Icon={USAGE_LIMIT_OPERATION_TYPE_ICONS[candidate]}
+ />
+ }
+ >
+ {t(USAGE_OPERATION_TYPE_LABELS[candidate])}
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ </Dropdown.Page>
+ ))}
+ </SettingsBillingLimitNestedSelect>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitForm.stories.tsx b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitForm.stories.tsx
index b89e17a1ee0..ba6375935ce 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitForm.stories.tsx
@@ -1,4 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
import { SettingsBillingLimitForm } from '@/settings/billing/components/SettingsBillingLimitForm';
@@ -52,7 +53,19 @@ const meta: Meta<typeof SettingsBillingLimitForm> = {
export default meta;
type Story = StoryObj<typeof SettingsBillingLimitForm>;
-export const Empty: Story = {};
+export const Empty: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ canvas.getByRole('button', { name: /Choose a usage/ }),
+ ).toHaveAttribute('aria-haspopup', 'dialog');
+ expect(canvas.getByText('Workspace · Workspace')).toBeVisible();
+ expect(
+ canvas.queryByRole('button', { name: /Workspace · Workspace/ }),
+ ).not.toBeInTheDocument();
+ },
+};
export const Filled: Story = {
args: { values: FILLED_VALUES },
diff --git a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitSpenderSelect.stories.tsx b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitSpenderSelect.stories.tsx
index ba363637a1f..30e6aee7497 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitSpenderSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitSpenderSelect.stories.tsx
@@ -1,7 +1,10 @@
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 { SettingsBillingLimitSpenderSelect } from '@/settings/billing/components/SettingsBillingLimitSpenderSelect';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedApiKeys } from '~/testing/mock-data/generated/metadata/api-keys/mock-api-keys-data';
const meta: Meta<typeof SettingsBillingLimitSpenderSelect> = {
title: 'Modules/Settings/Billing/SettingsBillingLimitSpenderSelect',
@@ -33,8 +36,74 @@ export const AllUsers: Story = {
export const WorkspaceOnlyPlan: Story = {
args: { isIntraWorkspaceLimitEntitled: false },
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(within(canvasElement).getByRole('button'));
+ const popup = await body.findByRole('dialog', { name: 'Spender' });
+
+ expect(
+ within(popup).getByRole('button', { name: /User.*Organization plan/ }),
+ ).toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(
+ within(popup).getByRole('button', { name: /User.*Organization plan/ }),
+ );
+ expect(
+ within(popup).queryByRole('button', { name: 'All users' }),
+ ).not.toBeInTheDocument();
+ await userEvent.keyboard('{Escape}');
+ },
};
export const ReadOnly: Story = {
args: { isDisabled: true },
+ play: async ({ canvasElement }) => {
+ expect(within(canvasElement).queryByRole('button')).not.toBeInTheDocument();
+ },
+};
+
+export const SpenderPagesAndSelection: Story = {
+ args: { onChange: fn() },
+ parameters: { msw: graphqlMocks },
+ play: async ({ canvasElement, args }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = within(canvasElement).getByRole('button');
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Spender' });
+
+ expect(
+ within(popup).getByRole('button', { name: /Workspace/, pressed: true }),
+ ).toBeVisible();
+
+ await userEvent.click(within(popup).getByRole('button', { name: 'User' }));
+ expect(
+ await within(popup).findByRole('button', { name: 'All users' }),
+ ).toBeVisible();
+ await userEvent.click(within(popup).getByRole('button', { name: 'User' }));
+ await waitFor(() =>
+ expect(within(popup).getByRole('button', { name: 'User' })).toHaveFocus(),
+ );
+ expect(
+ within(popup).queryByRole('button', { name: 'All users' }),
+ ).not.toBeInTheDocument();
+
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'API key' }),
+ );
+ await userEvent.click(
+ await within(popup).findByRole('button', { name: 'My api key' }),
+ );
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ expect(args.onChange).toHaveBeenCalledWith({
+ spenderType: 'apiKey',
+ spenderId: mockedApiKeys[0].id,
+ });
+
+ await userEvent.click(trigger);
+ expect(
+ await body.findByRole('button', { name: 'Application' }),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ },
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitUsageSelect.stories.tsx b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitUsageSelect.stories.tsx
index 85292b2b9aa..efc927e0438 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitUsageSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/__stories__/SettingsBillingLimitUsageSelect.stories.tsx
@@ -1,4 +1,5 @@
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 { SettingsBillingLimitUsageSelect } from '@/settings/billing/components/SettingsBillingLimitUsageSelect';
@@ -56,3 +57,47 @@ export const AllOperations: Story = {
operationType: UsageOperationType.ALL,
},
};
+
+export const NavigateAndSelect: Story = {
+ args: {
+ resourceType: UsageResourceType.AI,
+ operationType: UsageOperationType.AI_CHAT_TOKEN,
+ onChange: fn(),
+ },
+ play: async ({ canvasElement, args }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = within(canvasElement).getByRole('button');
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Usage' });
+
+ await userEvent.click(within(popup).getByRole('button', { name: 'AI' }));
+ expect(
+ await within(popup).findByRole('button', {
+ name: 'AI Chat',
+ pressed: true,
+ }),
+ ).toBeVisible();
+ await userEvent.click(within(popup).getByRole('button', { name: 'AI' }));
+ await waitFor(() =>
+ expect(within(popup).getByRole('button', { name: 'AI' })).toHaveFocus(),
+ );
+
+ await userEvent.keyboard('{Enter}');
+ await userEvent.click(
+ await within(popup).findByRole('button', { name: 'Web Search' }),
+ );
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ expect(args.onChange).toHaveBeenCalledWith({
+ resourceType: UsageResourceType.AI,
+ operationType: UsageOperationType.WEB_SEARCH,
+ });
+
+ await userEvent.click(trigger);
+ expect(await body.findByRole('button', { name: 'AI' })).toBeVisible();
+ expect(
+ body.queryByRole('button', { name: 'Web Search' }),
+ ).not.toBeInTheDocument();
+ await userEvent.keyboard('{Escape}');
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitNestedSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitNestedSelect.tsx
index aa06a171251..0743d7ac381 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitNestedSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitNestedSelect.tsx
@@ -1,10 +1,12 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
+import { Dropdown } from 'twenty-ui/components';
import { type IconComponent } from 'twenty-ui/icon';
import { StyledSettingsBillingFieldLabel } from '@/settings/billing/components/internal/SettingsBillingFieldLabel';
import { SelectControl } from '@/ui/input/components/SelectControl';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
const StyledContainer = styled.div`
width: 100%;
@@ -18,8 +20,7 @@ type SettingsBillingLimitNestedSelectProps = {
SelectedIcon?: IconComponent;
SelectedAvatar?: ReactNode;
isDisabled?: boolean;
- dropdownComponents: ReactNode;
- onClose?: () => void;
+ children: ReactNode;
};
export const SettingsBillingLimitNestedSelect = ({
@@ -30,8 +31,7 @@ export const SettingsBillingLimitNestedSelect = ({
SelectedIcon,
SelectedAvatar,
isDisabled = false,
- dropdownComponents,
- onClose,
+ children,
}: SettingsBillingLimitNestedSelectProps) => {
const selectedOption = {
value: selectedLabel,
@@ -50,18 +50,17 @@ export const SettingsBillingLimitNestedSelect = ({
isDisabled
/>
) : (
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="bottom-start"
- onClose={onClose}
- clickableComponent={
+ <DropdownRoot dropdownId={dropdownId} type="picker">
+ <Dropdown.Trigger render={<div />} nativeButton={false}>
<SelectControl
selectedOption={selectedOption}
LeftComponent={SelectedAvatar}
/>
- }
- dropdownComponents={dropdownComponents}
- />
+ </Dropdown.Trigger>
+ <DropdownContent align="start" aria-label={label}>
+ {children}
+ </DropdownContent>
+ </DropdownRoot>
)}
</StyledContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitSpenderOptionList.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitSpenderOptionList.tsx
new file mode 100644
index 00000000000..66c35562a01
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLimitSpenderOptionList.tsx
@@ -0,0 +1,69 @@
+import { AVATAR_SPENDER_TYPES } from '@/settings/billing/constants/AvatarSpenderTypes';
+import { USAGE_LIMIT_SPENDER_TYPE_ICONS } from '@/settings/billing/constants/UsageLimitSpenderTypeIcons';
+import { USAGE_LIMIT_SPENDER_TYPE_POOL_LABELS } from '@/settings/billing/constants/UsageLimitSpenderTypePoolLabels';
+import { useUsageLimitSpenderOptions } from '@/settings/billing/hooks/useUsageLimitSpenderOptions';
+import { type UsageLimitSpenderType } from '@/settings/billing/types/UsageLimitSpenderType';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
+import { useLingui } from '@lingui/react/macro';
+import { Dropdown } from 'twenty-ui/components';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+
+type SettingsBillingLimitSpenderOptionListProps = {
+ spenderType: UsageLimitSpenderType;
+ selectedSpenderType: UsageLimitSpenderType | null;
+ selectedSpenderId: string;
+ onSelect: (spenderType: UsageLimitSpenderType, spenderId: string) => void;
+};
+
+export const SettingsBillingLimitSpenderOptionList = ({
+ spenderType,
+ selectedSpenderType,
+ selectedSpenderId,
+ onSelect,
+}: SettingsBillingLimitSpenderOptionListProps) => {
+ const { t } = useLingui();
+ const { spenderOptionsByType, loading } = useUsageLimitSpenderOptions([
+ spenderType,
+ ]);
+
+ const spenderOptions = spenderOptionsByType[spenderType] ?? [];
+ const isSelectedSpenderType = selectedSpenderType === spenderType;
+
+ return (
+ <Dropdown.Section>
+ <Dropdown.OptionItem
+ selected={isSelectedSpenderType && selectedSpenderId === ''}
+ onSelect={() => onSelect(spenderType, '')}
+ >
+ {t(USAGE_LIMIT_SPENDER_TYPE_POOL_LABELS[spenderType])}
+ </Dropdown.OptionItem>
+ {loading ? (
+ <Dropdown.Loading>{t`Loading…`}</Dropdown.Loading>
+ ) : (
+ spenderOptions.map((option) => (
+ <Dropdown.OptionItem
+ key={option.id}
+ selected={isSelectedSpenderType && selectedSpenderId === option.id}
+ onSelect={() => onSelect(spenderType, option.id)}
+ startIcon={
+ AVATAR_SPENDER_TYPES.includes(spenderType) ? (
+ <Avatar
+ name={option.label}
+ src={option.avatarUrl}
+ shape={spenderType === 'userWorkspace' ? 'circle' : 'square'}
+ size="md"
+ />
+ ) : (
+ <SelectOptionIcon
+ Icon={USAGE_LIMIT_SPENDER_TYPE_ICONS[spenderType]}
+ />
+ )
+ }
+ >
+ {option.label}
+ </Dropdown.OptionItem>
+ ))
+ )}
+ </Dropdown.Section>
+ );
+};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
index 7bdb4cf5169..3bbb3ae5c98 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
@@ -1,43 +1,27 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
-import { Fragment, useMemo, useRef, useState, type MouseEvent } from 'react';
-
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { useRef, useState } from 'react';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';
import { isAdvancedRelationTargetObjectMetadata } from '@/object-metadata/utils/isAdvancedRelationTargetObjectMetadata';
import { isObjectMetadataEligibleAsRelationTarget } from '@/object-metadata/utils/isObjectMetadataEligibleAsRelationTarget';
import { MultiSelectControl } from '@/ui/input/components/MultiSelectControl';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
+import { getSelectDropdownInitialFocus } from '@/ui/input/components/internal/select/utils/getSelectDropdownInitialFocus';
+import { isFocusMovingWithinSelect } from '@/ui/input/components/internal/select/utils/isFocusMovingWithinSelect';
+import { type SelectCallToActionButton } from '@/ui/input/types/SelectCallToActionButton';
+import { type SelectSizeVariant } from '@/ui/input/types/SelectSizeVariant';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
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';
-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-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';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { isNonEmptyString } from '@sniptt/guards';
+import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { IconBox, type IconComponent } from 'twenty-ui/icon';
+import { Dropdown } from 'twenty-ui/components';
+import { IconBox } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
-export type SelectSizeVariant = 'small' | 'default';
-
-type CallToActionButton = {
- text: string;
- onClick: (event: MouseEvent<HTMLDivElement>) => void;
- Icon?: IconComponent;
-};
-
-export type SettingsMorphRelationMultiSelectProps = {
+type SettingsMorphRelationMultiSelectProps = {
className?: string;
disabled?: boolean;
selectSizeVariant?: SelectSizeVariant;
@@ -51,9 +35,7 @@ export type SettingsMorphRelationMultiSelectProps = {
onBlur?: () => void;
selectedObjectMetadataIds: string[];
withSearchInput?: boolean;
- needIconCheck?: boolean;
- callToActionButton?: CallToActionButton;
- dropdownOffset?: DropdownOffset;
+ callToActionButton?: SelectCallToActionButton;
hasRightElement?: boolean;
error?: string;
};
@@ -98,11 +80,10 @@ export const SettingsMorphRelationMultiSelect = ({
selectedObjectMetadataIds,
withSearchInput,
callToActionButton,
- dropdownOffset,
hasRightElement,
error,
}: SettingsMorphRelationMultiSelectProps) => {
- const selectContainerRef = useRef<HTMLDivElement>(null);
+ const dropdownContentRef = useRef<HTMLDivElement>(null);
const [searchInputValue, setSearchInputValue] = useState('');
@@ -129,20 +110,17 @@ export const SettingsMorphRelationMultiSelect = ({
localSelectedObjectMetadataIds.includes(option.objectMetadataId),
);
- const filteredOptions = useMemo(() => {
- const matchingOptions = searchInputValue
- ? options.filter(({ label }) =>
- label.toLowerCase().includes(searchInputValue.toLowerCase()),
- )
- : options;
+ const matchingOptions = isNonEmptyString(searchInputValue)
+ ? options.filter(({ label: optionLabel }) =>
+ optionLabel.toLowerCase().includes(searchInputValue.toLowerCase()),
+ )
+ : options;
- return [
- ...matchingOptions.filter(({ isAdvanced }) => !isAdvanced),
- ...matchingOptions.filter(({ isAdvanced }) => isAdvanced),
- ];
- }, [options, searchInputValue]);
+ const regularOptions = matchingOptions.filter(
+ ({ isAdvanced }) => !isAdvanced,
+ );
- const advancedSectionStartIndex = filteredOptions.findIndex(
+ const advancedOptions = matchingOptions.filter(
({ isAdvanced }) => isAdvanced,
);
@@ -150,191 +128,146 @@ export const SettingsMorphRelationMultiSelect = ({
disabledFromProps ||
(options.length <= 1 && !isDefined(callToActionButton));
- const { closeDropdown } = useCloseDropdown();
-
- const dropDownMenuWidth =
- dropdownWidthAuto && selectContainerRef.current?.clientWidth
- ? selectContainerRef.current?.clientWidth
- : dropdownWidth;
-
- const selectableItemIdArray = filteredOptions.map(
- (option) => option.objectMetadataId,
- );
-
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- dropdownId,
- );
-
- const { setSelectedItemId } = useSelectableList(dropdownId);
+ const handleOptionToggle = (objectMetadataId: string) => {
+ const newSelectedObjectMetadataIds =
+ localSelectedObjectMetadataIds.includes(objectMetadataId)
+ ? localSelectedObjectMetadataIds.filter(
+ (selectedObjectMetadataId) =>
+ selectedObjectMetadataId !== objectMetadataId,
+ )
+ : [...localSelectedObjectMetadataIds, objectMetadataId];
- const handleDropdownOpen = () => {
- if (selectedOptions.length > 0 && !searchInputValue) {
- setSelectedItemId(selectedOptions[0].objectMetadataId);
- }
+ setLocalSelectedObjectMetadataIds(newSelectedObjectMetadataIds);
+ onChange?.(newSelectedObjectMetadataIds);
+ onBlur?.();
};
- const addOrRemoveFromArray = (array: string[], item: string) => {
- let newArray = new Set(array);
- if (newArray.has(item)) {
- newArray.delete(item);
- } else {
- newArray.add(item);
+ const handleOpenChange = (open: boolean) => {
+ if (!open) {
+ setSearchInputValue('');
}
- return Array.from(newArray);
};
+ const renderOption = (option: (typeof options)[number]) => (
+ <Dropdown.OptionItem
+ key={option.objectMetadataId}
+ selected={selectedObjectMetadataIds.includes(option.objectMetadataId)}
+ onSelect={() => handleOptionToggle(option.objectMetadataId)}
+ startIcon={
+ <SelectOptionIcon
+ Icon={option.Icon ?? undefined}
+ color={option.iconThemeColor}
+ />
+ }
+ >
+ {option.label}
+ </Dropdown.OptionItem>
+ );
+
+ const selectControl = (
+ <MultiSelectControl
+ selectedOptions={selectedOptions}
+ fixedIcon={selectedOptions.length < 2 ? undefined : IconBox}
+ fixedText={
+ selectedOptions.length < 2
+ ? undefined
+ : plural(selectedOptions.length, {
+ one: `# Object`,
+ other: `# Objects`,
+ })
+ }
+ isDisabled={isDisabled}
+ selectSizeVariant={selectSizeVariant}
+ hasRightElement={hasRightElement}
+ />
+ );
+
return (
<StyledContainer
className={className}
fullWidth={fullWidth}
- tabIndex={0}
- onBlur={onBlur}
- ref={selectContainerRef}
+ onBlur={(event) => {
+ if (
+ isFocusMovingWithinSelect({
+ event,
+ dropdownContent: dropdownContentRef.current,
+ })
+ ) {
+ return;
+ }
+
+ onBlur?.();
+ }}
>
- {!!label && <StyledLabel>{label}</StyledLabel>}
+ {isNonEmptyString(label) && <StyledLabel>{label}</StyledLabel>}
{isDisabled ? (
- <MultiSelectControl
- selectedOptions={selectedOptions}
- fixedIcon={selectedOptions.length < 2 ? undefined : IconBox}
- fixedText={
- selectedOptions.length < 2
- ? undefined
- : plural(selectedOptions.length, {
- one: `# Object`,
- other: `# Objects`,
- })
- }
- isDisabled={isDisabled}
- selectSizeVariant={selectSizeVariant}
- hasRightElement={hasRightElement}
- />
+ selectControl
) : (
- <Dropdown
+ <DropdownRoot
dropdownId={dropdownId}
- dropdownPlacement="bottom-start"
- dropdownOffset={dropdownOffset}
- onOpen={handleDropdownOpen}
- clickableComponent={
- <MultiSelectControl
- selectedOptions={selectedOptions}
- fixedIcon={selectedOptions.length < 2 ? undefined : IconBox}
- fixedText={
- selectedOptions.length < 2
- ? undefined
- : plural(selectedOptions.length, {
- one: `# Object`,
- other: `# Objects`,
- })
- }
- isDisabled={isDisabled}
- selectSizeVariant={selectSizeVariant}
- hasRightElement={hasRightElement}
- />
- }
- dropdownComponents={
- <LegacyDropdownContent widthInPixels={dropDownMenuWidth}>
- {!!withSearchInput && (
- <DropdownMenuSearchInput
- autoFocus
- value={searchInputValue}
- onChange={(event) => setSearchInputValue(event.target.value)}
- />
- )}
- {!!withSearchInput && !!filteredOptions.length && (
- <DropdownMenuSeparator />
- )}
- {!!filteredOptions.length && (
- <DropdownMenuItemsContainer isMultiSelect hasMaxHeight>
- <SelectableList
- selectableListInstanceId={dropdownId}
- focusId={dropdownId}
- selectableItemIdArray={selectableItemIdArray}
- >
- {filteredOptions.map((option, optionIndex) => (
- <Fragment key={option.objectMetadataId}>
- {optionIndex === advancedSectionStartIndex && (
- <>
- {optionIndex > 0 && <DropdownMenuSeparator />}
- <DropdownMenuSectionLabel label={t`Advanced`} />
- </>
- )}
- <SelectableListItem
- itemId={option.objectMetadataId}
- onEnter={() => {
- const newSelectedObjectMetadataIds =
- addOrRemoveFromArray(
- localSelectedObjectMetadataIds,
- option.objectMetadataId,
- );
- setLocalSelectedObjectMetadataIds(
- newSelectedObjectMetadataIds,
- );
- onChange?.(newSelectedObjectMetadataIds);
- onBlur?.();
- closeDropdown(dropdownId);
- }}
- >
- <ListItem
- className=""
- focused={selectedItemId === option.objectMetadataId}
- role="option"
- aria-selected={selectedObjectMetadataIds.some(
- (selectedObjectMetadataId) =>
- selectedObjectMetadataId ===
- option.objectMetadataId,
- )}
- selected={selectedObjectMetadataIds.some(
- (selectedObjectMetadataId) =>
- selectedObjectMetadataId ===
- option.objectMetadataId,
- )}
- indicator="checkbox"
- onClick={() => {
- const newSelectedObjectMetadataIds =
- addOrRemoveFromArray(
- localSelectedObjectMetadataIds,
- option.objectMetadataId,
- );
- setLocalSelectedObjectMetadataIds(
- newSelectedObjectMetadataIds,
- );
- onChange?.(newSelectedObjectMetadataIds);
- onBlur?.();
- }}
- startIcon={
- <SelectOptionIcon
- Icon={option.Icon ?? undefined}
- color={option.iconThemeColor}
- />
- }
- >
- {option.label}
- </ListItem>
- </SelectableListItem>
- </Fragment>
- ))}
- </SelectableList>
- </DropdownMenuItemsContainer>
- )}
- {!!callToActionButton && !!filteredOptions.length && (
- <DropdownMenuSeparator />
- )}
- {!!callToActionButton && (
- <DropdownMenuItemsContainer hasMaxHeight scrollable={false}>
- <ListItem
- onClick={callToActionButton.onClick}
- startIcon={
- <SelectOptionIcon Icon={callToActionButton.Icon} />
- }
- >
- {callToActionButton.text}
- </ListItem>
- </DropdownMenuItemsContainer>
- )}
- </LegacyDropdownContent>
- }
- />
+ type="picker"
+ multiple
+ onOpenChange={handleOpenChange}
+ >
+ <Dropdown.Trigger render={<div />} nativeButton={false}>
+ {selectControl}
+ </Dropdown.Trigger>
+ <DropdownContent
+ ref={dropdownContentRef}
+ width={dropdownWidthAuto ? 'var(--anchor-width)' : dropdownWidth}
+ align="start"
+ initialFocus={
+ withSearchInput
+ ? undefined
+ : () =>
+ getSelectDropdownInitialFocus(dropdownContentRef.current)
+ }
+ aria-label={isNonEmptyString(label) ? label : undefined}
+ >
+ {withSearchInput && (
+ <Dropdown.Search
+ value={searchInputValue}
+ onValueChange={setSearchInputValue}
+ placeholder={t`Search`}
+ aria-label={t`Search`}
+ />
+ )}
+ {withSearchInput && isNonEmptyArray(matchingOptions) && (
+ <Dropdown.Separator />
+ )}
+ {isNonEmptyArray(matchingOptions) && (
+ <Dropdown.Section scrollable>
+ {isNonEmptyArray(regularOptions) && (
+ <Dropdown.Section>
+ {regularOptions.map(renderOption)}
+ </Dropdown.Section>
+ )}
+ {isNonEmptyArray(regularOptions) &&
+ isNonEmptyArray(advancedOptions) && <Dropdown.Separator />}
+ {isNonEmptyArray(advancedOptions) && (
+ <Dropdown.Section label={t`Advanced`}>
+ {advancedOptions.map(renderOption)}
+ </Dropdown.Section>
+ )}
+ </Dropdown.Section>
+ )}
+ {isDefined(callToActionButton) &&
+ isNonEmptyArray(matchingOptions) && <Dropdown.Separator />}
+ {isDefined(callToActionButton) && (
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ onClick={callToActionButton.onClick}
+ closeOnClick={false}
+ startIcon={
+ <SelectOptionIcon Icon={callToActionButton.Icon} />
+ }
+ >
+ {callToActionButton.text}
+ </Dropdown.ActionItem>
+ </Dropdown.Section>
+ )}
+ </DropdownContent>
+ </DropdownRoot>
)}
{isNonEmptyString(description) && (
<StyledDescription>{description}</StyledDescription>
diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsMorphRelationMultiSelect.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsMorphRelationMultiSelect.stories.tsx
index 57e9158e8cc..7cf412a2de0 100644
--- a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsMorphRelationMultiSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsMorphRelationMultiSelect.stories.tsx
@@ -1,7 +1,7 @@
import { SettingsMorphRelationMultiSelect } from '@/settings/components/SettingsMorphRelationMultiSelect';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { fn } from 'storybook/test';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
@@ -27,11 +27,102 @@ export const Default: Story = {
'6f3b9df6-57c0-4fe0-b8af-1a5ed20d76bd',
],
withSearchInput: true,
- dropdownOffset: {
- x: 0,
- y: 0,
- },
hasRightElement: false,
onChange: fn(),
},
};
+
+export const SearchAndToggleStayOpen: Story = {
+ args: {
+ ...Default.args,
+ selectedObjectMetadataIds: [],
+ onChange: fn(),
+ onBlur: fn(),
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = await canvas.findByRole('button');
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Select objects' });
+ const search = within(popup).getByRole('searchbox', { name: 'Search' });
+
+ await waitFor(() => expect(search).toHaveFocus());
+ expect(args.onBlur).not.toHaveBeenCalled();
+ expect(
+ within(within(popup).getByRole('group', { name: 'Advanced' })).getByRole(
+ 'button',
+ { name: 'Attachment' },
+ ),
+ ).toBeVisible();
+
+ await userEvent.type(search, 'pet');
+ expect(
+ within(popup).queryByRole('group', { name: 'Advanced' }),
+ ).not.toBeInTheDocument();
+ await waitFor(() =>
+ expect(
+ within(popup).getByRole('button', { name: 'Pet' }),
+ ).toHaveAttribute('data-highlighted'),
+ );
+ await userEvent.keyboard('{Enter}');
+ expect(args.onChange).toHaveBeenLastCalledWith([expect.any(String)]);
+ expect(within(popup).getByRole('button', { name: 'Pet' })).toBeVisible();
+ expect(trigger).toHaveTextContent('Pet');
+
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'Pet Care Agreement' }),
+ );
+ expect(args.onChange).toHaveBeenLastCalledWith([
+ expect.any(String),
+ expect.any(String),
+ ]);
+ expect(popup).toBeVisible();
+ expect(trigger).toHaveTextContent('2 Objects');
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+
+ await userEvent.click(trigger);
+ expect(await body.findByRole('searchbox', { name: 'Search' })).toHaveValue(
+ '',
+ );
+ await userEvent.keyboard('{Escape}');
+ },
+};
+
+export const SingleTabStop: Story = {
+ args: {
+ ...Default.args,
+ selectedObjectMetadataIds: [],
+ },
+ play: async ({ canvasElement }) => {
+ const trigger = await within(canvasElement).findByRole('button');
+
+ await userEvent.tab();
+ expect(trigger).toHaveFocus();
+ await userEvent.tab();
+ expect(canvasElement).not.toContainElement(
+ canvasElement.ownerDocument.activeElement as HTMLElement,
+ );
+ },
+};
+
+export const Disabled: Story = {
+ args: {
+ ...Default.args,
+ disabled: true,
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(await canvas.findByText('Select objects')).toBeVisible();
+ expect(canvas.queryByRole('button')).not.toBeInTheDocument();
+ await userEvent.click(canvas.getByText('Select objects'));
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('dialog'),
+ ).not.toBeInTheDocument();
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
index 5926e4bed3c..1b0ec9de83c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, waitFor, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
@@ -73,4 +73,70 @@ export const WithSelectForm: Story = {
fieldType: FieldMetadataType.SELECT,
objectNameSingular: 'company',
},
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [optionsMenuTrigger, optionActionsTrigger] =
+ await canvas.findAllByRole('button', { name: 'More options' });
+
+ await userEvent.click(optionActionsTrigger);
+ const optionActions = await body.findByRole('menu', {
+ name: 'More options',
+ });
+
+ expect(
+ within(optionActions).getByRole('menuitem', { name: 'Remove option' }),
+ ).toBeVisible();
+ await userEvent.click(
+ within(optionActions).getByRole('menuitem', { name: 'Set as default' }),
+ );
+ await waitFor(() => expect(optionActions).not.toBeInTheDocument());
+
+ await waitFor(() => expect(optionActionsTrigger).toBeDisabled());
+ await userEvent.click(optionActionsTrigger);
+ expect(body.queryByRole('menu')).not.toBeInTheDocument();
+
+ const colorTrigger = canvas.getByRole('button', { name: 'Color' });
+
+ await userEvent.click(colorTrigger);
+ const colorPicker = await body.findByRole('dialog', { name: 'Color' });
+
+ await userEvent.click(
+ within(colorPicker).getByRole('button', { name: 'Red' }),
+ );
+ await waitFor(() => expect(colorPicker).not.toBeInTheDocument());
+ await waitFor(() => expect(colorTrigger).toHaveFocus());
+ await userEvent.click(colorTrigger);
+ expect(
+ await body.findByRole('button', { name: 'Red', pressed: true }),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+
+ await userEvent.click(optionsMenuTrigger);
+ const optionsMenu = await body.findByRole('menu', {
+ name: 'More options',
+ });
+
+ await userEvent.click(
+ within(optionsMenu).getByRole('menuitem', { name: 'Bulk edit' }),
+ );
+ expect(
+ await canvas.findByPlaceholderText('Enter one option per line'),
+ ).toHaveValue('Option 1');
+ await userEvent.click(optionsMenuTrigger);
+ await userEvent.click(
+ await body.findByRole('menuitem', { name: 'Single edit' }),
+ );
+ expect(await canvas.findByDisplayValue('Option 1')).toBeVisible();
+
+ await userEvent.click(optionsMenuTrigger);
+ await userEvent.click(
+ await body.findByRole('menuitem', { name: 'Remove all' }),
+ );
+ await waitFor(() =>
+ expect(
+ canvas.queryByRole('button', { name: 'Color' }),
+ ).not.toBeInTheDocument(),
+ );
+ },
};
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 0bf50e8ae8d..27cd69d2667 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
@@ -1,4 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { styled } from '@linaria/react';
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { Controller, useFormContext } from 'react-hook-form';
@@ -23,18 +22,16 @@ import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToStr
import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';
import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
import { TextArea } from '@/ui/input/components/TextArea';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { LightButton, LightIconButton } from 'twenty-ui/components';
+import { Dropdown, LightButton, LightIconButton } from 'twenty-ui/components';
import {
IconDotsVertical,
IconPencil,
@@ -194,7 +191,6 @@ export const SettingsDataModelFieldSelectForm = ({
const OPTIONS_DROPDOWN_ID =
'settings-data-model-field-select-options-dropdown';
- const { closeDropdown: closeOptionsDropdown } = useCloseDropdown();
useEffect(() => {
const newOptionValue = searchParams.get('newOption');
@@ -365,49 +361,45 @@ export const SettingsDataModelFieldSelectForm = ({
</StyledOptionsLabel>
</StyledLabelContainer>
{!disabled && (
- <Dropdown
- dropdownId={OPTIONS_DROPDOWN_ID}
- clickableComponent={
- <LightIconButton
- emphasis="subtle"
- aria-label={t`More options`}
- >
- <IconDotsVertical />
- </LightIconButton>
- }
- dropdownComponents={
- <LegacyDropdownContent
- widthInPixels={GenericDropdownContentWidth.Narrow}
- >
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconPencil />}
- onClick={() => {
- if (!isBulkInputMode) {
- setBulkInputText(
- convertOptionsToBulkText(options),
- );
- }
- setIsBulkInputMode(
- (currentInputMode) => !currentInputMode,
+ <DropdownRoot dropdownId={OPTIONS_DROPDOWN_ID} type="menu">
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ emphasis="subtle"
+ aria-label={t`More options`}
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent
+ width={GenericDropdownContentWidth.Narrow}
+ align="end"
+ >
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconPencil />}
+ onClick={() => {
+ if (!isBulkInputMode) {
+ setBulkInputText(
+ convertOptionsToBulkText(options),
);
- closeOptionsDropdown(OPTIONS_DROPDOWN_ID);
- }}
- >
- {isBulkInputMode ? t`Single edit` : t`Bulk edit`}
- </ListItem>
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- onChange([]);
- closeOptionsDropdown(OPTIONS_DROPDOWN_ID);
- }}
- >{t`Remove all`}</ListItem>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ }
+ setIsBulkInputMode(
+ (currentInputMode) => !currentInputMode,
+ );
+ }}
+ >
+ {isBulkInputMode ? t`Single edit` : t`Bulk edit`}
+ </Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={() => onChange([])}
+ >{t`Remove all`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
)}
</StyledOptionsHeaderContainer>
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 c407c97196c..090bc523d6e 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
@@ -2,13 +2,16 @@ import { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetad
import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
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 { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { LightIconButton, type ColorLabels } from 'twenty-ui/components';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ Dropdown,
+ LightIconButton,
+ type ColorLabels,
+} from 'twenty-ui/components';
import {
IconCheck,
IconDotsVertical,
@@ -17,7 +20,6 @@ import {
IconX,
} from 'twenty-ui/icon';
import { ColorSample } from 'twenty-ui/primitives/data-display';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { MAIN_COLOR_NAMES, useTheme, themeCssVariables } from 'twenty-ui/theme';
import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';
@@ -118,9 +120,6 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
const SELECT_COLOR_DROPDOWN_ID = `select-color-dropdown-${option.id}`;
const SELECT_ACTIONS_DROPDOWN_ID = `select-actions-dropdown-${option.id}`;
- const { closeDropdown: closeColorDropdown } = useCloseDropdown();
- const { closeDropdown: closeActionsDropdown } = useCloseDropdown();
-
const shouldForbidRemoveAsDefault = isDefault && !fieldIsNullable;
const handleInputEnter = () => {
@@ -155,37 +154,29 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
/>
</StyledOptionInputContainer>
</AdvancedSettingsWrapper>
- <Dropdown
- dropdownId={SELECT_COLOR_DROPDOWN_ID}
- dropdownPlacement="bottom-start"
- clickableComponent={
- <StyledColorSampleContainer>
- <ColorSample colorName={option.color} />
- </StyledColorSampleContainer>
- }
- dropdownComponents={
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- {MAIN_COLOR_NAMES.map((colorName) => (
- <ListItem
- key={colorName}
- onClick={() => {
- onChange({ ...option, color: colorName });
- closeColorDropdown(SELECT_COLOR_DROPDOWN_ID);
- }}
- role="option"
- aria-selected={colorName === option.color}
- selected={colorName === option.color}
- indicator="check"
- startIcon={<ColorSample colorName={colorName} />}
- >
- {colorLabels[colorName]}
- </ListItem>
- ))}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ <DropdownRoot dropdownId={SELECT_COLOR_DROPDOWN_ID} type="picker">
+ <Dropdown.Trigger
+ render={<StyledColorSampleContainer />}
+ nativeButton={false}
+ aria-label={t`Color`}
+ >
+ <ColorSample colorName={option.color} />
+ </Dropdown.Trigger>
+ <DropdownContent align="start">
+ <Dropdown.Section>
+ {MAIN_COLOR_NAMES.map((colorName) => (
+ <Dropdown.OptionItem
+ key={colorName}
+ selected={colorName === option.color}
+ onSelect={() => onChange({ ...option, color: colorName })}
+ startIcon={<ColorSample colorName={colorName} />}
+ >
+ {colorLabels[colorName]}
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
<StyledOptionInputContainer>
<SettingsTextInput
instanceId={`select-option-label-${option.id}`}
@@ -209,56 +200,44 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
autoSelectOnMount={isNewRow}
/>
</StyledOptionInputContainer>
- <Dropdown
- dropdownId={SELECT_ACTIONS_DROPDOWN_ID}
- dropdownPlacement="right-start"
- clickableComponent={
- <StyledLightIconButtonContainer>
- <LightIconButton
- emphasis="subtle"
- disabled={shouldForbidRemoveAsDefault}
- aria-label={t`More options`}
- >
- <IconDotsVertical />
- </LightIconButton>
- </StyledLightIconButtonContainer>
- }
- dropdownComponents={
- shouldForbidRemoveAsDefault ? null : (
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- {isDefault ? (
- <ListItem
- startIcon={<IconX />}
- onClick={() => {
- onRemoveAsDefault?.();
- closeActionsDropdown(SELECT_ACTIONS_DROPDOWN_ID);
- }}
- >{t`Remove as default`}</ListItem>
- ) : (
- <ListItem
- startIcon={<IconCheck />}
- onClick={() => {
- onSetAsDefault?.();
- closeActionsDropdown(SELECT_ACTIONS_DROPDOWN_ID);
- }}
- >{t`Set as default`}</ListItem>
- )}
- {!!onRemove && !isDefault && (
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={() => {
- onRemove();
- closeActionsDropdown(SELECT_ACTIONS_DROPDOWN_ID);
- }}
- >{t`Remove option`}</ListItem>
- )}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- )
- }
- />
+ <DropdownRoot dropdownId={SELECT_ACTIONS_DROPDOWN_ID} type="menu">
+ <StyledLightIconButtonContainer>
+ <Dropdown.Trigger
+ disabled={shouldForbidRemoveAsDefault}
+ render={
+ <LightIconButton
+ emphasis="subtle"
+ disabled={shouldForbidRemoveAsDefault}
+ aria-label={t`More options`}
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ </StyledLightIconButtonContainer>
+ <DropdownContent side="right" align="start">
+ <Dropdown.Section>
+ {isDefault ? (
+ <Dropdown.ActionItem
+ startIcon={<IconX />}
+ onClick={() => onRemoveAsDefault?.()}
+ >{t`Remove as default`}</Dropdown.ActionItem>
+ ) : (
+ <Dropdown.ActionItem
+ startIcon={<IconCheck />}
+ onClick={() => onSetAsDefault?.()}
+ >{t`Set as default`}</Dropdown.ActionItem>
+ )}
+ {isDefined(onRemove) && !isDefault && (
+ <Dropdown.ActionItem
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={() => onRemove()}
+ >{t`Remove option`}</Dropdown.ActionItem>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</StyledRow>
);
};
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 6abe122b9ee..1162f033cdc 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
@@ -7,17 +7,21 @@ import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFi
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 { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { type ReactNode, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { MAX_CUSTOM_INDEXES_PER_OBJECT } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { SearchInput, SettingsRow, useToast } from 'twenty-ui/components';
+import {
+ Dropdown,
+ SearchInput,
+ SettingsRow,
+ useToast,
+} from 'twenty-ui/components';
import { IconEyeOff, IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -164,26 +168,24 @@ export const SettingsObjectIndexesSection = ({
placeholder={t`Search an index...`}
value={searchTerm}
onChange={setSearchTerm}
- filterDropdown={(filterButton: ReactNode) => (
- <Dropdown
+ filterDropdown={(filterButton) => (
+ <DropdownRoot
dropdownId={HIDE_SYSTEM_INDEXES_DROPDOWN_ID}
- dropdownPlacement="bottom-end"
- dropdownOffset={{ x: 0, y: 8 }}
- clickableComponent={filterButton}
- dropdownComponents={
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- <SettingsRow
- startIcon={<IconEyeOff />}
- onCheckedChange={() =>
- setHideSystemIndexes(!hideSystemIndexes)
- }
- checked={hideSystemIndexes}
- >{t`Hide system indexes`}</SettingsRow>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ type="panel"
+ >
+ <Dropdown.Trigger render={filterButton} />
+ <DropdownContent align="end" sideOffset={8}>
+ <Dropdown.Section>
+ <SettingsRow
+ startIcon={<IconEyeOff />}
+ onCheckedChange={() =>
+ setHideSystemIndexes(!hideSystemIndexes)
+ }
+ checked={hideSystemIndexes}
+ >{t`Hide system indexes`}</SettingsRow>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
)}
/>
<SettingsObjectIndexTable
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 1fa224f2eec..e5d10eb875a 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
@@ -8,10 +8,8 @@ import { SettingsObjectFieldDataType } from '@/settings/data-model/object-detail
import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-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 { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
@@ -20,7 +18,7 @@ import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
-import { LightIconButton, useToast } from 'twenty-ui/components';
+import { Dropdown, LightIconButton, useToast } from 'twenty-ui/components';
import {
IconEye,
IconPlus,
@@ -29,7 +27,6 @@ import {
useIcons,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { Card } from 'twenty-ui/primitives/surfaces';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
import { FeatureFlagKey } from '~/generated-metadata/graphql';
@@ -110,7 +107,6 @@ export const SettingsObjectSearchSection = ({
const theme = useTheme();
const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
const { updateOneFieldMetadataItem } = useUpdateOneFieldMetadataItem();
- const { closeDropdown } = useCloseDropdown();
const { enqueueToast } = useToast();
const isConfigurableSearchFieldsEnabled = useIsFeatureEnabled(
@@ -254,41 +250,36 @@ export const SettingsObjectSearchSection = ({
)}
{isEditable && (
<StyledButtonContainer>
- <Dropdown
- dropdownId={ADD_SEARCH_FIELD_DROPDOWN_ID}
- dropdownPlacement="bottom-end"
- dropdownOffset={{ x: 0, y: 8 }}
- clickableComponent={
- <Button
- startIcon={<IconPlus />}
- size="sm"
- disabled={addableFields.length === 0}
- variant="outline"
- >{t`Add field`}</Button>
- }
- dropdownComponents={
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer hasMaxHeight>
- {addableFields.map((field) => {
- const FieldIcon = getIcon(field.icon);
+ <DropdownRoot dropdownId={ADD_SEARCH_FIELD_DROPDOWN_ID} type="menu">
+ <Dropdown.Trigger
+ disabled={addableFields.length === 0}
+ render={
+ <Button
+ startIcon={<IconPlus />}
+ size="sm"
+ disabled={addableFields.length === 0}
+ variant="outline"
+ >{t`Add field`}</Button>
+ }
+ />
+ <DropdownContent align="end" sideOffset={8}>
+ <Dropdown.Section scrollable>
+ {addableFields.map((field) => {
+ const FieldIcon = getIcon(field.icon);
- return (
- <ListItem
- key={field.id}
- startIcon={<SelectOptionIcon Icon={FieldIcon} />}
- onClick={() => {
- closeDropdown(ADD_SEARCH_FIELD_DROPDOWN_ID);
- handleSetFieldSearchable(field.id, true);
- }}
- >
- {field.label}
- </ListItem>
- );
- })}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ return (
+ <Dropdown.ActionItem
+ key={field.id}
+ startIcon={<SelectOptionIcon Icon={FieldIcon} />}
+ onClick={() => handleSetFieldSearchable(field.id, true)}
+ >
+ {field.label}
+ </Dropdown.ActionItem>
+ );
+ })}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</StyledButtonContainer>
)}
</StyledSearchSectionContent>
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 16a84df340b..6a267739a96 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
@@ -1,22 +1,13 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';
import { SelectControl } from '@/ui/input/components/SelectControl';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-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';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-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 { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components';
import {
IconBox,
IconDatabase,
@@ -26,7 +17,6 @@ import {
IconWebhook,
} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/primitives/input';
-import { ListItem } from 'twenty-ui/primitives/navigation';
const WEBHOOK_ENTITY_DROPDOWN_ID = 'webhook-entity-select';
@@ -47,12 +37,6 @@ export const WebhookEntitySelect = ({
useObjectMetadataSelectHelpers();
const [searchInput, setSearchInput] = useState('');
const { objectMetadataItems } = useObjectMetadataItems();
- const { closeDropdown } = useCloseDropdown();
-
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- dropdownId,
- );
const metadataOptions: SelectOption<string>[] = [
{ label: t`All Metadata`, value: 'metadata.*', Icon: IconFileInfo },
@@ -93,110 +77,78 @@ export const WebhookEntitySelect = ({
(option) => option.value === value,
) ?? { label: value, value, Icon: IconBox });
- const handleSelect = (selectedValue: string) => {
- if (disabled) return;
- onChange(selectedValue);
- closeDropdown(dropdownId);
- setSearchInput('');
+ const handleOpenChange = (open: boolean) => {
+ if (!open) {
+ setSearchInput('');
+ }
};
const shouldShowObjects = filteredObjectOptions.length > 0;
const shouldShowMetadata = filteredMetadataOptions.length > 0;
const shouldShowSeparator = shouldShowObjects && shouldShowMetadata;
- const selectableItemIds = [
- ...filteredObjectOptions.map((opt) => opt.value),
- ...filteredMetadataOptions.map((opt) => opt.value),
- ];
-
return (
- <Dropdown
+ <DropdownRoot
dropdownId={dropdownId}
- dropdownPlacement="bottom-start"
- disableClickForClickableComponent={disabled}
- onClose={() => setSearchInput('')}
- clickableComponent={
+ type="picker"
+ onOpenChange={handleOpenChange}
+ >
+ <Dropdown.Trigger
+ render={<div />}
+ nativeButton={false}
+ disabled={disabled}
+ >
<SelectControl
selectedOption={selectedOption}
isDisabled={disabled}
textAccent={!isDefined(value) ? 'placeholder' : 'default'}
/>
- }
- dropdownComponents={
- <LegacyDropdownContent
- widthInPixels={GenericDropdownContentWidth.Medium}
- >
- <DropdownMenuSearchInput
- autoFocus
- value={searchInput}
- placeholder={t`Search...`}
- onChange={(event) => setSearchInput(event.target.value)}
- />
- <DropdownMenuSeparator />
- <SelectableList
- selectableListInstanceId={dropdownId}
- selectableItemIdArray={selectableItemIds}
- focusId={dropdownId}
- >
- <DropdownMenuItemsContainer hasMaxHeight>
- {shouldShowObjects && (
- <>
- <DropdownMenuSectionLabel label={t`Core Objects`} />
- {filteredObjectOptions.map((option) => (
- <SelectableListItem
- key={option.value}
- itemId={option.value}
- onEnter={() => handleSelect(option.value)}
- >
- <ListItem
- focused={selectedItemId === option.value}
- onClick={() => handleSelect(option.value)}
- role="option"
- aria-selected={value === option.value}
- selected={value === option.value}
- indicator="check"
- startIcon={
- <SelectOptionIcon
- Icon={option.Icon}
- color={option.iconThemeColor}
- />
- }
- >
- {option.label}
- </ListItem>
- </SelectableListItem>
- ))}
- </>
- )}
- {shouldShowSeparator && <DropdownMenuSeparator />}
- {shouldShowMetadata && (
- <>
- <DropdownMenuSectionLabel label={t`Metadata`} />
- {filteredMetadataOptions.map((option) => (
- <SelectableListItem
- key={option.value}
- itemId={option.value}
- onEnter={() => handleSelect(option.value)}
- >
- <ListItem
- focused={selectedItemId === option.value}
- onClick={() => handleSelect(option.value)}
- role="option"
- aria-selected={value === option.value}
- selected={value === option.value}
- indicator="check"
- startIcon={<SelectOptionIcon Icon={option.Icon} />}
- >
- {option.label}
- </ListItem>
- </SelectableListItem>
- ))}
- </>
- )}
- </DropdownMenuItemsContainer>
- </SelectableList>
- </LegacyDropdownContent>
- }
- />
+ </Dropdown.Trigger>
+ <DropdownContent align="start" aria-label={t`Select entity`}>
+ <Dropdown.Search
+ value={searchInput}
+ placeholder={t`Search...`}
+ aria-label={t`Search`}
+ onValueChange={setSearchInput}
+ />
+ <Dropdown.Separator />
+ <Dropdown.Section scrollable>
+ {shouldShowObjects && (
+ <Dropdown.Section label={t`Core Objects`}>
+ {filteredObjectOptions.map((option) => (
+ <Dropdown.OptionItem
+ key={option.value}
+ selected={value === option.value}
+ onSelect={() => onChange(option.value)}
+ startIcon={
+ <SelectOptionIcon
+ Icon={option.Icon}
+ color={option.iconThemeColor}
+ />
+ }
+ >
+ {option.label}
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ )}
+ {shouldShowSeparator && <Dropdown.Separator />}
+ {shouldShowMetadata && (
+ <Dropdown.Section label={t`Metadata`}>
+ {filteredMetadataOptions.map((option) => (
+ <Dropdown.OptionItem
+ key={option.value}
+ selected={value === option.value}
+ onSelect={() => onChange(option.value)}
+ startIcon={<SelectOptionIcon Icon={option.Icon} />}
+ >
+ {option.label}
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ )}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
index 4cfb9074baa..7afa7385c11 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { HttpResponse, graphql } from 'msw';
-import { expect, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { SettingsDevelopersWebhookForm } from '@/settings/developers/components/SettingsDevelopersWebhookForm';
import { WebhookFormMode } from '@/settings/developers/constants/WebhookFormMode';
@@ -70,6 +70,65 @@ export const EditMode: Story = {
},
};
+export const EntityPicker: Story = {
+ args: {
+ mode: WebhookFormMode.Edit,
+ webhookId: '1234',
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [trigger] = await canvas.findAllByRole(
+ 'button',
+ { name: 'All Objects' },
+ { timeout: 3000 },
+ );
+
+ await userEvent.click(trigger);
+ const picker = await body.findByRole('dialog', { name: 'Select entity' });
+ const search = within(picker).getByRole('searchbox', { name: 'Search' });
+
+ await waitFor(() => expect(search).toHaveFocus());
+ expect(
+ within(picker).getByRole('group', { name: 'Core Objects' }),
+ ).toBeVisible();
+ expect(
+ within(picker).getByRole('group', { name: 'Metadata' }),
+ ).toBeVisible();
+
+ await userEvent.type(search, 'compan');
+ expect(
+ within(picker).queryByRole('group', { name: 'Metadata' }),
+ ).not.toBeInTheDocument();
+ await waitFor(() =>
+ expect(
+ within(picker).getByRole('button', { name: 'Companies' }),
+ ).toHaveAttribute('data-highlighted'),
+ );
+ await userEvent.keyboard('{Enter}');
+ await waitFor(() => expect(picker).not.toBeInTheDocument());
+ expect(trigger).toHaveTextContent('Companies');
+
+ await userEvent.click(trigger);
+ const reopenedPicker = await body.findByRole('dialog', {
+ name: 'Select entity',
+ });
+
+ expect(
+ within(reopenedPicker).getByRole('searchbox', { name: 'Search' }),
+ ).toHaveValue('');
+ expect(
+ within(reopenedPicker).getByRole('button', {
+ name: 'Companies',
+ pressed: true,
+ }),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(reopenedPicker).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
+
export const QueryError: Story = {
args: {
mode: WebhookFormMode.Edit,
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 a37c0b3683b..831ad3108db 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -2,16 +2,15 @@ import { SettingsRolesTableHeader } from '@/settings/roles/components/SettingsRo
import { SettingsRolesTableRow } from '@/settings/roles/components/SettingsRolesTableRow';
import { useSettingsAllRoles } from '@/settings/roles/hooks/useSettingsAllRoles';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
-import { Section, SettingsRow } from 'twenty-ui/components';
+import { Dropdown, Section, SettingsRow } from 'twenty-ui/components';
import {
IconFilter,
IconKey,
@@ -92,35 +91,32 @@ export const SettingsRolesList = () => {
onChange={setSearchTerm}
/>
</StyledSearchInputContainer>
- <Dropdown
- dropdownId="settings-roles-filter-dropdown"
- dropdownPlacement="bottom-end"
- dropdownOffset={{ x: 0, y: 8 }}
- clickableComponent={
- <Button
- startIcon={<IconFilter />}
- size="md"
- aria-label={t`Filter`}
- variant="outline"
- />
- }
- dropdownComponents={
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- <SettingsRow
- startIcon={<IconLego />}
- onCheckedChange={() => setShowAgentRoles(!showAgentRoles)}
- checked={showAgentRoles}
- >{t`Agent roles`}</SettingsRow>
- <SettingsRow
- startIcon={<IconKey />}
- onCheckedChange={() => setShowApiKeyRoles(!showApiKeyRoles)}
- checked={showApiKeyRoles}
- >{t`API key roles`}</SettingsRow>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- />
+ <DropdownRoot dropdownId="settings-roles-filter-dropdown" type="panel">
+ <Dropdown.Trigger
+ render={
+ <Button
+ startIcon={<IconFilter />}
+ size="md"
+ aria-label={t`Filter`}
+ variant="outline"
+ />
+ }
+ />
+ <DropdownContent align="end" sideOffset={8}>
+ <Dropdown.Section>
+ <SettingsRow
+ startIcon={<IconLego />}
+ onCheckedChange={() => setShowAgentRoles(!showAgentRoles)}
+ checked={showAgentRoles}
+ >{t`Agent roles`}</SettingsRow>
+ <SettingsRow
+ startIcon={<IconKey />}
+ onCheckedChange={() => setShowApiKeyRoles(!showApiKeyRoles)}
+ checked={showApiKeyRoles}
+ >{t`API key roles`}</SettingsRow>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
</StyledSearchAndFilterContainer>
<Table>
diff --git a/packages/twenty-front/src/modules/settings/roles/components/__stories__/SettingsRolesList.stories.tsx b/packages/twenty-front/src/modules/settings/roles/components/__stories__/SettingsRolesList.stories.tsx
new file mode 100644
index 00000000000..f93dc9a341c
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/roles/components/__stories__/SettingsRolesList.stories.tsx
@@ -0,0 +1,91 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { SettingsRolesList } from '@/settings/roles/components/SettingsRolesList';
+import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';
+import { settingsRoleIdsState } from '@/settings/roles/states/settingsRoleIdsState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
+import { mockedRoles } from '~/testing/mock-data/generated/metadata/roles/mock-roles-data';
+
+const ROLES = [
+ ...mockedRoles,
+ {
+ ...mockedRoles[1],
+ id: 'agent-only-role',
+ label: 'Agent only',
+ canBeAssignedToUsers: false,
+ canBeAssignedToAgents: true,
+ canBeAssignedToApiKeys: false,
+ workspaceMembers: [],
+ },
+ {
+ ...mockedRoles[1],
+ id: 'api-key-only-role',
+ label: 'API key only',
+ canBeAssignedToUsers: false,
+ canBeAssignedToAgents: false,
+ canBeAssignedToApiKeys: true,
+ workspaceMembers: [],
+ },
+];
+
+const meta: Meta<typeof SettingsRolesList> = {
+ title: 'Modules/Settings/Roles/SettingsRolesList',
+ component: SettingsRolesList,
+ decorators: [ComponentWithRouterDecorator],
+ beforeEach: () => {
+ jotaiStore.set(
+ settingsRoleIdsState.atom,
+ ROLES.map((role) => role.id),
+ );
+
+ for (const role of ROLES) {
+ jotaiStore.set(
+ settingsPersistedRoleFamilyState.atomFamily(role.id),
+ role,
+ );
+ }
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsRolesList>;
+
+export const FilterPanelTogglesStayOpen: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ expect(await canvas.findByText('Admin')).toBeVisible();
+ expect(canvas.queryByText('Agent only')).not.toBeInTheDocument();
+
+ const trigger = canvas.getByRole('button', { name: 'Filter' });
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', { name: 'Filter' });
+ const agentRoles = within(popup).getByRole('switch', {
+ name: 'Agent roles',
+ });
+
+ await waitFor(() => expect(agentRoles).toHaveFocus());
+ await userEvent.keyboard(' ');
+ expect(agentRoles).toBeChecked();
+ expect(await canvas.findByText('Agent only')).toBeVisible();
+ expect(popup).toBeVisible();
+
+ await userEvent.tab();
+ const apiKeyRoles = within(popup).getByRole('switch', {
+ name: 'API key roles',
+ });
+
+ expect(apiKeyRoles).toHaveFocus();
+ await userEvent.keyboard(' ');
+ expect(apiKeyRoles).toBeChecked();
+ expect(await canvas.findByText('API key only')).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index 979485d2bc2..590d6e20e8c 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -2,10 +2,11 @@ import { type CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMembe
import { SettingsRoleAssignmentEntityPickerDropdown } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown';
import { SettingsRoleAssignmentTable } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentTable';
import { SettingsRoleAssignmentWorkspaceMemberPickerDropdown } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { styled } from '@linaria/react';
-import { Section } from 'twenty-ui/components';
+import { Dropdown, Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { Button } from 'twenty-ui/primitives/input';
@@ -45,7 +46,6 @@ export const RoleAssignmentSection = ({
allWorkspaceMembersHaveThisRole,
}: RoleAssignmentSectionProps) => {
const config = ROLE_TARGET_CONFIG[roleTargetType];
- const { closeDropdown } = useCloseDropdown();
if (!config.canBeAssigned(settingsDraftRole)) {
return null;
@@ -64,52 +64,57 @@ export const RoleAssignmentSection = ({
roleTargetType={roleTargetType}
/>
<StyledAssignToMemberContainer>
- <Dropdown
- dropdownId={config.dropdownId}
- dropdownOffset={{ x: 0, y: 4 }}
- clickableComponent={
- <Tooltip
- content={config.tooltip?.content()}
- delay={TooltipDelay.noDelay}
- disabled={
- !config.tooltip?.shouldShow(allWorkspaceMembersHaveThisRole)
- }
- >
- <div>
- <Button
- startIcon={<IconPlus />}
- size="sm"
- disabled={allWorkspaceMembersHaveThisRole}
- variant="outline"
- >
- {config.buttonTitle()}
- </Button>
- </div>
- </Tooltip>
- }
- dropdownComponents={
- roleTargetType === 'member' ? (
+ <DropdownRoot dropdownId={config.dropdownId} type="picker">
+ <Tooltip
+ content={config.tooltip?.content()}
+ delay={TooltipDelay.noDelay}
+ disabled={
+ !config.tooltip?.shouldShow(allWorkspaceMembersHaveThisRole)
+ }
+ >
+ <div>
+ <Dropdown.Trigger
+ disabled={allWorkspaceMembersHaveThisRole}
+ render={
+ <Button
+ startIcon={<IconPlus />}
+ size="sm"
+ disabled={allWorkspaceMembersHaveThisRole}
+ variant="outline"
+ >
+ {config.buttonTitle()}
+ </Button>
+ }
+ />
+ </div>
+ </Tooltip>
+ <DropdownContent
+ width={
+ roleTargetType === 'member'
+ ? GenericDropdownContentWidth.ExtraLarge
+ : GenericDropdownContentWidth.Medium
+ }
+ align="end"
+ sideOffset={4}
+ >
+ {roleTargetType === 'member' ? (
<SettingsRoleAssignmentWorkspaceMemberPickerDropdown
excludedWorkspaceMemberIds={excludedIds}
- onSelect={(roleTarget: PartialWorkspaceMember) => {
- closeDropdown(config.dropdownId);
- onSelect(roleTarget, roleTargetType);
- }}
+ onSelect={(roleTarget: PartialWorkspaceMember) =>
+ onSelect(roleTarget, roleTargetType)
+ }
/>
) : (
<SettingsRoleAssignmentEntityPickerDropdown
entityType={roleTargetType}
excludedIds={excludedIds}
- onSelect={(
- roleTarget: PartialWorkspaceMember | Agent | ApiKeyForRole,
- ) => {
- closeDropdown(config.dropdownId);
- onSelect(roleTarget, roleTargetType);
- }}
+ onSelect={(roleTarget: Agent | ApiKeyForRole) =>
+ onSelect(roleTarget, roleTargetType)
+ }
/>
- )
- }
- />
+ )}
+ </DropdownContent>
+ </DropdownRoot>
</StyledAssignToMemberContainer>
</Section.Root>
);
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 f8ac3342429..13ccf871f5b 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,13 +1,7 @@
-import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
-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';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { useQuery } from '@apollo/client/react';
+import { Dropdown } from 'twenty-ui/components';
import {
type Agent,
type ApiKeyForRole,
@@ -15,26 +9,6 @@ import {
GetApiKeysDocument,
} from '~/generated-metadata/graphql';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
-import { themeCssVariables } from 'twenty-ui/theme';
-
-const StyledLoadingContainer = styled.div`
- padding: ${themeCssVariables.spacing[2]};
- text-align: center;
-`;
-
-const StyledDropdownItem = styled.div`
- cursor: pointer;
- padding: ${themeCssVariables.spacing[2]};
-
- &:hover {
- background-color: ${themeCssVariables.background.transparent.lighter};
- }
-`;
-
-const StyledItemName = styled.div`
- color: ${themeCssVariables.font.color.secondary};
- font-weight: ${themeCssVariables.font.weight.medium};
-`;
type EntityData = Agent | ApiKeyForRole;
@@ -111,33 +85,29 @@ export const SettingsRoleAssignmentEntityPickerDropdown = ({
}, [entities, searchFilter, excludedIds, isAgent]);
return (
- <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>
- <DropdownMenuSearchInput
+ <>
+ <Dropdown.Search
value={searchFilter}
- onChange={(event) => setSearchFilter(event.target.value)}
+ onValueChange={setSearchFilter}
placeholder={placeholder}
+ aria-label={placeholder}
/>
- <DropdownMenuSeparator />
- <DropdownMenuItemsContainer hasMaxHeight>
- {loading ? (
- <StyledLoadingContainer>{t`Loading...`}</StyledLoadingContainer>
- ) : filteredEntities.length > 0 ? (
+ <Dropdown.Separator />
+ <Dropdown.Section scrollable>
+ {loading && <Dropdown.Loading>{t`Loading...`}</Dropdown.Loading>}
+ {!loading && filteredEntities.length === 0 && (
+ <Dropdown.Empty>{getEmptyStateMessage()}</Dropdown.Empty>
+ )}
+ {!loading &&
filteredEntities.map((entity) => (
- <StyledDropdownItem
+ <Dropdown.ActionItem
key={entity.id}
- onClick={() => onSelect(entity as EntityData)}
+ onClick={() => onSelect(entity)}
>
- <StyledItemName>
- {isAgent ? (entity as Agent).label : entity.name}
- </StyledItemName>
- </StyledDropdownItem>
- ))
- ) : (
- <SettingsEmptyPlaceholder padding="2">
- {getEmptyStateMessage()}
- </SettingsEmptyPlaceholder>
- )}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ {isAgent ? (entity as Agent).label : entity.name}
+ </Dropdown.ActionItem>
+ ))}
+ </Dropdown.Section>
+ </>
);
};
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 2c1334334bd..53212539211 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,13 +4,9 @@ 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 { 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';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useLingui } from '@lingui/react/macro';
-import { type ChangeEvent, useState } from 'react';
+import { useState } from 'react';
+import { Dropdown } from 'twenty-ui/components';
type SettingsRoleAssignmentWorkspaceMemberPickerDropdownProps = {
excludedWorkspaceMemberIds: string[];
@@ -43,34 +39,26 @@ export const SettingsRoleAssignmentWorkspaceMemberPickerDropdown = ({
!excludedWorkspaceMemberIds.includes(workspaceMember.recordId),
) ?? [];
- const handleSearchFilterChange = (event: ChangeEvent<HTMLInputElement>) => {
- setSearchFilter(event.target.value);
- };
const { t } = useLingui();
return (
<>
<ToastOnQueryErrorEffect error={error} />
- <LegacyDropdownContent
- widthInPixels={GenericDropdownContentWidth.ExtraLarge}
- >
- <DropdownMenuSearchInput
- value={searchFilter}
- onChange={handleSearchFilterChange}
- placeholder={t`Search`}
+ <Dropdown.Search
+ value={searchFilter}
+ onValueChange={setSearchFilter}
+ placeholder={t`Search`}
+ aria-label={t`Search`}
+ />
+ <Dropdown.Separator />
+ <Dropdown.Section scrollable>
+ <SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent
+ loading={loading}
+ searchFilter={searchFilter}
+ filteredWorkspaceMembers={filteredWorkspaceMembers as SearchRecord[]}
+ onSelect={onSelect}
/>
- <DropdownMenuSeparator />
- <DropdownMenuItemsContainer hasMaxHeight>
- <SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent
- loading={loading}
- searchFilter={searchFilter}
- filteredWorkspaceMembers={
- filteredWorkspaceMembers as SearchRecord[]
- }
- onSelect={onSelect}
- />
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ </Dropdown.Section>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
index ac0a65f45b3..c0d0d25d3b0 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
@@ -3,8 +3,8 @@ import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPart
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { MenuItemAvatar } from 'twenty-ui/components';
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { Dropdown } from 'twenty-ui/components';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { type SearchRecord } from '~/generated/graphql';
type SettingsRoleAssignmentWorkspaceMemberPickerDropdownContentProps = {
@@ -29,7 +29,7 @@ export const SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent = ({
}
if (!filteredWorkspaceMembers.length && searchFilter.length > 0) {
- return <ListItem disabled>{t`No Results`}</ListItem>;
+ return <Dropdown.Empty>{t`No Results`}</Dropdown.Empty>;
}
const enrichedWorkspaceMembers = filteredWorkspaceMembers
@@ -46,19 +46,22 @@ export const SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent = ({
const workspaceMemberFullName = `${workspaceMember?.name.firstName ?? ''} ${workspaceMember?.name.lastName ?? ''}`;
return (
- <MenuItemAvatar
+ <Dropdown.ActionItem
key={workspaceMember.id}
onClick={() => onSelect(workspaceMember)}
- avatar={{
- shape: 'circle',
- size: 'md',
- name: workspaceMemberFullName,
- colorSeed: workspaceMember.id,
- src: workspaceMember.avatarUrl,
- }}
- text={workspaceMemberFullName}
- contextualText={workspaceMember.userEmail}
- />
+ startIcon={
+ <Avatar
+ shape="circle"
+ size="md"
+ name={workspaceMemberFullName}
+ colorSeed={workspaceMember.id}
+ src={workspaceMember.avatarUrl}
+ />
+ }
+ description={workspaceMember.userEmail}
+ >
+ {workspaceMemberFullName}
+ </Dropdown.ActionItem>
);
})}
</>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
index 771ce7cbf87..f7a2f5e24be 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
@@ -1,6 +1,4 @@
import { type CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';
-import { SettingsRoleAssignmentEntityPickerDropdown } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentEntityPickerDropdown';
-import { SettingsRoleAssignmentWorkspaceMemberPickerDropdown } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown';
import { t } from '@lingui/core/macro';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import {
@@ -24,7 +22,6 @@ export const ROLE_TARGET_CONFIG = {
canBeAssigned: (settingsDraftRole: RoleWithPartialMembers) =>
settingsDraftRole.canBeAssignedToUsers,
buttonTitle: () => t`Assign to member`,
- dropdownComponent: SettingsRoleAssignmentWorkspaceMemberPickerDropdown,
tooltip: {
anchorId: 'assign-member',
content: () => t`All workspace members already have this role`,
@@ -42,7 +39,6 @@ export const ROLE_TARGET_CONFIG = {
canBeAssigned: (settingsDraftRole: RoleWithPartialMembers) =>
settingsDraftRole.canBeAssignedToAgents,
buttonTitle: () => t`Assign to agent`,
- dropdownComponent: SettingsRoleAssignmentEntityPickerDropdown,
tooltip: null,
},
apiKey: {
@@ -57,7 +53,6 @@ export const ROLE_TARGET_CONFIG = {
canBeAssigned: (settingsDraftRole: RoleWithPartialMembers) =>
settingsDraftRole.canBeAssignedToApiKeys,
buttonTitle: () => t`Assign to API key`,
- dropdownComponent: SettingsRoleAssignmentEntityPickerDropdown,
tooltip: null,
},
} as const;
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 5bc566381a3..1df9d9698f4 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,13 +1,10 @@
import { useResetObjectPermission } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useResetObjectPermission';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-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';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { t } from '@lingui/core/macro';
-import { IconButton } from 'twenty-ui/components';
+import { Link } from 'react-router-dom';
+import { Dropdown, IconButton } from 'twenty-ui/components';
import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
type SettingsRolePermissionsObjectLevelTableRowOptionsDropdownProps = {
roleId: string;
@@ -24,50 +21,36 @@ export const SettingsRolePermissionsObjectLevelTableRowOptionsDropdown = ({
}: SettingsRolePermissionsObjectLevelTableRowOptionsDropdownProps) => {
const dropdownId = `settings-role-object-level-options-${objectMetadataId}`;
- const { closeDropdown } = useCloseDropdown();
-
const { resetObjectPermission } = useResetObjectPermission(roleId);
- const handleRemove = () => {
- closeDropdown(dropdownId);
- resetObjectPermission(objectMetadataId);
- };
-
return (
- <Dropdown
- dropdownId={dropdownId}
- clickableComponent={
- <IconButton
- aria-label={t`Object permission options`}
- variant="ghost"
- size="sm"
- >
- <IconDotsVertical />
- </IconButton>
- }
- dropdownComponents={
- <LegacyDropdownContent>
+ <DropdownRoot dropdownId={dropdownId} type="menu">
+ <Dropdown.Trigger
+ render={
+ <IconButton
+ aria-label={t`Object permission options`}
+ variant="ghost"
+ size="sm"
+ >
+ <IconDotsVertical />
+ </IconButton>
+ }
+ />
+ <DropdownContent align="end">
+ <Dropdown.Section>
{isEditable && (
- <DropdownMenuItemsContainer>
- <UndecoratedLink
- fullWidth
- to={objectPermissionDetailUrl}
- onClick={() => closeDropdown(dropdownId)}
- >
- <ListItem startIcon={<IconPencil />}>{t`Edit`}</ListItem>
- </UndecoratedLink>
- </DropdownMenuItemsContainer>
+ <Dropdown.ActionItem
+ startIcon={<IconPencil />}
+ render={<Link to={objectPermissionDetailUrl} />}
+ >{t`Edit`}</Dropdown.ActionItem>
)}
- <DropdownMenuItemsContainer>
- <ListItem
- onClick={handleRemove}
- startIcon={<IconTrash />}
- color="danger"
- >{t`Remove rule`}</ListItem>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
- }
- dropdownPlacement="bottom-end"
- />
+ <Dropdown.ActionItem
+ startIcon={<IconTrash />}
+ color="danger"
+ onClick={() => resetObjectPermission(objectMetadataId)}
+ >{t`Remove rule`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
index ef37f24e7d4..046474d80c5 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
@@ -1,15 +1,15 @@
import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
+import { Dropdown } from 'twenty-ui/components';
import { IconFilter } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { SettingsUnsubscribersFilterMenuContent } from '@/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterMenuContent';
import { SettingsUnsubscribersFilterOptionsContent } from '@/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterOptionsContent';
-import { type SettingsUnsubscribersFilterContentId } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId';
import { type SettingsUnsubscribersFilterOption } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterOption';
import { SETTINGS_UNSUBSCRIBERS_ALL_FILTER } from '@/settings/unsubscribers/constants/SettingsUnsubscribersAllFilter';
import { getMessageSuppressionReasonBadge } from '@/settings/unsubscribers/utils/getMessageSuppressionReasonBadge';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import {
MessageSuppressionReason,
type UnsubscribeTopicsQuery,
@@ -42,11 +42,6 @@ export const SettingsUnsubscribersFilterDropdown = ({
}: SettingsUnsubscribersFilterDropdownProps) => {
const { t } = useLingui();
- const [contentId, setContentId] =
- useState<SettingsUnsubscribersFilterContentId | null>(null);
-
- const goToMenu = () => setContentId(null);
-
const reasonOptions: SettingsUnsubscribersFilterOption[] = [
{ value: SETTINGS_UNSUBSCRIBERS_ALL_FILTER, label: t`All reasons` },
...Object.values(MessageSuppressionReason).map((reason) => ({
@@ -67,56 +62,47 @@ export const SettingsUnsubscribersFilterDropdown = ({
reasonValue !== SETTINGS_UNSUBSCRIBERS_ALL_FILTER ||
topicValue !== SETTINGS_UNSUBSCRIBERS_ALL_FILTER;
- const renderContent = () => {
- switch (contentId) {
- case 'reason':
- return (
+ return (
+ <DropdownRoot
+ dropdownId={SETTINGS_UNSUBSCRIBERS_FILTER_DROPDOWN_ID}
+ type="picker"
+ >
+ <Dropdown.Trigger
+ render={
+ <Button
+ startIcon={<IconFilter />}
+ size="md"
+ aria-label={t`Filter unsubscribers`}
+ variant="outline"
+ />
+ }
+ />
+ <DropdownContent align="end" sideOffset={8}>
+ <Dropdown.Page id="root">
+ <SettingsUnsubscribersFilterMenuContent
+ reasonLabel={getOptionLabel(reasonOptions, reasonValue)}
+ topicLabel={getOptionLabel(topicOptions, topicValue)}
+ hasActiveFilters={hasActiveFilters}
+ onClear={onClear}
+ />
+ </Dropdown.Page>
+ <Dropdown.Page id="reason">
<SettingsUnsubscribersFilterOptionsContent
title={t`Reason`}
options={reasonOptions}
selectedValue={reasonValue}
onSelect={onChangeReason}
- onBack={goToMenu}
/>
- );
- case 'topic':
- return (
+ </Dropdown.Page>
+ <Dropdown.Page id="topic">
<SettingsUnsubscribersFilterOptionsContent
title={t`Topic`}
options={topicOptions}
selectedValue={topicValue}
onSelect={onChangeTopic}
- onBack={goToMenu}
- />
- );
- default:
- return (
- <SettingsUnsubscribersFilterMenuContent
- reasonLabel={getOptionLabel(reasonOptions, reasonValue)}
- topicLabel={getOptionLabel(topicOptions, topicValue)}
- hasActiveFilters={hasActiveFilters}
- onContentChange={setContentId}
- onClear={onClear}
/>
- );
- }
- };
-
- return (
- <Dropdown
- dropdownId={SETTINGS_UNSUBSCRIBERS_FILTER_DROPDOWN_ID}
- dropdownPlacement="bottom-end"
- dropdownOffset={{ x: 0, y: 8 }}
- onClose={goToMenu}
- clickableComponent={
- <Button
- startIcon={<IconFilter />}
- size="md"
- aria-label={t`Filter unsubscribers`}
- variant="outline"
- />
- }
- dropdownComponents={renderContent()}
- />
+ </Dropdown.Page>
+ </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 44a4fcb03fe..18643626d37 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
@@ -1,17 +1,11 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { useLingui } from '@lingui/react/macro';
+import { Dropdown } from 'twenty-ui/components';
import { IconMailCog, IconStatusChange, IconTrash } from 'twenty-ui/icon';
-import { type SettingsUnsubscribersFilterContentId } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-
type SettingsUnsubscribersFilterMenuContentProps = {
reasonLabel: string;
topicLabel: string;
hasActiveFilters: boolean;
- onContentChange: (contentId: SettingsUnsubscribersFilterContentId) => void;
onClear: () => void;
};
@@ -19,39 +13,35 @@ export const SettingsUnsubscribersFilterMenuContent = ({
reasonLabel,
topicLabel,
hasActiveFilters,
- onContentChange,
onClear,
}: SettingsUnsubscribersFilterMenuContentProps) => {
const { t } = useLingui();
return (
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer>
- <ListItem
- startIcon={<IconStatusChange />}
- description={reasonLabel}
- descriptionPlacement="end"
- hasSubmenu
- onClick={() => onContentChange('reason')}
- >{t`Reason`}</ListItem>
- <ListItem
- startIcon={<IconMailCog />}
- description={topicLabel}
- descriptionPlacement="end"
- hasSubmenu
- onClick={() => onContentChange('topic')}
- >{t`Topic`}</ListItem>
- {hasActiveFilters && (
- <>
- <DropdownMenuSeparator />
- <ListItem
- color="danger"
- startIcon={<IconTrash />}
- onClick={onClear}
- >{t`Clear filters`}</ListItem>
- </>
- )}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ startIcon={<IconStatusChange />}
+ description={reasonLabel}
+ descriptionPlacement="end"
+ page="reason"
+ >{t`Reason`}</Dropdown.ActionItem>
+ <Dropdown.ActionItem
+ startIcon={<IconMailCog />}
+ description={topicLabel}
+ descriptionPlacement="end"
+ page="topic"
+ >{t`Topic`}</Dropdown.ActionItem>
+ {hasActiveFilters && (
+ <>
+ <Dropdown.Separator />
+ <Dropdown.ActionItem
+ closeOnClick={false}
+ color="danger"
+ startIcon={<IconTrash />}
+ onClick={onClear}
+ >{t`Clear filters`}</Dropdown.ActionItem>
+ </>
+ )}
+ </Dropdown.Section>
);
};
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 c66e7803ceb..72e8e5041d7 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
@@ -1,19 +1,12 @@
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { Dropdown } from 'twenty-ui/components';
import { type SettingsUnsubscribersFilterOption } from '@/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterOption';
-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';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
type SettingsUnsubscribersFilterOptionsContentProps = {
title: string;
options: SettingsUnsubscribersFilterOption[];
selectedValue: string;
onSelect: (value: string) => void;
- onBack: () => void;
};
export const SettingsUnsubscribersFilterOptionsContent = ({
@@ -21,41 +14,21 @@ export const SettingsUnsubscribersFilterOptionsContent = ({
options,
selectedValue,
onSelect,
- onBack,
}: SettingsUnsubscribersFilterOptionsContentProps) => {
- const { closeDropdown } = useCloseDropdown();
-
- const handleSelect = (value: string) => {
- onSelect(value);
- closeDropdown();
- };
-
return (
- <LegacyDropdownContent>
- <DropdownMenuHeader
- StartComponent={
- <DropdownMenuHeaderLeftComponent
- onClick={onBack}
- Icon={IconChevronLeft}
- />
- }
- >
- {title}
- </DropdownMenuHeader>
- <DropdownMenuItemsContainer>
+ <>
+ <Dropdown.Back>{title}</Dropdown.Back>
+ <Dropdown.Section>
{options.map((option) => (
- <ListItem
+ <Dropdown.OptionItem
key={option.value}
- onClick={() => handleSelect(option.value)}
- role="option"
- aria-selected={selectedValue === option.value}
selected={selectedValue === option.value}
- indicator="check"
+ onSelect={() => onSelect(option.value)}
>
{option.label}
- </ListItem>
+ </Dropdown.OptionItem>
))}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ </Dropdown.Section>
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx
new file mode 100644
index 00000000000..96a0999e8e8
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx
@@ -0,0 +1,111 @@
+import { SettingsUnsubscribersFilterDropdown } from '@/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown';
+import { SETTINGS_UNSUBSCRIBERS_ALL_FILTER } from '@/settings/unsubscribers/constants/SettingsUnsubscribersAllFilter';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
+
+const TOPICS = [
+ {
+ id: 'topic-newsletter',
+ name: 'Newsletter',
+ visibility: UnsubscribeTopicVisibility.PUBLIC,
+ },
+ {
+ id: 'topic-untitled',
+ name: null,
+ visibility: UnsubscribeTopicVisibility.PUBLIC,
+ },
+];
+
+const FilterExample = () => {
+ const [reasonValue, setReasonValue] = useState(
+ SETTINGS_UNSUBSCRIBERS_ALL_FILTER,
+ );
+ const [topicValue, setTopicValue] = useState(
+ SETTINGS_UNSUBSCRIBERS_ALL_FILTER,
+ );
+
+ return (
+ <>
+ <SettingsUnsubscribersFilterDropdown
+ topics={TOPICS}
+ reasonValue={reasonValue}
+ topicValue={topicValue}
+ onChangeReason={setReasonValue}
+ onChangeTopic={setTopicValue}
+ onClear={() => {
+ setReasonValue(SETTINGS_UNSUBSCRIBERS_ALL_FILTER);
+ setTopicValue(SETTINGS_UNSUBSCRIBERS_ALL_FILTER);
+ }}
+ />
+ <p>{`Reason: ${reasonValue}, topic: ${topicValue}`}</p>
+ </>
+ );
+};
+
+const meta: Meta = {
+ title: 'Modules/Settings/Unsubscribers/FilterDropdown',
+ decorators: [ComponentDecorator],
+ render: () => <FilterExample />,
+};
+export default meta;
+type Story = StoryObj;
+
+export const PagesSelectionAndClear: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', {
+ name: 'Filter unsubscribers',
+ });
+
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('dialog', {
+ name: 'Filter unsubscribers',
+ });
+
+ expect(
+ within(popup).getByRole('button', { name: /Reason.*All reasons/ }),
+ ).toBeVisible();
+ await userEvent.click(within(popup).getByRole('button', { name: /Topic/ }));
+ expect(
+ await within(popup).findByRole('button', { name: 'Untitled topic' }),
+ ).toBeVisible();
+ await userEvent.click(
+ within(popup).getByRole('button', { name: 'Newsletter' }),
+ );
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ expect(canvas.getByText(/topic: topic-newsletter/)).toBeVisible();
+
+ await userEvent.click(trigger);
+ const reopened = await body.findByRole('dialog', {
+ name: 'Filter unsubscribers',
+ });
+
+ expect(
+ within(reopened).getByRole('button', { name: /Topic.*Newsletter/ }),
+ ).toBeVisible();
+ await userEvent.click(
+ within(reopened).getByRole('button', { name: 'Clear filters' }),
+ );
+ expect(canvas.getByText(/topic: all/)).toBeVisible();
+ expect(reopened).toBeVisible();
+ expect(
+ within(reopened).queryByRole('button', { name: 'Clear filters' }),
+ ).not.toBeInTheDocument();
+
+ await userEvent.click(
+ within(reopened).getByRole('button', { name: /Reason/ }),
+ );
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(reopened).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+ await userEvent.click(trigger);
+ expect(
+ await body.findByRole('button', { name: /Reason.*All reasons/ }),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId.ts b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId.ts
deleted file mode 100644
index 50c4ef2fbe8..00000000000
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/types/SettingsUnsubscribersFilterContentId.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type SettingsUnsubscribersFilterContentId = 'reason' | 'topic';
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 b1690624dc0..1a21fe420f0 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -10,6 +10,8 @@ import { Dropdown } from 'twenty-ui/components';
import { Tag } from 'twenty-ui/primitives/data-display';
import { type SelectValue } from '@/ui/input/components/internal/select/types';
+import { getSelectDropdownInitialFocus } from '@/ui/input/components/internal/select/utils/getSelectDropdownInitialFocus';
+import { isFocusMovingWithinSelect } from '@/ui/input/components/internal/select/utils/isFocusMovingWithinSelect';
import { isSelectOptionMatchingSearch } from '@/ui/input/components/internal/select/utils/isSelectOptionMatchingSearch';
import { SelectControl } from '@/ui/input/components/SelectControl';
import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
@@ -135,13 +137,12 @@ export const Select = <TValue extends SelectValue>({
className={className}
fullWidth={fullWidth}
onBlur={(event) => {
- const nextFocus = event.relatedTarget;
- const isFocusWithinSelect =
- nextFocus instanceof Node &&
- (event.currentTarget.contains(nextFocus) ||
- dropdownContentRef.current?.contains(nextFocus));
-
- if (isFocusWithinSelect) {
+ if (
+ isFocusMovingWithinSelect({
+ event,
+ dropdownContent: dropdownContentRef.current,
+ })
+ ) {
return;
}
@@ -176,13 +177,7 @@ export const Select = <TValue extends SelectValue>({
withSearchInput
? undefined
: () =>
- dropdownContentRef.current?.querySelector<HTMLElement>(
- '[data-dropdown-item][aria-pressed="true"]:not([aria-disabled="true"])',
- ) ??
- dropdownContentRef.current?.querySelector<HTMLElement>(
- '[data-dropdown-item]:not([aria-disabled="true"])',
- ) ??
- true
+ getSelectDropdownInitialFocus(dropdownContentRef.current)
}
width={dropdownWidthAuto ? 'var(--anchor-width)' : dropdownWidth}
align="start"
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/OptionPickers.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/OptionPickers.stories.tsx
index 53ed39bba7e..84b6e8d0498 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/OptionPickers.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/OptionPickers.stories.tsx
@@ -49,6 +49,7 @@ const InnerSelectExample = () => {
return (
<DropdownMenuInnerSelect
dropdownId="inner-select-story"
+ aria-label="Position"
selectedOption={option}
options={options}
onChange={setOption}
@@ -70,6 +71,7 @@ export const CurrencySearchAndKeyboard: Story = {
const body = within(canvasElement.ownerDocument.body);
const trigger = canvas.getByRole('button');
await userEvent.click(trigger);
+ expect(await body.findByRole('dialog', { name: 'Currency' })).toBeVisible();
const search = await body.findByRole('searchbox', { name: 'Search' });
await userEvent.type(search, 'zzzzzz');
expect(await body.findByText('No results')).toBeVisible();
@@ -100,6 +102,7 @@ export const PhoneSearchAndSelection: Story = {
const body = within(canvasElement.ownerDocument.body);
const trigger = within(canvasElement).getByRole('button');
await userEvent.click(trigger);
+ expect(await body.findByRole('dialog', { name: 'Country' })).toBeVisible();
await userEvent.type(
await body.findByRole('searchbox', { name: 'Search' }),
'france',
@@ -165,6 +168,7 @@ export const InnerSelectSkipsDisabled: Story = {
const trigger = within(canvasElement).getByRole('button');
const body = within(canvasElement.ownerDocument.body);
await userEvent.click(trigger);
+ expect(await body.findByRole('dialog', { name: 'Position' })).toBeVisible();
expect(
await body.findByRole('button', { name: 'Disabled' }),
).toHaveAttribute('aria-disabled', 'true');
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
index 65782659ec8..4469a7cdd65 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
@@ -1,4 +1,5 @@
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -72,6 +73,7 @@ export const CurrencyPickerDropdownButton = ({
align="start"
sideOffset={4}
alignOffset={0}
+ aria-label={t`Currency`}
>
<CurrencyPickerDropdownSelect
selectedCurrency={currency}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
index e992d79413c..6eaa8e2fd51 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
@@ -3,6 +3,7 @@ import { type Country } from '@/ui/input/components/internal/types/Country';
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { Dropdown } from 'twenty-ui/components';
@@ -112,6 +113,7 @@ export const PhoneCountryPickerDropdownButton = ({
align="start"
sideOffset={4}
alignOffset={0}
+ aria-label={t`Country`}
>
<PhoneCountryPickerDropdownSelect
countries={countries}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/getSelectDropdownInitialFocus.ts b/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/getSelectDropdownInitialFocus.ts
new file mode 100644
index 00000000000..e4bf4e3ae80
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/getSelectDropdownInitialFocus.ts
@@ -0,0 +1,10 @@
+export const getSelectDropdownInitialFocus = (
+ dropdownContent: HTMLElement | null,
+) =>
+ dropdownContent?.querySelector<HTMLElement>(
+ '[data-dropdown-item][aria-pressed="true"]:not([aria-disabled="true"])',
+ ) ??
+ dropdownContent?.querySelector<HTMLElement>(
+ '[data-dropdown-item]:not([aria-disabled="true"])',
+ ) ??
+ true;
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/isFocusMovingWithinSelect.ts b/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/isFocusMovingWithinSelect.ts
new file mode 100644
index 00000000000..ac743b085f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/select/utils/isFocusMovingWithinSelect.ts
@@ -0,0 +1,18 @@
+import { type FocusEvent } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+export const isFocusMovingWithinSelect = ({
+ event,
+ dropdownContent,
+}: {
+ event: FocusEvent<HTMLElement>;
+ dropdownContent: HTMLElement | null;
+}) => {
+ const nextFocus = event.relatedTarget;
+
+ return (
+ nextFocus instanceof Node &&
+ (event.currentTarget.contains(nextFocus) ||
+ (isDefined(dropdownContent) && dropdownContent.contains(nextFocus)))
+ );
+};
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 ea4f36f2c48..c9e9bc144dc 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
@@ -31,6 +31,7 @@ type DropdownMenuInnerSelectProps = {
options: SelectOption[];
dropdownId: string;
widthInPixels?: number;
+ 'aria-label': string;
};
export const DropdownMenuInnerSelect = ({
@@ -39,6 +40,7 @@ export const DropdownMenuInnerSelect = ({
options,
dropdownId,
widthInPixels,
+ 'aria-label': ariaLabel,
}: DropdownMenuInnerSelectProps) => {
const theme = useTheme();
@@ -62,6 +64,7 @@ export const DropdownMenuInnerSelect = ({
side="bottom"
align="end"
alignOffset={-8}
+ aria-label={ariaLabel}
>
<Dropdown.Section>
{options.map((selectOption) => (
diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
index 0e89074d32c..eef7da9dd0c 100644
--- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
@@ -1,13 +1,21 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, within } from 'storybook/test';
+import { HttpResponse } from 'msw';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
import {
PageDecorator,
type PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
+import { graphqlMocks, metadataGraphql } from '~/testing/graphqlMocks';
+import { mockCurrentWorkspace } from '~/testing/mock-data/users';
import { sleep } from '~/utils/sleep';
+const updateOneFieldMetadataItem = fn();
+
import { SettingsObjectDetailPage } from '~/pages/settings/data-model/SettingsObjectDetailPage';
const meta: Meta<PageDecoratorArgs> = {
@@ -50,3 +58,84 @@ export const ObjectTabs: Story = {
await expect(settingsTab).toBeVisible();
},
};
+
+export const SettingsTabDropdowns: Story = {
+ beforeEach: () => {
+ updateOneFieldMetadataItem.mockClear();
+ jotaiStore.set(isAdvancedModeEnabledState.atom, true);
+ jotaiStore.set(currentWorkspaceState.atom, {
+ ...mockCurrentWorkspace,
+ featureFlags: [
+ {
+ key: FeatureFlagKey.IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED,
+ value: true,
+ },
+ ],
+ });
+
+ return () => jotaiStore.set(isAdvancedModeEnabledState.atom, false);
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ metadataGraphql.mutation(
+ 'UpdateOneFieldMetadataItem',
+ ({ variables }) => {
+ updateOneFieldMetadataItem(variables);
+
+ return HttpResponse.json({ data: { updateOneField: null } });
+ },
+ ),
+ ...graphqlMocks.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(await canvas.findByTestId('tab-settings'));
+
+ const addField = await canvas.findByRole('button', { name: 'Add field' });
+
+ await userEvent.click(addField);
+ const addFieldMenu = await body.findByRole('menu', { name: 'Add field' });
+
+ await waitFor(() =>
+ expect(
+ within(addFieldMenu).getByRole('menuitem', { name: 'Domain Name' }),
+ ).toHaveFocus(),
+ );
+ await userEvent.keyboard('{ArrowDown}');
+ expect(
+ within(addFieldMenu).getByRole('menuitem', { name: 'Address' }),
+ ).toHaveFocus();
+ await userEvent.keyboard('{Enter}');
+ await waitFor(() => expect(addFieldMenu).not.toBeInTheDocument());
+ await waitFor(() =>
+ expect(updateOneFieldMetadataItem).toHaveBeenCalledWith(
+ expect.objectContaining({ updatePayload: { isSearchable: true } }),
+ ),
+ );
+
+ const filterButton = canvas.getByRole('button', { name: 'Filter' });
+
+ expect(canvas.getByText('Account Owner')).toBeVisible();
+ await userEvent.click(filterButton);
+ const filterPanel = await body.findByRole('dialog', { name: 'Filter' });
+ const hideSystemIndexes = within(filterPanel).getByRole('switch', {
+ name: 'Hide system indexes',
+ });
+
+ await userEvent.click(hideSystemIndexes);
+ expect(hideSystemIndexes).toBeChecked();
+ expect(filterPanel).toBeVisible();
+ await waitFor(() =>
+ expect(canvas.queryByText('Account Owner')).not.toBeInTheDocument(),
+ );
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(filterPanel).not.toBeInTheDocument());
+ await waitFor(() => expect(filterButton).toHaveFocus());
+ },
+};
diff --git a/packages/twenty-front/src/pages/settings/members/roles/__stories__/SettingsRoleEdit.stories.tsx b/packages/twenty-front/src/pages/settings/members/roles/__stories__/SettingsRoleEdit.stories.tsx
index 24bd3511f0e..4dd647bec0c 100644
--- a/packages/twenty-front/src/pages/settings/members/roles/__stories__/SettingsRoleEdit.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/members/roles/__stories__/SettingsRoleEdit.stories.tsx
@@ -1,13 +1,18 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { delay, HttpResponse } from 'msw';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import {
PageDecorator,
type PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
+import { graphqlMocks, metadataGraphql } from '~/testing/graphqlMocks';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
import { SettingsRoleEdit } from '~/pages/settings/members/roles/SettingsRoleEdit';
+const OBJECT_RESTRICTED_ROLE_ID = '1e5b6baf-cd29-4d78-a3f1-55fb1fd27a81';
+
const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Settings/Roles/SettingsRoleEdit',
component: SettingsRoleEdit,
@@ -21,6 +26,9 @@ const meta: Meta<PageDecoratorArgs> = {
parameters: {
msw: graphqlMocks,
},
+ beforeEach: async () => {
+ await mockedApolloClient.clearStore();
+ },
};
export default meta;
@@ -28,3 +36,182 @@ export default meta;
export type Story = StoryObj<typeof SettingsRoleEdit>;
export const Default: Story = {};
+
+export const ObjectPermissionRowMenu: Story = {
+ args: {
+ routeParams: {
+ ':roleId': OBJECT_RESTRICTED_ROLE_ID,
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [trigger] = await canvas.findAllByRole(
+ 'button',
+ { name: 'Object permission options' },
+ { timeout: 5000 },
+ );
+
+ await userEvent.click(trigger);
+ const menu = await body.findByRole('menu', {
+ name: 'Object permission options',
+ });
+
+ expect(canvas.getByRole('link', { name: 'Assignment' })).toBeVisible();
+ expect(
+ within(menu).getByRole('menuitem', { name: 'Edit' }),
+ ).toHaveAttribute(
+ 'href',
+ expect.stringContaining(
+ `/settings/members/roles/${OBJECT_RESTRICTED_ROLE_ID}/object/`,
+ ),
+ );
+ expect(
+ within(menu).getByRole('menuitem', { name: 'Remove rule' }),
+ ).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(menu).not.toBeInTheDocument());
+ await waitFor(() => expect(trigger).toHaveFocus());
+ },
+};
+
+export const RoleAssignmentPickers: Story = {
+ args: {
+ routeParams: {
+ ':roleId': OBJECT_RESTRICTED_ROLE_ID,
+ },
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ metadataGraphql.query('FindManyAgents', () =>
+ HttpResponse.json({ data: { findManyAgents: [] } }),
+ ),
+ ...graphqlMocks.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole(
+ 'link',
+ { name: 'Assignment' },
+ { timeout: 5000 },
+ ),
+ );
+
+ const assignToMember = await canvas.findByRole('button', {
+ name: 'Assign to member',
+ });
+
+ expect(assignToMember).toBeDisabled();
+ await userEvent.hover(assignToMember.parentElement as HTMLElement);
+ expect(
+ await body.findByText('All workspace members already have this role'),
+ ).toBeVisible();
+ await userEvent.unhover(assignToMember.parentElement as HTMLElement);
+
+ const assignToAgent = canvas.getByRole('button', {
+ name: 'Assign to agent',
+ });
+
+ await userEvent.click(assignToAgent);
+ const agentPicker = await body.findByRole('dialog', {
+ name: 'Assign to agent',
+ });
+
+ expect(
+ await within(agentPicker).findByText('No agents available', undefined, {
+ timeout: 3000,
+ }),
+ ).toBeVisible();
+ await userEvent.type(
+ within(agentPicker).getByRole('searchbox', { name: 'Search agents' }),
+ 'Sales',
+ );
+ expect(
+ await within(agentPicker).findByText('No agents match your search'),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(agentPicker).not.toBeInTheDocument());
+ await waitFor(() => expect(assignToAgent).toHaveFocus());
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Assign to API key' }),
+ );
+ const apiKeyPicker = await body.findByRole('dialog', {
+ name: 'Assign to API key',
+ });
+ const search = within(apiKeyPicker).getByRole('searchbox', {
+ name: 'Search API keys',
+ });
+
+ await waitFor(() => expect(search).toHaveFocus());
+ await userEvent.type(search, 'unknown');
+ expect(
+ await within(apiKeyPicker).findByText('No API keys match your search'),
+ ).toBeVisible();
+ await userEvent.clear(search);
+ await userEvent.click(
+ await within(apiKeyPicker).findByRole('button', { name: 'My api key' }),
+ );
+
+ await waitFor(() => expect(apiKeyPicker).not.toBeInTheDocument());
+ const confirmation = await body.findByRole('dialog', {
+ name: 'Assign My api key?',
+ });
+
+ await waitFor(() =>
+ expect(confirmation).toContainElement(
+ canvasElement.ownerDocument.activeElement as HTMLElement,
+ ),
+ );
+ },
+};
+
+export const RoleAssignmentPickerLoading: Story = {
+ args: {
+ routeParams: {
+ ':roleId': OBJECT_RESTRICTED_ROLE_ID,
+ },
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ metadataGraphql.query('FindManyAgents', async () => {
+ await delay('infinite');
+
+ return HttpResponse.json({ data: { findManyAgents: [] } });
+ }),
+ ...graphqlMocks.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole(
+ 'link',
+ { name: 'Assignment' },
+ { timeout: 5000 },
+ ),
+ );
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Assign to agent' }),
+ );
+ const agentPicker = await body.findByRole('dialog', {
+ name: 'Assign to agent',
+ });
+
+ expect(within(agentPicker).getByText('Loading...')).toBeVisible();
+ expect(
+ within(agentPicker).queryByText('No agents available'),
+ ).not.toBeInTheDocument();
+ },
+};
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
index 2a513041d2d..0bfc54c5907 100644
--- a/packages/twenty-ui/src/components/index.ts
+++ b/packages/twenty-ui/src/components/index.ts
@@ -71,6 +71,7 @@ export { Section } from './layout/Section/Section';
export type { SectionHeaderProps } from './layout/Section/types/SectionHeaderProps';
export type { SectionRootProps } from './layout/Section/types/SectionRootProps';
export { Dropdown } from './navigation/Dropdown/Dropdown';
+export { useDropdownPage } from './navigation/Dropdown/hooks/useDropdownPage';
export type { DropdownActionItemProps } from './navigation/Dropdown/types/DropdownActionItemProps';
export type { DropdownCloseProps } from './navigation/Dropdown/types/DropdownCloseProps';
export type { DropdownContentProps } from './navigation/Dropdown/types/DropdownContentProps';
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
index 7470a198356..dde785e81ac 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
@@ -24,6 +24,10 @@
}
}
+.section[data-scrollable] > .section {
+ padding: 0;
+}
+
.separator[data-dropdown-separator] {
margin-inline: 0;
}
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 82772d2c5ee..8e7cde12c56 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
@@ -2,6 +2,8 @@ import { render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it, vi } from 'vitest';
+import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
+import { IconDotsVertical } from '@ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
import { Dropdown } from '../Dropdown';
@@ -525,3 +527,151 @@ describe('Dropdown menu', () => {
expect(activateRow).toHaveBeenCalledOnce();
});
});
+
+describe('Dropdown popup name', () => {
+ it('names a menu after its icon trigger without matching the menu by label text', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger
+ render={
+ <LightIconButton aria-label="More options">
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ <Dropdown.Content>
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'More options' }));
+
+ expect(screen.getByRole('menu', { name: 'More options' })).toBeVisible();
+ expect(screen.getAllByLabelText('More options')).toHaveLength(1);
+ });
+
+ it.each(['picker', 'panel'] as const)(
+ 'names a %s after its trigger',
+ async (type) => {
+ const user = userEvent.setup();
+
+ render(
+ <Dropdown.Root type={type}>
+ <Dropdown.Trigger render={<Button>Choose person</Button>} />
+ <Dropdown.Content>
+ <Dropdown.ActionItem>Invite person</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Choose person' }));
+
+ expect(
+ screen.getByRole('dialog', { name: 'Choose person' }),
+ ).toBeVisible();
+ },
+ );
+
+ it('names a submenu after its submenu trigger', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content>
+ <Dropdown.Submenu>
+ <Dropdown.SubmenuTrigger>Export</Dropdown.SubmenuTrigger>
+ <Dropdown.Content>
+ <Dropdown.ActionItem>CSV</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Submenu>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.tab();
+ await user.keyboard('{ArrowDown}');
+ await waitFor(() =>
+ expect(screen.getByRole('menuitem', { name: 'Export' })).toHaveFocus(),
+ );
+ await user.keyboard('{ArrowRight}');
+
+ expect(await screen.findByRole('menu', { name: 'Export' })).toBeVisible();
+ expect(screen.getByRole('menu', { name: 'Record actions' })).toBeVisible();
+ });
+
+ it('leaves a popup without a trigger unnamed until it passes a label', async () => {
+ const { rerender } = render(
+ <Dropdown.Root type="menu" open>
+ <Dropdown.Content>
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ const menu = await screen.findByRole('menu');
+
+ expect(menu).not.toHaveAttribute('aria-labelledby');
+ expect(menu).toHaveAccessibleName('');
+
+ rerender(
+ <Dropdown.Root type="menu" open>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.ActionItem>Duplicate</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ expect(menu).toHaveAccessibleName('Record actions');
+ });
+
+ it('prefers an explicit label over the trigger name', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <Dropdown.Root type="picker">
+ <Dropdown.Trigger>Currency</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Choose a currency">
+ <Dropdown.OptionItem selected>Euro</Dropdown.OptionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Currency' }));
+
+ expect(
+ screen.getByRole('dialog', { name: 'Choose a currency' }),
+ ).toBeVisible();
+ });
+
+ it('prefers a title while it is rendered and falls back to the trigger name', async () => {
+ const user = userEvent.setup();
+ const SortPicker = ({ hasTitle }: { hasTitle: boolean }) => (
+ <Dropdown.Root type="picker">
+ <Dropdown.Trigger>Sort</Dropdown.Trigger>
+ <Dropdown.Content>
+ {hasTitle && (
+ <Dropdown.Header>
+ <Dropdown.Title>Sort records by</Dropdown.Title>
+ </Dropdown.Header>
+ )}
+ <Dropdown.OptionItem selected={false}>Name</Dropdown.OptionItem>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ );
+ const { rerender } = render(<SortPicker hasTitle />);
+
+ await user.click(screen.getByRole('button', { name: 'Sort' }));
+
+ expect(
+ screen.getByRole('dialog', { name: 'Sort records by' }),
+ ).toBeVisible();
+
+ rerender(<SortPicker hasTitle={false} />);
+
+ expect(screen.getByRole('dialog', { name: 'Sort' })).toBeVisible();
+ });
+});
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.pages.test.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.pages.test.tsx
index f4046129fe1..f2b9e6e31d6 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.pages.test.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.pages.test.tsx
@@ -1,11 +1,12 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { useState } from 'react';
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
import { Input } from '@ui/primitives/input/Input/Input';
import { Dropdown } from '../Dropdown';
+import { useDropdownPage } from '../hooks/useDropdownPage';
import { type DropdownType } from '../types/DropdownType';
type FilterPagesProps = {
@@ -50,7 +51,115 @@ const FilterPages = ({
);
};
+const StatusOptions = ({
+ onStatusChange,
+}: {
+ onStatusChange: (status: string) => void;
+}) => {
+ const { goBack } = useDropdownPage();
+
+ return ['Active', 'Archived'].map((status) => (
+ <Dropdown.OptionItem
+ key={status}
+ selected={false}
+ closeOnSelect={false}
+ onSelect={() => {
+ onStatusChange(status);
+ goBack();
+ }}
+ >
+ {status}
+ </Dropdown.OptionItem>
+ ));
+};
+
+const CurrentPage = () => {
+ const { page, canGoBack } = useDropdownPage();
+
+ return <p>{canGoBack ? `${page} page with history` : `${page} page`}</p>;
+};
+
+const OpenDetailsAction = () => {
+ const { goToPage } = useDropdownPage();
+
+ return (
+ <Dropdown.ActionItem
+ closeOnClick={false}
+ onClick={() => goToPage('details')}
+ >
+ Open details
+ </Dropdown.ActionItem>
+ );
+};
+
describe('Dropdown pages', () => {
+ it('returns to the previous page after a selection and restores its invoking row', async () => {
+ const user = userEvent.setup();
+ const onStatusChange = vi.fn();
+
+ render(
+ <Dropdown.Root type="picker">
+ <Dropdown.Trigger>Filters</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Filters">
+ <Dropdown.Page id="root">
+ <Dropdown.ActionItem>Clear filters</Dropdown.ActionItem>
+ <Dropdown.ActionItem page="status">Status</Dropdown.ActionItem>
+ </Dropdown.Page>
+ <Dropdown.Page id="status">
+ <Dropdown.Back>Back to filters</Dropdown.Back>
+ <StatusOptions onStatusChange={onStatusChange} />
+ </Dropdown.Page>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Filters' }));
+ await user.click(screen.getByRole('button', { name: 'Status' }));
+ await user.click(screen.getByRole('button', { name: 'Archived' }));
+
+ expect(onStatusChange).toHaveBeenCalledWith('Archived');
+ expect(screen.getByRole('dialog', { name: 'Filters' })).toBeVisible();
+ expect(
+ screen.queryByRole('button', { name: 'Archived' }),
+ ).not.toBeInTheDocument();
+ await waitFor(() =>
+ expect(screen.getByRole('button', { name: 'Status' })).toHaveFocus(),
+ );
+ });
+
+ it('navigates programmatically and exposes the current page and history', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.Page id="root">
+ <CurrentPage />
+ <OpenDetailsAction />
+ </Dropdown.Page>
+ <Dropdown.Page id="details">
+ <CurrentPage />
+ <Dropdown.Back>Back to actions</Dropdown.Back>
+ </Dropdown.Page>
+ </Dropdown.Content>
+ </Dropdown.Root>,
+ );
+
+ await user.click(screen.getByRole('button', { name: 'Record actions' }));
+ expect(screen.getByText('root page')).toBeVisible();
+ await user.click(screen.getByRole('menuitem', { name: 'Open details' }));
+ expect(screen.getByText('details page with history')).toBeVisible();
+ expect(screen.getByRole('menu', { name: 'Record actions' })).toBeVisible();
+ await user.click(screen.getByRole('menuitem', { name: 'Back to actions' }));
+ expect(screen.getByText('root page')).toBeVisible();
+ await waitFor(() =>
+ expect(
+ screen.getByRole('menuitem', { name: 'Open details' }),
+ ).toHaveFocus(),
+ );
+ });
+
it('keeps the current page and focus when navigation is prevented', async () => {
const user = userEvent.setup();
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPage.ts b/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPage.ts
new file mode 100644
index 00000000000..9288433cb86
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPage.ts
@@ -0,0 +1,12 @@
+import { useDropdownContext } from '../internal/useDropdownContext';
+
+export const useDropdownPage = () => {
+ const { pageId, goToPage, goBack, canGoBack } = useDropdownContext();
+
+ return {
+ page: pageId,
+ goToPage: (page: string) => goToPage({ id: page }),
+ goBack,
+ canGoBack,
+ };
+};
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 a12218405ab..f3cdd104e00 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
@@ -32,11 +32,20 @@ export const DropdownContent = ({
onClick,
onMouseDown,
onPointerDown,
+ 'aria-label': ariaLabel,
+ 'aria-labelledby': ariaLabelledBy,
ref,
...props
}: DropdownContentProps) => {
- const { type, isSubmenu, setOpen, initialFocusEdge, focusOnOpen } =
- useDropdownContext();
+ const {
+ type,
+ isSubmenu,
+ setOpen,
+ initialFocusEdge,
+ focusOnOpen,
+ triggerId,
+ titleId,
+ } = useDropdownContext();
const contentRef = useRef<HTMLDivElement>(null);
const [content, setContent] = useState<HTMLDivElement | null>(null);
const mergedRef = useMergedRefs(contentRef, ref, setContent);
@@ -45,6 +54,9 @@ export const DropdownContent = ({
isSubmenu,
setOpen,
});
+ const defaultAriaLabelledBy = isDefined(ariaLabel)
+ ? undefined
+ : (titleId ?? triggerId);
return (
<>
@@ -59,6 +71,8 @@ export const DropdownContent = ({
container={container}
keepMounted={keepMounted}
role={type === 'menu' ? 'menu' : 'dialog'}
+ aria-label={ariaLabel}
+ aria-labelledby={ariaLabelledBy ?? defaultAriaLabelledBy}
data-dropdown-content=""
data-type={type}
className={mergeClassNames(styles.content, className)}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContextValue.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContextValue.ts
index cb241938bff..2f6a3d48d70 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContextValue.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContextValue.ts
@@ -23,10 +23,14 @@ export type DropdownContextValue = {
setFocusOnOpen: (focusOnOpen: boolean) => void;
setOpen: (open: boolean) => void;
closeTree: () => void;
- goToPage: (page: { id: string; trigger: DropdownFocusTarget }) => void;
+ goToPage: (page: { id: string; trigger?: DropdownFocusTarget }) => void;
goBack: () => void;
registerPage: (page: { id: string; type?: DropdownType }) => void;
registerOpenNestedRoot: () => () => void;
searchTargetId?: string;
setSearchTargetId: (id: string | undefined) => void;
+ triggerId?: string;
+ registerTrigger: (id: string) => () => void;
+ titleId?: string;
+ registerTitle: (id: string) => () => void;
};
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 9c3eb5946c1..e2834704d77 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
@@ -10,6 +10,7 @@ import { type DropdownFocusTarget } from './DropdownFocusTarget';
import { type DropdownPageFocusRequest } from './DropdownPageFocusRequest';
import { DropdownNestedRootEffect } from './DropdownNestedRootEffect';
import { preventDismissingClickActivation } from './preventDismissingClickActivation';
+import { useRegisteredElementId } from './useRegisteredElementId';
type PageHistoryEntry = { id?: string; trigger?: DropdownFocusTarget };
@@ -51,6 +52,8 @@ export const DropdownRoot = ({
);
const [focusOnOpen, setFocusOnOpen] = useState(true);
const [searchTargetId, setSearchTargetId] = useState<string>();
+ const [triggerId, registerTrigger] = useRegisteredElementId();
+ const [titleId, registerTitle] = useRegisteredElementId();
if (previousOpen !== open) {
setPreviousOpen(open);
@@ -86,7 +89,7 @@ export const DropdownRoot = ({
trigger,
}: {
id: string;
- trigger: DropdownFocusTarget;
+ trigger?: DropdownFocusTarget;
}) => {
setPageFocusRequest({ pageId: id });
setPageHistory((history) => [...history, { id, trigger }]);
@@ -177,6 +180,10 @@ export const DropdownRoot = ({
registerOpenNestedRoot,
searchTargetId,
setSearchTargetId,
+ triggerId,
+ registerTrigger,
+ titleId,
+ registerTitle,
}}
>
<DropdownNestedRootEffect
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
index 8083d525e97..63ef20944fe 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
@@ -1,3 +1,4 @@
+import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
import { useId } from 'react';
import { ListItem } from '@ui/primitives/navigation/ListItem/ListItem';
@@ -8,6 +9,7 @@ import { type DropdownSubmenuTriggerProps } from '../types/DropdownSubmenuTrigge
import { getDropdownFocusTarget } from './getDropdownFocusTarget';
import { useDropdownContext } from './useDropdownContext';
import { useDropdownItemFocus } from './useDropdownItemFocus';
+import { useRegisterDropdownLabelElement } from './useRegisterDropdownLabelElement';
export const DropdownSubmenuTrigger = ({
color,
@@ -25,9 +27,10 @@ export const DropdownSubmenuTrigger = ({
onKeyDown,
onFocus,
id,
+ ref,
...props
}: DropdownSubmenuTriggerProps) => {
- const { type, parentType, open, setOpen, setFocusOnOpen } =
+ const { type, parentType, open, setOpen, setFocusOnOpen, registerTrigger } =
useDropdownContext();
const generatedId = useId();
const itemId = id ?? generatedId;
@@ -35,10 +38,14 @@ export const DropdownSubmenuTrigger = ({
id: itemId,
isSubmenuTrigger: true,
});
+ const registerTriggerElement =
+ useRegisterDropdownLabelElement(registerTrigger);
+ const mergedRef = useMergedRefs(ref, registerTriggerElement);
return (
<Popover.Trigger
{...props}
+ ref={mergedRef}
id={itemId}
disabled={disabled}
nativeButton={nativeButton}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTitle.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTitle.tsx
index aa8b3476d5f..5ba9ba20359 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTitle.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTitle.tsx
@@ -1,18 +1,29 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
+import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Dropdown.module.scss';
import { type DropdownTitleProps } from '../types/DropdownTitleProps';
+import { useDropdownContext } from './useDropdownContext';
+import { useRegisterDropdownLabelElement } from './useRegisterDropdownLabelElement';
export const DropdownTitle = ({
className,
render,
+ ref,
...props
-}: DropdownTitleProps) => (
- <PopoverPrimitive.Title
- {...props}
- render={render ?? <div />}
- className={mergeClassNames(styles.title, className)}
- />
-);
+}: DropdownTitleProps) => {
+ const { registerTitle } = useDropdownContext();
+ const registerTitleElement = useRegisterDropdownLabelElement(registerTitle);
+ const mergedRef = useMergedRefs(ref, registerTitleElement);
+
+ return (
+ <PopoverPrimitive.Title
+ {...props}
+ ref={mergedRef}
+ render={render ?? <div />}
+ className={mergeClassNames(styles.title, className)}
+ />
+ );
+};
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 30d7bd3fb3f..580725d49e6 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
@@ -1,19 +1,32 @@
+import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
+
import { Popover } from '@ui/primitives/surfaces/Popover/Popover';
import { type DropdownTriggerProps } from '../types/DropdownTriggerProps';
import { useDropdownContext } from './useDropdownContext';
+import { useRegisterDropdownLabelElement } from './useRegisterDropdownLabelElement';
export const DropdownTrigger = ({
onKeyDown,
onClick,
+ ref,
...props
}: DropdownTriggerProps) => {
- const { type, setOpen, setInitialFocusEdge, setFocusOnOpen } =
- useDropdownContext();
+ const {
+ type,
+ setOpen,
+ setInitialFocusEdge,
+ setFocusOnOpen,
+ registerTrigger,
+ } = useDropdownContext();
+ const registerTriggerElement =
+ useRegisterDropdownLabelElement(registerTrigger);
+ const mergedRef = useMergedRefs(ref, registerTriggerElement);
return (
<Popover.Trigger
{...props}
+ ref={mergedRef}
aria-haspopup={type === 'menu' ? 'menu' : 'dialog'}
onClick={(event) => {
event.stopPropagation();
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisterDropdownLabelElement.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisterDropdownLabelElement.ts
new file mode 100644
index 00000000000..5261dd309e7
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisterDropdownLabelElement.ts
@@ -0,0 +1,18 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { useCallback } from 'react';
+
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+export const useRegisterDropdownLabelElement = (
+ registerElementId: (id: string) => () => void,
+) =>
+ useCallback(
+ (element: HTMLElement | null) => {
+ if (!isDefined(element) || !isNonEmptyString(element.id)) {
+ return;
+ }
+
+ return registerElementId(element.id);
+ },
+ [registerElementId],
+ );
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisteredElementId.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisteredElementId.ts
new file mode 100644
index 00000000000..c9268ca3c63
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useRegisteredElementId.ts
@@ -0,0 +1,16 @@
+import { useCallback, useState } from 'react';
+
+export const useRegisteredElementId = () => {
+ const [elementId, setElementId] = useState<string>();
+
+ const registerElementId = useCallback((id: string) => {
+ setElementId(id);
+
+ return () =>
+ setElementId((currentElementId) =>
+ currentElementId === id ? undefined : currentElementId,
+ );
+ }, []);
+
+ return [elementId, registerElementId] as const;
+};