Skip to content

The open alternative to Salesforce, designed for AI.

Migrate date pickers and field overlays (#26897)

Raphaël Bosi9f9a467d65a7
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NoteTile.tsx b/packages/twenty-front/src/modules/activities/notes/components/NoteTile.tsx
index f6345f82782..db051147369 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NoteTile.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NoteTile.tsx
@@ -7,7 +7,6 @@ import { getActivityPreview } from '@/activities/utils/getActivityPreview';
import { useObjectMorphJunctionConfigOrThrow } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfigOrThrow';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
@@ -112,17 +111,11 @@ export const NoteTile = ({
fieldPosition={0}
isDisplayModeFixHeight
>
- <RecordFieldsScopeContextProvider
- value={{
- scopeInstanceId: note.id,
- }}
+ <RecordFieldComponentInstanceContext.Provider
+ value={{ instanceId: componentInstanceId }}
>
- <RecordFieldComponentInstanceContext.Provider
- value={{ instanceId: componentInstanceId }}
- >
- <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
- </RecordFieldComponentInstanceContext.Provider>
- </RecordFieldsScopeContextProvider>
+ <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
+ </RecordFieldComponentInstanceContext.Provider>
</FieldContextProvider>
</StyledFooter>
</StyledCard>
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index 7745d35dd11..882c945260f 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -9,7 +9,6 @@ import { useActivityFieldComponentInstanceId } from '@/activities/hooks/useActiv
import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
import { type Task } from '@/activities/types/Task';
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
import { useObjectMorphJunctionConfigOrThrow } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfigOrThrow';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
@@ -155,19 +154,13 @@ export const TaskRow = ({ task }: { task: Task }) => {
maxWidth={200}
isDisplayModeFixHeight
>
- <RecordFieldsScopeContextProvider
- value={{
- scopeInstanceId: task.id,
- }}
- >
- <StopPropagationContainer>
- <RecordFieldComponentInstanceContext.Provider
- value={{ instanceId: componentInstanceId }}
- >
- <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
- </RecordFieldComponentInstanceContext.Provider>
- </StopPropagationContainer>
- </RecordFieldsScopeContextProvider>
+ <StopPropagationContainer>
+ <RecordFieldComponentInstanceContext.Provider
+ value={{ instanceId: componentInstanceId }}
+ >
+ <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
+ </RecordFieldComponentInstanceContext.Provider>
+ </StopPropagationContainer>
</FieldContextProvider>
</StyledActivityTargetsContainer>
}
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx
index a5f505ae48e..c827c936e72 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx
@@ -526,3 +526,26 @@ export const TurnIntoHeading: Story = {
);
},
};
+
+export const SlashMenuKeepsEditorFocus: Story = {
+ play: async ({ canvasElement }) => {
+ const body = within(canvasElement.ownerDocument.body);
+ const editor = await within(canvasElement).findByRole('textbox');
+ await userEvent.click(editor);
+ await userEvent.keyboard('/heading');
+ await body.findByText('Heading 1');
+ await expect(editor).toHaveFocus();
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+ await waitFor(() => {
+ expect(body.queryByText('Heading 2')).not.toBeInTheDocument();
+ });
+ await expect(editor).toHaveFocus();
+ await userEvent.keyboard('Heading from slash menu');
+ await expect(
+ within(editor).getByRole('heading', {
+ level: 2,
+ name: 'Heading from slash menu',
+ }),
+ ).toBeVisible();
+ },
+};
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
index 04939f332c6..11c93a863c2 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
@@ -11,10 +11,8 @@ import { type BLOCK_SCHEMA } from '@/blocknote-editor/blocks/Schema';
import { getSlashMenu } from '@/blocknote-editor/utils/getSlashMenu';
import { CustomMentionMenu } from '@/blocknote-editor/components/CustomMentionMenu';
import { CustomSideMenu } from '@/blocknote-editor/components/CustomSideMenu';
-import {
- CustomSlashMenu,
- type SuggestionItem,
-} from '@/blocknote-editor/components/CustomSlashMenu';
+import { CustomSlashMenu } from '@/blocknote-editor/components/CustomSlashMenu';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { useMentionMenu } from '@/mention/hooks/useMentionMenu';
import { IconX } from 'twenty-ui/icon';
import { useThemeColorScheme, themeCssVariables } from 'twenty-ui/theme';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
index 276667edb8c..a85c1f34045 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
@@ -6,19 +6,12 @@ import { createPortal } from 'react-dom';
import { MENTION_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/ui/input/constants/MentionMenuDropdownClickOutsideId';
import { MentionMenuListItem } from '@/mention/components/MentionMenuListItem';
-import {
- type CustomMentionMenuProps,
- type MentionItem,
-} from '@/blocknote-editor/types/SuggestionMenuItems';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { type CustomMentionMenuProps } from '@/blocknote-editor/types/SuggestionMenuItems';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { isDefined } from 'twenty-shared/utils';
-export type { MentionItem };
-
-const MenuPixelWidth = 240;
-
const StyledContainer = styled.div`
height: 1px;
width: 1px;
@@ -64,22 +57,20 @@ export const CustomMentionMenu = ({
style={floatingStyles}
data-click-outside-id={MENTION_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
- <LegacyDropdownContent widthInPixels={MenuPixelWidth}>
- <DropdownMenuItemsContainer hasMaxHeight>
- {filteredItems.map((item, index) => (
- <MentionMenuListItem
- key={item.recordId!}
- recordId={item.recordId!}
- objectNameSingular={item.objectNameSingular!}
- label={item.label ?? item.title}
- imageUrl={item.imageUrl ?? ''}
- objectLabelSingular={item.objectLabelSingular ?? ''}
- isSelected={index === selectedIndex}
- onClick={() => onItemClick?.(item)}
- />
- ))}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ <OverlayMenuList width={GenericDropdownContentWidth.Large}>
+ {filteredItems.map((item, index) => (
+ <MentionMenuListItem
+ key={item.recordId!}
+ recordId={item.recordId!}
+ objectNameSingular={item.objectNameSingular!}
+ label={item.label ?? item.title}
+ imageUrl={item.imageUrl ?? ''}
+ objectLabelSingular={item.objectLabelSingular ?? ''}
+ isSelected={index === selectedIndex}
+ onClick={() => onItemClick?.(item)}
+ />
+ ))}
+ </OverlayMenuList>
</OverlayContainer>
</motion.div>,
document.body,
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
index c5fa633ccb0..fe4270cb2aa 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
@@ -8,17 +8,11 @@ import { SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/ui/input/constants/Slash
import { SLASH_MENU_LIST_ID } from '@/ui/input/constants/SlashMenuListId';
import { CustomSlashMenuListItem } from '@/blocknote-editor/components/CustomSlashMenuListItem';
import { CustomSlashMenuSelectedIndexSyncEffect } from '@/blocknote-editor/components/CustomSlashMenuSelectedIndexSyncEffect';
-import type {
- CustomSlashMenuProps,
- SuggestionItem,
-} from '@/blocknote-editor/types/SuggestionMenuItems';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import type { CustomSlashMenuProps } from '@/blocknote-editor/types/SuggestionMenuItems';
+import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-export type { SuggestionItem };
-
const StyledContainer = styled.div`
height: 1px;
width: 1px;
@@ -74,19 +68,17 @@ export const CustomSlashMenu = ({
style={floatingStyles}
data-click-outside-id={SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
>
- <LegacyDropdownContent>
- <DropdownMenuItemsContainer hasMaxHeight>
- <SelectableList
- focusId={SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
- selectableListInstanceId={SLASH_MENU_LIST_ID}
- selectableItemIdArray={items.map((item) => item.title)}
- >
- {items.map((item) => (
- <CustomSlashMenuListItem key={item.title} item={item} />
- ))}
- </SelectableList>
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ <OverlayMenuList>
+ <SelectableList
+ focusId={SLASH_MENU_DROPDOWN_CLICK_OUTSIDE_ID}
+ selectableListInstanceId={SLASH_MENU_LIST_ID}
+ selectableItemIdArray={items.map((item) => item.title)}
+ >
+ {items.map((item) => (
+ <CustomSlashMenuListItem key={item.title} item={item} />
+ ))}
+ </SelectableList>
+ </OverlayMenuList>
</OverlayContainer>
</motion.div>,
document.body,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
index 6c54f1b6589..4935c5d9c6a 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -13,7 +13,6 @@ import { RecordBoardCardCellHoveredPortal } from '@/object-record/record-board/r
import { RecordBoardCardBody } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBody';
import { RecordBoardCardHeader } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeader';
import { RECORD_BOARD_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardClickOutsideId';
-import { RECORD_BOARD_CARD_INPUT_ID_PREFIX } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardInputIdPrefix';
import { RecordBoardCardComponentInstanceContext } from '@/object-record/record-board/record-board-card/states/contexts/RecordBoardCardComponentInstanceContext';
import { recordBoardCardIsExpandedComponentState } from '@/object-record/record-board/record-board-card/states/recordBoardCardIsExpandedComponentState';
import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';
@@ -22,7 +21,6 @@ import { RecordDragMultiDragStack } from '@/object-record/record-drag/components
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
@@ -168,46 +166,42 @@ export const RecordBoardCard = () => {
instanceId: `record-board-card-${recordId}`,
}}
>
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: RECORD_BOARD_CARD_INPUT_ID_PREFIX }}
+ <StyledBoardCardWrapper
+ data-click-outside-id={RECORD_BOARD_CARD_CLICK_OUTSIDE_ID}
+ onContextMenu={handleContextMenuOpen}
+ onPointerCancel={handlePointerCancel}
+ onPointerDown={handlePointerDown}
+ onPointerUp={handlePointerUp}
>
- <StyledBoardCardWrapper
- data-click-outside-id={RECORD_BOARD_CARD_CLICK_OUTSIDE_ID}
- onContextMenu={handleContextMenuOpen}
- onPointerCancel={handlePointerCancel}
- onPointerDown={handlePointerDown}
- onPointerUp={handlePointerUp}
+ <StyledCardContainer
+ isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
>
- <StyledCardContainer
- isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
+ {isDragOverlay && isRecordIdPrimaryDragMultiple && (
+ <RecordDragMultiDragStack />
+ )}
+ <RecordCard
+ data-selected={isRecordBoardCardSelected}
+ data-focused={isRecordBoardCardFocused}
+ data-active={isRecordBoardCardActive}
+ onMouseLeave={onMouseLeaveBoard}
+ onClick={handleCardClick}
+ isDragging={isDraggingThisCard}
>
- {isDragOverlay && isRecordIdPrimaryDragMultiple && (
- <RecordDragMultiDragStack />
- )}
- <RecordCard
- data-selected={isRecordBoardCardSelected}
- data-focused={isRecordBoardCardFocused}
- data-active={isRecordBoardCardActive}
- onMouseLeave={onMouseLeaveBoard}
- onClick={handleCardClick}
- isDragging={isDraggingThisCard}
+ <RecordBoardCardHeader />
+ <Collapsible
+ isExpanded={recordBoardCardIsExpanded || !isCompactModeActive}
>
- <RecordBoardCardHeader />
- <Collapsible
- isExpanded={recordBoardCardIsExpanded || !isCompactModeActive}
- >
- <RecordBoardCardBody />
- </Collapsible>
- </RecordCard>
- </StyledCardContainer>
- {!isDragOverlay && (
- <>
- <RecordBoardCardCellHoveredPortal />
- <RecordBoardCardCellEditModePortal />
- </>
- )}
- </StyledBoardCardWrapper>
- </RecordFieldsScopeContextProvider>
+ <RecordBoardCardBody />
+ </Collapsible>
+ </RecordCard>
+ </StyledCardContainer>
+ {!isDragOverlay && (
+ <>
+ <RecordBoardCardCellHoveredPortal />
+ <RecordBoardCardCellEditModePortal />
+ </>
+ )}
+ </StyledBoardCardWrapper>
</RecordBoardCardComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
index d9a38268f71..dbdf3787ddc 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
@@ -10,10 +10,10 @@ import { DatePickerWithoutCalendar } from '@/ui/input/components/internal/date/c
import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/components/TimeZoneAbbreviation';
import { Select } from '@/ui/input/components/Select';
import { SelectControl } from '@/ui/input/components/SelectControl';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { Dropdown } from 'twenty-ui/components';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';
import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -153,8 +153,6 @@ export const RecordCalendarTopBar = () => {
{ locale: dateLocale.localeCatalog },
);
- const dropdownContentOffset = { x: 140, y: 0 } satisfies DropdownOffset;
-
return (
<StyledContainer>
<StyledLeftSection>
@@ -172,9 +170,8 @@ export const RecordCalendarTopBar = () => {
onChange={handleCalendarLayoutChange}
/>
)}
- <Dropdown
- dropdownId={datePickerDropdownId}
- clickableComponent={
+ <DropdownRoot dropdownId={datePickerDropdownId} type="panel">
+ <Dropdown.Trigger render={<div />} nativeButton={false}>
<SelectControl
selectedOption={{
label: formattedDate,
@@ -182,21 +179,24 @@ export const RecordCalendarTopBar = () => {
}}
selectSizeVariant="small"
/>
- }
- dropdownComponents={
- <LegacyDropdownContent widthInPixels={280}>
- <DatePickerWithoutCalendar
- instanceId={recordCalendarId}
- date={recordCalendarSelectedDate.toString()}
- onChange={handleDateChange}
- onClose={handleDateChange}
- onEnter={handleDateChange}
- onEscape={handleDateChange}
- />
- </LegacyDropdownContent>
- }
- dropdownOffset={dropdownContentOffset}
- />
+ </Dropdown.Trigger>
+ <DropdownContent
+ initialFocus={false}
+ width="fit-content"
+ align="end"
+ alignOffset={-140}
+ aria-label={t`Select date`}
+ >
+ <DatePickerWithoutCalendar
+ instanceId={recordCalendarId}
+ date={recordCalendarSelectedDate.toString()}
+ onChange={handleDateChange}
+ onClose={handleDateChange}
+ onEnter={handleDateChange}
+ onEscape={handleDateChange}
+ />
+ </DropdownContent>
+ </DropdownRoot>
<TimeZoneAbbreviation instant={Temporal.Now.instant()} />
</StyledLeftSection>
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__stories__/RecordCalendarTopBar.stories.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__stories__/RecordCalendarTopBar.stories.tsx
new file mode 100644
index 00000000000..c894ad267ca
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__stories__/RecordCalendarTopBar.stories.tsx
@@ -0,0 +1,192 @@
+import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
+import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';
+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { Temporal } from 'temporal-polyfill';
+import { Button } from 'twenty-ui/primitives/input';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+
+const CALENDAR_ID = 'calendar-top-bar-story';
+const SECOND_CALENDAR_ID = 'second-calendar-top-bar-story';
+
+const CalendarTopBarStory = ({
+ instanceId = CALENDAR_ID,
+ isWidget = false,
+}: {
+ instanceId?: string;
+ isWidget?: boolean;
+}) => (
+ <RecordCalendarComponentInstanceContext.Provider value={{ instanceId }}>
+ <ViewComponentInstanceContext.Provider value={{ instanceId }}>
+ <WidgetComponentInstanceContext.Provider
+ value={isWidget ? { instanceId } : null}
+ >
+ <RecordCalendarTopBar />
+ </WidgetComponentInstanceContext.Provider>
+ </ViewComponentInstanceContext.Provider>
+ </RecordCalendarComponentInstanceContext.Provider>
+);
+
+const meta: Meta<typeof CalendarTopBarStory> = {
+ title: 'Modules/ObjectRecord/RecordCalendar/TopBar',
+ component: CalendarTopBarStory,
+ render: (args) => <CalendarTopBarStory {...args} />,
+ decorators: [
+ ComponentDecorator,
+ ContextStoreDecorator,
+ ObjectMetadataItemsDecorator,
+ MemoryRouterDecorator,
+ ],
+ beforeEach: () => {
+ for (const instanceId of [CALENDAR_ID, SECOND_CALENDAR_ID]) {
+ jotaiStore.set(
+ recordCalendarSelectedDateComponentState.atomFamily({ instanceId }),
+ Temporal.PlainDate.from('2026-01-15'),
+ );
+ }
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof CalendarTopBarStory>;
+
+export const Default: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await expect(
+ await canvas.findByRole(
+ 'button',
+ { name: 'January 2026' },
+ { timeout: 10000 },
+ ),
+ ).toBeVisible();
+ },
+};
+
+export const ChangingMonthClosesTheDatePanel: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole(
+ 'button',
+ { name: 'January 2026' },
+ { timeout: 10000 },
+ ),
+ );
+ const panel = await body.findByRole('dialog', { name: 'Select date' });
+ await userEvent.click(
+ await within(panel).findByRole('button', { name: 'January' }),
+ );
+ await userEvent.click(
+ await body.findByRole('button', { name: 'February' }),
+ );
+
+ await waitFor(() => {
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+ await expect(
+ canvas.getByRole('button', { name: 'February 2026' }),
+ ).toBeVisible();
+ },
+};
+
+export const DismissesOnePanelAtATime: Story = {
+ render: () => (
+ <>
+ <CalendarTopBarStory />
+ <Button>Outside calendar</Button>
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ for (const dismissal of ['escape', 'outside']) {
+ await userEvent.click(
+ await canvas.findByRole(
+ 'button',
+ { name: 'January 2026' },
+ { timeout: 10000 },
+ ),
+ );
+ const panel = await body.findByRole('dialog', { name: 'Select date' });
+ await userEvent.click(
+ await within(panel).findByRole('button', { name: 'January' }),
+ );
+ await body.findByRole('button', { name: 'February' });
+
+ if (dismissal === 'escape') {
+ await userEvent.keyboard('{Escape}');
+ }
+ if (dismissal === 'outside') {
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside calendar' }),
+ );
+ }
+
+ await waitFor(() => {
+ expect(
+ body.queryByRole('button', { name: 'February' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(panel).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => {
+ expect(
+ body.queryByRole('dialog', { name: 'Select date' }),
+ ).not.toBeInTheDocument();
+ });
+ }
+ },
+};
+
+export const WidgetCalendarsKeepIndependentDates: Story = {
+ render: () => (
+ <>
+ <CalendarTopBarStory isWidget />
+ <CalendarTopBarStory instanceId={SECOND_CALENDAR_ID} isWidget />
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const triggers = await canvas.findAllByRole(
+ 'button',
+ { name: 'January 2026' },
+ { timeout: 10000 },
+ );
+
+ await userEvent.click(triggers[0]);
+ const panel = await body.findByRole('dialog', { name: 'Select date' });
+ await userEvent.click(
+ await within(panel).findByRole('button', { name: '2026' }),
+ );
+ await userEvent.click(await body.findByRole('button', { name: '2027' }));
+ await waitFor(() => {
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument();
+ });
+
+ await expect(
+ canvas.getByRole('button', { name: 'January 2027' }),
+ ).toBeVisible();
+ await userEvent.click(canvas.getByRole('button', { name: 'January 2026' }));
+ const secondPanel = await body.findByRole('dialog', {
+ name: 'Select date',
+ });
+ await expect(
+ await within(secondPanel).findByRole('button', { name: '2026' }),
+ ).toBeVisible();
+ await expect(
+ canvas.queryByRole('button', { name: 'Month' }),
+ ).not.toBeInTheDocument();
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
index e2802774ede..67f447cadcd 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
@@ -66,10 +66,6 @@ jest.mock('@/ui/input/components/SelectControl', () => ({
selectedOption: { label: string };
}) => <span data-testid="selected-date">{selectedOption.label}</span>,
}));
-jest.mock('@/ui/layout/dropdown/components/Dropdown', () => ({
- Dropdown: ({ clickableComponent }: { clickableComponent: React.ReactNode }) =>
- clickableComponent,
-}));
jest.mock('@/ui/layout/dropdown/hooks/useCloseDropdown', () => ({
useCloseDropdown: jest.fn(() => ({ closeDropdown: jest.fn() })),
}));
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
index 7c8f187df81..9056794f69a 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
@@ -8,7 +8,6 @@ import { RecordCalendarCardHeader } from '@/object-record/record-calendar/record
import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';
import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';
import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
-import { getRecordCalendarCardInstanceIdPrefix } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardInstanceIdPrefix';
import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
@@ -16,7 +15,6 @@ import { isDraggingRecordComponentState } from '@/object-record/record-drag/stat
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
@@ -137,52 +135,44 @@ export const RecordCalendarCard = ({
instanceId: `${recordId}-${calendarDay}`,
}}
>
- <RecordFieldsScopeContextProvider
- value={{
- scopeInstanceId: getRecordCalendarCardInstanceIdPrefix(calendarDay),
- }}
- >
- <StyledContainer onContextMenu={handleContextMenuOpen}>
- <StyledRecordCardContainer>
- <StyledCardContainer
- isPrimaryMultiDrag={
- isDragOverlay && isRecordIdPrimaryDragMultiple
- }
+ <StyledContainer onContextMenu={handleContextMenuOpen}>
+ <StyledRecordCardContainer>
+ <StyledCardContainer
+ isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
+ >
+ {isDragOverlay && isRecordIdPrimaryDragMultiple && (
+ <RecordDragMultiDragStack />
+ )}
+ <RecordCard
+ data-selected={isRecordCalendarCardSelected}
+ data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}
+ onClick={isCompactModeActive ? handleCardClick : undefined}
+ isDragging={isDraggingThisCard}
>
- {isDragOverlay && isRecordIdPrimaryDragMultiple && (
- <RecordDragMultiDragStack />
- )}
- <RecordCard
- data-selected={isRecordCalendarCardSelected}
- data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}
- onClick={isCompactModeActive ? handleCardClick : undefined}
- isDragging={isDraggingThisCard}
- >
- <RecordCalendarCardHeader recordId={recordId} />
- <Collapsible isExpanded={!isCompactModeActive}>
- <RecordCalendarCardBody
- recordId={recordId}
- calendarDay={calendarDay}
- isRecordReadOnly={false}
- />
- </Collapsible>
- </RecordCard>
- </StyledCardContainer>
- </StyledRecordCardContainer>
- {!isDragOverlay && (
- <>
- <RecordCalendarCardCellHoveredPortal
- recordId={recordId}
- calendarDay={calendarDay}
- />
- <RecordCalendarCardCellEditModePortal
- recordId={recordId}
- calendarDay={calendarDay}
- />
- </>
- )}
- </StyledContainer>
- </RecordFieldsScopeContextProvider>
+ <RecordCalendarCardHeader recordId={recordId} />
+ <Collapsible isExpanded={!isCompactModeActive}>
+ <RecordCalendarCardBody
+ recordId={recordId}
+ calendarDay={calendarDay}
+ isRecordReadOnly={false}
+ />
+ </Collapsible>
+ </RecordCard>
+ </StyledCardContainer>
+ </StyledRecordCardContainer>
+ {!isDragOverlay && (
+ <>
+ <RecordCalendarCardCellHoveredPortal
+ recordId={recordId}
+ calendarDay={calendarDay}
+ />
+ <RecordCalendarCardCellEditModePortal
+ recordId={recordId}
+ calendarDay={calendarDay}
+ />
+ </>
+ )}
+ </StyledContainer>
</RecordCalendarCardComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
index 85dd1f6e2b0..08fe1a80e7d 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
@@ -34,16 +34,6 @@ jest.mock('@/ui/utilities/state/jotai/hooks/useSetAtomComponentState', () => ({
jest.mock('@/ui/layout/dropdown/hooks/useOpenDropdown', () => ({
useOpenDropdown: () => ({ openDropdown: jest.fn() }),
}));
-jest.mock(
- '@/object-record/record-field-list/contexts/RecordFieldsScopeContext',
- () => ({
- RecordFieldsScopeContextProvider: ({
- children,
- }: {
- children: React.ReactNode;
- }) => children,
- }),
-);
jest.mock(
'@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal',
() => ({ RecordCalendarCardCellHoveredPortal: () => null }),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/RecordTargetsInlineCell.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/RecordTargetsInlineCell.tsx
index b9c9cd934dd..16775cdb189 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/RecordTargetsInlineCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/RecordTargetsInlineCell.tsx
@@ -1,6 +1,5 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
import { FieldInput } from '@/object-record/record-field/ui/components/FieldInput';
import { FieldInputEventContextProvider } from '@/object-record/record-field/ui/components/FieldInputEventContextProvider';
@@ -76,33 +75,29 @@ export const RecordTargetsInlineCell = ({
onOpenEditMode={openEditMode}
onCloseEditMode={closeEditMode}
>
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: instanceIdPrefix }}
+ <RecordFieldComponentInstanceContext.Provider
+ value={{ instanceId: fieldInstanceId }}
>
- <RecordFieldComponentInstanceContext.Provider
- value={{ instanceId: fieldInstanceId }}
- >
- <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
+ <RecordInlineCell instanceIdPrefix={instanceIdPrefix} />
- {/* RecordInlineCell only renders display mode; the field input lives in
- an anchored portal that each container mounts for itself. */}
- {isEditing && (
- <RecordInlineCellAnchoredPortal
- fieldMetadataItem={junctionField}
- objectMetadataItem={objectMetadataItem}
- recordId={recordId}
- instanceIdPrefix={instanceIdPrefix}
- onCloseEditMode={closeEditMode}
- >
- <FieldInputEventContextProvider onClose={closeEditMode}>
- <RecordInlineCellEditMode>
- <FieldInput />
- </RecordInlineCellEditMode>
- </FieldInputEventContextProvider>
- </RecordInlineCellAnchoredPortal>
- )}
- </RecordFieldComponentInstanceContext.Provider>
- </RecordFieldsScopeContextProvider>
+ {/* RecordInlineCell only renders display mode; the field input lives in
+ an anchored portal that each container mounts for itself. */}
+ {isEditing && (
+ <RecordInlineCellAnchoredPortal
+ fieldMetadataItem={junctionField}
+ objectMetadataItem={objectMetadataItem}
+ recordId={recordId}
+ instanceIdPrefix={instanceIdPrefix}
+ onCloseEditMode={closeEditMode}
+ >
+ <FieldInputEventContextProvider onClose={closeEditMode}>
+ <RecordInlineCellEditMode>
+ <FieldInput />
+ </RecordInlineCellEditMode>
+ </FieldInputEventContextProvider>
+ </RecordInlineCellAnchoredPortal>
+ )}
+ </RecordFieldComponentInstanceContext.Provider>
</FieldContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
index d02d445fc1d..79ce8f6b789 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
@@ -4,16 +4,12 @@ import { FormFieldInputRowContainer } from '@/object-record/record-field/ui/form
import { VariableChipStandalone } from '@/object-record/record-field/ui/form-types/components/VariableChipStandalone';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
import { Field } from 'twenty-ui/primitives/input';
-import {
- DatePicker,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DatePicker';
+import { DatePicker } from '@/ui/input/components/internal/date/components/DatePicker';
import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';
+import { useIsDatePickerDropdownOpen } from '@/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
@@ -125,25 +121,22 @@ export const FormDateFieldInput = ({
}
};
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
+ const { isDatePickerDropdownOpen } = useIsDatePickerDropdownOpen();
useListenClickOutside({
refs: [datePickerWrapperRef],
- listenerId: 'FormDateFieldInputBase',
+ listenerId: `FormDateFieldInputBase-${instanceId}`,
callback: (event) => {
+ if (isDatePickerDropdownOpen(instanceId)) {
+ return;
+ }
+
event.stopImmediatePropagation();
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
handlePickerClickOutside();
},
enabled: displayDatePicker,
- excludedClickOutsideIds: [
- FORM_DATE_FIELD_PICKER_CLICK_OUTSIDE_ID,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- ],
+ excludedClickOutsideIds: [FORM_DATE_FIELD_PICKER_CLICK_OUTSIDE_ID],
});
const handlePickerChange = (newDate: Nullable<string>) => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
index b67b4bc178f..9c9f87aee9e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
@@ -4,17 +4,12 @@ import { FormFieldInputRowContainer } from '@/object-record/record-field/ui/form
import { VariableChipStandalone } from '@/object-record/record-field/ui/form-types/components/VariableChipStandalone';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
import { Field } from 'twenty-ui/primitives/input';
-import {
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- DateTimePicker,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DateTimePicker';
+import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';
import { DateTimePickerInput } from '@/ui/input/components/internal/date/components/DateTimePickerInput';
+import { useIsDatePickerDropdownOpen } from '@/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
@@ -123,26 +118,22 @@ export const FormDateTimeFieldInput = ({
}
};
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
+ const { isDatePickerDropdownOpen } = useIsDatePickerDropdownOpen();
useListenClickOutside({
refs: [datePickerWrapperRef],
- listenerId: 'FormDateTimeFieldInputBase',
+ listenerId: `FormDateTimeFieldInputBase-${instanceId}`,
callback: (event) => {
+ if (isDatePickerDropdownOpen(instanceId)) {
+ return;
+ }
+
event.stopImmediatePropagation();
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
handlePickerClickOutside();
},
enabled: displayDatePicker,
- excludedClickOutsideIds: [
- FORM_DATE_TIME_FIELD_PICKER_CLICK_OUTSIDE_ID,
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- ],
+ excludedClickOutsideIds: [FORM_DATE_TIME_FIELD_PICKER_CLICK_OUTSIDE_ID],
});
const handlePickerChange = (newDate: Nullable<Temporal.ZonedDateTime>) => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/CurrencyFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/CurrencyFieldInput.stories.tsx
index 5f0b9e14ca5..8cad82925ec 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/CurrencyFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/CurrencyFieldInput.stories.tsx
@@ -12,7 +12,6 @@ import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { NumberFormat } from '@/localization/constants/NumberFormat';
import { workspaceMemberFormatPreferencesState } from '@/localization/states/workspaceMemberFormatPreferencesState';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useCurrencyField } from '@/object-record/record-field/ui/meta-types/hooks/useCurrencyField';
import { CurrencyFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput';
@@ -23,7 +22,6 @@ import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFi
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { CurrencyCode } from 'twenty-shared/constants';
-import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
const {
FieldInputEventContextProviderWithJestMocks,
@@ -120,18 +118,13 @@ const CurrencyFieldInputWithContext = ({
isRecordFieldReadOnly: false,
}}
>
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: RECORD_TABLE_CELL_INPUT_ID_PREFIX }}
- >
- <FieldInputEventContextProviderWithJestMocks>
- {isReady && <StorybookFieldInputDropdownFocusIdSetterEffect />}
- <CurrencyFieldValueSetterEffect
- amountMicros={amountMicros}
- numberFormat={numberFormat}
- />
- <CurrencyFieldInput />
- </FieldInputEventContextProviderWithJestMocks>
- </RecordFieldsScopeContextProvider>
+ <FieldInputEventContextProviderWithJestMocks>
+ <CurrencyFieldValueSetterEffect
+ amountMicros={amountMicros}
+ numberFormat={numberFormat}
+ />
+ <CurrencyFieldInput />
+ </FieldInputEventContextProviderWithJestMocks>
</FieldContext.Provider>
{isReady && <div data-testid="is-ready-marker" />}
<div data-testid="data-field-input-click-outside-div" />
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
index 32502cb95d0..bccbd441f46 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
@@ -1,11 +1,11 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useEffect } from 'react';
-import { expect, userEvent, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { Button } from 'twenty-ui/primitives/input';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useDateTimeField } from '@/object-record/record-field/ui/meta-types/hooks/useDateTimeField';
import { getFieldInputEventContextProviderWithJestMocks } from '@/object-record/record-field/ui/meta-types/input/components/__stories__/utils/getFieldInputEventContextProviderWithJestMocks';
@@ -14,7 +14,6 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel
import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/constants/RecordTableCellInputIdPrefix';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
-import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
const {
FieldInputEventContextProviderWithJestMocks,
@@ -91,17 +90,12 @@ const DateFieldInputWithContext = ({
isRecordFieldReadOnly: false,
}}
>
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: instanceId }}
- >
- <FieldInputEventContextProviderWithJestMocks>
- <StorybookFieldInputDropdownFocusIdSetterEffect />
- <DateFieldValueSetterEffect value={value} />
- <DateFieldValueGater />
- </FieldInputEventContextProviderWithJestMocks>
- </RecordFieldsScopeContextProvider>
+ <FieldInputEventContextProviderWithJestMocks>
+ <DateFieldValueSetterEffect value={value} />
+ <DateFieldValueGater />
+ </FieldInputEventContextProviderWithJestMocks>
</FieldContext.Provider>
- <div data-testid="data-field-input-click-outside-div"></div>
+ <Button>Outside date field</Button>
</RecordFieldComponentInstanceContext.Provider>
);
};
@@ -168,9 +162,17 @@ export const ClickOutside: Story = {
// Increased timeout to account for lazy-loaded react-datepicker on slower CI runners
await body.findByText('January', {}, { timeout: 10000 });
- const emptyDiv = canvas.getByTestId('data-field-input-click-outside-div');
- await userEvent.click(emptyDiv);
- await userEvent.click(emptyDiv);
+ const outsideButton = canvas.getByRole('button', {
+ name: 'Outside date field',
+ });
+ await userEvent.click(outsideButton);
+ await waitFor(() => {
+ expect(
+ body.queryByRole('dialog', { name: 'Select month and year' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(handleClickoutsideMocked).not.toHaveBeenCalled();
+ await userEvent.click(outsideButton);
await expect(handleClickoutsideMocked).toHaveBeenCalledTimes(1);
},
@@ -193,6 +195,12 @@ export const Escape: Story = {
await body.findByText('January', {}, { timeout: 10000 });
await userEvent.keyboard('{escape}');
+ await waitFor(() => {
+ expect(
+ body.queryByRole('dialog', { name: 'Select month and year' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(handleEscapeMocked).not.toHaveBeenCalled();
await userEvent.keyboard('{escape}');
await expect(handleEscapeMocked).toHaveBeenCalledTimes(1);
@@ -216,6 +224,12 @@ export const Enter: Story = {
await body.findByText('January', {}, { timeout: 10000 });
await userEvent.keyboard('{enter}');
+ await waitFor(() => {
+ expect(
+ body.queryByRole('dialog', { name: 'Select month and year' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(handleEnterMocked).not.toHaveBeenCalled();
await userEvent.keyboard('{enter}');
await expect(handleEnterMocked).toHaveBeenCalledTimes(1);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
index 1d5224cfd30..5e658da9766 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
@@ -10,7 +10,6 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePush
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useNumberField } from '@/object-record/record-field/ui/meta-types/hooks/useNumberField';
import { NumberFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/NumberFieldInput';
@@ -19,7 +18,6 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel
import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/constants/RecordTableCellInputIdPrefix';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
-import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
const {
FieldInputEventContextProviderWithJestMocks,
@@ -100,15 +98,10 @@ const NumberFieldInputWithContext = ({
isRecordFieldReadOnly: false,
}}
>
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: RECORD_TABLE_CELL_INPUT_ID_PREFIX }}
- >
- <FieldInputEventContextProviderWithJestMocks>
- {isReady && <StorybookFieldInputDropdownFocusIdSetterEffect />}
- <NumberFieldValueSetterEffect value={value} />
- <NumberFieldInput />
- </FieldInputEventContextProviderWithJestMocks>
- </RecordFieldsScopeContextProvider>
+ <FieldInputEventContextProviderWithJestMocks>
+ <NumberFieldValueSetterEffect value={value} />
+ <NumberFieldInput />
+ </FieldInputEventContextProviderWithJestMocks>
</FieldContext.Provider>
{isReady && <div data-testid="is-ready-marker" />}
<div data-testid="data-field-input-click-outside-div" />
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
index d2cc5268a90..f83f84e6eb8 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
@@ -1,7 +1,5 @@
-import { useCallback, useContext } from 'react';
+import { useContext } from 'react';
-import { FieldDisplay } from '@/object-record/record-field/ui/components/FieldDisplay';
-import { FieldInput } from '@/object-record/record-field/ui/components/FieldInput';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { FieldFocusContextProvider } from '@/object-record/record-field/ui/contexts/FieldFocusContextProvider';
import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetButtonIcon';
@@ -9,17 +7,6 @@ import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetBu
import { useIsFieldInputOnly } from '@/object-record/record-field/ui/hooks/useIsFieldInputOnly';
import { useOpenFieldInputEditMode } from '@/object-record/record-field/ui/hooks/useOpenFieldInputEditMode';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import {
- FieldInputEventContext,
- type FieldInputClickOutsideEvent,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistFieldFromFieldInputContext } from '@/object-record/record-field/ui/hooks/usePersistFieldFromFieldInputContext';
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
-import { activeDropdownFocusIdState } from '@/ui/layout/dropdown/states/activeDropdownFocusIdState';
-import { useStore } from 'jotai';
import { useIcons } from 'twenty-ui/icon';
import { RecordInlineCellContainer } from './RecordInlineCellContainer';
import {
@@ -45,8 +32,6 @@ export const RecordInlineCell = ({
onCloseEditMode: onCloseEditModeFromContext,
isRecordFieldReadOnly: isReadOnly,
} = useContext(FieldContext);
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
- const store = useStore();
const { openFieldInput, closeFieldInput } = useOpenFieldInputEditMode();
@@ -59,125 +44,19 @@ export const RecordInlineCell = ({
prefix: instanceIdPrefix,
});
- const onCloseEditMode = useCallback(() => {
- onCloseEditModeFromContext
- ? onCloseEditModeFromContext()
- : closeFieldInput({
+ const onCloseEditMode = onCloseEditModeFromContext
+ ? onCloseEditModeFromContext
+ : () =>
+ closeFieldInput({
fieldDefinition,
recordId,
prefix: instanceIdPrefix,
});
- }, [
- onCloseEditModeFromContext,
- closeFieldInput,
- fieldDefinition,
- recordId,
- instanceIdPrefix,
- ]);
const buttonIcon = useGetButtonIcon();
const isFieldInputOnly = useIsFieldInputOnly();
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
-
- const closeInlineCell = useCallback(() => {
- onCloseEditMode();
- goBackToPreviousDropdownFocusId();
- }, [onCloseEditMode, goBackToPreviousDropdownFocusId]);
-
- const { persistFieldFromFieldInputContext } =
- usePersistFieldFromFieldInputContext();
-
- const handleEnter: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleSubmit: FieldInputEvent = ({
- newValue,
- skipPersist,
- skipClose,
- }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- if (skipClose !== true) {
- closeInlineCell();
- }
- };
-
- const handleCancel = () => {
- closeInlineCell();
- };
-
- const handleEscape: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleTab: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleShiftTab: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleClickOutside = useCallback(
- ({
- event,
- newValue,
- skipPersist,
- }: Parameters<FieldInputClickOutsideEvent>[0]) => {
- const currentDropdownFocusId = store.get(activeDropdownFocusIdState.atom);
-
- const expectedDropdownFocusId = getDropdownFocusIdForRecordField({
- recordId,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- componentType: 'inline-cell',
- instanceId: scopeInstanceId,
- });
-
- if (currentDropdownFocusId !== expectedDropdownFocusId) {
- return;
- }
-
- event?.preventDefault();
- event?.stopImmediatePropagation();
-
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- },
- [
- recordId,
- fieldDefinition.fieldMetadataId,
- scopeInstanceId,
- closeInlineCell,
- persistFieldFromFieldInputContext,
- store,
- ],
- );
-
const { getIcon } = useIcons();
const RecordInlineCellContextValue: RecordInlineCellContextProps = {
@@ -190,8 +69,6 @@ export const RecordInlineCell = ({
labelWidth: fieldDefinition.labelWidth,
showLabel: fieldDefinition.showLabel,
isCentered,
- editModeContent: <FieldInput />,
- displayModeContent: <FieldDisplay />,
isDisplayModeFixHeight: isDisplayModeFixHeight,
editModeContentOnly: isFieldInputOnly,
loading: loading,
@@ -200,22 +77,10 @@ export const RecordInlineCell = ({
};
return (
- <FieldInputEventContext.Provider
- value={{
- onCancel: handleCancel,
- onEnter: handleEnter,
- onEscape: handleEscape,
- onClickOutside: handleClickOutside,
- onShiftTab: handleShiftTab,
- onSubmit: handleSubmit,
- onTab: handleTab,
- }}
- >
- <FieldFocusContextProvider>
- <RecordInlineCellContext.Provider value={RecordInlineCellContextValue}>
- <RecordInlineCellContainer />
- </RecordInlineCellContext.Provider>
- </FieldFocusContextProvider>
- </FieldInputEventContext.Provider>
+ <FieldFocusContextProvider>
+ <RecordInlineCellContext.Provider value={RecordInlineCellContextValue}>
+ <RecordInlineCellContainer />
+ </RecordInlineCellContext.Provider>
+ </FieldFocusContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
index 0f869d53e40..70ec052a864 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
@@ -1,5 +1,3 @@
-import { FieldDisplay } from '@/object-record/record-field/ui/components/FieldDisplay';
-import { FieldInput } from '@/object-record/record-field/ui/components/FieldInput';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetButtonIcon';
import { useIsFieldInputOnly } from '@/object-record/record-field/ui/hooks/useIsFieldInputOnly';
@@ -39,8 +37,6 @@ export const RecordInlineCellAnchoredPortalContext = ({
labelWidth: fieldDefinition.labelWidth,
showLabel: fieldDefinition.showLabel,
isCentered,
- editModeContent: <FieldInput />,
- displayModeContent: <FieldDisplay />,
isDisplayModeFixHeight: isDisplayModeFixHeight,
editModeContentOnly: isFieldInputOnly,
loading: false,
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
index 64f1dab71ca..76a2d4a0a71 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
@@ -1,4 +1,4 @@
-import { createContext, type ReactElement, useContext } from 'react';
+import { createContext, useContext } from 'react';
import { type IconComponent } from 'twenty-ui/icon';
export type RecordInlineCellContextProps = {
@@ -8,9 +8,7 @@ export type RecordInlineCellContextProps = {
labelWidth?: number;
showLabel?: boolean;
buttonIcon?: IconComponent;
- editModeContent?: ReactElement;
editModeContentOnly?: boolean;
- displayModeContent?: ReactElement;
isDisplayModeFixHeight?: boolean;
disableHoverEffect?: boolean;
loading?: boolean;
@@ -26,9 +24,7 @@ const defaultRecordInlineCellContextProp: RecordInlineCellContextProps = {
labelWidth: 0,
showLabel: false,
buttonIcon: undefined,
- editModeContent: undefined,
editModeContentOnly: false,
- displayModeContent: undefined,
isDisplayModeFixHeight: false,
disableHoverEffect: false,
loading: false,
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
index 44584300992..6c2d1545cb8 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
@@ -5,7 +5,7 @@ import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/r
import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionLoadingComponentState';
import { RecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
import { FIELD_INPUT_ANCHOR_WIDTH_CSS_VARIABLE } from '@/ui/field/input/constants/FieldInputAnchorWidthCssVariable';
-import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
+import { StyledOverlayPortalLayer } from '@/ui/layout/overlay/components/StyledOverlayPortalLayer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -106,7 +106,7 @@ export const RecordInlineCellEditMode = ({
>
<>
{createPortal(
- <StyledDropdownContentContainer
+ <StyledOverlayPortalLayer
data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
@@ -117,7 +117,7 @@ export const RecordInlineCellEditMode = ({
>
{children}
</OverlayContainer>
- </StyledDropdownContentContainer>,
+ </StyledOverlayPortalLayer>,
document.body,
)}
</>
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
index 86f3ff24495..b139033e6e3 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
@@ -2,13 +2,9 @@ import { useContext } from 'react';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useInitDraftValue } from '@/object-record/record-field/ui/hooks/useInitDraftValue';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { useRecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
-import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
export const useInlineCell = (
@@ -22,18 +18,11 @@ export const useInlineCell = (
);
const { onOpenEditMode, onCloseEditMode } = useRecordInlineCellContext();
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
-
- const { setActiveDropdownFocusIdAndMemorizePrevious } =
- useSetActiveDropdownFocusIdAndMemorizePrevious();
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
const initFieldInputDraftValue = useInitDraftValue();
const closeInlineCell = () => {
onCloseEditMode?.();
- goBackToPreviousDropdownFocusId();
};
const openInlineCell = () => {
@@ -43,15 +32,6 @@ export const useInlineCell = (
fieldDefinition,
fieldComponentInstanceId: recordFieldComponentInstanceId,
});
-
- const dropdownId = getDropdownFocusIdForRecordField({
- recordId,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- componentType: 'inline-cell',
- instanceId: scopeInstanceId,
- });
-
- setActiveDropdownFocusIdAndMemorizePrevious(dropdownId);
};
return {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/__stories__/RecordTable.stories.tsx b/packages/twenty-front/src/modules/object-record/record-table/__stories__/RecordTable.stories.tsx
index 513d7667db2..5b0dd72d635 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/__stories__/RecordTable.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/__stories__/RecordTable.stories.tsx
@@ -1,7 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';
-import { fireEvent, userEvent, within } from 'storybook/test';
+import { expect, fireEvent, userEvent, waitFor, within } from 'storybook/test';
+import { Button } from 'twenty-ui/primitives/input';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
import { FileUploadDecorator } from '~/testing/decorators/FileUploadDecorator';
@@ -12,6 +13,8 @@ import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
import { mockedViews } from '~/testing/mock-data/generated/metadata/views/mock-views-data';
+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
import { sleep } from '~/utils/sleep';
const companyView = mockedViews.find((v) => v.name === 'All Companies')!;
@@ -81,6 +84,81 @@ export const HeaderMenuStaysOpenAfterMoveRight: Story = {
},
};
+export const NestedCurrencyPickerPreservesCellEditMode: Story = {
+ beforeEach: () => {
+ const originalViewFields = companyView.viewFields;
+ const originalCurrencyValue =
+ mockedCompanyRecords[0].annualRecurringRevenue;
+ const currencyField = getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('company'),
+ fieldName: 'annualRecurringRevenue',
+ });
+
+ companyView.viewFields = [
+ ...originalViewFields.map((viewField) => ({
+ ...viewField,
+ position: viewField.position === 0 ? 0 : viewField.position + 1,
+ })),
+ {
+ ...originalViewFields[0],
+ id: 'currency-focus-story-field',
+ fieldMetadataId: currencyField.id,
+ position: 1,
+ },
+ ];
+ mockedCompanyRecords[0].annualRecurringRevenue = {
+ amountMicros: 123_000_000,
+ currencyCode: 'USD',
+ };
+
+ return () => {
+ companyView.viewFields = originalViewFields;
+ mockedCompanyRecords[0].annualRecurringRevenue = originalCurrencyValue;
+ };
+ },
+ render: (args) => (
+ <>
+ <Button>Outside table</Button>
+ <RecordTableWithWrappers {...args} />
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await canvas.findByText(
+ mockedCompanyRecords[0].name,
+ {},
+ { timeout: 3000 },
+ );
+ const amountDisplay = await canvas.findByText('123', {}, { timeout: 3000 });
+
+ await userEvent.click(amountDisplay);
+
+ const amountInput = await body.findByRole('textbox');
+
+ await userEvent.click(await body.findByText('USD'));
+
+ const picker = await body.findByRole('dialog', { name: 'Currency' });
+
+ await expect(amountInput).toBeVisible();
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside table' }),
+ );
+
+ await waitFor(() => expect(picker).not.toBeInTheDocument());
+ await expect(amountInput).toBeVisible();
+ await expect(amountInput).toHaveValue('123');
+
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Outside table' }),
+ );
+
+ await waitFor(() => expect(amountInput).not.toBeInTheDocument());
+ await expect(amountDisplay).toBeVisible();
+ },
+};
+
export const ScrolledLeft: Story = {
parameters: {
container: {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
index 063392d28bd..bbc70980775 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
@@ -6,11 +6,9 @@ import { RecordTableContextProvider as RecordTableContextInternalProvider } from
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { type RecordUpdateHookParams } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useResolveOpenRecordIn } from '@/object-record/record-index/hooks/useResolveOpenRecordIn';
-import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/constants/RecordTableCellInputIdPrefix';
import { RECORD_TABLE_COLUMN_MIN_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnMinWidth';
import { RecordTableUpdateContext } from '@/object-record/record-table/contexts/RecordTableUpdateContext';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
@@ -71,29 +69,25 @@ export const RecordTableContextProvider = ({
: 'MOUSE_DOWN';
return (
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: RECORD_TABLE_CELL_INPUT_ID_PREFIX }}
+ <RecordTableContextInternalProvider
+ value={{
+ viewBarId,
+ objectMetadataItem,
+ objectMetadataItems,
+ recordTableId,
+ objectNameSingular,
+ objectPermissions,
+ visibleRecordFields: visibleRecordFields.map((field) => ({
+ ...field,
+ size: Math.max(field.size, RECORD_TABLE_COLUMN_MIN_WIDTH),
+ })),
+ onRecordIdentifierClick,
+ triggerEvent,
+ }}
>
- <RecordTableContextInternalProvider
- value={{
- viewBarId,
- objectMetadataItem,
- objectMetadataItems,
- recordTableId,
- objectNameSingular,
- objectPermissions,
- visibleRecordFields: visibleRecordFields.map((field) => ({
- ...field,
- size: Math.max(field.size, RECORD_TABLE_COLUMN_MIN_WIDTH),
- })),
- onRecordIdentifierClick,
- triggerEvent,
- }}
- >
- <RecordTableUpdateContext.Provider value={updateRecord}>
- {children}
- </RecordTableUpdateContext.Provider>
- </RecordTableContextInternalProvider>
- </RecordFieldsScopeContextProvider>
+ <RecordTableUpdateContext.Provider value={updateRecord}>
+ {children}
+ </RecordTableUpdateContext.Provider>
+ </RecordTableContextInternalProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx
index dc8b46e83a2..c27cd936419 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx
@@ -1,12 +1,10 @@
+import { type OpenTableCellArgs } from '@/object-record/record-table/types/OpenTableCellArgs';
import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { useRecordTableMoveFocusedCell } from '@/object-record/record-table/hooks/useRecordTableMoveFocusedCell';
import { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup';
import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';
-import {
- type OpenTableCellArgs,
- useOpenRecordTableCell,
-} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
+import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';
import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';
import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx
index 13584ad75a5..522060b4f76 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx
@@ -1,12 +1,10 @@
+import { type OpenTableCellArgs } from '@/object-record/record-table/types/OpenTableCellArgs';
import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { useRecordTableMoveFocusedCell } from '@/object-record/record-table/hooks/useRecordTableMoveFocusedCell';
import { useCloseRecordTableCellInGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup';
import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';
-import {
- type OpenTableCellArgs,
- useOpenRecordTableCell,
-} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
+import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';
import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';
import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts
index 4e2fa0835d1..5e2a2e0d763 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts
@@ -1,6 +1,6 @@
+import { type OpenTableCellArgs } from '@/object-record/record-table/types/OpenTableCellArgs';
import type React from 'react';
-import { type OpenTableCellArgs } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';
import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
import { createRequiredContext } from '~/utils/createRequiredContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
index 9291227df12..016d9f638b6 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
@@ -2,7 +2,6 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
import { useRemoveLastFocusItemFromFocusStackByComponentType } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackByComponentType';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
@@ -14,24 +13,18 @@ export const useCloseCurrentTableCellInEditMode = (recordTableId?: string) => {
recordTableId,
);
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
-
const { removeLastFocusItemFromFocusStackByComponentType } =
useRemoveLastFocusItemFromFocusStackByComponentType();
return useCallback(() => {
store.set(currentTableCellInEditModePosition, null);
- goBackToPreviousDropdownFocusId();
-
removeLastFocusItemFromFocusStackByComponentType({
componentType: FocusComponentType.OPENED_FIELD_INPUT,
});
}, [
store,
currentTableCellInEditModePosition,
- goBackToPreviousDropdownFocusId,
removeLastFocusItemFromFocusStackByComponentType,
]);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
index 6f25774cc54..1050f3b5978 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
@@ -6,7 +6,7 @@ import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/r
import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionLoadingComponentState';
import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell';
-import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
+import { StyledOverlayPortalLayer } from '@/ui/layout/overlay/components/StyledOverlayPortalLayer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -41,7 +41,7 @@ const StyledInputModeOnlyContainer = styled.div`
width: 100%;
`;
-export type RecordTableCellEditModeProps = {
+type RecordTableCellEditModeProps = {
children: ReactElement;
};
@@ -117,7 +117,7 @@ export const RecordTableCellEditMode = ({
</StyledInputModeOnlyContainer>
) : (
<FloatingPortal>
- <StyledDropdownContentContainer
+ <StyledOverlayPortalLayer
data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
@@ -128,7 +128,7 @@ export const RecordTableCellEditMode = ({
>
{children}
</OverlayContainer>
- </StyledDropdownContentContainer>
+ </StyledOverlayPortalLayer>
</FloatingPortal>
)}
</StyledEditableCellEditModeContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
index d914c009c27..083d55bff4a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
@@ -1,22 +1,17 @@
+import { type OpenTableCellArgs } from '@/object-record/record-table/types/OpenTableCellArgs';
import { useInitDraftValue } from '@/object-record/record-field/ui/hooks/useInitDraftValue';
-import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
-import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
import { FOCUS_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/FocusClickOutsideListenerId';
import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/constants/RecordTableCellInputIdPrefix';
import { useLeaveTableFocus } from '@/object-record/record-table/hooks/internal/useLeaveTableFocus';
-import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
import { useOpenFieldInputEditMode } from '@/object-record/record-field/ui/hooks/useOpenFieldInputEditMode';
import { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/RecordTableClickOutsideListenerId';
import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState';
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
-import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useResolveOpenRecordIn } from '@/object-record/record-index/hooks/useResolveOpenRecordIn';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
@@ -25,7 +20,6 @@ import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/use
import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell';
import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState';
import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
import { useRemoveLastFocusItemFromFocusStackByComponentType } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackByComponentType';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -33,17 +27,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { OpenRecordIn } from 'twenty-shared/types';
-export type OpenTableCellArgs = {
- initialValue?: string;
- cellPosition: TableCellPosition;
- isReadOnly: boolean;
- fieldDefinition: FieldDefinition<FieldMetadata>;
- recordId: string;
- isNavigating: boolean;
-};
-
export const useOpenRecordTableCell = (recordTableId: string) => {
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
const store = useStore();
const setRecordTableCellEditModePosition = useSetAtomComponentState(
@@ -60,14 +44,8 @@ export const useOpenRecordTableCell = (recordTableId: string) => {
const initDraftValue = useInitDraftValue();
- const { setActiveDropdownFocusIdAndMemorizePrevious } =
- useSetActiveDropdownFocusIdAndMemorizePrevious();
-
const { openFieldInput } = useOpenFieldInputEditMode();
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
-
const { removeLastFocusItemFromFocusStackByComponentType } =
useRemoveLastFocusItemFromFocusStackByComponentType();
@@ -151,7 +129,6 @@ export const useOpenRecordTableCell = (recordTableId: string) => {
prefix: RECORD_TABLE_CELL_INPUT_ID_PREFIX,
onFileUploadClose: () => {
setRecordTableCellEditModePosition(null);
- goBackToPreviousDropdownFocusId();
removeLastFocusItemFromFocusStackByComponentType({
componentType: FocusComponentType.OPENED_FIELD_INPUT,
});
@@ -172,15 +149,6 @@ export const useOpenRecordTableCell = (recordTableId: string) => {
});
toggleClickOutside(false);
-
- setActiveDropdownFocusIdAndMemorizePrevious(
- getDropdownFocusIdForRecordField({
- recordId,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- componentType: 'table-cell',
- instanceId: scopeInstanceId,
- }),
- );
},
[
deactivateRecordTableRow,
@@ -189,12 +157,9 @@ export const useOpenRecordTableCell = (recordTableId: string) => {
setDragSelectionStartEnabled,
openFieldInput,
setRecordTableCellEditModePosition,
- goBackToPreviousDropdownFocusId,
removeLastFocusItemFromFocusStackByComponentType,
initDraftValue,
toggleClickOutside,
- setActiveDropdownFocusIdAndMemorizePrevious,
- scopeInstanceId,
leaveTableFocus,
openRecordFromIndexView,
openRecordIn,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/types/OpenTableCellArgs.ts b/packages/twenty-front/src/modules/object-record/record-table/types/OpenTableCellArgs.ts
new file mode 100644
index 00000000000..8f1283f6105
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/types/OpenTableCellArgs.ts
@@ -0,0 +1,12 @@
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
+
+export type OpenTableCellArgs = {
+ initialValue?: string;
+ cellPosition: TableCellPosition;
+ isReadOnly: boolean;
+ fieldDefinition: FieldDefinition<FieldMetadata>;
+ recordId: string;
+ isNavigating: boolean;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/hooks/useRecordTitleCell.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/hooks/useRecordTitleCell.tsx
index 7d119c31543..57f48e764f8 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/hooks/useRecordTitleCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/hooks/useRecordTitleCell.tsx
@@ -3,7 +3,6 @@ import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/uti
import { useInitDraftValue } from '@/object-record/record-field/ui/hooks/useInitDraftValue';
import { RecordTitleCellComponentInstanceContext } from '@/object-record/record-title-cell/states/contexts/RecordTitleCellComponentInstanceContext';
import { isTitleCellInEditModeComponentState } from '@/object-record/record-title-cell/states/isTitleCellInEditModeComponentState';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
@@ -19,9 +18,6 @@ type OpenTitleCellFunctionParams = {
};
export const useRecordTitleCell = () => {
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
-
const instanceId = useAvailableComponentInstanceId(
RecordTitleCellComponentInstanceContext,
);
@@ -54,15 +50,8 @@ export const useRecordTitleCell = () => {
removeFocusItemFromFocusStackById({
focusId: computedInstanceId,
});
-
- goBackToPreviousDropdownFocusId();
},
- [
- goBackToPreviousDropdownFocusId,
- instanceId,
- removeFocusItemFromFocusStackById,
- store,
- ],
+ [instanceId, removeFocusItemFromFocusStackById, store],
);
const initFieldInputDraftValue = useInitDraftValue();
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/getDropdownFocusIdForRecordField.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/getDropdownFocusIdForRecordField.test.ts
deleted file mode 100644
index b6d310f8d95..00000000000
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/getDropdownFocusIdForRecordField.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
-
-describe('getDropdownFocusIdForRecordField', () => {
- it('should generate correct dropdown focus id for table-cell', () => {
- const result = getDropdownFocusIdForRecordField({
- recordId: 'record-123',
- fieldMetadataId: 'field-456',
- componentType: 'table-cell',
- instanceId: 'instance-789',
- });
-
- expect(result).toBe(
- 'dropdown-instance-789-table-cell-record-record-123-field-field-456',
- );
- });
-
- it('should generate correct dropdown focus id for inline-cell', () => {
- const result = getDropdownFocusIdForRecordField({
- recordId: 'record-abc',
- fieldMetadataId: 'field-def',
- componentType: 'inline-cell',
- instanceId: 'instance-ghi',
- });
-
- expect(result).toBe(
- 'dropdown-instance-ghi-inline-cell-record-record-abc-field-field-def',
- );
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/utils/getDropdownFocusIdForRecordField.ts b/packages/twenty-front/src/modules/object-record/utils/getDropdownFocusIdForRecordField.ts
deleted file mode 100644
index b7d99da7319..00000000000
--- a/packages/twenty-front/src/modules/object-record/utils/getDropdownFocusIdForRecordField.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export const getDropdownFocusIdForRecordField = ({
- recordId,
- fieldMetadataId,
- componentType,
- instanceId,
-}: {
- recordId: string;
- fieldMetadataId: string;
- componentType: 'table-cell' | 'inline-cell';
- instanceId: string;
-}) => {
- return `dropdown-${instanceId}-${componentType}-record-${recordId}-field-${fieldMetadataId}`;
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
index 3282e9821b5..4b59221db22 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
@@ -101,16 +101,14 @@ export const WidgetActionFieldEdit = ({
} satisfies GenericFieldContextType;
return (
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <RecordFieldComponentInstanceContext.Provider
- value={{
- instanceId: recordFieldInputInstanceId,
- }}
- >
- <FieldContext.Provider value={fieldContextValue}>
- <FieldWidgetEditAction />
- </FieldContext.Provider>
- </RecordFieldComponentInstanceContext.Provider>
- </RecordFieldsScopeContextProvider>
+ <RecordFieldComponentInstanceContext.Provider
+ value={{
+ instanceId: recordFieldInputInstanceId,
+ }}
+ >
+ <FieldContext.Provider value={fieldContextValue}>
+ <FieldWidgetEditAction />
+ </FieldContext.Provider>
+ </RecordFieldComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
index 2ed113d2fa1..41600636d7e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
@@ -3,7 +3,6 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
@@ -67,65 +66,63 @@ export const FieldWidgetDisplay = ({
const handleMouseLeave = () => setFieldWidgetHover(false);
return (
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <SidePanelProvider value={{ isInSidePanel }}>
- <RecordFieldComponentInstanceContext.Provider
- value={{
- instanceId: getRecordFieldInputInstanceId({
+ <SidePanelProvider value={{ isInSidePanel }}>
+ <RecordFieldComponentInstanceContext.Provider
+ value={{
+ instanceId: getRecordFieldInputInstanceId({
+ recordId,
+ fieldName: fieldMetadataItem.name,
+ prefix: instanceId,
+ }),
+ }}
+ >
+ <StyledContainer>
+ <FieldContext.Provider
+ value={{
recordId,
- fieldName: fieldMetadataItem.name,
- prefix: instanceId,
- }),
- }}
- >
- <StyledContainer>
- <FieldContext.Provider
- value={{
- recordId,
- maxWidth: 200,
- isLabelIdentifier: false,
+ maxWidth: 200,
+ isLabelIdentifier: false,
+ fieldDefinition,
+ useUpdateRecord: useUpdateOneObjectRecordMutation,
+ isDisplayModeFixHeight: false,
+ isRecordFieldReadOnly: isRecordFieldReadOnly({
+ isRecordReadOnly,
+ objectPermissions:
+ getObjectPermissionsFromMapByObjectMetadataId({
+ objectPermissionsByObjectMetadataId,
+ objectMetadataId: objectMetadataItem.id,
+ }),
+ fieldMetadataItem,
fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isDisplayModeFixHeight: false,
- isRecordFieldReadOnly: isRecordFieldReadOnly({
- isRecordReadOnly,
- objectPermissions:
- getObjectPermissionsFromMapByObjectMetadataId({
- objectPermissionsByObjectMetadataId,
- objectMetadataId: objectMetadataItem.id,
- }),
- fieldMetadataItem,
- fieldDefinition,
- objectPermissionsByObjectMetadataId,
- }),
- onMouseEnter: handleMouseEnter,
- anchorId: getRecordFieldInputInstanceId({
- recordId,
- fieldName: fieldMetadataItem.name,
- prefix: instanceId,
- }),
- }}
- >
- <FieldWidgetInlineCell instanceIdPrefix={instanceId} />
- </FieldContext.Provider>
- </StyledContainer>
+ objectPermissionsByObjectMetadataId,
+ }),
+ onMouseEnter: handleMouseEnter,
+ anchorId: getRecordFieldInputInstanceId({
+ recordId,
+ fieldName: fieldMetadataItem.name,
+ prefix: instanceId,
+ }),
+ }}
+ >
+ <FieldWidgetInlineCell instanceIdPrefix={instanceId} />
+ </FieldContext.Provider>
+ </StyledContainer>
- <FieldWidgetCellHoveredPortal
- objectMetadataItem={objectMetadataItem}
- fieldMetadataItem={fieldMetadataItem}
- recordId={recordId}
- instanceId={instanceId}
- isHovered={fieldWidgetHover}
- onMouseLeave={handleMouseLeave}
- />
- <FieldWidgetCellEditModePortal
- objectMetadataItem={objectMetadataItem}
- fieldMetadataItem={fieldMetadataItem}
- recordId={recordId}
- instanceId={instanceId}
- />
- </RecordFieldComponentInstanceContext.Provider>
- </SidePanelProvider>
- </RecordFieldsScopeContextProvider>
+ <FieldWidgetCellHoveredPortal
+ objectMetadataItem={objectMetadataItem}
+ fieldMetadataItem={fieldMetadataItem}
+ recordId={recordId}
+ instanceId={instanceId}
+ isHovered={fieldWidgetHover}
+ onMouseLeave={handleMouseLeave}
+ />
+ <FieldWidgetCellEditModePortal
+ objectMetadataItem={objectMetadataItem}
+ fieldMetadataItem={fieldMetadataItem}
+ recordId={recordId}
+ instanceId={instanceId}
+ />
+ </RecordFieldComponentInstanceContext.Provider>
+ </SidePanelProvider>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetInlineCell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetInlineCell.tsx
index 962074b9e68..6e2e71a8b10 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetInlineCell.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetInlineCell.tsx
@@ -1,7 +1,5 @@
-import { useCallback, useContext } from 'react';
+import { useContext } from 'react';
-import { FieldDisplay } from '@/object-record/record-field/ui/components/FieldDisplay';
-import { FieldInput } from '@/object-record/record-field/ui/components/FieldInput';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { FieldFocusContextProvider } from '@/object-record/record-field/ui/contexts/FieldFocusContextProvider';
import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetButtonIcon';
@@ -9,22 +7,11 @@ import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetBu
import { useIsFieldInputOnly } from '@/object-record/record-field/ui/hooks/useIsFieldInputOnly';
import { useOpenFieldInputEditMode } from '@/object-record/record-field/ui/hooks/useOpenFieldInputEditMode';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import {
- FieldInputEventContext,
- type FieldInputClickOutsideEvent,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistFieldFromFieldInputContext } from '@/object-record/record-field/ui/hooks/usePersistFieldFromFieldInputContext';
import {
RecordInlineCellContext,
type RecordInlineCellContextProps,
} from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
import { FieldWidgetInlineCellContainer } from '@/page-layout/widgets/field/components/FieldWidgetInlineCellContainer';
-import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
-import { activeDropdownFocusIdState } from '@/ui/layout/dropdown/states/activeDropdownFocusIdState';
-import { useStore } from 'jotai';
type FieldWidgetInlineCellProps = {
loading?: boolean;
@@ -35,8 +22,6 @@ export const FieldWidgetInlineCell = ({
loading,
instanceIdPrefix,
}: FieldWidgetInlineCellProps) => {
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
- const store = useStore();
const {
fieldDefinition,
recordId,
@@ -58,132 +43,24 @@ export const FieldWidgetInlineCell = ({
prefix: instanceIdPrefix,
});
- const onCloseEditMode = useCallback(() => {
- onCloseEditModeFromContext
- ? onCloseEditModeFromContext()
- : closeFieldInput({
+ const onCloseEditMode = onCloseEditModeFromContext
+ ? onCloseEditModeFromContext
+ : () =>
+ closeFieldInput({
fieldDefinition,
recordId,
prefix: instanceIdPrefix,
});
- }, [
- onCloseEditModeFromContext,
- closeFieldInput,
- fieldDefinition,
- recordId,
- instanceIdPrefix,
- ]);
const buttonIcon = useGetButtonIcon();
const isFieldInputOnly = useIsFieldInputOnly();
- const { goBackToPreviousDropdownFocusId } =
- useGoBackToPreviousDropdownFocusId();
-
- const closeInlineCell = useCallback(() => {
- onCloseEditMode();
- goBackToPreviousDropdownFocusId();
- }, [onCloseEditMode, goBackToPreviousDropdownFocusId]);
-
- const { persistFieldFromFieldInputContext } =
- usePersistFieldFromFieldInputContext();
-
- const handleEnter: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleSubmit: FieldInputEvent = ({
- newValue,
- skipPersist,
- skipClose,
- }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- if (skipClose !== true) {
- closeInlineCell();
- }
- };
-
- const handleCancel = () => {
- closeInlineCell();
- };
-
- const handleEscape: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleTab: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleShiftTab: FieldInputEvent = ({ newValue, skipPersist }) => {
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- };
-
- const handleClickOutside = useCallback(
- ({
- event,
- newValue,
- skipPersist,
- }: Parameters<FieldInputClickOutsideEvent>[0]) => {
- const currentDropdownFocusId = store.get(activeDropdownFocusIdState.atom);
-
- const expectedDropdownFocusId = getDropdownFocusIdForRecordField({
- recordId,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- componentType: 'inline-cell',
- instanceId: scopeInstanceId,
- });
-
- if (currentDropdownFocusId !== expectedDropdownFocusId) {
- return;
- }
-
- event?.preventDefault();
- event?.stopImmediatePropagation();
-
- if (skipPersist !== true) {
- persistFieldFromFieldInputContext(newValue);
- }
-
- closeInlineCell();
- },
- [
- closeInlineCell,
- recordId,
- fieldDefinition.fieldMetadataId,
- persistFieldFromFieldInputContext,
- scopeInstanceId,
- store,
- ],
- );
-
const RecordInlineCellContextValue: RecordInlineCellContextProps = {
readonly: isReadOnly,
buttonIcon: buttonIcon,
label: fieldDefinition.label,
labelWidth: fieldDefinition.labelWidth,
- editModeContent: <FieldInput />,
- displayModeContent: <FieldDisplay />,
isDisplayModeFixHeight: isDisplayModeFixHeight,
editModeContentOnly: isFieldInputOnly,
loading: loading,
@@ -193,22 +70,10 @@ export const FieldWidgetInlineCell = ({
};
return (
- <FieldInputEventContext.Provider
- value={{
- onCancel: handleCancel,
- onEnter: handleEnter,
- onEscape: handleEscape,
- onClickOutside: handleClickOutside,
- onShiftTab: handleShiftTab,
- onSubmit: handleSubmit,
- onTab: handleTab,
- }}
- >
- <FieldFocusContextProvider>
- <RecordInlineCellContext.Provider value={RecordInlineCellContextValue}>
- <FieldWidgetInlineCellContainer />
- </RecordInlineCellContext.Provider>
- </FieldFocusContextProvider>
- </FieldInputEventContext.Provider>
+ <FieldFocusContextProvider>
+ <RecordInlineCellContext.Provider value={RecordInlineCellContextValue}>
+ <FieldWidgetInlineCellContainer />
+ </RecordInlineCellContext.Provider>
+ </FieldFocusContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
index 0c6ca10c9d5..7ee745a662e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
@@ -22,6 +22,7 @@ import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/con
import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { Button } from 'twenty-ui/primitives/input';
import { ComponentDecorator } from 'twenty-ui/testing';
import {
FieldDisplayMode,
@@ -679,20 +680,22 @@ export const BooleanFieldWidget: Story = {
},
};
-export const CurrencyFieldWidget: Story = {
- render: () =>
- renderFieldWidgetStory({
- widget: buildFieldWidget({
- id: 'widget-currency-field',
- title: 'Annual Recurring Revenue',
- objectMetadataId: companyObjectMetadataItem.id,
- fieldMetadataId: annualRecurringRevenueField.id,
- fieldDisplayMode: FieldDisplayMode.FIELD,
- }),
+const renderCurrencyFieldWidgetStory = () =>
+ renderFieldWidgetStory({
+ widget: buildFieldWidget({
+ id: 'widget-currency-field',
+ title: 'Annual Recurring Revenue',
objectMetadataId: companyObjectMetadataItem.id,
- targetRecord: companyTargetRecord,
- records: companyRecords,
+ fieldMetadataId: annualRecurringRevenueField.id,
+ fieldDisplayMode: FieldDisplayMode.FIELD,
}),
+ objectMetadataId: companyObjectMetadataItem.id,
+ targetRecord: companyTargetRecord,
+ records: companyRecords,
+ });
+
+export const CurrencyFieldWidget: Story = {
+ render: renderCurrencyFieldWidgetStory,
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
@@ -1012,3 +1015,45 @@ export const OneToManyRelationCardWidgetWithProgressiveLoading: Story = {
).not.toBeInTheDocument();
},
};
+
+export const NestedCurrencyPickerKeepsFieldOpen: Story = {
+ render: () => (
+ <>
+ {renderCurrencyFieldWidgetStory()}
+ <Button>Outside field</Button>
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const outsideButton = canvas.getByRole('button', { name: 'Outside field' });
+
+ await userEvent.click(await canvas.findByText('5m'));
+ const amountInput = await body.findByPlaceholderText('Currency');
+ await userEvent.clear(amountInput);
+ await userEvent.type(amountInput, '6000000');
+ await userEvent.click(await body.findByRole('button', { name: 'USD' }));
+ await body.findByRole('dialog', { name: 'Currency' });
+
+ await userEvent.click(outsideButton);
+
+ await waitFor(() => {
+ expect(
+ body.queryByRole('dialog', { name: 'Currency' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(body.getByRole('button', { name: 'USD' })).toBeVisible();
+ await expect(amountInput).toHaveValue('6,000,000');
+
+ await userEvent.clear(amountInput);
+ await userEvent.type(amountInput, '5000000');
+ await userEvent.click(outsideButton);
+
+ await waitFor(() => {
+ expect(
+ body.queryByRole('button', { name: 'USD' }),
+ ).not.toBeInTheDocument();
+ });
+ await expect(canvas.getByText('5m')).toBeVisible();
+ },
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
index 20998558be2..9489c0c90dd 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
@@ -1,5 +1,4 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';
import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
@@ -117,62 +116,60 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {
return (
<FieldDescriptionTooltipProvider>
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <StyledWidgetScrollContainer>
- <RecordFieldListComponentInstanceContext.Provider
- value={{
- instanceId,
- }}
- >
- {shouldDisplayGroupHeaders ? (
- groups.map((group) => (
- <FieldsWidgetGroupContainer key={group.id} title={group.name}>
- <StyledPropertyBox>
- <FieldsWidgetFieldList
- fields={group.fields}
- instanceId={instanceId}
- />
- </StyledPropertyBox>
- </FieldsWidgetGroupContainer>
- ))
- ) : (
- <StyledInlineFieldsPropertyBox
- hasMoreGroup={shouldShowHiddenFields}
- >
- <FieldsWidgetFieldList
- fields={visibleFields}
- instanceId={instanceId}
- />
- </StyledInlineFieldsPropertyBox>
- )}
-
- {shouldShowHiddenFields && (
- <FieldsWidgetGroupContainer
- title={t`More (${hiddenFieldsWithOffsetGlobalIndex.length})`}
- defaultExpanded={false}
- >
+ <StyledWidgetScrollContainer>
+ <RecordFieldListComponentInstanceContext.Provider
+ value={{
+ instanceId,
+ }}
+ >
+ {shouldDisplayGroupHeaders ? (
+ groups.map((group) => (
+ <FieldsWidgetGroupContainer key={group.id} title={group.name}>
<StyledPropertyBox>
<FieldsWidgetFieldList
- fields={hiddenFieldsWithOffsetGlobalIndex}
+ fields={group.fields}
instanceId={instanceId}
/>
</StyledPropertyBox>
</FieldsWidgetGroupContainer>
- )}
-
- <FieldsWidgetCellHoveredPortal
- objectMetadataItem={objectMetadataItem}
- recordId={targetRecord.id}
- flattenedFieldMetadataItems={flattenedFieldMetadataItems}
- />
- <FieldsWidgetCellEditModePortal
- objectMetadataItem={objectMetadataItem}
- recordId={targetRecord.id}
- flattenedFieldMetadataItems={flattenedFieldMetadataItems}
- />
- </RecordFieldListComponentInstanceContext.Provider>
- </StyledWidgetScrollContainer>
- </RecordFieldsScopeContextProvider>
+ ))
+ ) : (
+ <StyledInlineFieldsPropertyBox
+ hasMoreGroup={shouldShowHiddenFields}
+ >
+ <FieldsWidgetFieldList
+ fields={visibleFields}
+ instanceId={instanceId}
+ />
+ </StyledInlineFieldsPropertyBox>
+ )}
+
+ {shouldShowHiddenFields && (
+ <FieldsWidgetGroupContainer
+ title={t`More (${hiddenFieldsWithOffsetGlobalIndex.length})`}
+ defaultExpanded={false}
+ >
+ <StyledPropertyBox>
+ <FieldsWidgetFieldList
+ fields={hiddenFieldsWithOffsetGlobalIndex}
+ instanceId={instanceId}
+ />
+ </StyledPropertyBox>
+ </FieldsWidgetGroupContainer>
+ )}
+
+ <FieldsWidgetCellHoveredPortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={targetRecord.id}
+ flattenedFieldMetadataItems={flattenedFieldMetadataItems}
+ />
+ <FieldsWidgetCellEditModePortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={targetRecord.id}
+ flattenedFieldMetadataItems={flattenedFieldMetadataItems}
+ />
+ </RecordFieldListComponentInstanceContext.Provider>
+ </StyledWidgetScrollContainer>
</FieldDescriptionTooltipProvider>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
index 066d8606137..a5b7bcc2f2a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
@@ -5,10 +5,8 @@ import { css } from '@linaria/core';
import { styled } from '@linaria/react';
import { type ClipboardEvent } from 'react';
-import {
- CustomSlashMenu,
- type SuggestionItem,
-} from '@/blocknote-editor/components/CustomSlashMenu';
+import { CustomSlashMenu } from '@/blocknote-editor/components/CustomSlashMenu';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { DashboardEditorSideMenu } from '@/page-layout/widgets/standalone-rich-text/components/DashboardEditorSideMenu';
import { DashboardFormattingToolbar } from '@/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar';
import { type DASHBOARD_BLOCK_SCHEMA } from '@/page-layout/widgets/standalone-rich-text/constants/DashboardBlockSchema';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
index eb3fe6c01e4..42f26e4f66a 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
@@ -10,12 +10,8 @@ import {
useFloating,
} from '@floating-ui/react';
-import {
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- DateTimePicker,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DateTimePicker';
+import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';
+import { useIsDatePickerDropdownOpen } from '@/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
@@ -64,7 +60,7 @@ const StyledIconContainer = styled.div`
display: flex;
`;
-export type SettingsDatePickerInputProps = {
+type SettingsDatePickerInputProps = {
label?: string;
instanceId?: string;
value: Date | undefined;
@@ -86,6 +82,7 @@ export const SettingsDatePickerInput = ({
const generatedId = useId();
const pickerInstanceId = instanceId ?? label ?? generatedId;
+ const dateTimePickerInstanceId = `settings-date-picker-${pickerInstanceId}`;
const { refs, floatingStyles } = useFloating({
open: isOpen,
@@ -98,17 +95,20 @@ export const SettingsDatePickerInput = ({
setIsOpen(false);
};
+ const { isDatePickerDropdownOpen } = useIsDatePickerDropdownOpen();
+
useListenClickOutside({
refs: [containerRef],
- listenerId: `settings-date-picker-${pickerInstanceId}`,
- callback: handleClose,
+ listenerId: dateTimePickerInstanceId,
+ callback: () => {
+ if (isDatePickerDropdownOpen(dateTimePickerInstanceId)) {
+ return;
+ }
+
+ handleClose();
+ },
enabled: isOpen,
- excludedClickOutsideIds: [
- SETTINGS_DATE_PICKER_CLICK_OUTSIDE_ID,
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- ],
+ excludedClickOutsideIds: [SETTINGS_DATE_PICKER_CLICK_OUTSIDE_ID],
});
const handleDateTimeChange = (newDateTime: Temporal.ZonedDateTime | null) => {
@@ -172,7 +172,7 @@ export const SettingsDatePickerInput = ({
value={SETTINGS_DATE_PICKER_CLICK_OUTSIDE_ID}
>
<DateTimePicker
- instanceId={`settings-date-picker-${pickerInstanceId}`}
+ instanceId={dateTimePickerInstanceId}
date={zonedDateTime}
onChange={handleDateTimeChange}
onClose={handleDateTimeClose}
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
index e787045d56f..ed54ffb047c 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
@@ -2,11 +2,6 @@ import { useCallback, useRef, useState } from 'react';
import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';
import { DatePicker } from '@/ui/input/components/internal/date/components/DatePicker';
-import {
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DateTimePicker';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';
import { useStore } from 'jotai';
import { type Nullable } from 'twenty-ui/utilities';
@@ -60,20 +55,11 @@ export const DateInput = ({
onSubmit?.(newDate);
};
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
-
const handleEnter = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
-
onEnter(internalValue);
};
const handleEscape = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
-
onEscape(internalValue);
};
@@ -82,19 +68,10 @@ export const DateInput = ({
const currentFocusId = store.get(currentFocusIdSelector.atom);
if (currentFocusId === instanceId) {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
onClickOutside(event, internalValue);
}
},
- [
- instanceId,
- closeDropdownYearSelect,
- closeDropdownMonthSelect,
- onClickOutside,
- internalValue,
- store,
- ],
+ [instanceId, onClickOutside, internalValue, store],
);
useRegisterInputEvents({
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx
index b59a6fc3205..659b9584249 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx
@@ -1,20 +1,14 @@
import { useCallback, useRef, useState } from 'react';
import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';
-import {
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- DateTimePicker,
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DateTimePicker';
+import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';
import { useStore } from 'jotai';
import { type Temporal } from 'temporal-polyfill';
import { type Nullable } from 'twenty-ui/utilities';
-export type DateTimeInputProps = {
+type DateTimeInputProps = {
instanceId: string;
value: Nullable<Temporal.Instant>;
onEnter: (newDateTime: Nullable<Temporal.Instant>) => void;
@@ -64,23 +58,11 @@ export const DateTimeInput = ({
onSubmit?.(newDateTime?.toInstant());
};
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
- const { closeDropdown: closeMonthYearPanel } = useCloseDropdown();
-
const handleEnter = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- closeMonthYearPanel(DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID);
-
onEnter(internalValue);
};
const handleEscape = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- closeMonthYearPanel(DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID);
-
onEscape(internalValue);
};
@@ -89,21 +71,10 @@ export const DateTimeInput = ({
const currentFocusId = store.get(currentFocusIdSelector.atom);
if (currentFocusId === instanceId) {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- closeMonthYearPanel(DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID);
onClickOutside(event, internalValue);
}
},
- [
- instanceId,
- closeDropdownYearSelect,
- closeDropdownMonthSelect,
- closeMonthYearPanel,
- onClickOutside,
- internalValue,
- store,
- ],
+ [instanceId, onClickOutside, internalValue, store],
);
const internalZonedDateTime = internalValue?.toZonedDateTimeISO(userTimezone);
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
index b06de07c4c4..d11b237d01c 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
@@ -283,10 +283,14 @@ export const ParentAndClickOutsideContainment: Story = {
expect(onExcludedClickOutside).not.toHaveBeenCalled();
await userEvent.click(trigger);
await body.findByRole('dialog');
- await userEvent.click(canvas.getByRole('button', { name: 'Outside' }));
+ const outsideButton = canvas.getByRole('button', { name: 'Outside' });
+ await userEvent.click(outsideButton);
await waitFor(() =>
expect(body.queryByRole('dialog')).not.toBeInTheDocument(),
);
+ expect(onParentClickOutside).not.toHaveBeenCalled();
+ expect(onExcludedClickOutside).not.toHaveBeenCalled();
+ await userEvent.click(outsideButton);
expect(onParentClickOutside).toHaveBeenCalledTimes(1);
expect(onExcludedClickOutside).toHaveBeenCalledTimes(1);
},
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
index b70b858b056..3a496732f26 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
@@ -15,7 +15,6 @@ import {
StyledDatePickerContainer,
} from '@/ui/input/components/internal/date/components/StyledDatePickerContainer';
import { getRelativeDatePickerCalendarRange } from '@/ui/input/components/internal/date/utils/getRelativeDatePickerCalendarRange';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import 'react-datepicker/dist/react-datepicker.css';
@@ -32,11 +31,6 @@ import { IconCalendarX } from 'twenty-ui/icon';
import { Text } from 'twenty-ui/primitives/typography';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
-export const MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID =
- 'date-picker-month-and-year-dropdown-month-select';
-export const MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID =
- 'date-picker-month-and-year-dropdown-year-select';
-
const StyledButtonContainer = styled.div`
align-items: center;
border-radius: calc(
@@ -157,23 +151,7 @@ export const DatePicker = ({
relativeRangeEndPlainDate,
);
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
- const handleClear = () => {
- closeDropdowns();
- onClear?.();
- };
-
- const closeDropdowns = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- };
-
- const handleClose = (newDate: string) => {
- closeDropdowns();
- onClose?.(newDate);
- };
const handleChangeMonth = (month: number) => {
const newDate = plainDate?.with({ month: month });
@@ -214,7 +192,7 @@ export const DatePicker = ({
}
const plainDatePicked = turnJSDateToPlainDate(datePicked);
- handleClose?.(plainDatePicked.toString());
+ onClose?.(plainDatePicked.toString());
};
const calendarStartDay =
@@ -292,6 +270,7 @@ export const DatePicker = ({
/>
) : (
<DatePickerHeader
+ instanceId={instanceId}
date={plainDate?.toString() ?? null}
onChange={onChange}
onChangeMonth={handleChangeMonth}
@@ -308,7 +287,7 @@ export const DatePicker = ({
</Suspense>
</div>
{clearable && (
- <StyledButtonContainer onClick={handleClear}>
+ <StyledButtonContainer onClick={() => onClear?.()}>
<StyledButtonContent>
<IconCalendarX size={theme.icon.size.md} />
<Text>{t`Clear`}</Text>
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
index 1e321e935fc..3a16756ef8e 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
@@ -5,8 +5,8 @@ import { Select } from '@/ui/input/components/Select';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';
+import { getDatePickerDropdownIds } from '@/ui/input/components/internal/date/utils/getDatePickerDropdownIds';
import { getMonthSelectOptions } from '@/ui/input/components/internal/date/utils/getMonthSelectOptions';
-import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Temporal } from 'temporal-polyfill';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
@@ -15,10 +15,6 @@ import { LightIconButton } from 'twenty-ui/components';
import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
-const MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID =
- 'date-picker-month-and-year-dropdown-month-select';
-const MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID =
- 'date-picker-month-and-year-dropdown-year-select';
const YEARS_SELECT_OPTIONS = Array.from(
{ length: 200 },
(_, i) => new Date().getFullYear() + 50 - i,
@@ -36,6 +32,7 @@ const StyledCustomDatePickerHeader = styled.div`
`;
type DatePickerHeaderProps = {
+ instanceId: string;
date: string | null;
onChange?: (date: string | null) => void;
onChangeMonth: (month: number) => void;
@@ -48,6 +45,7 @@ type DatePickerHeaderProps = {
};
export const DatePickerHeader = ({
+ instanceId,
date,
onChange,
onChangeMonth,
@@ -61,38 +59,29 @@ export const DatePickerHeader = ({
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
const userLocale = currentWorkspaceMember?.locale ?? SOURCE_LOCALE;
+ const { monthSelectDropdownId, yearSelectDropdownId } =
+ getDatePickerDropdownIds(instanceId);
+
const dateParsed = isDefined(date) ? Temporal.PlainDate.from(date) : null;
return (
<>
{!hideInput && <DatePickerInput date={date} onChange={onChange} />}
<StyledCustomDatePickerHeader>
- <ClickOutsideListenerContext.Provider
- value={{
- excludedClickOutsideId: MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- }}
- >
- <Select
- dropdownId={MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID}
- options={getMonthSelectOptions(userLocale)}
- onChange={onChangeMonth}
- value={dateParsed?.month}
- fullWidth
- />
- </ClickOutsideListenerContext.Provider>
- <ClickOutsideListenerContext.Provider
- value={{
- excludedClickOutsideId: MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- }}
- >
- <Select
- dropdownId={MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID}
- onChange={onChangeYear}
- value={dateParsed?.year}
- options={YEARS_SELECT_OPTIONS}
- fullWidth
- />
- </ClickOutsideListenerContext.Provider>
+ <Select
+ dropdownId={monthSelectDropdownId}
+ options={getMonthSelectOptions(userLocale)}
+ onChange={onChangeMonth}
+ value={dateParsed?.month}
+ fullWidth
+ />
+ <Select
+ dropdownId={yearSelectDropdownId}
+ onChange={onChangeYear}
+ value={dateParsed?.year}
+ options={YEARS_SELECT_OPTIONS}
+ fullWidth
+ />
<LightIconButton
onClick={onSubtractMonth}
size="md"
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerWithoutCalendar.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerWithoutCalendar.tsx
index a4b402a8c19..d30f73bec8f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerWithoutCalendar.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerWithoutCalendar.tsx
@@ -13,7 +13,6 @@ import {
DATE_PICKER_CONTAINER_WIDTH,
StyledDatePickerContainer,
} from '@/ui/input/components/internal/date/components/StyledDatePickerContainer';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import 'react-datepicker/dist/react-datepicker.css';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -22,11 +21,6 @@ import { type Nullable } from 'twenty-shared/types';
import { isDefined, turnJSDateToPlainDate } from 'twenty-shared/utils';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
-export const MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID =
- 'date-picker-month-and-year-dropdown-month-select';
-export const MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID =
- 'date-picker-month-and-year-dropdown-year-select';
-
const DATE_PICKER_SKELETON_PADDING = 16;
const StyledSpacer = styled.div`
@@ -74,6 +68,7 @@ const ReactDatePicker = lazy<ComponentType<DatePickerPropsType>>(() =>
);
export const DatePickerWithoutCalendar = ({
+ instanceId,
date,
onChange,
onClose,
@@ -81,20 +76,8 @@ export const DatePickerWithoutCalendar = ({
const theme = useTheme();
const plainDate = isDefined(date) ? Temporal.PlainDate.from(date) : null;
- const { closeDropdown: closeDropdownMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeDropdownYearSelect } = useCloseDropdown();
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
- const closeDropdowns = () => {
- closeDropdownYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- closeDropdownMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- };
-
- const handleClose = (newDate: string) => {
- closeDropdowns();
- onClose?.(newDate);
- };
-
const handleChangeMonth = (month: number) => {
const newDate = plainDate?.with({ month: month });
@@ -134,7 +117,7 @@ export const DatePickerWithoutCalendar = ({
}
const plainDatePicked = turnJSDateToPlainDate(datePicked);
- handleClose?.(plainDatePicked.toString());
+ onClose?.(plainDatePicked.toString());
};
const calendarStartDay =
@@ -207,6 +190,7 @@ export const DatePickerWithoutCalendar = ({
}) => (
<>
<DatePickerHeader
+ instanceId={instanceId}
date={plainDate?.toString() ?? null}
onChange={onChange}
onChangeMonth={handleChangeMonth}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
index 10f0a90475e..9a653a3dc6a 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
@@ -6,15 +6,11 @@ import {
type RelativeDateFilter,
} from 'twenty-shared/utils';
-import {
- DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID,
- DateTimePickerHeader,
-} from '@/ui/input/components/internal/date/components/DateTimePickerHeader';
+import { DateTimePickerHeader } from '@/ui/input/components/internal/date/components/DateTimePickerHeader';
import { RelativeDatePickerHeader } from '@/ui/input/components/internal/date/components/RelativeDatePickerHeader';
import { RelativeDateTimeRangeText } from '@/ui/input/components/internal/date/components/RelativeDateTimeRangeText';
import { StyledDatePickerContainer } from '@/ui/input/components/internal/date/components/StyledDatePickerContainer';
import { getRelativeDatePickerCalendarRange } from '@/ui/input/components/internal/date/utils/getRelativeDatePickerCalendarRange';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Suspense, lazy, type ComponentType } from 'react';
@@ -31,12 +27,6 @@ import { useUserFirstDayOfTheWeek } from '@/ui/input/components/internal/date/ho
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { Temporal } from 'temporal-polyfill';
-export {
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from '@/ui/input/components/internal/date/components/DatePicker';
-export { DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID } from '@/ui/input/components/internal/date/components/DateTimePickerHeader';
-
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
const StyledOuterWrapper = styled.div`
@@ -156,8 +146,6 @@ export const DateTimePicker = ({
const dateToUse =
date ?? Temporal.Now.zonedDateTimeISO(timeZone ?? userTimezone);
- const { closeDropdown: closeMonthYearPanel } = useCloseDropdown();
-
const { getShiftedDateToSystemTimeZone } =
useGetShiftedDateToSystemTimeZone();
@@ -178,16 +166,6 @@ export const DateTimePicker = ({
return { zonedDateTime };
};
- const handleClear = () => {
- closeMonthYearPanel(DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID);
- onClear?.();
- };
-
- const handleClose = (newDate: Temporal.ZonedDateTime) => {
- closeMonthYearPanel(DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID);
- onClose?.(newDate);
- };
-
const handleChangeMonth = (month: number) => {
const newZonedDateTime = dateToUse?.with({ month: month }) ?? null;
@@ -227,7 +205,7 @@ export const DateTimePicker = ({
}
const { zonedDateTime } = getZonedDateTimeFromDatePicked(newDate);
- handleClose?.(zonedDateTime);
+ onClose?.(zonedDateTime);
};
const relativeUnit = relativeDate?.unit ?? 'DAY';
@@ -358,6 +336,7 @@ export const DateTimePicker = ({
/>
) : (
<DateTimePickerHeader
+ instanceId={instanceId}
date={dateToUse}
onChange={onChange}
onAddMonth={handleAddMonth}
@@ -376,7 +355,7 @@ export const DateTimePicker = ({
{clearable && (
<>
<StyledSeparator />
- <StyledButtonContainer onClick={handleClear}>
+ <StyledButtonContainer onClick={() => onClear?.()}>
<StyledButtonContent>
<IconCalendarX size={theme.icon.size.md} />
<Text>{t`Clear`}</Text>
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
index e20179cd6b5..837cf130a9f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
@@ -8,17 +8,17 @@ import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
import { Select } from '@/ui/input/components/Select';
import { DateTimePickerInput } from '@/ui/input/components/internal/date/components/DateTimePickerInput';
import { useTimeInput } from '@/ui/input/components/internal/date/hooks/useTimeInput';
+import { getDatePickerDropdownIds } from '@/ui/input/components/internal/date/utils/getDatePickerDropdownIds';
import { getMonthSelectOptions } from '@/ui/input/components/internal/date/utils/getMonthSelectOptions';
import { getTimeBlocks } from '@/ui/input/components/internal/date/utils/getTimeBlocks';
import { getTimeMask } from '@/ui/input/components/internal/date/utils/getTimeMask';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { t } from '@lingui/core/macro';
import { type Temporal } from 'temporal-polyfill';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
-import { LightIconButton } from 'twenty-ui/components';
+import { Dropdown, LightIconButton } from 'twenty-ui/components';
import {
IconCalendar,
IconChevronLeft,
@@ -27,14 +27,6 @@ import {
} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
-import {
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
-} from './DateTimePicker';
-
-export const DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID =
- 'date-time-picker-month-year-panel';
-
const YEARS_SELECT_OPTIONS = Array.from(
{ length: 200 },
(_, i) => new Date().getFullYear() + 50 - i,
@@ -129,6 +121,7 @@ const StyledMonthYearSelector = styled.div`
`;
type DateTimePickerHeaderProps = {
+ instanceId: string;
date: Temporal.ZonedDateTime | null;
onChange?: (date: Temporal.ZonedDateTime | null) => void;
onAddMonth: () => void;
@@ -141,6 +134,7 @@ type DateTimePickerHeaderProps = {
};
export const DateTimePickerHeader = ({
+ instanceId,
date,
onChange,
onAddMonth,
@@ -157,13 +151,11 @@ export const DateTimePickerHeader = ({
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
const userLocale = currentWorkspaceMember?.locale ?? SOURCE_LOCALE;
- const { closeDropdown: closeMonthSelect } = useCloseDropdown();
- const { closeDropdown: closeYearSelect } = useCloseDropdown();
-
- const closeInnerDropdowns = () => {
- closeMonthSelect(MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID);
- closeYearSelect(MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID);
- };
+ const {
+ monthSelectDropdownId,
+ yearSelectDropdownId,
+ monthYearPanelDropdownId,
+ } = getDatePickerDropdownIds(instanceId);
const { ref: iMaskRef, setValue } = useIMask(
{
@@ -221,55 +213,43 @@ export const DateTimePickerHeader = ({
</StyledTimeInputContainer>
</StyledTimeInputWrapper>
<StyledRightControls>
- <Dropdown
- dropdownId={DATE_TIME_PICKER_MONTH_YEAR_PANEL_DROPDOWN_ID}
- clickableComponent={
- <LightIconButton size="md" aria-label={t`Select month and year`}>
- <IconCalendar />
- </LightIconButton>
- }
- dropdownPlacement="bottom-start"
- dropdownOffset={{ y: 8 }}
- onClose={closeInnerDropdowns}
- excludedClickOutsideIds={[
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- ]}
- dropdownComponents={
- <StyledMonthYearSelector>
- <ClickOutsideListenerContext.Provider
- value={{
- excludedClickOutsideId:
- MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
- }}
+ <DropdownRoot dropdownId={monthYearPanelDropdownId} type="panel">
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ size="md"
+ aria-label={t`Select month and year`}
>
- <Select
- dropdownId={MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID}
- options={getMonthSelectOptions(userLocale)}
- onChange={onChangeMonth}
- value={date?.month}
- fullWidth={false}
- dropdownWidth={160}
- />
- </ClickOutsideListenerContext.Provider>
- <ClickOutsideListenerContext.Provider
- value={{
- excludedClickOutsideId:
- MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
- }}
- >
- <Select
- dropdownId={MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID}
- onChange={onChangeYear}
- value={date?.year}
- options={YEARS_SELECT_OPTIONS}
- fullWidth={false}
- dropdownWidth={160}
- />
- </ClickOutsideListenerContext.Provider>
+ <IconCalendar />
+ </LightIconButton>
+ }
+ />
+ <DropdownContent
+ align="start"
+ sideOffset={8}
+ width={170}
+ initialFocus={false}
+ >
+ <StyledMonthYearSelector>
+ <Select
+ dropdownId={monthSelectDropdownId}
+ options={getMonthSelectOptions(userLocale)}
+ onChange={onChangeMonth}
+ value={date?.month}
+ fullWidth={false}
+ dropdownWidth={160}
+ />
+ <Select
+ dropdownId={yearSelectDropdownId}
+ onChange={onChangeYear}
+ value={date?.year}
+ options={YEARS_SELECT_OPTIONS}
+ fullWidth={false}
+ dropdownWidth={160}
+ />
</StyledMonthYearSelector>
- }
- />
+ </DropdownContent>
+ </DropdownRoot>
<StyledNavigationButtons>
<LightIconButton
onClick={onSubtractMonth}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
index 535a2d48331..56e1e7f0457 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
@@ -1,7 +1,7 @@
import { DatePicker } from '@/ui/input/components/internal/date/components/DatePicker';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { expect, userEvent, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { type RelativeDateFilter } from 'twenty-shared/utils';
import { ComponentDecorator } from 'twenty-ui/testing';
@@ -16,9 +16,11 @@ const RELATIVE_DATE: RelativeDateFilter & { start: string; end: string } = {
};
const DatePickerStory = ({
+ instanceId = 'story-date-picker',
isRelative,
clearable,
}: {
+ instanceId?: string;
isRelative?: boolean;
clearable?: boolean;
}) => {
@@ -28,7 +30,7 @@ const DatePickerStory = ({
return (
<DatePicker
- instanceId="story-date-picker"
+ instanceId={instanceId}
plainDateString={plainDateString}
onChange={setPlainDateString}
clearable={clearable}
@@ -104,3 +106,27 @@ export const WithOpenYearSelect: Story = {
}
},
};
+
+export const OpensOnlyItsOwnMonthSelect: Story = {
+ render: () => (
+ <>
+ <DatePickerStory instanceId="first-date-picker" />
+ <DatePickerStory instanceId="second-date-picker" />
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [firstMonthSelect] = await canvas.findAllByText(
+ 'January',
+ {},
+ { timeout: 10000 },
+ );
+
+ await userEvent.click(firstMonthSelect);
+
+ await waitFor(() => {
+ expect(body.getAllByRole('dialog', { name: 'January' })).toHaveLength(1);
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePickerWithoutCalendar.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePickerWithoutCalendar.stories.tsx
index cfa319332f3..fa29b252d8e 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePickerWithoutCalendar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePickerWithoutCalendar.stories.tsx
@@ -1,17 +1,21 @@
import { DatePickerWithoutCalendar } from '@/ui/input/components/internal/date/components/DatePickerWithoutCalendar';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { expect, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
const INITIAL_PLAIN_DATE = '2023-01-01';
-const DatePickerWithoutCalendarStory = () => {
+const DatePickerWithoutCalendarStory = ({
+ instanceId = 'story-date-picker-without-calendar',
+}: {
+ instanceId?: string;
+}) => {
const [date, setDate] = useState<string | null>(INITIAL_PLAIN_DATE);
return (
<DatePickerWithoutCalendar
- instanceId="story-date-picker-without-calendar"
+ instanceId={instanceId}
date={date}
onChange={setDate}
/>
@@ -40,3 +44,27 @@ export const Default: Story = {
expect(monthSelect).toBeInTheDocument();
},
};
+
+export const OpensOnlyItsOwnYearSelect: Story = {
+ render: () => (
+ <>
+ <DatePickerWithoutCalendarStory instanceId="first-date-picker-without-calendar" />
+ <DatePickerWithoutCalendarStory instanceId="second-date-picker-without-calendar" />
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [firstYearSelect] = await canvas.findAllByText(
+ '2023',
+ {},
+ { timeout: 10000 },
+ );
+
+ await userEvent.click(firstYearSelect);
+
+ await waitFor(() => {
+ expect(body.getAllByRole('dialog', { name: '2023' })).toHaveLength(1);
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DateTimePicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DateTimePicker.stories.tsx
index f1b9de3505c..08783405982 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DateTimePicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DateTimePicker.stories.tsx
@@ -1,7 +1,7 @@
import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { expect, userEvent, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { Temporal } from 'temporal-polyfill';
import { ComponentDecorator } from 'twenty-ui/testing';
@@ -25,15 +25,15 @@ const RELATIVE_SUB_DAY_RANGE = {
end: Temporal.ZonedDateTime.from('2023-01-01T03:00:00+00:00[UTC]'),
};
-const DateTimePickerStory = () => {
+const DateTimePickerStory = ({
+ instanceId = 'story-date-time-picker',
+}: {
+ instanceId?: string;
+}) => {
const [date, setDate] = useState<Temporal.ZonedDateTime | null>(INITIAL_DATE);
return (
- <DateTimePicker
- instanceId="story-date-time-picker"
- date={date}
- onChange={setDate}
- />
+ <DateTimePicker instanceId={instanceId} date={date} onChange={setDate} />
);
};
@@ -164,3 +164,29 @@ export const RelativeWithSubDayText: Story = {
/>
),
};
+
+export const OpensOnlyItsOwnMonthYearPanel: Story = {
+ render: () => (
+ <>
+ <DateTimePickerStory instanceId="first-date-time-picker" />
+ <DateTimePickerStory instanceId="second-date-time-picker" />
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const [firstCalendarButton] = await canvas.findAllByRole(
+ 'button',
+ { name: 'Select month and year' },
+ { timeout: 10000 },
+ );
+
+ await userEvent.click(firstCalendarButton);
+
+ await waitFor(() => {
+ expect(
+ body.getAllByRole('dialog', { name: 'Select month and year' }),
+ ).toHaveLength(1);
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen.ts b/packages/twenty-front/src/modules/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen.ts
new file mode 100644
index 00000000000..46b5c317e5a
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/hooks/useIsDatePickerDropdownOpen.ts
@@ -0,0 +1,23 @@
+import { getDatePickerDropdownIds } from '@/ui/input/components/internal/date/utils/getDatePickerDropdownIds';
+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
+import { useStore } from 'jotai';
+import { useCallback } from 'react';
+
+export const useIsDatePickerDropdownOpen = () => {
+ const store = useStore();
+
+ const isDatePickerDropdownOpen = useCallback(
+ (datePickerInstanceId: string) =>
+ Object.values(getDatePickerDropdownIds(datePickerInstanceId)).some(
+ (dropdownId) =>
+ store.get(
+ isDropdownOpenComponentState.atomFamily({
+ instanceId: dropdownId,
+ }),
+ ),
+ ),
+ [store],
+ );
+
+ return { isDatePickerDropdownOpen };
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/utils/getDatePickerDropdownIds.ts b/packages/twenty-front/src/modules/ui/input/components/internal/date/utils/getDatePickerDropdownIds.ts
new file mode 100644
index 00000000000..45360b8fe84
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/utils/getDatePickerDropdownIds.ts
@@ -0,0 +1,5 @@
+export const getDatePickerDropdownIds = (datePickerInstanceId: string) => ({
+ monthSelectDropdownId: `${datePickerInstanceId}-month-select`,
+ yearSelectDropdownId: `${datePickerInstanceId}-year-select`,
+ monthYearPanelDropdownId: `${datePickerInstanceId}-month-year-panel`,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
index 785f165184e..0cafc46cd84 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
@@ -1,4 +1,4 @@
-import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
+import { StyledOverlayPortalLayer } from '@/ui/layout/overlay/components/StyledOverlayPortalLayer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { activeDropdownFocusIdState } from '@/ui/layout/dropdown/states/activeDropdownFocusIdState';
@@ -25,16 +25,6 @@ import { useContext, useEffect } from 'react';
import { type Keys } from 'react-hotkeys-hook';
import { Key } from 'ts-key-enum';
-export const StyledDropdownContentContainer = styled.div<{
- isDropdownInModal?: boolean;
-}>`
- display: flex;
- z-index: ${({ isDropdownInModal }) =>
- isDropdownInModal
- ? RootStackingContextZIndices.DropdownPortalAboveModal
- : RootStackingContextZIndices.DropdownPortalBelowModal};
-`;
-
const StyledDropdownInsideContainer = styled.div`
display: flex;
@@ -43,7 +33,7 @@ const StyledDropdownInsideContainer = styled.div`
width: 100%;
`;
-export type DropdownInternalContainerProps = {
+type DropdownInternalContainerProps = {
dropdownId: string;
dropdownPlacement: Placement;
floatingUiRefs: UseFloatingReturn['refs'];
@@ -155,14 +145,14 @@ export const DropdownInternalContainer = ({
)}
<FloatingPortal>
- <StyledDropdownContentContainer
+ <StyledOverlayPortalLayer
data-floating-ui-viewport
ref={floatingUiRefs.setFloating}
style={dropdownMenuStyles}
role="listbox"
id={`${dropdownId}-options`}
data-click-outside-id={excludedClickOutsideId}
- isDropdownInModal={isDropdownInModal}
+ isAboveModal={isDropdownInModal}
>
<OverlayContainer>
<StyledDropdownInsideContainer
@@ -173,7 +163,7 @@ export const DropdownInternalContainer = ({
{dropdownComponents}
</StyledDropdownInsideContainer>
</OverlayContainer>
- </StyledDropdownContentContainer>
+ </StyledOverlayPortalLayer>
</FloatingPortal>
</>
);
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
index 60730ab151a..63254a97129 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
@@ -1,5 +1,5 @@
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { StyledOverlayPortalLayer } from '@/ui/layout/overlay/components/StyledOverlayPortalLayer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { styled } from '@linaria/react';
@@ -13,11 +13,12 @@ type ExpandedListDropdownProps = {
onClickOutside?: () => void;
};
-const StyledExpandedListContainer = styled.div`
+const StyledExpandedListContainer = styled.div<{ widthInPixels: number }>`
display: flex;
flex-wrap: wrap;
gap: ${themeCssVariables.spacing[1]};
padding: ${themeCssVariables.spacing[2]};
+ width: ${({ widthInPixels }) => widthInPixels}px;
`;
// TODO: unify this and use Dropdown component instead
@@ -43,23 +44,21 @@ export const ExpandedListDropdown = ({
const dropdownContentWidth = anchorElement
? Math.max(220, anchorElement.offsetWidth)
- : undefined;
+ : GenericDropdownContentWidth.Medium;
return (
<FloatingPortal>
- <StyledDropdownContentContainer
+ <StyledOverlayPortalLayer
data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
>
<OverlayContainer>
- <LegacyDropdownContent widthInPixels={dropdownContentWidth}>
- <StyledExpandedListContainer>
- {children}
- </StyledExpandedListContainer>
- </LegacyDropdownContent>
+ <StyledExpandedListContainer widthInPixels={dropdownContentWidth}>
+ {children}
+ </StyledExpandedListContainer>
</OverlayContainer>
- </StyledDropdownContentContainer>
+ </StyledOverlayPortalLayer>
</FloatingPortal>
);
};
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
index a2020be7f29..2c72e2aea5d 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
@@ -53,7 +53,24 @@ export const WithExpandedList: Story = {
const body = canvasElement.ownerDocument.body;
const bodyCanvas = within(body);
- expect(await bodyCanvas.findByText('Option 7')).toBeDefined();
+ expect(await bodyCanvas.findByText('Option 7')).toBeVisible();
+ },
+};
+
+export const ClosesExpandedListOnClickOutside: Story = {
+ ...WithChipCount,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const bodyCanvas = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(await canvas.findByText(/^\+\d+$/));
+ expect(await bodyCanvas.findByText('Option 7')).toBeVisible();
+
+ await userEvent.click(canvasElement);
+
+ await waitFor(() => {
+ expect(bodyCanvas.queryByText('Option 7')).not.toBeInTheDocument();
+ });
},
};
diff --git a/packages/twenty-front/src/modules/ui/layout/overlay/components/OverlayMenuList.tsx b/packages/twenty-front/src/modules/ui/layout/overlay/components/OverlayMenuList.tsx
new file mode 100644
index 00000000000..3b22de446b5
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/overlay/components/OverlayMenuList.tsx
@@ -0,0 +1,54 @@
+import { DROPDOWN_MENU_ITEMS_CONTAINER_MAX_HEIGHT } from '@/ui/layout/dropdown/constants/DropdownMenuItemsContainerMaxHeight';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { styled } from '@linaria/react';
+import { type ReactNode, type Ref } from 'react';
+import { themeCssVariables } from 'twenty-ui/theme';
+
+const StyledContainer = styled.div<{ widthInPixels: number }>`
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ width: ${({ widthInPixels }) => widthInPixels}px;
+`;
+
+const StyledScrollableContainer = styled.div`
+ box-sizing: border-box;
+ display: flex;
+ max-height: ${DROPDOWN_MENU_ITEMS_CONTAINER_MAX_HEIGHT}px;
+ overflow-y: auto;
+ scrollbar-color: ${themeCssVariables.border.color.medium} transparent;
+ scrollbar-width: thin;
+ width: 100%;
+
+ *::-webkit-scrollbar-thumb {
+ border-radius: ${themeCssVariables.border.radius.pill};
+ }
+`;
+
+const StyledItems = styled.div`
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.betweenSiblingsGap};
+ height: fit-content;
+ padding: ${themeCssVariables.spacing[1]};
+ width: 100%;
+`;
+
+type OverlayMenuListProps = {
+ children: ReactNode;
+ width?: number;
+ ref?: Ref<HTMLDivElement>;
+};
+
+export const OverlayMenuList = ({
+ children,
+ width = GenericDropdownContentWidth.Medium,
+ ref,
+}: OverlayMenuListProps) => (
+ <StyledContainer ref={ref} widthInPixels={width}>
+ <StyledScrollableContainer>
+ <StyledItems>{children}</StyledItems>
+ </StyledScrollableContainer>
+ </StyledContainer>
+);
diff --git a/packages/twenty-front/src/modules/ui/layout/overlay/components/StyledOverlayPortalLayer.tsx b/packages/twenty-front/src/modules/ui/layout/overlay/components/StyledOverlayPortalLayer.tsx
new file mode 100644
index 00000000000..2f5e0c21e1e
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/overlay/components/StyledOverlayPortalLayer.tsx
@@ -0,0 +1,12 @@
+import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
+import { styled } from '@linaria/react';
+
+export const StyledOverlayPortalLayer = styled.div<{
+ isAboveModal?: boolean;
+}>`
+ display: flex;
+ z-index: ${({ isAboveModal }) =>
+ isAboveModal
+ ? RootStackingContextZIndices.DropdownPortalAboveModal
+ : RootStackingContextZIndices.DropdownPortalBelowModal};
+`;
diff --git a/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx b/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
index 76b85b11619..1f2ecbea0da 100644
--- a/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
+++ b/packages/twenty-front/src/modules/ui/suggestion/components/SuggestionMenu.tsx
@@ -16,8 +16,7 @@ import {
} from 'react';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { SuggestionItemPreviewTooltip } from '@/ui/suggestion/components/SuggestionItemPreviewTooltip';
import type { SuggestionMenuProps } from '@/ui/suggestion/types/SuggestionMenuProps';
@@ -203,26 +202,24 @@ const SuggestionMenuInner = <TItem,>(
zIndex: RootStackingContextZIndices.DropdownPortalAboveModal,
}}
>
- <LegacyDropdownContent ref={listContainerRef}>
- <DropdownMenuItemsContainer hasMaxHeight>
- {items.map((item, index) => {
- const isSelected = index === clampedSelectedIndex;
-
- return (
- <div
- key={getItemKey(item)}
- id={getSuggestionMenuItemAnchorId(getItemKey(item))}
- ref={isSelected ? activeItemRef : null}
- onMouseDown={(event) => {
- event.preventDefault();
- }}
- >
- {renderItem(item, isSelected)}
- </div>
- );
- })}
- </DropdownMenuItemsContainer>
- </LegacyDropdownContent>
+ <OverlayMenuList ref={listContainerRef}>
+ {items.map((item, index) => {
+ const isSelected = index === clampedSelectedIndex;
+
+ return (
+ <div
+ key={getItemKey(item)}
+ id={getSuggestionMenuItemAnchorId(getItemKey(item))}
+ ref={isSelected ? activeItemRef : null}
+ onMouseDown={(event) => {
+ event.preventDefault();
+ }}
+ >
+ {renderItem(item, isSelected)}
+ </div>
+ );
+ })}
+ </OverlayMenuList>
</OverlayContainer>
{shouldDisplayPreview && (
<SuggestionItemPreviewTooltip
diff --git a/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx b/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx
deleted file mode 100644
index eef392b32ac..00000000000
--- a/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
-import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';
-import { useContext, useEffect } from 'react';
-
-export const StorybookFieldInputDropdownFocusIdSetterEffect = () => {
- const { recordId, fieldDefinition } = useContext(FieldContext);
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
-
- const { setActiveDropdownFocusIdAndMemorizePrevious } =
- useSetActiveDropdownFocusIdAndMemorizePrevious();
-
- const fieldDropdownFocusIdTableCell = getDropdownFocusIdForRecordField({
- recordId,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- componentType: 'table-cell',
- instanceId: scopeInstanceId,
- });
-
- useEffect(() => {
- setActiveDropdownFocusIdAndMemorizePrevious(fieldDropdownFocusIdTableCell);
- }, [
- setActiveDropdownFocusIdAndMemorizePrevious,
- fieldDropdownFocusIdTableCell,
- ]);
-
- return null;
-};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.dismissal.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.dismissal.stories.tsx
index dc366ebe33a..ed2c60b8760 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.dismissal.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.dismissal.stories.tsx
@@ -38,6 +38,24 @@ const DismissibleRecordActions = ({
);
};
+const RecordDetailsPanel = ({
+ onInteractOutside,
+ onOutsideClick,
+}: DismissibleRecordActionsProps) => {
+ return (
+ <>
+ <Button>Before</Button>
+ <Dropdown.Root type="panel" onInteractOutside={onInteractOutside}>
+ <Dropdown.Trigger>Record details</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record details" initialFocus={false}>
+ Last updated today
+ </Dropdown.Content>
+ </Dropdown.Root>
+ <Button onClick={onOutsideClick}>Outside</Button>
+ </>
+ );
+};
+
const preventDismiss = (event: DropdownDismissEvent) => {
event.preventDefault();
};
@@ -112,16 +130,37 @@ export const InteractOutside: Story = {
});
await openRecordActions(canvasElement);
- await userEvent.click(outside);
-
- expect(args.onInteractOutside).toHaveBeenCalledOnce();
- expect(args.onInteractOutside).toHaveBeenCalledWith(
- expect.objectContaining({ target: outside }),
- );
- await waitFor(() =>
- expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ const handleDocumentClick = fn();
+ canvasElement.ownerDocument.addEventListener(
+ 'click',
+ handleDocumentClick,
+ true,
);
- expect(args.onOutsideClick).not.toHaveBeenCalled();
+
+ try {
+ await userEvent.click(outside);
+
+ expect(args.onInteractOutside).toHaveBeenCalledOnce();
+ expect(args.onInteractOutside).toHaveBeenCalledWith(
+ expect.objectContaining({ target: outside }),
+ );
+ await waitFor(() =>
+ expect(body.queryByRole('menu')).not.toBeInTheDocument(),
+ );
+ expect(args.onOutsideClick).not.toHaveBeenCalled();
+ expect(handleDocumentClick).not.toHaveBeenCalled();
+
+ await userEvent.click(outside);
+
+ expect(args.onOutsideClick).toHaveBeenCalledOnce();
+ expect(handleDocumentClick).toHaveBeenCalledOnce();
+ } finally {
+ canvasElement.ownerDocument.removeEventListener(
+ 'click',
+ handleDocumentClick,
+ true,
+ );
+ }
},
};
@@ -166,3 +205,31 @@ export const TabAway: Story = {
);
},
};
+
+export const ShiftTabAwayKeepsNextClick: Story = {
+ render: (args) => <RecordDetailsPanel {...args} />,
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole('button', { name: 'Record details' });
+
+ await userEvent.click(trigger);
+ await waitFor(() =>
+ expect(
+ body.getByRole('dialog', { name: 'Record details' }),
+ ).toBeVisible(),
+ );
+ expect(trigger).toHaveFocus();
+
+ await userEvent.tab({ shift: true });
+
+ await waitFor(() =>
+ expect(body.queryByRole('dialog')).not.toBeInTheDocument(),
+ );
+ expect(args.onInteractOutside).toHaveBeenCalled();
+
+ canvas.getByRole('button', { name: 'Outside' }).click();
+
+ expect(args.onOutsideClick).toHaveBeenCalledOnce();
+ },
+};
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts
index d36291b34d7..a78a345b607 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/preventDismissingClickActivation.ts
@@ -4,6 +4,14 @@ const DISMISSING_EVENT_TYPES_FOLLOWED_BY_CLICK = [
'focusout',
];
+const EVENT_TYPES_CANCELLING_FOLLOWING_CLICK = ['pointerdown', 'keydown'];
+
+const EVENT_TYPES_CANCELLING_FOLLOWING_CLICK_AFTER_FOCUS_OUT = [
+ ...EVENT_TYPES_CANCELLING_FOLLOWING_CLICK,
+ 'keyup',
+ 'mousedown',
+];
+
const stopActivation = (event: Event) => {
event.preventDefault();
event.stopPropagation();
@@ -23,14 +31,19 @@ export const preventDismissingClickActivation = (event: Event) => {
event.target instanceof Node
? (event.target.ownerDocument ?? document)
: document;
+ const listenerTarget = ownerDocument.defaultView ?? ownerDocument;
const followingClickListeners = new AbortController();
const stopListeningForFollowingClick = () => followingClickListeners.abort();
const listenerOptions = {
capture: true,
signal: followingClickListeners.signal,
};
+ const eventTypesCancellingFollowingClick =
+ event.type === 'focusout'
+ ? EVENT_TYPES_CANCELLING_FOLLOWING_CLICK_AFTER_FOCUS_OUT
+ : EVENT_TYPES_CANCELLING_FOLLOWING_CLICK;
- ownerDocument.addEventListener(
+ listenerTarget.addEventListener(
'click',
(clickEvent) => {
stopActivation(clickEvent);
@@ -38,14 +51,12 @@ export const preventDismissingClickActivation = (event: Event) => {
},
listenerOptions,
);
- ownerDocument.addEventListener(
- 'pointerdown',
- stopListeningForFollowingClick,
- listenerOptions,
- );
- ownerDocument.addEventListener(
- 'keydown',
- stopListeningForFollowingClick,
- listenerOptions,
- );
+
+ for (const eventType of eventTypesCancellingFollowingClick) {
+ listenerTarget.addEventListener(
+ eventType,
+ stopListeningForFollowingClick,
+ listenerOptions,
+ );
+ }
};