Skip to content

The open alternative to Salesforce, designed for AI.

Migrate multiple record pickers (#28643)

Raphaël Bosi21f230054dec
diff --git a/packages/twenty-docs/ui/components/navigation/dropdown.mdx b/packages/twenty-docs/ui/components/navigation/dropdown.mdx
index 1f0d6681450..bd456b3ef07 100644
--- a/packages/twenty-docs/ui/components/navigation/dropdown.mdx
+++ b/packages/twenty-docs/ui/components/navigation/dropdown.mdx
@@ -467,6 +467,8 @@ export const RecordContextMenu = ({ recordName }: { recordName: string }) => {
Right-clicking elsewhere while the menu is open moves it to the new point.
+Call `useDropdownPlacementOrThrow` inside `Dropdown.Content` to read its resolved `side` and `align`, including collision flips. Use the resolved side to place a picker's search and create controls beside its trigger. Keep the controls in their visual DOM order so keyboard navigation follows the layout. A search below the results receives focus from `ArrowDown` on the last result; `ArrowUp` from that search returns to the last result.
+
## Labels
Each part owns its text: supply `Search.placeholder` and native accessible names, `Close` accessible attributes, and children for `Back`, `Loading`, and `Empty`. `Back` defaults to `Back`; loading and empty states have no built-in message. Item parts accept `shortcutJoinLabel` to replace the default `then` between sequential shortcut steps. Native `aria-labelledby` takes precedence over `aria-label`.
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerTargetsInput.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerTargetsInput.tsx
index ceb2812cfd2..5577ac98bd6 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerTargetsInput.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerTargetsInput.tsx
@@ -4,14 +4,13 @@ import { type CalendarEventComposerTarget } from '@/activities/calendar/types/Ca
import { RecordChip } from '@/object-record/components/RecordChip';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-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 { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { IconButton } from 'twenty-ui/components/input';
import { OverflowingList } from 'twenty-ui/components/layout';
+import { Dropdown } from 'twenty-ui/components/navigation';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type MouseEvent, useId, useState } from 'react';
@@ -49,11 +48,6 @@ export const CalendarEventComposerTargetsInput = ({
const [containerElement, setContainerElement] =
useState<HTMLDivElement | null>(null);
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownId,
- );
- const { closeDropdown } = useCloseDropdown();
const { toggleDropdown } = useToggleDropdown();
const { openCalendarEventTargetsPicker } =
useOpenCalendarEventTargetsPicker();
@@ -66,6 +60,14 @@ export const CalendarEventComposerTargetsInput = ({
}
const handleToggleDropdown = (event: MouseEvent) => {
+ const isButtonClick =
+ event.target instanceof Element &&
+ isDefined(event.target.closest('button'));
+
+ if (isButtonClick || event.defaultPrevented) {
+ return;
+ }
+
event.stopPropagation();
event.preventDefault();
toggleDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });
@@ -101,14 +103,21 @@ export const CalendarEventComposerTargetsInput = ({
.filter(isDefined);
const hasChips = isNonEmptyArray(chips);
const pickerLabel = t`Add a related record`;
- const pickerOptionsId = `${dropdownId}-options`;
return (
- <>
+ <DropdownRoot
+ dropdownId={dropdownId}
+ type="picker"
+ multiple
+ onOpenChange={(open) => {
+ if (open) {
+ handleOpenDropdown();
+ }
+ }}
+ >
<StyledClickableContainer
ref={setContainerElement}
onClick={handleToggleDropdown}
- data-click-outside-id={dropdownId}
>
{hasChips ? (
<>
@@ -118,48 +127,42 @@ export const CalendarEventComposerTargetsInput = ({
>
{chips}
</OverflowingList>
- <IconButton
- type="button"
- size="sm"
- variant="ghost"
- aria-label={pickerLabel}
- aria-controls={pickerOptionsId}
- aria-expanded={isDropdownOpen}
- aria-haspopup="listbox"
- >
- <IconPlus />
- </IconButton>
+ <Dropdown.Trigger
+ render={
+ <IconButton
+ type="button"
+ size="sm"
+ variant="ghost"
+ aria-label={pickerLabel}
+ >
+ <IconPlus />
+ </IconButton>
+ }
+ />
</>
) : (
- <Button
- type="button"
- size="sm"
- variant="ghost"
- aria-controls={pickerOptionsId}
- aria-expanded={isDropdownOpen}
- aria-haspopup="listbox"
- >
- <StyledPlaceholder>{pickerLabel}</StyledPlaceholder>
- </Button>
+ <Dropdown.Trigger
+ render={
+ <Button type="button" size="sm" variant="ghost">
+ <StyledPlaceholder>{pickerLabel}</StyledPlaceholder>
+ </Button>
+ }
+ />
)}
</StyledClickableContainer>
- <Dropdown
- dropdownId={dropdownId}
- dropdownPlacement="bottom-start"
- positionReference={containerElement}
- excludedClickOutsideIds={[dropdownId]}
- onOpen={handleOpenDropdown}
- dropdownComponents={
- <MultipleRecordPicker
- componentInstanceId={dropdownId}
- focusId={dropdownId}
- onChange={onTargetChange}
- onSubmit={() => closeDropdown(dropdownId)}
- onClickOutside={() => closeDropdown(dropdownId)}
- dropdownWidth={GenericDropdownContentWidth.ExtraLarge}
- />
- }
- />
- </>
+ <DropdownContent
+ anchor={containerElement}
+ side="bottom"
+ align="start"
+ width={GenericDropdownContentWidth.ExtraLarge}
+ aria-label={pickerLabel}
+ >
+ <MultipleRecordPicker
+ componentInstanceId={dropdownId}
+ onChange={onTargetChange}
+ layoutDirection="search-bar-on-bottom"
+ />
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/__stories__/CalendarEventComposerTargetsInput.stories.tsx b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/CalendarEventComposerTargetsInput.stories.tsx
index d348613778e..94436561a52 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/__stories__/CalendarEventComposerTargetsInput.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/CalendarEventComposerTargetsInput.stories.tsx
@@ -81,17 +81,26 @@ export const OverflowAndPicker: Story = {
await userEvent.keyboard('{Escape}');
await userEvent.click(canvas.getByText('Jeffery Griffin'));
- expect(await body.findByRole('textbox')).toBeVisible();
+ const picker = await body.findByRole('dialog', {
+ name: 'Add a related record',
+ });
+
+ expect(await within(picker).findByRole('searchbox')).toBeVisible();
expect(pickerButton).toHaveAttribute('aria-expanded', 'true');
await userEvent.click(
await body.findByRole('option', { name: /Jeffery Griffin/ }),
);
expect(args.onTargetChange).toHaveBeenCalled();
+ expect(picker).toBeVisible();
await userEvent.click(
canvas.getByRole('button', { name: 'Outside calendar field' }),
);
- await waitFor(() => expect(body.queryAllByRole('listbox')).toHaveLength(0));
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Add a related record' }),
+ ).not.toBeInTheDocument(),
+ );
},
};
@@ -108,10 +117,19 @@ export const EmptyKeyboardActivation: Story = {
expect(pickerButton).toHaveFocus();
await userEvent.keyboard('{Enter}');
- expect(await body.findByRole('textbox')).toBeVisible();
+ const picker = await body.findByRole('dialog', {
+ name: 'Add a related record',
+ });
+
+ expect(await within(picker).findByRole('searchbox')).toBeVisible();
expect(pickerButton).toHaveAttribute('aria-expanded', 'true');
await userEvent.keyboard('{Escape}');
- await waitFor(() => expect(body.queryAllByRole('listbox')).toHaveLength(0));
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Add a related record' }),
+ ).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(pickerButton).toHaveFocus());
},
};
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadDetailsDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadDetailsDropdown.tsx
index a258a969c60..1da39a02537 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadDetailsDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadDetailsDropdown.tsx
@@ -28,8 +28,6 @@ import { agentChatThreadPermissionsFamilySelector } from '@/ai/states/selectors/
import { useOpenAssignAiChatInSidePanel } from '@/side-panel/hooks/useOpenAssignAiChatInSidePanel';
import { RecordChip } from '@/object-record/components/RecordChip';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
-import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
-import { Dropdown as LegacyDropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
@@ -39,7 +37,6 @@ import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/
import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { FeatureFlagKey } from '~/generated-metadata/graphql';
@@ -103,6 +100,8 @@ export const AiChatThreadDetailsDropdown = ({
const isAiChatArtifactSurface = useIsAiChatArtifactSurface();
const { openRecordTarget } = useChatTargetNavigation();
const dropdownContentRef = useRef<HTMLDivElement>(null);
+ const detailsTriggerRef = useRef<HTMLButtonElement>(null);
+ const recordPickerContentRef = useRef<HTMLDivElement>(null);
const recordPickerDropdownId = `${dropdownId}-record-picker`;
const {
isAvailable: areRecordTargetsAvailable,
@@ -115,10 +114,6 @@ export const AiChatThreadDetailsDropdown = ({
recordPickerInstanceId: recordPickerDropdownId,
});
const { openDropdown } = useOpenDropdown();
- const setMultipleRecordPickerSearchFilter = useSetAtomComponentState(
- multipleRecordPickerSearchFilterComponentState,
- recordPickerDropdownId,
- );
const hasTargetRecords = isNonEmptyArray(targetRecords);
const editRecordTargetsLabel = hasTargetRecords
? t`Edit linked records`
@@ -144,6 +139,7 @@ export const AiChatThreadDetailsDropdown = ({
<Dropdown.Trigger
render={
<LightIconButton
+ ref={detailsTriggerRef}
aria-label={t`Chat details`}
title={t`Chat details`}
emphasis="subtle"
@@ -262,23 +258,41 @@ export const AiChatThreadDetailsDropdown = ({
</DropdownContent>
</DropdownRoot>
{canEditRecordTargets && (
- <LegacyDropdown
+ <DropdownRoot
dropdownId={recordPickerDropdownId}
- dropdownPlacement="bottom-start"
- disableClickForClickableComponent
- clickableComponent={<span />}
- onClose={() => setMultipleRecordPickerSearchFilter('')}
- dropdownComponents={
+ type="picker"
+ multiple
+ >
+ <DropdownContent
+ ref={recordPickerContentRef}
+ anchor={detailsTriggerRef}
+ finalFocus={(interaction) => {
+ const detailsTrigger = detailsTriggerRef.current;
+
+ if (interaction !== 'keyboard' || !isDefined(detailsTrigger)) {
+ return false;
+ }
+
+ const ownerDocument = detailsTrigger.ownerDocument;
+ const activeElement = ownerDocument.activeElement;
+ const isFocusStillInsidePicker =
+ activeElement === ownerDocument.body ||
+ (recordPickerContentRef.current?.contains(activeElement) ??
+ false);
+
+ return isFocusStillInsidePicker ? detailsTrigger : false;
+ }}
+ side="bottom"
+ align="start"
+ aria-label={editRecordTargetsLabel}
+ >
<MultipleRecordPicker
- focusId={recordPickerDropdownId}
componentInstanceId={recordPickerDropdownId}
onChange={handleRecordPickerChange}
- onSubmit={() => closeDropdown(recordPickerDropdownId)}
- onClickOutside={() => closeDropdown(recordPickerDropdownId)}
layoutDirection="search-bar-on-top"
/>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
index 333fb09d434..92304001185 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useContext } from 'react';
+import { type ReactElement, useContext } from 'react';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { isRecordReadOnly } from '@/object-record/read-only/utils/isRecordReadOnly';
@@ -13,7 +13,7 @@ import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
type RecordDetailMorphRelationSectionDropdownProps = {
loading: boolean;
- dropdownTriggerClickableComponent: ReactNode;
+ dropdownTriggerClickableComponent: ReactElement;
};
export const RecordDetailMorphRelationSectionDropdown = ({
@@ -68,13 +68,11 @@ export const RecordDetailMorphRelationSectionDropdown = ({
dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
/>
);
- } else if (isToManyObjects) {
- return (
- <RecordDetailMorphRelationSectionDropdownOneToMany
- dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
- />
- );
- } else {
- return null;
}
+
+ return isToManyObjects ? (
+ <RecordDetailMorphRelationSectionDropdownOneToMany
+ dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
+ />
+ ) : null;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
index 6aaacc39ba3..980bb449842 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useCallback, useContext } from 'react';
+import { type ReactElement, useContext } from 'react';
import { t } from '@lingui/core/macro';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
@@ -12,21 +12,19 @@ import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-rec
import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
-import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
-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 { Dropdown } from 'twenty-ui/components/navigation';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { dropdownPlacementComponentState } from '@/ui/layout/dropdown/states/dropdownPlacementComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
import { CustomError, isDefined } from 'twenty-shared/utils';
import { doNotTranslate } from 'twenty-shared/i18n';
type RecordDetailMorphRelationSectionDropdownOneToManyProps = {
- dropdownTriggerClickableComponent: ReactNode;
+ dropdownTriggerClickableComponent: ReactElement;
};
export const RecordDetailMorphRelationSectionDropdownOneToMany = ({
@@ -66,18 +64,6 @@ export const RecordDetailMorphRelationSectionDropdownOneToMany = ({
instanceId: scopeInstanceId,
});
- const { closeDropdown } = useCloseDropdown();
-
- const dropdownPlacement = useAtomComponentStateValue(
- dropdownPlacementComponentState,
- dropdownId,
- );
-
- const setMultipleRecordPickerSearchFilter = useSetAtomComponentState(
- multipleRecordPickerSearchFilterComponentState,
- dropdownId,
- );
-
const setMultipleRecordPickerPickableMorphItems = useSetAtomComponentState(
multipleRecordPickerPickableMorphItemsComponentState,
dropdownId,
@@ -94,15 +80,10 @@ export const RecordDetailMorphRelationSectionDropdownOneToMany = ({
const { openMultipleRecordPicker } = useMultipleRecordPickerOpen();
- const handleCloseRelationPickerDropdown = useCallback(() => {
- setMultipleRecordPickerSearchFilter('');
- }, [setMultipleRecordPickerSearchFilter]);
-
const handleOpenRelationPickerDropdown = () => {
setMultipleRecordPickerSearchableObjectMetadataItems(
relationObjectMetadataItems,
);
- setMultipleRecordPickerSearchFilter('');
setMultipleRecordPickerPickableMorphItems(
recordsWithObjectNameSingular.map((record) => {
const objectMetadataId = morphRelations.find(
@@ -153,33 +134,30 @@ export const RecordDetailMorphRelationSectionDropdownOneToMany = ({
useUpdateMorphRelationOneToManyFieldInput();
return (
- <Dropdown
+ <DropdownRoot
dropdownId={dropdownId}
- dropdownPlacement="left-start"
- onClose={handleCloseRelationPickerDropdown}
- onOpen={handleOpenRelationPickerDropdown}
- clickableComponent={dropdownTriggerClickableComponent}
- dropdownComponents={
+ type="picker"
+ multiple
+ onOpenChange={(open) => {
+ if (open) {
+ handleOpenRelationPickerDropdown();
+ }
+ }}
+ >
+ <Dropdown.Trigger render={dropdownTriggerClickableComponent} />
+ <DropdownContent
+ side="left"
+ align="start"
+ aria-label={fieldDefinition.label}
+ width={GenericDropdownContentWidth.ExtraLarge}
+ >
<MultipleRecordPicker
- focusId={dropdownId}
componentInstanceId={dropdownId}
onChange={(morphItem) => {
updateMorphRelationOneToMany(morphItem);
}}
- onSubmit={() => {
- closeDropdown(dropdownId);
- }}
- onClickOutside={() => {
- closeDropdown(dropdownId);
- }}
- layoutDirection={
- dropdownPlacement?.includes('end')
- ? 'search-bar-on-bottom'
- : 'search-bar-on-top'
- }
- dropdownWidth={GenericDropdownContentWidth.ExtraLarge}
/>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdown.tsx
index a3f6a09c714..40e2936eab6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdown.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useContext } from 'react';
+import { type ReactElement, useContext } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
@@ -10,7 +10,7 @@ import { RelationType } from '~/generated-metadata/graphql';
type RecordDetailRelationSectionDropdownProps = {
loading: boolean;
- dropdownTriggerClickableComponent: ReactNode;
+ dropdownTriggerClickableComponent: ReactElement;
};
export const RecordDetailRelationSectionDropdown = ({
@@ -59,13 +59,11 @@ export const RecordDetailRelationSectionDropdown = ({
dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
/>
);
- } else if (isToManyObjects) {
- return (
- <RecordDetailRelationSectionDropdownToMany
- dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
- />
- );
- } else {
- return null;
}
+
+ return isToManyObjects ? (
+ <RecordDetailRelationSectionDropdownToMany
+ dropdownTriggerClickableComponent={dropdownTriggerClickableComponent}
+ />
+ ) : null;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
index 2b14537ebba..3c814b22d58 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useCallback, useContext } from 'react';
+import { type ReactElement, useCallback, useContext } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
@@ -17,22 +17,21 @@ import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-rec
import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
-import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-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 { Dropdown } from 'twenty-ui/components/navigation';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { dropdownPlacementComponentState } from '@/ui/layout/dropdown/states/dropdownPlacementComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { CustomError, isDefined } from 'twenty-shared/utils';
import { doNotTranslate } from 'twenty-shared/i18n';
type RecordDetailRelationSectionDropdownToManyProps = {
- dropdownTriggerClickableComponent: ReactNode;
+ dropdownTriggerClickableComponent: ReactElement;
};
export const RecordDetailRelationSectionDropdownToMany = ({
@@ -122,16 +121,6 @@ export const RecordDetailRelationSectionDropdownToMany = ({
const { closeDropdown } = useCloseDropdown();
- const dropdownPlacement = useAtomComponentStateValue(
- dropdownPlacementComponentState,
- dropdownId,
- );
-
- const setMultipleRecordPickerSearchFilter = useSetAtomComponentState(
- multipleRecordPickerSearchFilterComponentState,
- dropdownId,
- );
-
const setMultipleRecordPickerPickableMorphItems = useSetAtomComponentState(
multipleRecordPickerPickableMorphItemsComponentState,
dropdownId,
@@ -148,10 +137,6 @@ export const RecordDetailRelationSectionDropdownToMany = ({
const { openMultipleRecordPicker } = useMultipleRecordPickerOpen();
- const handleCloseRelationPickerDropdown = useCallback(() => {
- setMultipleRecordPickerSearchFilter('');
- }, [setMultipleRecordPickerSearchFilter]);
-
const { updateRelation } = useUpdateRelationOneToManyFieldInput();
const { createNewRecordAndOpenSidePanel } = useAddNewRecordAndOpenSidePanel({
@@ -177,7 +162,6 @@ export const RecordDetailRelationSectionDropdownToMany = ({
setMultipleRecordPickerSearchableObjectMetadataItems(
searchableObjectMetadataItems,
);
- setMultipleRecordPickerSearchFilter('');
setMultipleRecordPickerPickableMorphItems(pickableMorphItems);
openMultipleRecordPicker(dropdownId);
@@ -235,15 +219,23 @@ export const RecordDetailRelationSectionDropdownToMany = ({
}
return (
- <Dropdown
+ <DropdownRoot
dropdownId={dropdownId}
- dropdownPlacement="left-start"
- onClose={handleCloseRelationPickerDropdown}
- onOpen={handleOpenRelationPickerDropdown}
- clickableComponent={dropdownTriggerClickableComponent}
- dropdownComponents={
+ type="picker"
+ multiple
+ onOpenChange={(open) => {
+ if (open) {
+ handleOpenRelationPickerDropdown();
+ }
+ }}
+ >
+ <Dropdown.Trigger render={dropdownTriggerClickableComponent} />
+ <DropdownContent
+ side="left"
+ align="start"
+ aria-label={fieldDefinition.label}
+ >
<MultipleRecordPicker
- focusId={dropdownId}
componentInstanceId={dropdownId}
onCreate={
isJunctionRelation || isDefined(createNewRecordAndOpenSidePanel)
@@ -252,19 +244,8 @@ export const RecordDetailRelationSectionDropdownToMany = ({
}
isCreatePending={isCreatingJunctionRecord}
onChange={handleChange}
- onSubmit={() => {
- closeDropdown(dropdownId);
- }}
- onClickOutside={() => {
- closeDropdown(dropdownId);
- }}
- layoutDirection={
- dropdownPlacement?.includes('end')
- ? 'search-bar-on-bottom'
- : 'search-bar-on-top'
- }
/>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
index 83645b33ba4..f21fb631324 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
@@ -15,9 +15,9 @@ import {
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
-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 { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyArray } from '@sniptt/guards';
@@ -25,6 +25,7 @@ import { useId, useState } from 'react';
import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
import { isDefined, isValidUuid } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
+import { Dropdown } from 'twenty-ui/components/navigation';
import { IconChevronDown } from 'twenty-ui/icon';
import { Field } from 'twenty-ui/primitives/input';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
@@ -54,7 +55,7 @@ const StyledVariablePickerContainer = styled.div`
flex-shrink: 0;
`;
-export type FormMultiRecordPickerProps = {
+type FormMultiRecordPickerProps = {
label?: string;
defaultValue?: Array<RecordId | Variable> | Variable | string | null;
onChange: (value: Array<RecordId | Variable> | Variable) => void;
@@ -83,7 +84,6 @@ export const FormMultiRecordPicker = ({
const dropdownId = `form-multi-record-picker-${componentId}`;
const variablesDropdownId = `form-multi-record-picker-${componentId}-variables`;
- const { closeDropdown } = useCloseDropdown();
const { enqueueToast } = useToast();
const { openFormMultiRecordPicker } = useOpenFormMultiRecordPicker({
objectNameSingular,
@@ -202,43 +202,52 @@ export const FormMultiRecordPicker = ({
</StyledFormSelectContainerWrapper>
) : (
<StyledDropdownContainer>
- <Dropdown
+ <DropdownRoot
dropdownId={dropdownId}
- dropdownPlacement="bottom-start"
- clickableComponentWidth="100%"
- onOpen={handleOpenDropdown}
- dropdownOffset={{
- y: parseInt(theme.spacing[1], 10),
+ type="picker"
+ multiple
+ onOpenChange={(open) => {
+ if (open) {
+ handleOpenDropdown();
+ }
}}
- clickableComponent={
- <StyledFormSelectContainerWrapper>
- <FormFieldInputInnerContainer
- formFieldInputInstanceId={componentId}
- hasRightElement={isDefined(VariablePicker) && !readonly}
- hoverable
- preventFocusStackUpdate={true}
- >
- {chips}
- <StyledIconButton>
- <IconChevronDown
- size={theme.icon.size.md}
- color={theme.font.color.light}
- />
- </StyledIconButton>
- </FormFieldInputInnerContainer>
- </StyledFormSelectContainerWrapper>
- }
- dropdownComponents={
+ >
+ <Dropdown.Trigger
+ nativeButton={false}
+ aria-label={label ?? t`Select records`}
+ render={
+ <StyledFormSelectContainerWrapper>
+ <FormFieldInputInnerContainer
+ formFieldInputInstanceId={componentId}
+ hasRightElement={isDefined(VariablePicker) && !readonly}
+ hoverable
+ preventFocusStackUpdate={true}
+ >
+ {chips}
+ <StyledIconButton>
+ <IconChevronDown
+ size={theme.icon.size.md}
+ color={theme.font.color.light}
+ />
+ </StyledIconButton>
+ </FormFieldInputInnerContainer>
+ </StyledFormSelectContainerWrapper>
+ }
+ />
+ <DropdownContent
+ side="bottom"
+ align="start"
+ sideOffset={parseInt(theme.spacing[1], 10)}
+ width={GenericDropdownContentWidth.ExtraLarge}
+ aria-label={label ?? t`Select records`}
+ >
<MultipleRecordPicker
componentInstanceId={dropdownId}
- focusId={dropdownId}
onChange={handleMorphItemChange}
- onSubmit={() => closeDropdown(dropdownId)}
- onClickOutside={() => closeDropdown(dropdownId)}
- dropdownWidth={GenericDropdownContentWidth.ExtraLarge}
+ layoutDirection="search-bar-on-bottom"
/>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
</StyledDropdownContainer>
)}
{isDefined(VariablePicker) && !readonly && (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiRecordPicker.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiRecordPicker.stories.tsx
index 45f0f448bcd..9562ec0a55a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiRecordPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiRecordPicker.stories.tsx
@@ -1,7 +1,9 @@
+import { StrictMode } from 'react';
import { FormMultiRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormMultiRecordPicker';
import { styled } from '@linaria/react';
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, fn, userEvent, within } from 'storybook/test';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { Button } from 'twenty-ui/primitives/input';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
@@ -135,3 +137,74 @@ export const Readonly: Story = {
expect(args.onChange).not.toHaveBeenCalled();
},
};
+
+export const MultipleSelectionAndSessionReset: Story = {
+ decorators: [
+ (Story) => (
+ <StrictMode>
+ <Story />
+ </StrictMode>
+ ),
+ ],
+ args: {
+ label: 'Companies',
+ defaultValue: [],
+ objectNameSingular: 'company',
+ onChange: fn(),
+ },
+ render: (args) => (
+ <>
+ <FormMultiRecordPicker {...args} />
+ <Button variant="ghost">Outside record picker</Button>
+ </>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = await canvas.findByRole('button', { name: 'Companies' });
+
+ await userEvent.click(trigger);
+
+ const picker = await body.findByRole('dialog', { name: 'Companies' });
+ const options = await within(picker).findAllByRole('option');
+
+ await userEvent.click(options[0]);
+ await userEvent.click(options[1]);
+
+ expect(options[0]).toHaveAttribute('aria-selected', 'true');
+ expect(options[1]).toHaveAttribute('aria-selected', 'true');
+ expect(picker).toBeVisible();
+ expect(args.onChange).toHaveBeenCalledTimes(2);
+
+ const search = within(picker).getByRole('searchbox');
+
+ await userEvent.type(search, 'company');
+ await userEvent.keyboard('{Escape}');
+
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Companies' }),
+ ).not.toBeInTheDocument(),
+ );
+ await waitFor(() => expect(trigger).toHaveFocus());
+ await userEvent.keyboard('{Enter}');
+
+ const reopenedPicker = await body.findByRole('dialog', {
+ name: 'Companies',
+ });
+
+ expect(within(reopenedPicker).getByRole('searchbox')).toHaveValue('');
+ expect(
+ await within(reopenedPicker).findAllByRole('option', { selected: true }),
+ ).toHaveLength(2);
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside record picker' }),
+ );
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Companies' }),
+ ).not.toBeInTheDocument(),
+ );
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
index b80427dd272..53b944f6fcc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
@@ -7,7 +7,6 @@ import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/u
import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
-import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
@@ -47,13 +46,6 @@ export const useOpenJunctionRelationPicker = () => {
searchableObjectMetadataItems,
);
- store.set(
- multipleRecordPickerSearchFilterComponentState.atomFamily({
- instanceId: recordPickerInstanceId,
- }),
- '',
- );
-
openMultipleRecordPicker(recordPickerInstanceId);
performSearch({
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown.tsx
index 25e72dd1ff1..dcb926ee88c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown.tsx
@@ -10,9 +10,12 @@ import { Dropdown } from 'twenty-ui/components/navigation';
type FieldInputDropdownProps<TValue> = {
children: ReactNode;
- value: TValue;
+ value?: TValue;
onDismiss: () => void;
multiple?: boolean;
+ width?: number;
+ shouldSkipPersist?: boolean;
+ shouldDismissOnOutsideInput?: boolean;
};
export const FieldInputDropdown = <TValue,>({
@@ -20,6 +23,9 @@ export const FieldInputDropdown = <TValue,>({
value,
onDismiss,
multiple,
+ width,
+ shouldSkipPersist = false,
+ shouldDismissOnOutsideInput = false,
}: FieldInputDropdownProps<TValue>) => {
const { fieldDefinition } = useContext(FieldContext);
const { onTab, onShiftTab } = useContext(FieldInputEventContext);
@@ -45,7 +51,7 @@ export const FieldInputDropdown = <TValue,>({
}
event.preventDefault();
- handleTab({ newValue: value });
+ handleTab(shouldSkipPersist ? { skipPersist: true } : { newValue: value });
};
return (
@@ -54,7 +60,11 @@ export const FieldInputDropdown = <TValue,>({
multiple={multiple}
open
onOpenChange={handleOpenChange}
- onInteractOutside={preventDropdownDismissOnInputElement}
+ onInteractOutside={
+ shouldDismissOnOutsideInput
+ ? undefined
+ : preventDropdownDismissOnInputElement
+ }
>
<DropdownContent
anchor={anchorRef}
@@ -62,6 +72,7 @@ export const FieldInputDropdown = <TValue,>({
sideOffset={sideOffset}
alignOffset={alignOffset}
collisionPadding={collisionPadding}
+ width={width}
aria-label={fieldDefinition.label}
finalFocus={false}
onKeyDown={handleKeyDown}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx
index 6934e7647d1..77a1566f58f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx
@@ -2,12 +2,11 @@ import { useContext } from 'react';
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
import { useUpdateMorphRelationOneToManyFieldInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useUpdateMorphRelationOneToManyFieldInput';
+import { FieldInputDropdown } from '@/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
-import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionComponentState';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
export const MorphRelationOneToManyFieldInput = () => {
const instanceId = useAvailableComponentInstanceIdOrThrow(
@@ -23,25 +22,18 @@ export const MorphRelationOneToManyFieldInput = () => {
onSubmit?.({ skipPersist: true });
};
- const recordFieldInputLayoutDirection = useAtomComponentStateValue(
- recordFieldInputLayoutDirectionComponentState,
- );
-
return (
- <MultipleRecordPicker
- focusId={instanceId}
- componentInstanceId={instanceId}
- onSubmit={handleSubmit}
- onChange={(morphItem) => {
- updateMorphRelationOneToMany(morphItem);
- }}
- onClickOutside={handleSubmit}
- layoutDirection={
- recordFieldInputLayoutDirection === 'downward'
- ? 'search-bar-on-top'
- : 'search-bar-on-bottom'
- }
- dropdownWidth={GenericDropdownContentWidth.ExtraLarge}
- />
+ <FieldInputDropdown
+ onDismiss={handleSubmit}
+ width={GenericDropdownContentWidth.ExtraLarge}
+ multiple
+ shouldSkipPersist
+ shouldDismissOnOutsideInput
+ >
+ <MultipleRecordPicker
+ componentInstanceId={instanceId}
+ onChange={updateMorphRelationOneToMany}
+ />
+ </FieldInputDropdown>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx
index 964ee90e68a..b98ffa75995 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx
@@ -8,14 +8,13 @@ import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts
import { useCreateJunctionRecordWithNestedTarget } from '@/object-record/record-field/ui/hooks/useCreateJunctionRecordWithNestedTarget';
import { useUpdateJunctionRelationFromCell } from '@/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell';
import { useAddNewRecordAndOpenSidePanel } from '@/object-record/record-field/ui/meta-types/input/hooks/useAddNewRecordAndOpenSidePanel';
+import { FieldInputDropdown } from '@/object-record/record-field/ui/meta-types/input/components/FieldInputDropdown';
import { useUpdateRelationOneToManyFieldInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useUpdateRelationOneToManyFieldInput';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
-import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionComponentState';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { CustomError, isDefined } from 'twenty-shared/utils';
import { doNotTranslate } from 'twenty-shared/i18n';
@@ -92,10 +91,6 @@ export const RelationOneToManyFieldInput = () => {
junctionConfig: isJunctionRelation ? junctionConfig : undefined,
});
- const recordFieldInputLayoutDirection = useAtomComponentStateValue(
- recordFieldInputLayoutDirectionComponentState,
- );
-
const handleCreateNew = useCallback(
async ({
searchInput,
@@ -136,31 +131,29 @@ export const RelationOneToManyFieldInput = () => {
}
return (
- <MultipleRecordPicker
- focusId={instanceId}
- componentInstanceId={instanceId}
- onSubmit={handleSubmit}
- onChange={(morphItem) => {
- if (isJunctionRelation) {
- updateJunctionRelationFromCell({
- morphItem,
- });
- } else {
+ <FieldInputDropdown
+ onDismiss={handleSubmit}
+ multiple
+ shouldSkipPersist
+ shouldDismissOnOutsideInput
+ >
+ <MultipleRecordPicker
+ componentInstanceId={instanceId}
+ onChange={(morphItem) => {
+ if (isJunctionRelation) {
+ updateJunctionRelationFromCell({ morphItem });
+ return;
+ }
+
updateRelation(morphItem);
+ }}
+ onCreate={
+ isJunctionRelation || isDefined(createNewRecordAndOpenSidePanel)
+ ? handleCreateNew
+ : undefined
}
- }}
- onCreate={
- isJunctionRelation || isDefined(createNewRecordAndOpenSidePanel)
- ? handleCreateNew
- : undefined
- }
- isCreatePending={isCreatingJunctionRecord}
- onClickOutside={handleSubmit}
- layoutDirection={
- recordFieldInputLayoutDirection === 'downward'
- ? 'search-bar-on-top'
- : 'search-bar-on-bottom'
- }
- />
+ isCreatePending={isCreatingJunctionRecord}
+ />
+ </FieldInputDropdown>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RelationOneToManyFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RelationOneToManyFieldInput.stories.tsx
index 6c1e83f20a4..fe7790370dc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RelationOneToManyFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RelationOneToManyFieldInput.stories.tsx
@@ -1,10 +1,18 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { useSetAtom } from 'jotai';
-import { useEffect, useMemo } from 'react';
+import { graphql, HttpResponse } from 'msw';
+import { useMemo, useState } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { Button, Input } from 'twenty-ui/primitives/input';
+import { FieldInputAnchorDecorator } from '~/testing/decorators/FieldInputAnchorDecorator';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
+import { generateDepthRecordGqlFieldsFromRecord } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord';
+import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { FileUploadDecorator } from '~/testing/decorators/FileUploadDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
@@ -16,16 +24,36 @@ import {
} from '~/testing/mock-data/users';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import {
+ FieldInputEventContext,
+ type FieldInputEvent,
+} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
import { useOpenFieldInputEditMode } from '@/object-record/record-field/ui/hooks/useOpenFieldInputEditMode';
import { RelationOneToManyFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
-import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
+import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
+import { RecordInlineCellEditMode } from '@/object-record/record-inline-cell/components/RecordInlineCellEditMode';
+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';
import { CoreObjectNameSingular, FieldMetadataType } from 'twenty-shared/types';
import { RelationType } from '~/generated-metadata/graphql';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { mockedPersonRecords } from '~/testing/mock-data/generated/data/people/mock-people-data';
+import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
+import { mockedWorkspaceMemberRecords } from '~/testing/mock-data/generated/data/workspaceMembers/mock-workspaceMembers-data';
+
+const COMPANY_RECORD_ID = mockedCompanyRecords[0].id;
+const FIELD_INPUT_INSTANCE_ID = getRecordFieldInputInstanceId({
+ recordId: COMPANY_RECORD_ID,
+ fieldName: 'people',
+});
+const PERSON_NAME = `${mockedPersonRecords[0].name.firstName} ${mockedPersonRecords[0].name.lastName}`;
+const updatePerson = fn();
+const submitFieldInput = fn<FieldInputEvent>();
+const tabFromFieldInput = fn<FieldInputEvent>();
+const shiftTabFromFieldInput = fn<FieldInputEvent>();
const personMetadata = getMockObjectMetadataItemOrThrow('person');
const companyMetadata = getMockObjectMetadataItemOrThrow('company');
@@ -38,18 +66,18 @@ const peopleFieldOnCompany = getMockFieldMetadataItemOrThrow({
fieldName: 'people',
});
-const RelationWorkspaceSetterEffect = () => {
- useEffect(() => {
- jotaiStore.set(currentWorkspaceState.atom, mockCurrentWorkspace);
- jotaiStore.set(currentWorkspaceMemberState.atom, mockedWorkspaceMemberData);
- }, []);
-
- return <></>;
+type RelationOneToManyFieldInputWithContextProps = {
+ isInline?: boolean;
};
-const RelationOneToManyFieldInputWithContext = () => {
- const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();
-
+const RelationOneToManyFieldInputWithContext = ({
+ isInline = false,
+}: RelationOneToManyFieldInputWithContextProps) => {
+ const [isOpen, setIsOpen] = useState(false);
+ const { openFieldInput, closeFieldInput } = useOpenFieldInputEditMode();
+ const apolloCoreClient = useApolloCoreClient();
+ const { objectMetadataItems } = useObjectMetadataItems();
+ const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
const fieldDefinition = useMemo(
() => ({
fieldMetadataId: peopleFieldOnCompany.id,
@@ -61,79 +89,196 @@ const RelationOneToManyFieldInputWithContext = () => {
relationType: RelationType.ONE_TO_MANY,
relationObjectMetadataNamePlural: 'people',
relationObjectMetadataNameSingular: CoreObjectNameSingular.Person,
+ relationObjectMetadataId: personMetadata.id,
objectMetadataNameSingular: 'company',
relationFieldMetadataId: companyFieldOnPerson.id,
+ targetFieldMetadataName: 'company',
},
}),
[],
);
- const setRecordStoreFieldValue = useSetAtom(
- recordStoreFamilySelector.selectorFamily({
- fieldName: 'people',
- recordId: 'recordId',
- }),
- );
+ const handleOpen = () => {
+ const recordsWithMetadata = [
+ {
+ objectMetadataItem: companyMetadata,
+ records: mockedCompanyRecords
+ .filter(({ id }) =>
+ [
+ COMPANY_RECORD_ID,
+ ...mockedPersonRecords
+ .slice(0, 2)
+ .map(({ companyId }) => companyId),
+ ].includes(id),
+ )
+ .map(({ __typename, id, name }) => ({ __typename, id, name })),
+ },
+ {
+ objectMetadataItem: personMetadata,
+ records: mockedPersonRecords
+ .slice(0, 2)
+ .map(({ __typename, id, name, company, companyId }) => ({
+ __typename,
+ id,
+ name,
+ company,
+ companyId,
+ })),
+ },
+ ];
- const { openFieldInput } = useOpenFieldInputEditMode();
+ for (const { objectMetadataItem, records } of recordsWithMetadata) {
+ for (const recordNode of records) {
+ const record = getRecordFromRecordNode({ recordNode });
- useEffect(() => {
- setRecordStoreFieldValue([]);
+ updateRecordFromCache({
+ cache: apolloCoreClient.cache,
+ objectMetadataItem,
+ objectMetadataItems,
+ record,
+ recordGqlFields: generateDepthRecordGqlFieldsFromRecord({
+ objectMetadataItem,
+ objectMetadataItems,
+ record,
+ depth: 1,
+ }),
+ objectPermissionsByObjectMetadataId,
+ });
+ }
+ }
- pushFocusItemToFocusStack({
- focusId: 'relation-from-many-field-input',
- component: {
- type: FocusComponentType.OPENED_FIELD_INPUT,
- instanceId: 'relation-from-many-field-input',
- },
- });
- openFieldInput({
- fieldDefinition,
- recordId: 'recordId',
- });
- }, [
- fieldDefinition,
- openFieldInput,
- pushFocusItemToFocusStack,
- setRecordStoreFieldValue,
- ]);
+ jotaiStore.set(
+ recordStoreFamilySelector.selectorFamily({
+ fieldName: 'people',
+ recordId: COMPANY_RECORD_ID,
+ }),
+ [],
+ );
+ openFieldInput({ fieldDefinition, recordId: COMPANY_RECORD_ID });
+ setIsOpen(true);
+ };
+
+ const handleClose = () => {
+ closeFieldInput({ fieldDefinition, recordId: COMPANY_RECORD_ID });
+ setIsOpen(false);
+ };
+
+ const picker = isOpen ? <RelationOneToManyFieldInput /> : null;
return (
<div>
<RecordFieldComponentInstanceContext.Provider
value={{
- instanceId: 'relation-from-many-field-input',
+ instanceId: FIELD_INPUT_INSTANCE_ID,
}}
>
<FieldContext.Provider
value={{
fieldDefinition,
- recordId: 'recordId',
+ recordId: COMPANY_RECORD_ID,
isLabelIdentifier: false,
isRecordFieldReadOnly: false,
}}
>
- <RelationWorkspaceSetterEffect />
- <RelationOneToManyFieldInput />
+ <FieldInputEventContext.Provider
+ value={{
+ onSubmit: (args) => {
+ submitFieldInput(args);
+ handleClose();
+ },
+ onTab: (args) => {
+ tabFromFieldInput(args);
+ handleClose();
+ },
+ onShiftTab: (args) => {
+ shiftTabFromFieldInput(args);
+ handleClose();
+ },
+ }}
+ >
+ {isInline ? (
+ <div style={{ position: 'relative', width: 200, height: 80 }}>
+ <RecordInlineCellEditMode>{picker}</RecordInlineCellEditMode>
+ </div>
+ ) : (
+ picker
+ )}
+ </FieldInputEventContext.Provider>
</FieldContext.Provider>
</RecordFieldComponentInstanceContext.Provider>
- <div data-testid="data-field-input-click-outside-div" />
+ <Button onClick={handleOpen}>Edit people</Button>
+ <Input aria-label="Outside input" />
+ <Button>Outside picker</Button>
</div>
);
};
-const meta: Meta = {
+const openRelationFieldInputStory = async (canvasElement: HTMLElement) => {
+ const trigger = await within(canvasElement).findByRole('button', {
+ name: 'Edit people',
+ });
+
+ await userEvent.click(trigger);
+};
+
+const meta: Meta<typeof RelationOneToManyFieldInputWithContext> = {
title: 'UI/Data/Field/Input/RelationOneToManyFieldInput',
component: RelationOneToManyFieldInputWithContext,
- args: {},
+ beforeEach: () => {
+ updatePerson.mockClear();
+ submitFieldInput.mockClear();
+ tabFromFieldInput.mockClear();
+ shiftTabFromFieldInput.mockClear();
+ jotaiStore.set(currentWorkspaceState.atom, mockCurrentWorkspace);
+ jotaiStore.set(currentWorkspaceMemberState.atom, mockedWorkspaceMemberData);
+
+ return () => {
+ jotaiStore.set(focusStackState.atom, (focusStack) =>
+ focusStack.filter(({ focusId }) => focusId !== FIELD_INPUT_INSTANCE_ID),
+ );
+ };
+ },
decorators: [
MemoryRouterDecorator,
ObjectMetadataItemsDecorator,
ToastDecorator,
FileUploadDecorator,
+ FieldInputAnchorDecorator,
],
parameters: {
clearMocks: true,
- msw: graphqlMocks,
+ msw: {
+ handlers: [
+ graphql.query('FindOneWorkspaceMember', ({ variables }) =>
+ HttpResponse.json({
+ data: {
+ workspaceMember:
+ mockedWorkspaceMemberRecords.find(
+ ({ id }) => id === variables.objectRecordId,
+ ) ?? null,
+ },
+ }),
+ ),
+ graphql.mutation('UpdateOnePerson', ({ variables }) => {
+ updatePerson(variables);
+
+ return HttpResponse.json({
+ data: {
+ updatePerson: {
+ ...mockedPersonRecords.find(
+ ({ id }) => id === variables.idToUpdate,
+ ),
+ companyId: variables.input.companyId,
+ company:
+ mockedCompanyRecords.find(
+ ({ id }) => id === variables.input.companyId,
+ ) ?? null,
+ },
+ },
+ });
+ }),
+ ...graphqlMocks.handlers,
+ ],
+ },
},
};
@@ -141,4 +286,107 @@ export default meta;
type Story = StoryObj<typeof RelationOneToManyFieldInputWithContext>;
-export const Default: Story = {};
+export const Default: Story = {
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ },
+};
+
+export const ToggleThenEscape: Story = {
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const popup = await body.findByRole('dialog', { name: 'People' });
+ const firstOption = await within(popup).findByRole('option', {
+ name: PERSON_NAME,
+ });
+ await userEvent.click(firstOption);
+ await waitFor(() =>
+ expect(firstOption).toHaveAttribute('aria-selected', 'true'),
+ );
+ await waitFor(() =>
+ expect(updatePerson).toHaveBeenCalledWith({
+ idToUpdate: mockedPersonRecords[0].id,
+ input: { companyId: COMPANY_RECORD_ID },
+ }),
+ );
+ expect(popup).toBeVisible();
+ expect(submitFieldInput).not.toHaveBeenCalled();
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => {
+ expect(submitFieldInput).toHaveBeenCalledWith({ skipPersist: true });
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+ },
+};
+
+export const OutsideInput: Story = {
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ await body.findByRole('dialog', { name: 'People' });
+ await userEvent.click(body.getByRole('textbox', { name: 'Outside input' }));
+ await waitFor(() => {
+ expect(submitFieldInput).toHaveBeenCalledWith({ skipPersist: true });
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+ },
+};
+
+export const Tab: Story = {
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const popup = await body.findByRole('dialog', { name: 'People' });
+ await waitFor(() =>
+ expect(within(popup).getByRole('searchbox')).toHaveFocus(),
+ );
+ await userEvent.tab();
+ await waitFor(() => {
+ expect(tabFromFieldInput).toHaveBeenCalledWith({ skipPersist: true });
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+ expect(submitFieldInput).not.toHaveBeenCalled();
+ },
+};
+
+export const ShiftTab: Story = {
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const popup = await body.findByRole('dialog', { name: 'People' });
+ await waitFor(() =>
+ expect(within(popup).getByRole('searchbox')).toHaveFocus(),
+ );
+ await userEvent.tab({ shift: true });
+ await waitFor(() => {
+ expect(shiftTabFromFieldInput).toHaveBeenCalledWith({
+ skipPersist: true,
+ });
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+ expect(submitFieldInput).not.toHaveBeenCalled();
+ },
+};
+
+export const InlineAnchor: Story = {
+ args: { isInline: true },
+ play: async ({ canvasElement }) => {
+ await openRelationFieldInputStory(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const popup = await body.findByRole('dialog', { name: 'People' });
+ const anchor = within(canvasElement).getByTestId(
+ 'inline-cell-edit-mode-container',
+ );
+ await waitFor(() => {
+ const anchorBounds = anchor.getBoundingClientRect();
+ const popupBounds = popup.getBoundingClientRect();
+ expect(
+ Math.abs(popupBounds.top - (anchorBounds.bottom - 29)),
+ ).toBeLessThan(2);
+ expect(Math.abs(popupBounds.left - (anchorBounds.left - 5))).toBeLessThan(
+ 2,
+ );
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/isFieldInputRenderedAsDropdown.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/isFieldInputRenderedAsDropdown.ts
index fd44dba94a9..10249a15a59 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/isFieldInputRenderedAsDropdown.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/isFieldInputRenderedAsDropdown.ts
@@ -2,8 +2,13 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fiel
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { isFieldMultiSelect } from '@/object-record/record-field/ui/types/guards/isFieldMultiSelect';
import { isFieldSelect } from '@/object-record/record-field/ui/types/guards/isFieldSelect';
+import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';
+import { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany';
export const isFieldInputRenderedAsDropdown = (
- fieldDefinition: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+ fieldDefinition: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
): boolean =>
- isFieldSelect(fieldDefinition) || isFieldMultiSelect(fieldDefinition);
+ isFieldSelect(fieldDefinition) ||
+ isFieldMultiSelect(fieldDefinition) ||
+ isFieldRelationOneToMany(fieldDefinition) ||
+ isFieldMorphRelationOneToMany(fieldDefinition);
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
index fdfb08c57c8..20abeb3c2c5 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
@@ -1,5 +1,10 @@
-import { ListItemButton } from 'twenty-ui/components/navigation';
-import { useCallback, useRef, useState } from 'react';
+import {
+ Dropdown,
+ useDropdownPage,
+ useDropdownPlacementOrThrow,
+} from 'twenty-ui/components/navigation';
+import { useRef } from 'react';
+import { styled } from '@linaria/react';
import { useStore } from 'jotai';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
@@ -7,33 +12,27 @@ import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
import { MultipleRecordPickerCreateTargetSelect } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect';
import { MultipleRecordPickerItemsDisplay } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerItemsDisplay';
-import { MultipleRecordPickerOnClickOutsideEffect } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerOnClickOutsideEffect';
import { MultipleRecordPickerSearchInput } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
import { multipleRecordPickerIsLoadingComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState';
+import { multipleRecordPickerPaginationState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState';
import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
-import { getMultipleRecordPickerSelectableListId } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId';
import { upsertMorphItem } from '@/object-record/record-picker/multiple-record-picker/utils/upsertMorphItem';
-import { type RecordPickerLayoutDirection } from '@/object-record/record-picker/types/RecordPickerLayoutDirection';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { Key } from 'ts-key-enum';
-import { isDefined } from 'twenty-shared/utils';
+import { type RecordPickerLayoutDirection } from '@/object-record/record-picker/types/RecordPickerLayoutDirection';
+import { getMultipleRecordPickerLayoutDirection } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerLayoutDirection';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { t } from '@lingui/core/macro';
import { IconPlus } from 'twenty-ui/icon';
import { logError } from '~/utils/logError';
type MultipleRecordPickerProps = {
onChange?: (morphItem: RecordPickerPickableMorphItem) => void;
- onSubmit?: () => void;
onCreate?: (options: {
searchInput?: string;
objectMetadataItemId: string;
@@ -41,31 +40,33 @@ type MultipleRecordPickerProps = {
isCreatePending?: boolean;
layoutDirection?: RecordPickerLayoutDirection;
componentInstanceId: string;
- onClickOutside: () => void;
- focusId: string;
- dropdownWidth?: number;
};
+const StyledRecordsPage = styled.div<{
+ layoutDirection: RecordPickerLayoutDirection;
+}>`
+ display: flex;
+ flex-direction: ${({ layoutDirection }) =>
+ layoutDirection === 'search-bar-on-bottom' ? 'column-reverse' : 'column'};
+ min-height: 0;
+`;
+
export const MultipleRecordPicker = ({
onChange,
- onSubmit,
onCreate,
- onClickOutside,
- layoutDirection = 'search-bar-on-bottom',
+ layoutDirection,
componentInstanceId,
- focusId,
- dropdownWidth,
isCreatePending = false,
}: MultipleRecordPickerProps) => {
- const [isSelectingCreateTarget, setIsSelectingCreateTarget] = useState(false);
+ const { page, isActive, goBack } = useDropdownPage();
+ const { side, align } = useDropdownPlacementOrThrow();
+ const resolvedLayoutDirection = getMultipleRecordPickerLayoutDirection({
+ layoutDirection,
+ side,
+ align,
+ });
// oxlint-disable-next-line twenty/no-state-useref
const createInFlightRef = useRef(false);
- const selectableListComponentInstanceId =
- getMultipleRecordPickerSelectableListId(componentInstanceId);
-
- const { resetSelectedItem } = useSelectableList(
- selectableListComponentInstanceId,
- );
const multipleRecordPickerSearchFilterState =
useAtomComponentStateCallbackState(
@@ -95,51 +96,29 @@ export const MultipleRecordPicker = ({
const store = useStore();
- const resetState = useCallback(() => {
- store.set(multipleRecordPickerPickableMorphItemsState, []);
- store.set(multipleRecordPickerSearchFilterState, '');
- setIsSelectingCreateTarget(false);
- }, [
- multipleRecordPickerPickableMorphItemsState,
- multipleRecordPickerSearchFilterState,
- store,
- ]);
-
- const handleSubmit = useCallback(() => {
- onSubmit?.();
- resetSelectedItem();
- resetState();
- }, [onSubmit, resetSelectedItem, resetState]);
+ const handleBackToRecords = () => {
+ if (!isActive || page !== 'create-target') {
+ return;
+ }
- const handleClickOutside = useCallback(() => {
- onClickOutside();
- resetSelectedItem();
- resetState();
- }, [onClickOutside, resetSelectedItem, resetState]);
+ goBack();
- const handleBackToRecordSelect = useCallback(() => {
- resetSelectedItem();
- setIsSelectingCreateTarget(false);
- }, [resetSelectedItem]);
+ const searchFilter = store.get(multipleRecordPickerSearchFilterState);
+ const { searchFilter: searchedFilter } = store.get(
+ multipleRecordPickerPaginationState.atomFamily({
+ instanceId: componentInstanceId,
+ }),
+ );
- useHotkeysOnFocusedElement({
- keys: [Key.Escape],
- callback: () => {
- if (isSelectingCreateTarget) {
- handleBackToRecordSelect();
- } else {
- handleSubmit();
- }
- },
- focusId,
- dependencies: [
- handleBackToRecordSelect,
- handleSubmit,
- isSelectingCreateTarget,
- ],
- });
+ if (searchedFilter === searchFilter) {
+ return;
+ }
- const containerRef = useRef<HTMLDivElement>(null);
+ void performSearch({
+ multipleRecordPickerInstanceId: componentInstanceId,
+ forceSearchFilter: searchFilter,
+ });
+ };
const creatableObjectMetadataItems = isDefined(onCreate)
? multipleRecordPickerSearchableObjectMetadataItems.filter(
@@ -181,8 +160,9 @@ export const MultipleRecordPicker = ({
);
store.set(multipleRecordPickerPickableMorphItemsState, newMorphItems);
- resetSelectedItem();
- setIsSelectingCreateTarget(false);
+ if (page === 'create-target') {
+ goBack();
+ }
await performSearch({
multipleRecordPickerInstanceId: componentInstanceId,
@@ -207,76 +187,50 @@ export const MultipleRecordPicker = ({
}
};
- const handleCreateNewButtonClick = () => {
- if (isCreatePending) {
- return;
- }
-
- if (creatableObjectMetadataItems.length === 1) {
- void handleCreate(creatableObjectMetadataItems[0].id);
- return;
- }
-
- resetSelectedItem();
- setIsSelectingCreateTarget(true);
- };
-
- const createNewButtonSection =
- creatableObjectMetadataItems.length > 0 ? (
- <DropdownMenuItemsContainer scrollable={false}>
- <ListItemButton
- onClick={handleCreateNewButtonClick}
- disabled={isCreatePending}
- startIcon={<IconPlus />}
- hasSubmenu={creatableObjectMetadataItems.length > 1}
- >{t`Add New`}</ListItemButton>
- </DropdownMenuItemsContainer>
- ) : null;
+ const hasSingleCreatableObjectMetadataItem =
+ creatableObjectMetadataItems.length === 1;
+
+ const createNewButtonSection = isNonEmptyArray(
+ creatableObjectMetadataItems,
+ ) ? (
+ <Dropdown.Section>
+ <Dropdown.ActionItem
+ onClick={
+ hasSingleCreatableObjectMetadataItem
+ ? () => void handleCreate(creatableObjectMetadataItems[0].id)
+ : undefined
+ }
+ closeOnClick={false}
+ disabled={isCreatePending}
+ startIcon={<IconPlus />}
+ page={
+ hasSingleCreatableObjectMetadataItem ? undefined : 'create-target'
+ }
+ >{t`Add New`}</Dropdown.ActionItem>
+ </Dropdown.Section>
+ ) : null;
return (
<MultipleRecordPickerComponentInstanceContext.Provider
value={{ instanceId: componentInstanceId }}
>
- <MultipleRecordPickerOnClickOutsideEffect
- containerRef={containerRef}
- onClickOutside={handleClickOutside}
- />
- <LegacyDropdownContent ref={containerRef} widthInPixels={dropdownWidth}>
- {isSelectingCreateTarget ? (
- <MultipleRecordPickerCreateTargetSelect
- objectMetadataItems={creatableObjectMetadataItems}
- selectableListInstanceId={selectableListComponentInstanceId}
- focusId={focusId}
- disabled={isCreatePending}
- onBack={handleBackToRecordSelect}
- onSelect={(objectMetadataItemId) => {
- void handleCreate(objectMetadataItemId);
- }}
- />
- ) : (
- <>
- {layoutDirection === 'search-bar-on-bottom' && (
- <>
- {createNewButtonSection}
- <MultipleRecordPickerItemsDisplay
- onChange={onChange}
- focusId={focusId}
- />
- </>
- )}
- <MultipleRecordPickerSearchInput />
- {layoutDirection === 'search-bar-on-top' && (
- <>
- <MultipleRecordPickerItemsDisplay
- onChange={onChange}
- focusId={focusId}
- />
- {createNewButtonSection}
- </>
- )}
- </>
- )}
- </LegacyDropdownContent>
+ <Dropdown.Page id="create-target">
+ <MultipleRecordPickerCreateTargetSelect
+ objectMetadataItems={creatableObjectMetadataItems}
+ disabled={isCreatePending}
+ onBack={handleBackToRecords}
+ onSelect={(objectMetadataItemId) => {
+ void handleCreate(objectMetadataItemId);
+ }}
+ />
+ </Dropdown.Page>
+ <Dropdown.Page id="root">
+ <StyledRecordsPage layoutDirection={resolvedLayoutDirection}>
+ <MultipleRecordPickerSearchInput />
+ <MultipleRecordPickerItemsDisplay onChange={onChange} />
+ {createNewButtonSection}
+ </StyledRecordsPage>
+ </Dropdown.Page>
</MultipleRecordPickerComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx
index 1582e8e7d6f..f9d9492bc34 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx
@@ -1,21 +1,12 @@
-import { ListItemButton } from 'twenty-ui/components/navigation';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-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 { 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 { t } from '@lingui/core/macro';
-import { IconChevronLeft } from 'twenty-ui/icon';
+import { Dropdown } from 'twenty-ui/components/navigation';
+import { type KeyboardEvent } from 'react';
+import { Key } from 'ts-key-enum';
type MultipleRecordPickerCreateTargetSelectProps = {
objectMetadataItems: EnrichedObjectMetadataItem[];
- selectableListInstanceId: string;
- focusId: string;
disabled: boolean;
onBack: () => void;
onSelect: (objectMetadataItemId: string) => void;
@@ -23,63 +14,46 @@ type MultipleRecordPickerCreateTargetSelectProps = {
export const MultipleRecordPickerCreateTargetSelect = ({
objectMetadataItems,
- selectableListInstanceId,
- focusId,
disabled,
onBack,
onSelect,
}: MultipleRecordPickerCreateTargetSelectProps) => {
- const selectedItemId = useAtomComponentStateValue(
- selectedItemIdComponentState,
- selectableListInstanceId,
- );
-
- const handleSelect = (objectMetadataItemId: string) => {
- if (!disabled) {
- onSelect(objectMetadataItemId);
+ const handleKeyDownCapture = (event: KeyboardEvent<HTMLDivElement>) => {
+ if (event.key !== Key.Escape || event.nativeEvent.isComposing) {
+ return;
}
+
+ event.preventDefault();
+ event.stopPropagation();
+ onBack();
};
return (
<>
- <DropdownMenuHeader
- StartComponent={
- <DropdownMenuHeaderLeftComponent
- Icon={IconChevronLeft}
- onClick={onBack}
- />
- }
- >
- {t`Select a record type`}
- </DropdownMenuHeader>
- <DropdownMenuSeparator />
- <DropdownMenuItemsContainer hasMaxHeight>
- <SelectableList
- selectableListInstanceId={selectableListInstanceId}
- selectableItemIdArray={objectMetadataItems.map(({ id }) => id)}
- focusId={focusId}
- shouldPreselectFirstItem
- >
- {objectMetadataItems.map((objectMetadataItem) => (
- <SelectableListItem
- key={objectMetadataItem.id}
- itemId={objectMetadataItem.id}
- onEnter={() => handleSelect(objectMetadataItem.id)}
- >
- <ListItemButton
- startIcon={
- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />
- }
- focused={selectedItemId === objectMetadataItem.id}
- disabled={disabled}
- onClick={() => handleSelect(objectMetadataItem.id)}
- >
- {objectMetadataItem.labelSingular}
- </ListItemButton>
- </SelectableListItem>
- ))}
- </SelectableList>
- </DropdownMenuItemsContainer>
+ <Dropdown.Header onKeyDownCapture={handleKeyDownCapture}>
+ <Dropdown.Back
+ onClick={(event) => {
+ event.preventDefault();
+ onBack();
+ }}
+ />
+ <Dropdown.Title>{t`Select a record type`}</Dropdown.Title>
+ </Dropdown.Header>
+ <Dropdown.Section scrollable onKeyDownCapture={handleKeyDownCapture}>
+ {objectMetadataItems.map((objectMetadataItem) => (
+ <Dropdown.ActionItem
+ key={objectMetadataItem.id}
+ startIcon={
+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />
+ }
+ disabled={disabled}
+ closeOnClick={false}
+ onClick={() => onSelect(objectMetadataItem.id)}
+ >
+ {objectMetadataItem.labelSingular}
+ </Dropdown.ActionItem>
+ ))}
+ </Dropdown.Section>
</>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx
index 99794d364f4..86dc6d79c8a 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx
@@ -1,4 +1,5 @@
import { t } from '@lingui/core/macro';
+import { useDropdownPage } from 'twenty-ui/components/navigation';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
@@ -36,6 +37,7 @@ const StyledIntersectionObserver = styled.div`
export const MultipleRecordPickerFetchMoreLoader = () => {
const store = useStore();
+ const { isActive } = useDropdownPage();
const [
multipleRecordPickerIsFetchingMore,
setMultipleRecordPickerIsFetchingMore,
@@ -55,11 +57,6 @@ export const MultipleRecordPickerFetchMoreLoader = () => {
componentInstanceId,
);
- const multipleRecordPickerSearchFilter = useAtomComponentStateValue(
- multipleRecordPickerSearchFilterComponentState,
- componentInstanceId,
- );
-
const multipleRecordPickerShouldShowInitialLoading =
useAtomComponentStateValue(
multipleRecordPickerShouldShowInitialLoadingComponentState,
@@ -77,25 +74,38 @@ export const MultipleRecordPickerFetchMoreLoader = () => {
instanceId: componentInstanceId,
}),
);
-
- if (multipleRecordPickerIsLoading || !currentPaginationState.hasNextPage) {
+ const currentSearchFilter = store.get(
+ multipleRecordPickerSearchFilterComponentState.atomFamily({
+ instanceId: componentInstanceId,
+ }),
+ );
+ const isNewSearchPending =
+ currentPaginationState.searchFilter !== currentSearchFilter;
+
+ if (
+ !isActive ||
+ multipleRecordPickerIsLoading ||
+ isNewSearchPending ||
+ !currentPaginationState.hasNextPage
+ ) {
return;
}
await performSearch({
multipleRecordPickerInstanceId: componentInstanceId,
- forceSearchFilter: multipleRecordPickerSearchFilter,
+ forceSearchFilter: currentPaginationState.searchFilter,
loadMore: true,
});
}, [
componentInstanceId,
+ isActive,
performSearch,
- multipleRecordPickerSearchFilter,
multipleRecordPickerIsLoading,
store,
]);
const { ref } = useInView({
+ skip: !isActive,
onChange: useCallback(
async (inView: boolean) => {
if (inView) {
@@ -111,6 +121,7 @@ export const MultipleRecordPickerFetchMoreLoader = () => {
});
if (
+ !isActive ||
!paginationState.hasNextPage ||
multipleRecordPickerShouldShowInitialLoading ||
multipleRecordPickerShouldShowSkeleton ||
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerItemsDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerItemsDisplay.tsx
index ba91f792ec6..e4f683e0cf8 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerItemsDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerItemsDisplay.tsx
@@ -1,21 +1,19 @@
import { MultipleRecordPickerLoadingEffect } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerLoadingEffect';
import { MultipleRecordPickerMenuItems } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { Dropdown } from 'twenty-ui/components/navigation';
export const MultipleRecordPickerItemsDisplay = ({
onChange,
- focusId,
}: {
onChange?: (morphItem: RecordPickerPickableMorphItem) => void;
- focusId: string;
}) => {
return (
<>
<MultipleRecordPickerLoadingEffect />
- <DropdownMenuSeparator />
- <MultipleRecordPickerMenuItems onChange={onChange} focusId={focusId} />
- <DropdownMenuSeparator />
+ <Dropdown.Separator />
+ <MultipleRecordPickerMenuItems onChange={onChange} />
+ <Dropdown.Separator />
</>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
index 8a7d2d9e726..a5c3f11c20c 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
@@ -1,17 +1,12 @@
-import { ListItemButton } from 'twenty-ui/components/navigation';
+import { Dropdown } from 'twenty-ui/components/navigation';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { multipleRecordPickerIsSelectedComponentFamilySelector } from '@/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector';
-import { getMultipleRecordPickerSelectableListId } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
-import { useSelectableListNativeItemRef } from '@/ui/layout/selectable-list/hooks/useSelectableListNativeItemRef';
-import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { capitalize } from 'twenty-shared/utils';
@@ -30,21 +25,10 @@ export const MultipleRecordPickerMenuItemContent = ({
objectMetadataItem,
onChange,
}: MultipleRecordPickerMenuItemContentProps) => {
- const nativeItemRef = useSelectableListNativeItemRef(searchRecord.recordId);
-
const componentInstanceId = useAvailableComponentInstanceIdOrThrow(
MultipleRecordPickerComponentInstanceContext,
);
- const selectableListComponentInstanceId =
- getMultipleRecordPickerSelectableListId(componentInstanceId);
-
- const isSelectedItemId = useAtomComponentFamilyStateValue(
- isSelectedItemIdComponentFamilyState,
- searchRecord.recordId,
- selectableListComponentInstanceId,
- );
-
const isRecordSelectedWithObjectItem = useAtomComponentFamilySelectorValue(
multipleRecordPickerIsSelectedComponentFamilySelector,
searchRecord.recordId,
@@ -74,36 +58,25 @@ export const MultipleRecordPickerMenuItemContent = ({
multipleRecordPickerSearchableObjectMetadataItems.length > 1;
return (
- <SelectableListItem
- itemId={searchRecord.recordId}
- key={searchRecord.recordId}
- onEnter={() => handleSelectChange(!isRecordSelectedWithObjectItem)}
+ <Dropdown.OptionItem
+ value={searchRecord.recordId}
+ description={
+ showObjectName
+ ? capitalize(objectMetadataItem.labelSingular)
+ : undefined
+ }
+ onSelect={() => handleSelectChange(!isRecordSelectedWithObjectItem)}
+ startIcon={
+ <Avatar
+ src={getAbsoluteImageUrl(searchRecord.imageUrl)}
+ colorSeed={searchRecord.recordId}
+ name={displayText}
+ size="md"
+ shape={getAvatarShape(objectMetadataItem)}
+ />
+ }
>
- <ListItemButton
- ref={nativeItemRef}
- focused={isSelectedItemId}
- role="option"
- aria-selected={isRecordSelectedWithObjectItem}
- selected={isRecordSelectedWithObjectItem}
- indicator="checkbox"
- description={
- showObjectName
- ? capitalize(objectMetadataItem.labelSingular)
- : undefined
- }
- onClick={() => handleSelectChange(!isRecordSelectedWithObjectItem)}
- startIcon={
- <Avatar
- src={getAbsoluteImageUrl(searchRecord.imageUrl)}
- colorSeed={searchRecord.recordId}
- name={displayText}
- size="md"
- shape={getAvatarShape(objectMetadataItem)}
- />
- }
- >
- {displayText}
- </ListItemButton>
- </SelectableListItem>
+ {displayText}
+ </Dropdown.OptionItem>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx
index f8584405365..0457afe0b76 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx
@@ -1,6 +1,5 @@
import { RecordPickerInitialLoadingEmptyContainer } from '@/object-record/record-picker/components/RecordPickerInitialLoadingEmptyContainer';
import { RecordPickerLoadingSkeletonList } from '@/object-record/record-picker/components/RecordPickerLoadingSkeletonList';
-import { RecordPickerNoRecordFoundMenuItem } from '@/object-record/record-picker/components/RecordPickerNoRecordFoundMenuItem';
import { MultipleRecordPickerFetchMoreLoader } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader';
import { MultipleRecordPickerMenuItem } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItem';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
@@ -8,108 +7,79 @@ import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-r
import { multipleRecordPickerShouldShowInitialLoadingComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState';
import { multipleRecordPickerShouldShowSkeletonComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState';
import { multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector } from '@/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector';
-import { getMultipleRecordPickerSelectableListId } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId';
+import { upsertMorphItem } from '@/object-record/record-picker/multiple-record-picker/utils/upsertMorphItem';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
+import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useCallback } from 'react';
-import { useStore } from 'jotai';
+import { t } from '@lingui/core/macro';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components/navigation';
type MultipleRecordPickerMenuItemsProps = {
onChange?: (morphItem: RecordPickerPickableMorphItem) => void;
- focusId: string;
};
export const MultipleRecordPickerMenuItems = ({
onChange,
- focusId,
}: MultipleRecordPickerMenuItemsProps) => {
- const store = useStore();
const componentInstanceId = useAvailableComponentInstanceIdOrThrow(
MultipleRecordPickerComponentInstanceContext,
);
-
- const selectableListComponentInstanceId =
- getMultipleRecordPickerSelectableListId(componentInstanceId);
-
const pickableRecordIds = useAtomComponentSelectorValue(
multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector,
componentInstanceId,
);
-
- const multipleRecordPickerPickableMorphItems =
- useAtomComponentStateCallbackState(
- multipleRecordPickerPickableMorphItemsComponentState,
- componentInstanceId,
- );
-
- const handleChange = useCallback(
- (morphItem: RecordPickerPickableMorphItem) => {
- const previousMorphItems = store.get(
- multipleRecordPickerPickableMorphItems,
- );
-
- const existingMorphItemIndex = previousMorphItems.findIndex(
- (item) => item.recordId === morphItem.recordId,
- );
-
- const newMorphItems = [...previousMorphItems];
-
- if (existingMorphItemIndex === -1) {
- newMorphItems.push(morphItem);
- } else {
- newMorphItems[existingMorphItemIndex] = morphItem;
- }
-
- store.set(multipleRecordPickerPickableMorphItems, newMorphItems);
- },
- [multipleRecordPickerPickableMorphItems, store],
+ const [
+ multipleRecordPickerPickableMorphItems,
+ setMultipleRecordPickerPickableMorphItems,
+ ] = useAtomComponentState(
+ multipleRecordPickerPickableMorphItemsComponentState,
+ componentInstanceId,
);
-
const multipleRecordPickerShouldShowInitialLoading =
useAtomComponentStateValue(
multipleRecordPickerShouldShowInitialLoadingComponentState,
);
-
const multipleRecordPickerShouldShowSkeleton = useAtomComponentStateValue(
multipleRecordPickerShouldShowSkeletonComponentState,
);
+ const selectedRecordIds = multipleRecordPickerPickableMorphItems
+ .filter(({ isSelected }) => isSelected)
+ .map(({ recordId }) => recordId);
- const searchHasNoResults = pickableRecordIds.length === 0;
+ const handleChange = (morphItem: RecordPickerPickableMorphItem) => {
+ setMultipleRecordPickerPickableMorphItems((previousMorphItems) =>
+ upsertMorphItem(previousMorphItems, morphItem),
+ );
+ onChange?.(morphItem);
+ };
return (
- <DropdownMenuItemsContainer isMultiSelect hasMaxHeight>
+ <Dropdown.Section scrollable>
{multipleRecordPickerShouldShowInitialLoading ? (
<RecordPickerInitialLoadingEmptyContainer />
) : multipleRecordPickerShouldShowSkeleton ? (
<RecordPickerLoadingSkeletonList />
- ) : searchHasNoResults ? (
- <RecordPickerNoRecordFoundMenuItem />
+ ) : !isNonEmptyArray(pickableRecordIds) ? (
+ <Dropdown.Empty>{t`No records found`}</Dropdown.Empty>
) : (
- <SelectableList
- selectableListInstanceId={selectableListComponentInstanceId}
- selectableItemIdArray={pickableRecordIds}
- focusId={focusId}
+ <Dropdown.SelectionGroup
+ multiple
+ value={selectedRecordIds}
+ aria-label={t`Records`}
>
- {pickableRecordIds.map((recordId) => {
- return (
- <MultipleRecordPickerMenuItem
- key={recordId}
- recordId={recordId}
- onChange={(morphItem) => {
- handleChange(morphItem);
- onChange?.(morphItem);
- }}
- />
- );
- })}
+ {pickableRecordIds.map((recordId) => (
+ <MultipleRecordPickerMenuItem
+ key={recordId}
+ recordId={recordId}
+ onChange={handleChange}
+ />
+ ))}
<MultipleRecordPickerFetchMoreLoader />
- </SelectableList>
+ </Dropdown.SelectionGroup>
)}
- </DropdownMenuItemsContainer>
+ </Dropdown.Section>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerOnClickOutsideEffect.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerOnClickOutsideEffect.tsx
deleted file mode 100644
index 0eb98a45c38..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerOnClickOutsideEffect.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { MULTIPLE_RECORD_PICKER_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-picker/multiple-record-picker/constants/MultipleRecordPickerClickOutsideListenerId';
-import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-
-export const MultipleRecordPickerOnClickOutsideEffect = ({
- containerRef,
- onClickOutside,
-}: {
- containerRef: React.RefObject<HTMLDivElement | null>;
- onClickOutside: () => void;
-}) => {
- useListenClickOutside({
- refs: [containerRef],
- callback: (event) => {
- event.stopImmediatePropagation();
- event.stopPropagation();
- event.preventDefault();
-
- onClickOutside();
- },
- listenerId: MULTIPLE_RECORD_PICKER_CLICK_OUTSIDE_LISTENER_ID,
- });
-
- return <></>;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx
index 6885ee7f5a2..1fe4e581754 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx
@@ -1,18 +1,25 @@
-import { useCallback } from 'react';
+import { type ChangeEvent, type KeyboardEvent } from 'react';
import { useStore } from 'jotai';
+import { Key } from 'ts-key-enum';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
+import { multipleRecordPickerPaginationState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState';
import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { Dropdown, useDropdownPage } from 'twenty-ui/components/navigation';
+import { t } from '@lingui/core/macro';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useDebouncedCallback } from 'use-debounce';
+const SEARCH_DEBOUNCE_DELAY_IN_MILLISECONDS = 500;
+
export const MultipleRecordPickerSearchInput = () => {
const componentInstanceId = useAvailableComponentInstanceIdOrThrow(
MultipleRecordPickerComponentInstanceContext,
);
+ const { isActive } = useDropdownPage();
+ const store = useStore();
const [
multipleRecordPickerSearchFilter,
@@ -21,39 +28,49 @@ export const MultipleRecordPickerSearchInput = () => {
const { performSearch } = useMultipleRecordPickerPerformSearch();
- const store = useStore();
+ const debouncedSearch = useDebouncedCallback((searchFilter: string) => {
+ if (!isActive) {
+ return;
+ }
- const debouncedSearch = useDebouncedCallback(
- useCallback(
- (searchFilter: string) => {
- store.set(
- multipleRecordPickerSearchFilterComponentState.atomFamily({
- instanceId: componentInstanceId,
- }),
- searchFilter,
- );
-
- performSearch({
- multipleRecordPickerInstanceId: componentInstanceId,
- forceSearchFilter: searchFilter,
- });
- },
- [componentInstanceId, performSearch, store],
- ),
- 500,
- );
+ void performSearch({
+ multipleRecordPickerInstanceId: componentInstanceId,
+ forceSearchFilter: searchFilter,
+ });
+ }, SEARCH_DEBOUNCE_DELAY_IN_MILLISECONDS);
- const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+ const handleFilterChange = (event: ChangeEvent<HTMLInputElement>) => {
const newSearchFilter = event.currentTarget.value;
setMultipleRecordPickerSearchFilter(newSearchFilter);
debouncedSearch(newSearchFilter);
};
+ const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+ if (event.key !== Key.Enter || event.nativeEvent.isComposing) {
+ return;
+ }
+
+ const { searchFilter: searchedFilter } = store.get(
+ multipleRecordPickerPaginationState.atomFamily({
+ instanceId: componentInstanceId,
+ }),
+ );
+
+ if (searchedFilter === multipleRecordPickerSearchFilter) {
+ return;
+ }
+
+ event.preventDefault();
+ debouncedSearch.flush();
+ };
+
return (
- <DropdownMenuSearchInput
+ <Dropdown.Search
+ aria-label={t`Search records`}
+ placeholder={t`Search`}
value={multipleRecordPickerSearchFilter}
onChange={handleFilterChange}
- autoFocus
+ onKeyDown={handleKeyDown}
/>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.placement.stories.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.placement.stories.tsx
new file mode 100644
index 00000000000..dba24b32423
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.placement.stories.tsx
@@ -0,0 +1,172 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fireEvent, userEvent, waitFor, within } from 'storybook/test';
+import { assertIsDefinedOrThrow } from 'twenty-shared/utils';
+
+import { MultipleRecordPickerPlacementStory } from '@/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerPlacementStory';
+import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
+import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
+import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedPersonRecords } from '~/testing/mock-data/generated/data/people/mock-people-data';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+const PERSON_METADATA = getMockObjectMetadataItemOrThrow('person');
+const PERSON_RECORDS = mockedPersonRecords.slice(0, 12);
+const LAST_RECORD = PERSON_RECORDS[PERSON_RECORDS.length - 1];
+const LAST_RECORD_LABEL = `${LAST_RECORD.name.firstName} ${LAST_RECORD.name.lastName}`;
+const FOCUS_STEPS_FROM_SEARCH = 3;
+const FOCUSED_RECORD =
+ PERSON_RECORDS[PERSON_RECORDS.length - FOCUS_STEPS_FROM_SEARCH];
+const FOCUSED_RECORD_LABEL = `${FOCUSED_RECORD.name.firstName} ${FOCUSED_RECORD.name.lastName}`;
+const ANCHOR_SCROLL_TOP = 320;
+const POSITION_TOLERANCE_IN_PIXELS = 2;
+
+const meta: Meta<typeof MultipleRecordPickerPlacementStory> = {
+ title: 'UI/RecordPicker/MultipleRecordPicker/Placement',
+ component: MultipleRecordPickerPlacementStory,
+ decorators: [
+ MemoryRouterDecorator,
+ ObjectMetadataItemsDecorator,
+ ToastDecorator,
+ ],
+ args: { componentInstanceId: 'multiple-record-picker-placement-story' },
+ parameters: { msw: graphqlMocks },
+ beforeEach: ({ args }) => {
+ const componentStateKey = { instanceId: args.componentInstanceId };
+
+ jotaiStore.set(
+ multipleRecordPickerSearchableObjectMetadataItemsComponentState.atomFamily(
+ componentStateKey,
+ ),
+ [PERSON_METADATA],
+ );
+ jotaiStore.set(
+ multipleRecordPickerPickableMorphItemsComponentState.atomFamily(
+ componentStateKey,
+ ),
+ PERSON_RECORDS.map(({ id }) => ({
+ recordId: id,
+ objectMetadataId: PERSON_METADATA.id,
+ isSelected: false,
+ isMatchingSearchFilter: true,
+ })),
+ );
+
+ for (const record of PERSON_RECORDS) {
+ jotaiStore.set(searchRecordStoreFamilyState.atomFamily(record.id), {
+ recordId: record.id,
+ label: `${record.name.firstName} ${record.name.lastName}`,
+ objectNameSingular: PERSON_METADATA.nameSingular,
+ objectLabelSingular: PERSON_METADATA.labelSingular,
+ imageUrl: '',
+ tsRank: 0,
+ tsRankCD: 0,
+ record,
+ });
+ }
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof MultipleRecordPickerPlacementStory>;
+
+export const FlipKeepsResultsAndFocus: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const anchorRegion = await canvas.findByRole('region', {
+ name: 'Scrollable record editor',
+ });
+ const trigger = canvas.getByRole('button', { name: 'Link records' });
+
+ await userEvent.click(trigger);
+
+ const popup = await body.findByRole('dialog', { name: 'Related records' });
+ const picker = within(popup);
+ const search = picker.getByRole('searchbox');
+ const listbox = picker.getByRole('listbox', { name: 'Records' });
+ const recordsScroller = listbox.parentElement;
+ const focusedOption = picker.getByRole('option', {
+ name: FOCUSED_RECORD_LABEL,
+ });
+
+ assertIsDefinedOrThrow(recordsScroller);
+
+ await waitFor(() => {
+ expect(popup.getBoundingClientRect().bottom).toBeLessThanOrEqual(
+ trigger.getBoundingClientRect().top + POSITION_TOLERANCE_IN_PIXELS,
+ );
+ expect(search).toHaveFocus();
+ });
+ expect(search.getBoundingClientRect().top).toBeGreaterThanOrEqual(
+ recordsScroller.getBoundingClientRect().bottom,
+ );
+
+ await userEvent.tab({ shift: true });
+ expect(picker.getByRole('button', { name: 'Add New' })).toHaveFocus();
+ await userEvent.tab({ shift: true });
+ expect(trigger).toHaveFocus();
+ expect(popup).toBeVisible();
+ await userEvent.tab();
+ expect(picker.getByRole('button', { name: 'Add New' })).toHaveFocus();
+ await userEvent.tab();
+ expect(search).toHaveFocus();
+
+ await userEvent.keyboard('{ArrowUp}'.repeat(FOCUS_STEPS_FROM_SEARCH));
+ await waitFor(() => {
+ expect(focusedOption).toHaveFocus();
+ expect(recordsScroller.scrollTop).toBeGreaterThan(0);
+ });
+
+ const resultsScrollTop = recordsScroller.scrollTop;
+
+ anchorRegion.scrollTop = ANCHOR_SCROLL_TOP;
+ fireEvent.scroll(anchorRegion);
+
+ await waitFor(() => {
+ expect(popup.getBoundingClientRect().top).toBeGreaterThanOrEqual(
+ trigger.getBoundingClientRect().bottom - POSITION_TOLERANCE_IN_PIXELS,
+ );
+ });
+ await waitFor(() => {
+ expect(picker.getByRole('searchbox')).toBe(search);
+ expect(picker.getByRole('listbox', { name: 'Records' })).toBe(listbox);
+ expect(picker.getByRole('option', { name: FOCUSED_RECORD_LABEL })).toBe(
+ focusedOption,
+ );
+ expect(focusedOption).toHaveFocus();
+ expect(recordsScroller.scrollTop).toBe(resultsScrollTop);
+ expect(search.getBoundingClientRect().bottom).toBeLessThanOrEqual(
+ recordsScroller.getBoundingClientRect().top,
+ );
+ });
+
+ await userEvent.keyboard('{End}');
+ expect(picker.getByRole('button', { name: 'Add New' })).toHaveFocus();
+ await userEvent.keyboard('{ArrowUp}');
+ expect(
+ picker.getByRole('option', {
+ name: LAST_RECORD_LABEL,
+ }),
+ ).toHaveFocus();
+
+ await userEvent.click(search);
+ anchorRegion.scrollTop = 0;
+ fireEvent.scroll(anchorRegion);
+ await waitFor(() =>
+ expect(search.getBoundingClientRect().top).toBeGreaterThanOrEqual(
+ recordsScroller.getBoundingClientRect().bottom,
+ ),
+ );
+ expect(search).toHaveFocus();
+ await userEvent.tab();
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ expect(
+ canvas.getByRole('button', { name: 'Outside picker' }),
+ ).toHaveFocus();
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.stories.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.stories.tsx
new file mode 100644
index 00000000000..87b844f4ded
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPicker.stories.tsx
@@ -0,0 +1,453 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { HttpResponse, delay, graphql } from 'msw';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import { MultipleRecordPickerCreationStory } from '@/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerCreationStory';
+import { initializeMultipleRecordPickerStory } from '@/object-record/record-picker/multiple-record-picker/components/__stories__/initializeMultipleRecordPickerStory';
+import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+import { mockedApolloCoreClient } from '~/testing/mockedApolloCoreClient';
+import { MOCKED_DATE } from '~/testing/constants/MockedDate';
+import {
+ type SearchQuery,
+ type SearchQueryVariables,
+} from '~/generated/graphql';
+import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+const COMPANY_METADATA = getMockObjectMetadataItemOrThrow('company');
+const PERSON_METADATA = getMockObjectMetadataItemOrThrow('person');
+const COMPANY_RECORD = mockedCompanyRecords[0];
+const CREATED_COMPANY_LABEL_PATTERN = new RegExp(String(COMPANY_RECORD.name));
+const CREATED_MORPH_ITEM: RecordPickerPickableMorphItem = {
+ recordId: COMPANY_RECORD.id,
+ objectMetadataId: COMPANY_METADATA.id,
+ isSelected: true,
+ isMatchingSearchFilter: true,
+};
+const createRecord = fn(async () => CREATED_MORPH_ITEM);
+const onSearchRequest = fn<(searchInput: string) => void>();
+const HIDDEN_SEARCH_QUERY = 'Hidden record search';
+const ACTIVE_SEARCH_QUERY = 'Active record search';
+const BACK_BUTTON_SEARCH_QUERY = 'Back button record search';
+const CLOSED_SEARCH_QUERY = 'Closed record search';
+const CREATION_AFTER_BACK_SEARCH_QUERY = 'Created after Back';
+const SEARCH_SETTLE_WAIT_IN_MILLISECONDS = 750;
+
+const meta: Meta<typeof MultipleRecordPickerCreationStory> = {
+ title: 'UI/RecordPicker/MultipleRecordPicker',
+ component: MultipleRecordPickerCreationStory,
+ decorators: [
+ ComponentDecorator,
+ MemoryRouterDecorator,
+ ObjectMetadataItemsDecorator,
+ ToastDecorator,
+ ],
+ parameters: { msw: graphqlMocks },
+ args: {
+ componentInstanceId: 'multiple-record-picker-creation-story',
+ onCreate: createRecord,
+ },
+ beforeEach: ({ args }) =>
+ initializeMultipleRecordPickerStory(args.componentInstanceId),
+};
+
+export default meta;
+type Story = StoryObj<typeof MultipleRecordPickerCreationStory>;
+
+export const CreateTargetAndSession: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = await canvas.findByRole('button', { name: 'Link records' });
+
+ await userEvent.click(trigger);
+
+ const picker = await body.findByRole('dialog', { name: 'Related records' });
+ const search = within(picker).getByRole('searchbox');
+
+ await userEvent.type(search, 'New company');
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+
+ expect(
+ await within(picker).findByText('Select a record type'),
+ ).toBeVisible();
+ expect(within(picker).queryByRole('searchbox')).not.toBeInTheDocument();
+
+ await userEvent.keyboard('{End}');
+ expect(
+ within(picker).getByRole('button', {
+ name: PERSON_METADATA.labelSingular,
+ }),
+ ).toHaveFocus();
+ await userEvent.keyboard('{Escape}');
+
+ const addNewButton = await within(picker).findByRole('button', {
+ name: 'Add New',
+ });
+
+ await waitFor(() => expect(addNewButton).toHaveFocus());
+ expect(search).toHaveValue('New company');
+ expect(picker).toBeVisible();
+
+ await userEvent.click(addNewButton);
+ await userEvent.keyboard('{Home}');
+
+ expect(within(picker).getByRole('button', { name: 'Back' })).toHaveFocus();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(addNewButton).toHaveFocus());
+ expect(search).toHaveValue('New company');
+ expect(picker).toBeVisible();
+
+ await userEvent.click(addNewButton);
+
+ const finishCreation = fn<() => void>();
+ const pendingCreation = new Promise<RecordPickerPickableMorphItem>(
+ (resolve) => {
+ finishCreation.mockImplementation(() => resolve(CREATED_MORPH_ITEM));
+ },
+ );
+ createRecord.mockReturnValueOnce(pendingCreation);
+
+ await userEvent.dblClick(
+ await within(picker).findByRole('button', {
+ name: COMPANY_METADATA.labelSingular,
+ }),
+ );
+
+ expect(createRecord).toHaveBeenCalledTimes(1);
+ expect(createRecord).toHaveBeenCalledWith({
+ searchInput: 'New company',
+ objectMetadataItemId: COMPANY_METADATA.id,
+ });
+ expect(within(picker).getByText('Select a record type')).toBeVisible();
+
+ finishCreation();
+
+ expect(await within(picker).findByRole('searchbox')).toHaveValue(
+ 'New company',
+ );
+ expect(
+ await within(picker).findByRole('option', {
+ name: CREATED_COMPANY_LABEL_PATTERN,
+ selected: true,
+ }),
+ ).toBeVisible();
+ expect(picker).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Related records' }),
+ ).not.toBeInTheDocument(),
+ );
+ await userEvent.click(trigger);
+
+ const reopenedPicker = await body.findByRole('dialog', {
+ name: 'Related records',
+ });
+
+ expect(within(reopenedPicker).getByRole('searchbox')).toHaveValue('');
+ expect(
+ within(reopenedPicker).getByRole('button', { name: 'Add New' }),
+ ).toBeVisible();
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside picker' }),
+ );
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Related records' }),
+ ).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const CreateAfterReturningToRecords: Story = {
+ args: {
+ componentInstanceId: 'multiple-record-picker-create-after-back-story',
+ },
+ play: async ({ canvasElement }) => {
+ createRecord.mockClear();
+
+ const finishCreation = fn<() => void>();
+ const pendingCreation = new Promise<RecordPickerPickableMorphItem>(
+ (resolve) => {
+ finishCreation.mockImplementation(() => resolve(CREATED_MORPH_ITEM));
+ },
+ );
+ createRecord.mockReturnValueOnce(pendingCreation);
+
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = await canvas.findByRole('button', { name: 'Link records' });
+
+ await userEvent.click(trigger);
+
+ const picker = await body.findByRole('dialog', { name: 'Related records' });
+ const search = within(picker).getByRole('searchbox');
+
+ await userEvent.type(search, CREATION_AFTER_BACK_SEARCH_QUERY);
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+ await userEvent.click(
+ await within(picker).findByRole('button', {
+ name: COMPANY_METADATA.labelSingular,
+ }),
+ );
+
+ expect(createRecord).toHaveBeenCalledTimes(1);
+ expect(within(picker).getByText('Select a record type')).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+
+ const restoredSearch = await within(picker).findByRole('searchbox');
+
+ expect(restoredSearch).toHaveValue(CREATION_AFTER_BACK_SEARCH_QUERY);
+ expect(picker).toBeVisible();
+ await userEvent.click(restoredSearch);
+ expect(restoredSearch).toHaveFocus();
+
+ finishCreation();
+
+ expect(
+ await within(picker).findByRole('option', {
+ name: CREATED_COMPANY_LABEL_PATTERN,
+ selected: true,
+ }),
+ ).toBeVisible();
+ expect(within(picker).getByRole('searchbox')).toHaveValue(
+ CREATION_AFTER_BACK_SEARCH_QUERY,
+ );
+ expect(restoredSearch).toHaveFocus();
+ expect(picker).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Related records' }),
+ ).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const PendingCreationKeepsNewCreateTargetPage: Story = {
+ args: {
+ componentInstanceId:
+ 'multiple-record-picker-pending-new-create-target-story',
+ },
+ play: async ({ canvasElement }) => {
+ createRecord.mockClear();
+
+ const finishCreation = fn<() => void>();
+ const pendingCreation = new Promise<RecordPickerPickableMorphItem>(
+ (resolve) => {
+ finishCreation.mockImplementation(() => resolve(CREATED_MORPH_ITEM));
+ },
+ );
+ createRecord.mockReturnValueOnce(pendingCreation);
+
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Link records' }),
+ );
+
+ const picker = await body.findByRole('dialog', { name: 'Related records' });
+ const search = within(picker).getByRole('searchbox');
+
+ await userEvent.type(search, CREATION_AFTER_BACK_SEARCH_QUERY);
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+ await userEvent.click(
+ await within(picker).findByRole('button', {
+ name: COMPANY_METADATA.labelSingular,
+ }),
+ );
+
+ expect(createRecord).toHaveBeenCalledTimes(1);
+
+ await userEvent.keyboard('{Escape}');
+
+ expect(await within(picker).findByRole('searchbox')).toHaveValue(
+ CREATION_AFTER_BACK_SEARCH_QUERY,
+ );
+
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+
+ const createTargetTitle = await within(picker).findByText(
+ 'Select a record type',
+ );
+ const personTypeButton = within(picker).getByRole('button', {
+ name: PERSON_METADATA.labelSingular,
+ });
+
+ await userEvent.keyboard('{End}');
+ expect(personTypeButton).toHaveFocus();
+
+ finishCreation();
+ await pendingCreation;
+ await userEvent.keyboard('{End}');
+
+ await waitFor(() => {
+ expect(createTargetTitle).toBeVisible();
+ expect(personTypeButton).toHaveFocus();
+ expect(within(picker).queryByRole('searchbox')).not.toBeInTheDocument();
+ });
+ expect(createRecord).toHaveBeenCalledTimes(1);
+
+ await userEvent.click(within(picker).getByRole('button', { name: 'Back' }));
+
+ expect(await within(picker).findByRole('searchbox')).toHaveValue(
+ CREATION_AFTER_BACK_SEARCH_QUERY,
+ );
+ expect(
+ await within(picker).findByRole('option', {
+ name: CREATED_COMPANY_LABEL_PATTERN,
+ selected: true,
+ }),
+ ).toBeVisible();
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Related records' }),
+ ).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const InactivePagesSkipSearch: Story = {
+ args: {
+ componentInstanceId: 'multiple-record-picker-inactive-search-story',
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query<SearchQuery, SearchQueryVariables>(
+ 'Search',
+ ({ variables }) => {
+ onSearchRequest(variables.searchInput);
+
+ return HttpResponse.json({
+ data: {
+ search: {
+ edges: [],
+ pageInfo: { hasNextPage: false, endCursor: null },
+ },
+ },
+ });
+ },
+ ),
+ ...graphqlMocks.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const initialTimeInMilliseconds = Date.parse(MOCKED_DATE);
+ const initialPerformanceTime = performance.now();
+ const originalDateNow = Date.now;
+ Date.now = () =>
+ initialTimeInMilliseconds +
+ Math.floor(performance.now() - initialPerformanceTime);
+
+ try {
+ for (const client of [mockedApolloClient, mockedApolloCoreClient]) {
+ client.cache.evict({ fieldName: 'search' });
+ }
+ onSearchRequest.mockClear();
+
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Link records' }),
+ );
+
+ const picker = await body.findByRole('dialog', {
+ name: 'Related records',
+ });
+ const search = within(picker).getByRole('searchbox');
+
+ await userEvent.type(search, HIDDEN_SEARCH_QUERY);
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+
+ expect(
+ await within(picker).findByText('Select a record type'),
+ ).toBeVisible();
+
+ await delay(SEARCH_SETTLE_WAIT_IN_MILLISECONDS);
+
+ expect(onSearchRequest).not.toHaveBeenCalledWith(HIDDEN_SEARCH_QUERY);
+
+ await userEvent.keyboard('{Escape}');
+
+ const restoredSearch = await within(picker).findByRole('searchbox');
+
+ expect(restoredSearch).toHaveValue(HIDDEN_SEARCH_QUERY);
+
+ await waitFor(() =>
+ expect(onSearchRequest).toHaveBeenCalledWith(HIDDEN_SEARCH_QUERY),
+ );
+
+ await userEvent.clear(restoredSearch);
+ await userEvent.type(restoredSearch, ACTIVE_SEARCH_QUERY);
+ expect(restoredSearch).toHaveValue(ACTIVE_SEARCH_QUERY);
+
+ await waitFor(() =>
+ expect(onSearchRequest).toHaveBeenCalledWith(ACTIVE_SEARCH_QUERY),
+ );
+
+ await userEvent.clear(restoredSearch);
+ await userEvent.type(restoredSearch, BACK_BUTTON_SEARCH_QUERY);
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Add New' }),
+ );
+ await delay(SEARCH_SETTLE_WAIT_IN_MILLISECONDS);
+
+ expect(onSearchRequest).not.toHaveBeenCalledWith(
+ BACK_BUTTON_SEARCH_QUERY,
+ );
+
+ await userEvent.click(
+ within(picker).getByRole('button', { name: 'Back' }),
+ );
+ expect(await within(picker).findByRole('searchbox')).toHaveValue(
+ BACK_BUTTON_SEARCH_QUERY,
+ );
+ await waitFor(() =>
+ expect(onSearchRequest).toHaveBeenCalledWith(BACK_BUTTON_SEARCH_QUERY),
+ );
+
+ await userEvent.clear(restoredSearch);
+ await userEvent.type(restoredSearch, CLOSED_SEARCH_QUERY);
+ await userEvent.keyboard('{Escape}');
+
+ await waitFor(() =>
+ expect(
+ body.queryByRole('dialog', { name: 'Related records' }),
+ ).not.toBeInTheDocument(),
+ );
+ await delay(SEARCH_SETTLE_WAIT_IN_MILLISECONDS);
+
+ expect(onSearchRequest).not.toHaveBeenCalledWith(CLOSED_SEARCH_QUERY);
+ } finally {
+ Date.now = originalDateNow;
+ }
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerCreationStory.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerCreationStory.tsx
new file mode 100644
index 00000000000..779813a5077
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerCreationStory.tsx
@@ -0,0 +1,61 @@
+import { type ComponentProps } from 'react';
+import { Dropdown } from 'twenty-ui/components/navigation';
+import { Button } from 'twenty-ui/primitives/input';
+
+import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
+import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';
+import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+
+type MultipleRecordPickerCreationStoryProps = {
+ componentInstanceId: string;
+ onCreate: NonNullable<
+ ComponentProps<typeof MultipleRecordPicker>['onCreate']
+ >;
+};
+
+export const MultipleRecordPickerCreationStory = ({
+ componentInstanceId,
+ onCreate,
+}: MultipleRecordPickerCreationStoryProps) => {
+ const { openMultipleRecordPicker } = useMultipleRecordPickerOpen();
+ const { performSearch } = useMultipleRecordPickerPerformSearch();
+
+ const handleOpenChange = (open: boolean) => {
+ if (!open) {
+ return;
+ }
+
+ openMultipleRecordPicker(componentInstanceId);
+ void performSearch({
+ multipleRecordPickerInstanceId: componentInstanceId,
+ forceSearchFilter: '',
+ });
+ };
+
+ return (
+ <>
+ <DropdownRoot
+ dropdownId={componentInstanceId}
+ type="picker"
+ multiple
+ onOpenChange={handleOpenChange}
+ >
+ <Dropdown.Trigger render={<Button>Link records</Button>} />
+ <DropdownContent
+ width={GenericDropdownContentWidth.ExtraLarge}
+ aria-label="Related records"
+ >
+ <MultipleRecordPicker
+ componentInstanceId={componentInstanceId}
+ onCreate={onCreate}
+ layoutDirection="search-bar-on-top"
+ />
+ </DropdownContent>
+ </DropdownRoot>
+ <Button variant="ghost">Outside picker</Button>
+ </>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerPlacementStory.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerPlacementStory.tsx
new file mode 100644
index 00000000000..72feeff3075
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/MultipleRecordPickerPlacementStory.tsx
@@ -0,0 +1,52 @@
+import { Dropdown } from 'twenty-ui/components/navigation';
+import { Button } from 'twenty-ui/primitives/input';
+
+import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+
+type MultipleRecordPickerPlacementStoryProps = {
+ componentInstanceId: string;
+};
+
+export const MultipleRecordPickerPlacementStory = ({
+ componentInstanceId,
+}: MultipleRecordPickerPlacementStoryProps) => (
+ <div
+ role="region"
+ aria-label="Scrollable record editor"
+ style={{
+ position: 'fixed',
+ top: 32,
+ left: 32,
+ height: 'calc(100vh - 64px)',
+ width: 400,
+ overflowY: 'auto',
+ }}
+ >
+ <div
+ style={{
+ boxSizing: 'content-box',
+ minHeight: '100vh',
+ paddingTop: 'calc(100vh - 160px)',
+ }}
+ >
+ <DropdownRoot dropdownId={componentInstanceId} type="picker" multiple>
+ <Dropdown.Trigger render={<Button>Link records</Button>} />
+ <DropdownContent
+ side="bottom"
+ align="start"
+ width={GenericDropdownContentWidth.ExtraLarge}
+ aria-label="Related records"
+ >
+ <MultipleRecordPicker
+ componentInstanceId={componentInstanceId}
+ onCreate={async () => undefined}
+ />
+ </DropdownContent>
+ </DropdownRoot>
+ <Button variant="ghost">Outside picker</Button>
+ </div>
+ </div>
+);
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/initializeMultipleRecordPickerStory.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/initializeMultipleRecordPickerStory.ts
new file mode 100644
index 00000000000..1f89b6b404b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/__stories__/initializeMultipleRecordPickerStory.ts
@@ -0,0 +1,30 @@
+import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
+import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+export const initializeMultipleRecordPickerStory = (
+ componentInstanceId: string,
+) => {
+ const companyMetadata = getMockObjectMetadataItemOrThrow('company');
+ const personMetadata = getMockObjectMetadataItemOrThrow('person');
+ const companyRecord = mockedCompanyRecords[0];
+
+ jotaiStore.set(
+ multipleRecordPickerSearchableObjectMetadataItemsComponentState.atomFamily({
+ instanceId: componentInstanceId,
+ }),
+ [companyMetadata, personMetadata],
+ );
+ jotaiStore.set(searchRecordStoreFamilyState.atomFamily(companyRecord.id), {
+ recordId: companyRecord.id,
+ label: String(companyRecord.name),
+ objectNameSingular: companyMetadata.nameSingular,
+ objectLabelSingular: companyMetadata.labelSingular,
+ imageUrl: '',
+ tsRank: 0,
+ tsRankCD: 0,
+ record: companyRecord,
+ });
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/constants/MultipleRecordPickerClickOutsideListenerId.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/constants/MultipleRecordPickerClickOutsideListenerId.ts
deleted file mode 100644
index 094cfa97487..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/constants/MultipleRecordPickerClickOutsideListenerId.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const MULTIPLE_RECORD_PICKER_CLICK_OUTSIDE_LISTENER_ID =
- 'multiple-record-picker-click-outside-listener';
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen.ts
index f5495f8701f..eb79aaeea96 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen.ts
@@ -1,3 +1,4 @@
+import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerShouldShowInitialLoadingComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState';
import { multipleRecordPickerShouldShowSkeletonComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState';
import { useCallback } from 'react';
@@ -19,6 +20,12 @@ export const useMultipleRecordPickerOpen = () => {
const openMultipleRecordPicker = useCallback(
(recordPickerComponentInstanceId: string) => {
+ store.set(
+ multipleRecordPickerSearchFilterComponentState.atomFamily({
+ instanceId: recordPickerComponentInstanceId,
+ }),
+ '',
+ );
setInitialLoading(recordPickerComponentInstanceId, true);
store.set(
multipleRecordPickerShouldShowSkeletonComponentState.atomFamily({
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
index f2bb942ec6a..93542cc41d0 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
@@ -352,6 +352,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
...paginationState,
endCursor: pageInfo.endCursor,
hasNextPage: pageInfo.hasNextPage,
+ searchFilter,
});
store.set(
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts
index b84afe9fcc6..2f485b8d90a 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts
@@ -4,6 +4,7 @@ import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/creat
export type MultipleRecordPickerPaginationState = {
endCursor: string | null;
hasNextPage: boolean;
+ searchFilter: string;
};
export const multipleRecordPickerPaginationState =
@@ -12,6 +13,7 @@ export const multipleRecordPickerPaginationState =
defaultValue: {
endCursor: null,
hasNextPage: false,
+ searchFilter: '',
},
componentInstanceContext: MultipleRecordPickerComponentInstanceContext,
});
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getMultipleRecordPickerLayoutDirection.test.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getMultipleRecordPickerLayoutDirection.test.ts
new file mode 100644
index 00000000000..eaacb74b1a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getMultipleRecordPickerLayoutDirection.test.ts
@@ -0,0 +1,40 @@
+import { getMultipleRecordPickerLayoutDirection } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerLayoutDirection';
+
+describe('getMultipleRecordPickerLayoutDirection', () => {
+ it('keeps an explicit layout direction whatever the placement', () => {
+ expect(
+ getMultipleRecordPickerLayoutDirection({
+ layoutDirection: 'search-bar-on-bottom',
+ side: 'bottom',
+ align: 'start',
+ }),
+ ).toBe('search-bar-on-bottom');
+ });
+
+ it('places the search on top when the popup opens below', () => {
+ expect(
+ getMultipleRecordPickerLayoutDirection({ side: 'bottom', align: 'end' }),
+ ).toBe('search-bar-on-top');
+ });
+
+ it('places the search at the bottom when the popup opens above', () => {
+ expect(
+ getMultipleRecordPickerLayoutDirection({ side: 'top', align: 'start' }),
+ ).toBe('search-bar-on-bottom');
+ });
+
+ it.each(['left', 'right'] as const)(
+ 'follows the alignment of a popup opened on the %s',
+ (side) => {
+ expect(
+ getMultipleRecordPickerLayoutDirection({ side, align: 'start' }),
+ ).toBe('search-bar-on-top');
+ expect(
+ getMultipleRecordPickerLayoutDirection({ side, align: 'center' }),
+ ).toBe('search-bar-on-top');
+ expect(
+ getMultipleRecordPickerLayoutDirection({ side, align: 'end' }),
+ ).toBe('search-bar-on-bottom');
+ },
+ );
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerLayoutDirection.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerLayoutDirection.ts
new file mode 100644
index 00000000000..c2cb86dafa6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerLayoutDirection.ts
@@ -0,0 +1,30 @@
+import { type RecordPickerLayoutDirection } from '@/object-record/record-picker/types/RecordPickerLayoutDirection';
+import { isDefined } from 'twenty-shared/utils';
+import { type useDropdownPlacementOrThrow } from 'twenty-ui/components/navigation';
+
+type GetMultipleRecordPickerLayoutDirectionArgs = Pick<
+ ReturnType<typeof useDropdownPlacementOrThrow>,
+ 'side' | 'align'
+> & {
+ layoutDirection?: RecordPickerLayoutDirection;
+};
+
+export const getMultipleRecordPickerLayoutDirection = ({
+ layoutDirection,
+ side,
+ align,
+}: GetMultipleRecordPickerLayoutDirectionArgs): RecordPickerLayoutDirection => {
+ if (isDefined(layoutDirection)) {
+ return layoutDirection;
+ }
+
+ const isHorizontalPopup = side === 'left' || side === 'right';
+ const shouldPlaceSearchAtBottom =
+ side === 'top' || (isHorizontalPopup && align === 'end');
+
+ if (shouldPlaceSearchAtBottom) {
+ return 'search-bar-on-bottom';
+ }
+
+ return 'search-bar-on-top';
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId.ts
deleted file mode 100644
index 8de4e4d6a02..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const getMultipleRecordPickerSelectableListId = (
- multipleRecordPickerComponentInstanceId: string,
-) => {
- return `${multipleRecordPickerComponentInstanceId}-selectable-list`;
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
index ba04acf8941..8e677f5729e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
@@ -93,32 +93,32 @@ export const FieldWidgetRelationEditAction = ({
const triggerLabel = isEditAction ? t`Edit relation` : t`Add relation`;
const dropdownTriggerClickableComponent = (
- <StyledEditButtonWrapper>
- <IconButton variant="ghost" size="sm" aria-label={triggerLabel}>
- <TriggerIcon />
- </IconButton>
- </StyledEditButtonWrapper>
+ <IconButton variant="ghost" size="sm" aria-label={triggerLabel}>
+ <TriggerIcon />
+ </IconButton>
);
return (
- <FieldContext.Provider value={fieldContextValue}>
- <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
- {isMorphRelation ? (
- <RecordDetailMorphRelationSectionDropdown
- loading={false}
- dropdownTriggerClickableComponent={
- dropdownTriggerClickableComponent
- }
- />
- ) : (
- <RecordDetailRelationSectionDropdown
- loading={false}
- dropdownTriggerClickableComponent={
- dropdownTriggerClickableComponent
- }
- />
- )}
- </FieldInputEventContext.Provider>
- </FieldContext.Provider>
+ <StyledEditButtonWrapper>
+ <FieldContext.Provider value={fieldContextValue}>
+ <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
+ {isMorphRelation ? (
+ <RecordDetailMorphRelationSectionDropdown
+ loading={false}
+ dropdownTriggerClickableComponent={
+ dropdownTriggerClickableComponent
+ }
+ />
+ ) : (
+ <RecordDetailRelationSectionDropdown
+ loading={false}
+ dropdownTriggerClickableComponent={
+ dropdownTriggerClickableComponent
+ }
+ />
+ )}
+ </FieldInputEventContext.Provider>
+ </FieldContext.Provider>
+ </StyledEditButtonWrapper>
);
};
diff --git a/packages/twenty-ui/docs/public-exports.json b/packages/twenty-ui/docs/public-exports.json
index 03fc2e4187b..04bb4074eaa 100644
--- a/packages/twenty-ui/docs/public-exports.json
+++ b/packages/twenty-ui/docs/public-exports.json
@@ -167,7 +167,8 @@
"Dropdown": "components/navigation/Dropdown/Dropdown",
"ListItemButton": "components/navigation/ListItemButton/ListItemButton",
"TabButton": "components/navigation/TabButton/TabButton",
- "useDropdownPage": "components/navigation/Dropdown/hooks/useDropdownPage"
+ "useDropdownPage": "components/navigation/Dropdown/hooks/useDropdownPage",
+ "useDropdownPlacementOrThrow": "components/navigation/Dropdown/hooks/useDropdownPlacementOrThrow"
},
"types": {
"ColorLabels": "components/navigation/MenuItem/types/ColorLabels",
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.placement.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.placement.stories.tsx
new file mode 100644
index 00000000000..d9f8d02f078
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.placement.stories.tsx
@@ -0,0 +1,56 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+
+import { ComponentDecorator } from '@ui/testing';
+
+import { DropdownPlacementExample } from './DropdownPlacementExample';
+import { DROPDOWN_STORY_A11Y_PARAMETERS } from './dropdownStoryA11yParameters';
+
+const onContentRef = fn<(element: HTMLDivElement | null) => void>();
+
+const meta: Meta<typeof DropdownPlacementExample> = {
+ id: 'ui-components-dropdown-interactions-placement',
+ title: 'UI/Components/Navigation/Dropdown/Interactions/Placement',
+ component: DropdownPlacementExample,
+ tags: ['!autodocs'],
+ decorators: [ComponentDecorator],
+ args: { onContentRef },
+ parameters: { a11y: DROPDOWN_STORY_A11Y_PARAMETERS },
+ beforeEach: () => {
+ onContentRef.mockClear();
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof DropdownPlacementExample>;
+
+export const ResolvedCollisionPlacementPreservesCustomization: Story = {
+ play: async ({ canvasElement }) => {
+ const trigger = within(canvasElement).getByRole('button', {
+ name: 'Placement picker',
+ });
+
+ await userEvent.click(trigger);
+
+ const popup = await within(canvasElement.ownerDocument.body).findByRole(
+ 'dialog',
+ { name: 'Placement picker' },
+ );
+ const placement = within(popup).getByTestId('resolved-placement');
+
+ await waitFor(() => {
+ expect(popup).toHaveAttribute('data-side', 'top');
+ expect(placement).toHaveAttribute('data-resolved-side', 'top');
+ expect(placement).toHaveAttribute('data-resolved-align', 'start');
+ expect(popup.getBoundingClientRect().bottom).toBeLessThan(
+ trigger.getBoundingClientRect().top,
+ );
+ });
+ expect(popup).toHaveAttribute('data-caller-render', 'preserved');
+ expect(onContentRef).toHaveBeenCalledWith(popup);
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(popup).not.toBeInTheDocument());
+ expect(onContentRef).toHaveBeenLastCalledWith(null);
+ },
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.search.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.search.stories.tsx
index 938cef590d3..353a61c7674 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.search.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.search.stories.tsx
@@ -28,9 +28,11 @@ const onSearchBlur = fn();
const SearchActivationExample = ({
filterResults = false,
+ searchPlacement = 'top',
onInteractOutside,
}: {
filterResults?: boolean;
+ searchPlacement?: 'top' | 'bottom';
} & Pick<DropdownRootProps, 'onInteractOutside'>) => {
const search = query.useValue();
const orderedPeople = people.useValue();
@@ -42,16 +44,20 @@ const SearchActivationExample = ({
)
: orderedPeople;
+ const searchInput = (
+ <Dropdown.Search
+ aria-label="Search reviewers"
+ value={search}
+ onValueChange={query.set}
+ onBlur={onSearchBlur}
+ />
+ );
+
return (
<Dropdown.Root type="picker" onInteractOutside={onInteractOutside}>
<Dropdown.Trigger>Reviewers</Dropdown.Trigger>
<Dropdown.Content aria-label="Choose reviewers">
- <Dropdown.Search
- aria-label="Search reviewers"
- value={search}
- onValueChange={query.set}
- onBlur={onSearchBlur}
- />
+ {searchPlacement === 'top' && searchInput}
<Dropdown.ActionItem onClick={onInvite}>
Invite reviewer
</Dropdown.ActionItem>
@@ -85,6 +91,7 @@ const SearchActivationExample = ({
Margaret Hamilton
</Dropdown.OptionItem>
</Dropdown.SelectionGroup>
+ {searchPlacement === 'bottom' && searchInput}
</Dropdown.Content>
</Dropdown.Root>
);
@@ -326,3 +333,35 @@ export const ControlledQueryUpdatesPreview: Story = {
await userEvent.keyboard('{Escape}');
},
};
+
+export const SearchAfterResultsMirrorsArrowNavigation: Story = {
+ render: () => <SearchActivationExample searchPlacement="bottom" />,
+ play: async ({ canvasElement }) => {
+ const { popup, search } = await openPicker(canvasElement);
+ const picker = within(popup);
+ const invite = picker.getByRole('button', { name: 'Invite reviewer' });
+ const ada = picker.getByRole('option', { name: 'Ada Lovelace' });
+ const margaret = picker.getByRole('option', { name: 'Margaret Hamilton' });
+
+ await userEvent.keyboard('{ArrowUp}');
+ expect(margaret).toHaveFocus();
+ await userEvent.keyboard('{ArrowDown}');
+ expect(search).toHaveFocus();
+ await userEvent.keyboard('{ArrowDown}');
+ expect(invite).toHaveFocus();
+ await userEvent.keyboard('{ArrowUp}');
+ expect(margaret).toHaveFocus();
+ await userEvent.keyboard('{ArrowDown}');
+ expect(search).toHaveFocus();
+
+ await userEvent.type(search, 'ada');
+ await waitFor(() =>
+ expect(search).toHaveAttribute('aria-activedescendant', ada.id),
+ );
+ await userEvent.keyboard('{Enter}');
+ expect(ada).toHaveAttribute('aria-selected', 'true');
+ expect(onSelect).toHaveBeenCalledOnce();
+ expect(popup).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ },
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/DropdownPlacementExample.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/DropdownPlacementExample.tsx
new file mode 100644
index 00000000000..6521764b059
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/DropdownPlacementExample.tsx
@@ -0,0 +1,63 @@
+import { type Ref } from 'react';
+
+import { Button } from '@ui/primitives/input/Button/Button';
+import { Text } from '@ui/primitives/typography/Text/Text';
+import { themeCssVariables } from '@ui/theme';
+
+import { Dropdown } from '../Dropdown';
+import { useDropdownPlacementOrThrow } from '../hooks/useDropdownPlacementOrThrow';
+
+type DropdownPlacementExampleProps = {
+ onContentRef: Ref<HTMLDivElement>;
+};
+
+const ResolvedDropdownPlacement = () => {
+ const { side, align } = useDropdownPlacementOrThrow();
+
+ return (
+ <Text
+ data-testid="resolved-placement"
+ data-resolved-side={side}
+ data-resolved-align={align}
+ >
+ {side} / {align}
+ </Text>
+ );
+};
+
+export const DropdownPlacementExample = ({
+ onContentRef,
+}: DropdownPlacementExampleProps) => (
+ <div
+ style={{
+ position: 'fixed',
+ bottom: themeCssVariables.spacing[2],
+ left: themeCssVariables.spacing[10],
+ }}
+ >
+ <Dropdown.Root type="picker">
+ <Dropdown.Trigger render={<Button>Placement picker</Button>} />
+ <Dropdown.Content
+ side="bottom"
+ align="start"
+ sideOffset={8}
+ width={240}
+ ref={onContentRef}
+ render={<div data-caller-render="preserved" />}
+ >
+ <ResolvedDropdownPlacement />
+ <Dropdown.Section>
+ <Dropdown.SelectionGroup id="placement-options" aria-label="People">
+ <Dropdown.OptionItem value="ada">Ada Lovelace</Dropdown.OptionItem>
+ <Dropdown.OptionItem value="grace">
+ Grace Hopper
+ </Dropdown.OptionItem>
+ <Dropdown.OptionItem value="margaret">
+ Margaret Hamilton
+ </Dropdown.OptionItem>
+ </Dropdown.SelectionGroup>
+ </Dropdown.Section>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ </div>
+);
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPlacementOrThrow.ts b/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPlacementOrThrow.ts
new file mode 100644
index 00000000000..0f41d539ff1
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/hooks/useDropdownPlacementOrThrow.ts
@@ -0,0 +1,20 @@
+import { useContext } from 'react';
+
+import { doNotTranslate } from '@ui/utilities/internal/doNotTranslate';
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+import { DropdownPlacementContext } from '../internal/DropdownPlacementContext';
+
+export const useDropdownPlacementOrThrow = () => {
+ const placement = useContext(DropdownPlacementContext);
+
+ if (!isDefined(placement)) {
+ throw new Error(
+ doNotTranslate(
+ 'useDropdownPlacementOrThrow must be used within Dropdown.Content',
+ ),
+ );
+ }
+
+ return placement;
+};
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 b0b01961f1f..29b8c8c0c0c 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContent.tsx
@@ -9,6 +9,7 @@ import { isDefined } from '@ui/utilities/utils/isDefined';
import styles from '../Dropdown.module.scss';
import { type DropdownContentProps } from '../types/DropdownContentProps';
import { DropdownContext } from './DropdownContext';
+import { DropdownContentRenderer } from './DropdownContentRenderer';
import { DropdownPageFocusEffect } from './DropdownPageFocusEffect';
import { DropdownRowsEffect } from './DropdownRowsEffect';
import { getDropdownFocusTarget } from './getDropdownFocusTarget';
@@ -30,6 +31,7 @@ export const DropdownContent = ({
width = 200,
className,
style,
+ render,
children,
initialFocus,
finalFocus,
@@ -81,6 +83,13 @@ export const DropdownContent = ({
<Popover.Popup
{...props}
ref={mergedRef}
+ render={(popupProps, state) => (
+ <DropdownContentRenderer
+ props={popupProps}
+ state={state}
+ render={render}
+ />
+ )}
role={type === 'menu' ? 'menu' : 'dialog'}
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy ?? defaultAriaLabelledBy}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContentRenderer.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContentRenderer.tsx
new file mode 100644
index 00000000000..47c24b4e110
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownContentRenderer.tsx
@@ -0,0 +1,47 @@
+import { type Popover as PopoverPrimitive } from '@base-ui/react/popover';
+import { useRender } from '@base-ui/react/use-render';
+
+import { type PopoverPopupProps } from '@ui/primitives/surfaces/Popover/types/PopoverPopupProps';
+
+import { DropdownPlacementContext } from './DropdownPlacementContext';
+
+type DropdownContentRendererProps = {
+ props: useRender.ElementProps<'div'>;
+ state: PopoverPrimitive.Popup.State;
+ render?: PopoverPopupProps['render'];
+};
+
+const skipStateAttribute = () => null;
+
+const POPUP_STATE_ATTRIBUTES_ALREADY_IN_PROPS: Record<
+ keyof PopoverPrimitive.Popup.State,
+ typeof skipStateAttribute
+> = {
+ open: skipStateAttribute,
+ side: skipStateAttribute,
+ align: skipStateAttribute,
+ instant: skipStateAttribute,
+ transitionStatus: skipStateAttribute,
+};
+
+export const DropdownContentRenderer = ({
+ props,
+ state,
+ render,
+}: DropdownContentRendererProps) => {
+ const element = useRender({
+ defaultTagName: 'div',
+ props: { ...props },
+ state: { ...state },
+ stateAttributesMapping: POPUP_STATE_ATTRIBUTES_ALREADY_IN_PROPS,
+ render,
+ });
+
+ return (
+ <DropdownPlacementContext.Provider
+ value={{ side: state.side, align: state.align }}
+ >
+ {element}
+ </DropdownPlacementContext.Provider>
+ );
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownPlacementContext.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownPlacementContext.ts
new file mode 100644
index 00000000000..fae9daf8300
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownPlacementContext.ts
@@ -0,0 +1,6 @@
+import { type Popover as PopoverPrimitive } from '@base-ui/react/popover';
+import { createContext } from 'react';
+
+export const DropdownPlacementContext = createContext<
+ Pick<PopoverPrimitive.Popup.State, 'side' | 'align'> | undefined
+>(undefined);
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 d311fd08019..869401fb0c5 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRoot.tsx
@@ -19,6 +19,11 @@ import { DropdownSelectionContext } from './DropdownSelectionContext';
type PageHistoryEntry = { id?: string; trigger?: DropdownFocusTarget };
+type PageNavigationState = {
+ history: PageHistoryEntry[];
+ focusRequest?: DropdownPageFocusRequest;
+};
+
export const DropdownRoot = ({
children,
type,
@@ -50,18 +55,28 @@ export const DropdownRoot = ({
const open = isPageActive && (controlledOpen ?? uncontrolledOpen);
const [previousOpen, setPreviousOpen] = useState(open);
const [sessionId, setSessionId] = useState(0);
- const [pageHistory, setPageHistory] = useState<PageHistoryEntry[]>([
- { id: defaultPage },
- ]);
+ const [
+ { history: pageHistory, focusRequest: pageFocusRequest },
+ setPageNavigation,
+ ] = useState<PageNavigationState>({ history: [{ id: defaultPage }] });
+ const setPageFocusRequest = useCallback(
+ (request: DropdownPageFocusRequest | undefined) => {
+ setPageNavigation((navigation) =>
+ navigation.focusRequest === request
+ ? navigation
+ : { ...navigation, focusRequest: request },
+ );
+ },
+ [],
+ );
const [activePage, setActivePage] = useState<{
id: string;
type: DropdownType;
}>();
const [rowIds, setRowIds] = useState<string[]>();
const [focusedRowId, setFocusedRowId] = useState<string>();
- const pageId = pageHistory[pageHistory.length - 1]?.id;
- const [pageFocusRequest, setPageFocusRequest] =
- useState<DropdownPageFocusRequest>();
+ const currentPage = pageHistory[pageHistory.length - 1];
+ const pageId = currentPage?.id;
const [initialFocusEdge, setInitialFocusEdge] = useState<'first' | 'last'>(
'first',
);
@@ -83,9 +98,8 @@ export const DropdownRoot = ({
if (isOpening) {
setSessionId(sessionId + 1);
- setPageHistory([{ id: defaultPage }]);
+ setPageNavigation({ history: [{ id: defaultPage }] });
setActivePage(undefined);
- setPageFocusRequest(undefined);
setFocusedRowId(undefined);
setRowIds(undefined);
}
@@ -158,24 +172,32 @@ export const DropdownRoot = ({
id: string;
trigger?: DropdownFocusTarget;
}) => {
- setPageFocusRequest({ pageId: id });
- setPageHistory((history) => [...history, { id, trigger }]);
+ setPageNavigation((navigation) => ({
+ history: [...navigation.history, { id, trigger }],
+ focusRequest: { pageId: id },
+ }));
};
const goBack = () => {
- const previousPage = pageHistory[pageHistory.length - 2];
+ setPageNavigation((navigation) => {
+ if (navigation.history[navigation.history.length - 1] !== currentPage) {
+ return navigation;
+ }
- if (!isDefined(previousPage)) {
- return;
- }
+ const previousPage = navigation.history[navigation.history.length - 2];
- const trigger = pageHistory[pageHistory.length - 1]?.trigger;
+ if (!isDefined(previousPage)) {
+ return navigation;
+ }
- setPageFocusRequest({
- pageId: previousPage.id,
- target: trigger,
+ return {
+ history: navigation.history.slice(0, -1),
+ focusRequest: {
+ pageId: previousPage.id,
+ target: navigation.history[navigation.history.length - 1]?.trigger,
+ },
+ };
});
- setPageHistory((history) => history.slice(0, -1));
};
const registerPage = useCallback(
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRowsEffect.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRowsEffect.tsx
index 23ddcf4f739..42aafb5d114 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRowsEffect.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownRowsEffect.tsx
@@ -38,7 +38,15 @@ export const DropdownRowsEffect = ({ content }: DropdownRowsEffectProps) => {
childList: true,
subtree: true,
attributes: true,
- attributeFilter: ['disabled', 'aria-disabled', 'id', 'hidden', 'inert'],
+ attributeFilter: [
+ 'disabled',
+ 'aria-disabled',
+ 'id',
+ 'hidden',
+ 'inert',
+ 'class',
+ 'style',
+ ],
});
return () => {
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 a6f0f9a0792..cc109ef3c6a 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownTrigger.tsx
@@ -1,9 +1,12 @@
import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
import { Popover } from '@ui/primitives/surfaces/Popover/Popover';
import { type DropdownTriggerProps } from '../types/DropdownTriggerProps';
import { useDropdownContext } from './useDropdownContext';
+import { getDropdownTriggerTabTarget } from './getDropdownTriggerTabTarget';
import { useRegisterDropdownLabelElement } from './useRegisterDropdownLabelElement';
export const DropdownTrigger = ({
@@ -48,6 +51,21 @@ export const DropdownTrigger = ({
return;
}
+ const isForwardTabFromOpenPicker =
+ open &&
+ triggerType === 'picker' &&
+ event.key === 'Tab' &&
+ !event.shiftKey;
+ const tabTarget = isForwardTabFromOpenPicker
+ ? getDropdownTriggerTabTarget(event.currentTarget)
+ : undefined;
+
+ if (isDefined(tabTarget)) {
+ event.preventDefault();
+ tabTarget.focus();
+ return;
+ }
+
if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
return;
}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/compareDropdownElementOrder.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/compareDropdownElementOrder.ts
new file mode 100644
index 00000000000..5fdf1248112
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/compareDropdownElementOrder.ts
@@ -0,0 +1,64 @@
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+export const compareDropdownElementOrder = ({
+ firstElement,
+ secondElement,
+}: {
+ firstElement: HTMLElement;
+ secondElement: HTMLElement;
+}) => {
+ if (firstElement === secondElement) {
+ return 0;
+ }
+
+ const documentOrder =
+ (firstElement.compareDocumentPosition(secondElement) &
+ Node.DOCUMENT_POSITION_FOLLOWING) !==
+ 0
+ ? -1
+ : 1;
+ let firstBranch = firstElement;
+
+ while (
+ isDefined(firstBranch.parentElement) &&
+ !firstBranch.parentElement.contains(secondElement)
+ ) {
+ firstBranch = firstBranch.parentElement;
+ }
+
+ const commonParent = firstBranch.parentElement;
+ const ownerWindow = commonParent?.ownerDocument.defaultView;
+
+ if (!isDefined(commonParent) || !isDefined(ownerWindow)) {
+ return documentOrder;
+ }
+
+ let secondBranch = secondElement;
+
+ while (
+ isDefined(secondBranch.parentElement) &&
+ secondBranch.parentElement !== commonParent
+ ) {
+ secondBranch = secondBranch.parentElement;
+ }
+
+ if (firstBranch === secondBranch) {
+ return documentOrder;
+ }
+
+ const parentStyle = ownerWindow.getComputedStyle(commonParent);
+ const isFlexParent =
+ parentStyle.display === 'flex' || parentStyle.display === 'inline-flex';
+
+ if (!isFlexParent) {
+ return documentOrder;
+ }
+
+ const firstOrder = Number(ownerWindow.getComputedStyle(firstBranch).order);
+ const secondOrder = Number(ownerWindow.getComputedStyle(secondBranch).order);
+ const elementOrder = firstOrder - secondOrder || documentOrder;
+
+ return parentStyle.flexDirection === 'column-reverse'
+ ? -elementOrder
+ : elementOrder;
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownItems.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownItems.ts
index 0a92fc0c939..2745219d4fd 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownItems.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownItems.ts
@@ -1,6 +1,9 @@
+import { compareDropdownElementOrder } from './compareDropdownElementOrder';
import { isEnabledDropdownItem } from './isEnabledDropdownItem';
export const getDropdownItems = (content: HTMLElement) =>
- Array.from(
- content.querySelectorAll<HTMLElement>('[data-dropdown-item]'),
- ).filter((item) => isEnabledDropdownItem({ content, item }));
+ Array.from(content.querySelectorAll<HTMLElement>('[data-dropdown-item]'))
+ .filter((item) => isEnabledDropdownItem({ content, item }))
+ .sort((firstElement, secondElement) =>
+ compareDropdownElementOrder({ firstElement, secondElement }),
+ );
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownRows.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownRows.ts
index 4351c259564..0350e26f4fe 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownRows.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownRows.ts
@@ -1,6 +1,5 @@
+import { getDropdownItems } from './getDropdownItems';
import { isDropdownRow } from './isDropdownRow';
export const getDropdownRows = (content: HTMLElement) =>
- Array.from(
- content.querySelectorAll<HTMLElement>('[data-dropdown-item]'),
- ).filter((item) => isDropdownRow({ content, item }));
+ getDropdownItems(content).filter((item) => isDropdownRow({ content, item }));
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTabNavigation.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTabNavigation.ts
new file mode 100644
index 00000000000..d5f7b5a2614
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTabNavigation.ts
@@ -0,0 +1,40 @@
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+import { isActiveDropdownElement } from './isActiveDropdownElement';
+import { compareDropdownElementOrder } from './compareDropdownElementOrder';
+
+const DROPDOWN_TABBABLE_ELEMENT_SELECTOR =
+ 'a[href],button,input:not([type="hidden"]),select,textarea,[tabindex]';
+
+export const getDropdownTabNavigation = ({
+ content,
+ target,
+ shiftKey,
+}: {
+ content: HTMLElement;
+ target?: HTMLElement;
+ shiftKey: boolean;
+}) => {
+ const tabStops = Array.from(
+ content.querySelectorAll<HTMLElement>(DROPDOWN_TABBABLE_ELEMENT_SELECTOR),
+ ).filter(
+ (element) =>
+ Number(element.getAttribute('data-tabindex') ?? element.tabIndex) >= 0 &&
+ !element.matches(':disabled,[aria-disabled="true"]') &&
+ isActiveDropdownElement(element) &&
+ element.closest('[data-dropdown-content]') === content,
+ );
+ const visualTabStops = [...tabStops].sort((firstElement, secondElement) =>
+ compareDropdownElementOrder({ firstElement, secondElement }),
+ );
+ const hasReorderedTabStops = tabStops.some(
+ (element, index) => element !== visualTabStops[index],
+ );
+ const targetIndex = isDefined(target) ? visualTabStops.indexOf(target) : -1;
+
+ if (!hasReorderedTabStops || (isDefined(target) && targetIndex < 0)) {
+ return undefined;
+ }
+
+ return { target: visualTabStops[targetIndex + (shiftKey ? -1 : 1)] };
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTrigger.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTrigger.ts
index 6b16df6d754..72d3e2dba85 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTrigger.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTrigger.ts
@@ -2,9 +2,7 @@ import { isActiveDropdownElement } from './isActiveDropdownElement';
export const getDropdownTrigger = (content: HTMLElement) =>
Array.from(
- content.ownerDocument.querySelectorAll<HTMLElement>(
- '[data-dropdown-item][aria-controls]',
- ),
+ content.ownerDocument.querySelectorAll<HTMLElement>('[aria-controls]'),
).find(
(trigger) =>
trigger.getAttribute('aria-controls') === content.id &&
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTriggerTabTarget.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTriggerTabTarget.ts
new file mode 100644
index 00000000000..2df470a1f85
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownTriggerTabTarget.ts
@@ -0,0 +1,16 @@
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+import { getDropdownTabNavigation } from './getDropdownTabNavigation';
+
+export const getDropdownTriggerTabTarget = (trigger: HTMLElement) => {
+ const contentId = trigger.getAttribute('aria-controls');
+ const content = isDefined(contentId)
+ ? trigger.ownerDocument.getElementById(contentId)
+ : null;
+
+ if (!isDefined(content)) {
+ return undefined;
+ }
+
+ return getDropdownTabNavigation({ content, shiftKey: false })?.target;
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getNextDropdownItem.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getNextDropdownItem.ts
index 8f00f490c56..91495d24209 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getNextDropdownItem.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getNextDropdownItem.ts
@@ -1,5 +1,6 @@
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { compareDropdownElementOrder } from './compareDropdownElementOrder';
import { getNextDropdownGridItem } from './getNextDropdownGridItem';
export const getNextDropdownItem = ({
@@ -30,12 +31,29 @@ export const getNextDropdownItem = ({
}
const lastIndex = items.length - 1;
+ const lastItem = items[lastIndex];
+ const isSearchAfterItems =
+ isDefined(search) &&
+ isDefined(lastItem) &&
+ compareDropdownElementOrder({
+ firstElement: lastItem,
+ secondElement: search,
+ }) < 0;
+
+ if (key === 'ArrowDown' && currentIndex === lastIndex && isSearchAfterItems) {
+ return search ?? undefined;
+ }
if (key === 'ArrowDown') {
return items[currentIndex === lastIndex ? 0 : currentIndex + 1];
}
- if (key === 'ArrowUp' && currentIndex === 0 && isDefined(search)) {
+ if (
+ key === 'ArrowUp' &&
+ currentIndex === 0 &&
+ isDefined(search) &&
+ !isSearchAfterItems
+ ) {
return search;
}
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
index 1dcbc497f3b..a8dec23ba42 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
@@ -10,6 +10,7 @@ import { getDropdownRows } from './getDropdownRows';
import { getDropdownSearch } from './getDropdownSearch';
import { getDropdownSearchTarget } from './getDropdownSearchTarget';
import { getDropdownTrigger } from './getDropdownTrigger';
+import { getDropdownTabNavigation } from './getDropdownTabNavigation';
import { getNextDropdownGridItem } from './getNextDropdownGridItem';
import { getNextDropdownItem } from './getNextDropdownItem';
import { useDropdownContext } from './useDropdownContext';
@@ -82,6 +83,47 @@ export const useDropdownKeyboardNavigation = () => {
return;
}
+ const tabNavigation =
+ type === 'picker' && event.key === 'Tab'
+ ? getDropdownTabNavigation({
+ content,
+ target,
+ shiftKey: event.shiftKey,
+ })
+ : undefined;
+
+ if (isDefined(tabNavigation)) {
+ event.preventDefault();
+ }
+
+ if (isDefined(tabNavigation?.target)) {
+ tabNavigation.target.focus();
+ return;
+ }
+
+ const backwardTabTrigger =
+ isDefined(tabNavigation) && event.shiftKey
+ ? getDropdownTrigger(content)
+ : undefined;
+
+ if (isDefined(backwardTabTrigger)) {
+ backwardTabTrigger.focus();
+ return;
+ }
+
+ if (isDefined(tabNavigation) && event.shiftKey) {
+ closeTree(event.nativeEvent);
+ return;
+ }
+
+ if (isDefined(tabNavigation)) {
+ tabForwardOutOfTree({
+ ownerDocument: content.ownerDocument,
+ tabOutEvent: event.nativeEvent,
+ });
+ return;
+ }
+
if (type === 'menu' && event.key === 'Tab' && event.shiftKey) {
event.preventDefault();
closeTree(event.nativeEvent);
diff --git a/packages/twenty-ui/src/components/navigation/index.ts b/packages/twenty-ui/src/components/navigation/index.ts
index f3911d394c4..ec52acb4d9c 100644
--- a/packages/twenty-ui/src/components/navigation/index.ts
+++ b/packages/twenty-ui/src/components/navigation/index.ts
@@ -11,6 +11,7 @@ export { CountPager } from './CountPager/CountPager';
export type { CountPagerProps } from './CountPager/types/CountPagerProps';
export { Dropdown } from './Dropdown/Dropdown';
export { useDropdownPage } from './Dropdown/hooks/useDropdownPage';
+export { useDropdownPlacementOrThrow } from './Dropdown/hooks/useDropdownPlacementOrThrow';
export type { DropdownActionItemProps } from './Dropdown/types/DropdownActionItemProps';
export type { DropdownCloseProps } from './Dropdown/types/DropdownCloseProps';
export type { DropdownContentProps } from './Dropdown/types/DropdownContentProps';