Skip to content

The open alternative to Salesforce, designed for AI.

Clean up record selection, drag and drop, and list code (#27191)

Félix Malfait4c345c2f1594
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
index fdb4971fc18..ada712ccdbb 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
@@ -5,7 +5,7 @@ import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomRes
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { EventList } from '@/activities/timeline-activities/components/EventList';
import { useTimelineActivities } from '@/activities/timeline-activities/hooks/useTimelineActivities';
-import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';
+import { UpsertRecordsInStoreEffect } from '@/object-record/record-store/components/UpsertRecordsInStoreEffect';
import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
@@ -73,7 +73,7 @@ export const TimelineCard = () => {
return (
<>
- <RecordListUpsertRecordsInStoreEffect records={linkedRecords} />
+ <UpsertRecordsInStoreEffect records={linkedRecords} />
<StyledMainContainer>
<EventList
targetableObject={targetRecord}
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx
index 0db90813697..ab55eced265 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx
@@ -1,7 +1,6 @@
import { type MouseEvent } from 'react';
import { AiChatThreadList } from '@/ai/components/AiChatThreadList';
-import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';
@@ -24,7 +23,6 @@ export const AiChatInboxThreadList = ({
return (
<AiChatThreadList
threads={threads}
- surface={AI_CHAT_THREAD_ACTIONS_SURFACE.INBOX_PAGE}
selectedThreadIds={selectedThreadIds}
onThreadClick={onThreadClick}
onThreadContextMenu={(thread, event) =>
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx
index de16b28f8de..25306c9fd2b 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { type ReactElement, type MouseEvent } from 'react';
+import { type MouseEvent } from 'react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { Dropdown, LightIconButton } from 'twenty-ui/components';
@@ -9,11 +9,9 @@ import { AiChatThreadCommandMenuItems } from '@/ai/components/AiChatThreadComman
import { useRefreshAgentChatThreadPermissions } from '@/ai/hooks/useRefreshAgentChatThreadPermissions';
import { useTargetAiChatThreadsInContextStore } from '@/ai/hooks/useTargetAiChatThreadsInContextStore';
import { agentChatThreadPermissionsFamilySelector } from '@/ai/states/selectors/agentChatThreadPermissionsFamilySelector';
-import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';
-import { getAiChatThreadActionsInstanceId } from '@/ai/utils/getAiChatThreadActionsInstanceId';
-import { getAiChatThreadItemMenuDropdownId } from '@/ai/utils/getAiChatThreadItemMenuDropdownId';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
@@ -29,18 +27,16 @@ type AiChatThreadActionsDropdownProps = {
deletedAt?: string | null;
lastActivityAt?: string | null;
};
- surface: AiChatThreadActionsSurface;
+ instanceId: string;
onRenameRequested: () => void;
onDetach?: () => void;
- trigger?: ReactElement;
};
export const AiChatThreadActionsDropdown = ({
thread,
- surface,
+ instanceId,
onRenameRequested,
onDetach,
- trigger,
}: AiChatThreadActionsDropdownProps) => {
const { t } = useLingui();
const { upsertRecordsInStore } = useUpsertRecordsInStore();
@@ -59,11 +55,6 @@ export const AiChatThreadActionsDropdown = ({
agentChatThreadPermissionsFamilySelector,
thread.id,
);
- const instanceId = getAiChatThreadActionsInstanceId({
- threadId: thread.id,
- surface,
- });
-
if (!isDefined(chatObjectMetadataItem)) {
return null;
}
@@ -85,10 +76,7 @@ export const AiChatThreadActionsDropdown = ({
<ContextStoreComponentInstanceContext.Provider value={{ instanceId }}>
<CommandMenuComponentInstanceContext.Provider value={{ instanceId }}>
<DropdownRoot
- dropdownId={getAiChatThreadItemMenuDropdownId({
- threadId: thread.id,
- surface,
- })}
+ dropdownId={getCommandMenuDropdownIdFromCommandMenuId(instanceId)}
type="menu"
onOpenChange={(isOpen) => {
if (isOpen) {
@@ -115,11 +103,9 @@ export const AiChatThreadActionsDropdown = ({
>
<Dropdown.Trigger
render={
- trigger ?? (
- <LightIconButton aria-label={t`Chat actions`} emphasis="subtle">
- <IconDotsVertical />
- </LightIconButton>
- )
+ <LightIconButton aria-label={t`Chat actions`} emphasis="subtle">
+ <IconDotsVertical />
+ </LightIconButton>
}
/>
<DropdownContent align="end" aria-label={t`Chat actions`}>
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx
index eea949af450..eac99bd2589 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx
@@ -5,7 +5,6 @@ import { themeCssVariables } from 'twenty-ui/theme';
import { AiChatThreadListItem } from '@/ai/components/AiChatThreadListItem';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
-import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';
import { groupThreadsByDate } from '@/ai/utils/groupThreadsByDate';
const StyledGroupTitle = styled.div`
@@ -18,7 +17,6 @@ const StyledGroupTitle = styled.div`
type AiChatThreadListProps = {
threads: AgentChatThreadRecord[];
- surface: AiChatThreadActionsSurface;
selectedThreadIds?: string[];
onThreadClick: (
thread: AgentChatThreadRecord,
@@ -33,7 +31,6 @@ type AiChatThreadListProps = {
export const AiChatThreadList = ({
threads,
- surface,
selectedThreadIds = [],
onThreadClick,
onThreadContextMenu,
@@ -45,7 +42,6 @@ export const AiChatThreadList = ({
<AiChatThreadListItem
key={thread.id}
thread={thread}
- surface={surface}
isSelected={selectedThreadIdSet.has(thread.id)}
onClick={onThreadClick}
onContextMenu={onThreadContextMenu}
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
index 3636b34804d..9bd710a96e0 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { type MouseEvent } from 'react';
+import { type MouseEvent, useId } from 'react';
import { useLingui } from '@lingui/react/macro';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
@@ -7,12 +7,11 @@ import { themeCssVariables } from 'twenty-ui/theme';
import { AiChatThreadActionsDropdown } from '@/ai/components/AiChatThreadActionsDropdown';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
-import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';
import { useAgentChatThreadMembers } from '@/ai/hooks/useAgentChatThreadMembers';
import { useAiChatThreadRename } from '@/ai/hooks/useAiChatThreadRename';
import { agentChatThreadInboxStatusFamilySelector } from '@/ai/states/selectors/agentChatThreadInboxStatusFamilySelector';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { getAiChatThreadItemMenuDropdownId } from '@/ai/utils/getAiChatThreadItemMenuDropdownId';
+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { TextInput } from '@/ui/input/components/TextInput';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
import { VisibilityHidden } from 'twenty-ui/primitives/accessibility';
@@ -120,7 +119,6 @@ const StyledMenuTrigger = styled.div<{ $isDropdownOpen: boolean }>`
type AiChatThreadListItemProps = {
thread: AgentChatThreadRecord;
- surface: AiChatThreadActionsSurface;
isSelected: boolean;
onClick: (
thread: AgentChatThreadRecord,
@@ -133,10 +131,8 @@ type AiChatThreadListItemProps = {
onDetach?: () => void;
};
-// Keyed per surface; every record page uses RECORD_PAGE, so two record pages on screen share it.
export const AiChatThreadListItem = ({
thread,
- surface,
isSelected,
onClick,
onContextMenu,
@@ -190,10 +186,9 @@ export const AiChatThreadListItem = ({
);
}
};
- const itemMenuDropdownId = getAiChatThreadItemMenuDropdownId({
- threadId: thread.id,
- surface,
- });
+ const actionsInstanceId = useId();
+ const itemMenuDropdownId =
+ getCommandMenuDropdownIdFromCommandMenuId(actionsInstanceId);
const isDropdownOpen = useAtomComponentStateValue(
isDropdownOpenComponentState,
itemMenuDropdownId,
@@ -273,7 +268,7 @@ export const AiChatThreadListItem = ({
>
<AiChatThreadActionsDropdown
thread={thread}
- surface={surface}
+ instanceId={actionsInstanceId}
onRenameRequested={startRename}
onDetach={onDetach}
/>
diff --git a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
index b37d1d15866..616bcb5a222 100644
--- a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
@@ -1,13 +1,13 @@
import { IconMessage } from 'twenty-ui/icon';
import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';
import { useLingui } from '@lingui/react/macro';
+import { useId } from 'react';
import { AiChatThreadActionsDropdown } from '@/ai/components/AiChatThreadActionsDropdown';
-import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';
import { useAiChatThreadRename } from '@/ai/hooks/useAiChatThreadRename';
import { agentChatThreadInboxStatusFamilySelector } from '@/ai/states/selectors/agentChatThreadInboxStatusFamilySelector';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { getAiChatThreadItemMenuDropdownId } from '@/ai/utils/getAiChatThreadItemMenuDropdownId';
+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerInput';
@@ -42,12 +42,10 @@ export const NavigationDrawerAiChatThreadItem = ({
thread.id,
);
const displayLabel = thread.title || t`New chat`;
+ const actionsInstanceId = useId();
const isDropdownOpen = useAtomComponentStateValue(
isDropdownOpenComponentState,
- getAiChatThreadItemMenuDropdownId({
- threadId: thread.id,
- surface: AI_CHAT_THREAD_ACTIONS_SURFACE.NAV_DRAWER,
- }),
+ getCommandMenuDropdownIdFromCommandMenuId(actionsInstanceId),
);
if (isRenaming && isExpanded) {
return (
@@ -74,7 +72,7 @@ export const NavigationDrawerAiChatThreadItem = ({
rightOptions={
<AiChatThreadActionsDropdown
thread={thread}
- surface={AI_CHAT_THREAD_ACTIONS_SURFACE.NAV_DRAWER}
+ instanceId={actionsInstanceId}
onRenameRequested={startRename}
/>
}
diff --git a/packages/twenty-front/src/modules/ai/constants/AiChatThreadActionsSurface.ts b/packages/twenty-front/src/modules/ai/constants/AiChatThreadActionsSurface.ts
deleted file mode 100644
index fcb1a7f4bc1..00000000000
--- a/packages/twenty-front/src/modules/ai/constants/AiChatThreadActionsSurface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const AI_CHAT_THREAD_ACTIONS_SURFACE = {
- NAV_DRAWER: 'nav-drawer',
- RECORD_PAGE: 'record-page',
- INBOX_PAGE: 'inbox-page',
-} as const;
diff --git a/packages/twenty-front/src/modules/ai/types/AiChatThreadActionsSurface.ts b/packages/twenty-front/src/modules/ai/types/AiChatThreadActionsSurface.ts
deleted file mode 100644
index 1e364e45321..00000000000
--- a/packages/twenty-front/src/modules/ai/types/AiChatThreadActionsSurface.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { type AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';
-
-export type AiChatThreadActionsSurface =
- (typeof AI_CHAT_THREAD_ACTIONS_SURFACE)[keyof typeof AI_CHAT_THREAD_ACTIONS_SURFACE];
diff --git a/packages/twenty-front/src/modules/ai/utils/getAiChatThreadActionsInstanceId.ts b/packages/twenty-front/src/modules/ai/utils/getAiChatThreadActionsInstanceId.ts
deleted file mode 100644
index 8430519b867..00000000000
--- a/packages/twenty-front/src/modules/ai/utils/getAiChatThreadActionsInstanceId.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';
-
-export const getAiChatThreadActionsInstanceId = ({
- threadId,
- surface,
-}: {
- threadId: string;
- surface: AiChatThreadActionsSurface;
-}) => `ai-chat-thread-actions-${surface}-${threadId}`;
diff --git a/packages/twenty-front/src/modules/ai/utils/getAiChatThreadItemMenuDropdownId.ts b/packages/twenty-front/src/modules/ai/utils/getAiChatThreadItemMenuDropdownId.ts
deleted file mode 100644
index 54bd8927d86..00000000000
--- a/packages/twenty-front/src/modules/ai/utils/getAiChatThreadItemMenuDropdownId.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getAiChatThreadActionsInstanceId } from '@/ai/utils/getAiChatThreadActionsInstanceId';
-import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';
-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
-
-// Command menu items close the dropdown of their command menu instance
-export const getAiChatThreadItemMenuDropdownId = ({
- threadId,
- surface,
-}: {
- threadId: string;
- surface: AiChatThreadActionsSurface;
-}) =>
- getCommandMenuDropdownIdFromCommandMenuId(
- getAiChatThreadActionsInstanceId({ threadId, surface }),
- );
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx b/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx
index 77efbe369f7..5a43b9dc9f0 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
import { Dropdown } from 'twenty-ui/components';
import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';
-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';
+import { commandMenuDropdownPositionComponentState } from '@/command-menu-item/states/commandMenuDropdownPositionComponentState';
import { createVirtualElementFromPosition } from '@/command-menu-item/utils/createVirtualElementFromPosition';
import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
@@ -27,17 +27,14 @@ export const CommandMenuDropdownAtCursor = ({
const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);
- const recordIndexCommandMenuDropdownPosition = useAtomComponentStateValue(
- recordIndexCommandMenuDropdownPositionComponentState,
- dropdownId,
+ const commandMenuDropdownPosition = useAtomComponentStateValue(
+ commandMenuDropdownPositionComponentState,
);
return (
<DropdownRoot dropdownId={dropdownId} type="menu">
<DropdownContent
- anchor={createVirtualElementFromPosition(
- recordIndexCommandMenuDropdownPosition,
- )}
+ anchor={createVirtualElementFromPosition(commandMenuDropdownPosition)}
aria-label={t`Actions`}
>
<Dropdown.Section
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
index 93fcab73a45..a0117e6537a 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
@@ -8,6 +8,7 @@ import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/st
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { isDefined } from 'twenty-shared/utils';
export const RecordIndexCommandMenu = () => {
const isInSidePanel = useWorkspaceSurface().type === 'side-panel';
@@ -20,26 +21,26 @@ export const RecordIndexCommandMenu = () => {
isLayoutCustomizationModeEnabledState,
);
+ if (!isDefined(contextStoreCurrentObjectMetadataItemId)) {
+ return null;
+ }
+
return (
<>
- {contextStoreCurrentObjectMetadataItemId && (
- <>
- <CommandMenuContextProvider
- displayType="button"
- containerType={CommandMenuItemContainerType.IndexPageHeader}
- isInPreviewMode={isLayoutCustomizationModeEnabled && !isInSidePanel}
- >
- <PinnedCommandMenuItemButtons />
- </CommandMenuContextProvider>
- <CommandMenuContextProvider
- displayType="dropdownItem"
- containerType={CommandMenuItemContainerType.IndexPageDropdown}
- >
- <RecordIndexCommandMenuDropdown />
- </CommandMenuContextProvider>
- {!isInSidePanel && <CommandMenuItemEditButton />}
- </>
- )}
+ <CommandMenuContextProvider
+ displayType="button"
+ containerType={CommandMenuItemContainerType.IndexPageHeader}
+ isInPreviewMode={isLayoutCustomizationModeEnabled && !isInSidePanel}
+ >
+ <PinnedCommandMenuItemButtons />
+ </CommandMenuContextProvider>
+ <CommandMenuContextProvider
+ displayType="dropdownItem"
+ containerType={CommandMenuItemContainerType.IndexPageDropdown}
+ >
+ <RecordIndexCommandMenuDropdown />
+ </CommandMenuContextProvider>
+ {!isInSidePanel && <CommandMenuItemEditButton />}
</>
);
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
index e46c9c8fea1..b90e4fb3fea 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
@@ -169,7 +169,7 @@ describe('useCloseCommandMenu', () => {
});
describe('when containerType is command-menu-show-page-dropdown', () => {
- it('should call closeDropdown with the correct dropdown id', () => {
+ it('should close the side panel dropdown', () => {
const wrapper = getWrapper({
containerType: CommandMenuItemContainerType.CommandMenuShowPageDropdown,
});
@@ -181,7 +181,7 @@ describe('useCloseCommandMenu', () => {
});
expect(mockCloseDropdown).toHaveBeenCalledWith(
- `command-menu-dropdown-${TEST_COMMAND_MENU_ID}`,
+ `side-panel-command-menu-dropdown-${TEST_COMMAND_MENU_ID}`,
);
});
@@ -221,7 +221,7 @@ describe('useCloseCommandMenu', () => {
});
describe('when isInSidePanel is true', () => {
- it('should use side panel dropdown id for closeDropdown', () => {
+ it('should close the index page dropdown it was opened from', () => {
const wrapper = getWrapper({
containerType: CommandMenuItemContainerType.IndexPageDropdown,
isInSidePanel: true,
@@ -234,7 +234,7 @@ describe('useCloseCommandMenu', () => {
});
expect(mockCloseDropdown).toHaveBeenCalledWith(
- `side-panel-command-menu-dropdown-${TEST_COMMAND_MENU_ID}`,
+ `command-menu-dropdown-${TEST_COMMAND_MENU_ID}`,
);
});
});
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
index c0c81b8828f..d154207c61e 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
@@ -15,9 +15,7 @@ export const useCloseCommandMenu = ({
closeSidePanelOnShowPageOptionsExecution?: boolean;
closeSidePanelOnCommandMenuListExecution?: boolean;
} = {}) => {
- const { containerType, commandMenuContextApi } =
- useContext(CommandMenuContext);
- const isInSidePanel = commandMenuContextApi.isInSidePanel;
+ const { containerType } = useContext(CommandMenuContext);
const { closeSidePanelMenu } = useSidePanelMenu();
@@ -27,9 +25,10 @@ export const useCloseCommandMenu = ({
CommandMenuComponentInstanceContext,
);
- const dropdownId = isInSidePanel
- ? getSidePanelCommandMenuDropdownIdFromCommandMenuId(commandMenuId)
- : getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);
+ const dropdownId =
+ containerType === CommandMenuItemContainerType.CommandMenuShowPageDropdown
+ ? getSidePanelCommandMenuDropdownIdFromCommandMenuId(commandMenuId)
+ : getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);
const closeCommandMenu = () => {
if (containerType === CommandMenuItemContainerType.CommandMenuList) {
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts
index d10b32a5f04..19770991f1b 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts
@@ -2,7 +2,7 @@ import { useStore } from 'jotai';
import { type MouseEvent, useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';
+import { commandMenuDropdownPositionComponentState } from '@/command-menu-item/states/commandMenuDropdownPositionComponentState';
import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -25,12 +25,10 @@ export const useOpenCommandMenuDropdownAtCursor = () => {
CommandMenuComponentInstanceContext,
);
- const isCommandMenuAvailable = isDefined(commandMenuInstanceId);
-
const openCommandMenuDropdownAtCursor = useCallback(
(event: CommandMenuDropdownTriggerEvent) => {
if (!isDefined(commandMenuInstanceId)) {
- return;
+ return false;
}
event.preventDefault();
@@ -40,8 +38,8 @@ export const useOpenCommandMenuDropdownAtCursor = () => {
);
store.set(
- recordIndexCommandMenuDropdownPositionComponentState.atomFamily({
- instanceId: commandMenuDropdownId,
+ commandMenuDropdownPositionComponentState.atomFamily({
+ instanceId: commandMenuInstanceId,
}),
{ x: event.clientX, y: event.clientY },
);
@@ -57,6 +55,8 @@ export const useOpenCommandMenuDropdownAtCursor = () => {
enableGlobalHotkeysConflictingWithKeyboard: false,
},
});
+
+ return true;
},
[
closeSidePanelMenu,
@@ -67,5 +67,5 @@ export const useOpenCommandMenuDropdownAtCursor = () => {
],
);
- return { isCommandMenuAvailable, openCommandMenuDropdownAtCursor };
+ return { openCommandMenuDropdownAtCursor };
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState.ts b/packages/twenty-front/src/modules/command-menu-item/states/commandMenuDropdownPositionComponentState.ts
similarity index 78%
rename from packages/twenty-front/src/modules/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState.ts
rename to packages/twenty-front/src/modules/command-menu-item/states/commandMenuDropdownPositionComponentState.ts
index d2ca78721a6..55f09999378 100644
--- a/packages/twenty-front/src/modules/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/states/commandMenuDropdownPositionComponentState.ts
@@ -2,9 +2,9 @@ import { CommandMenuComponentInstanceContext } from '@/command-menu/states/conte
import { type PositionType } from '@/command-menu-item/types/PositionType';
import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-export const recordIndexCommandMenuDropdownPositionComponentState =
+export const commandMenuDropdownPositionComponentState =
createAtomComponentState<PositionType>({
- key: 'recordIndexCommandMenuDropdownPositionComponentState',
+ key: 'commandMenuDropdownPositionComponentState',
defaultValue: {
x: null,
y: null,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx
index de8963176cc..cdbfd95dacb 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx
@@ -4,11 +4,9 @@ import { Key } from 'ts-key-enum';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';
import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';
-import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';
import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex';
import { PageFocusId } from '@/types/PageFocusId';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
export const RecordBoardBodyEscapeHotkeyEffect = () => {
const { recordBoardId } = useContext(RecordBoardContext);
@@ -17,17 +15,10 @@ export const RecordBoardBodyEscapeHotkeyEffect = () => {
const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);
const { resetFocusStackToRecordIndex } = useResetFocusStackToRecordIndex();
- const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(
- isAtLeastOneRecordSelectedComponentSelector,
- recordBoardId,
- );
-
const handleEscape = () => {
unfocusBoardCard();
- if (isAtLeastOneRecordSelected) {
- resetRecordSelection();
- }
+ resetRecordSelection();
resetFocusStackToRecordIndex();
};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
index 74c8f7a55b3..b51dc6200f6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
@@ -21,7 +21,6 @@ export const RecordBoardClickOutsideEffect = () => {
const isDraggingRecord = useAtomComponentStateValue(
isDraggingRecordComponentState,
- recordBoardId,
);
const { deactivateBoardCard } = useActiveRecordBoardCard(recordBoardId);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx
index 2934c1b3af6..f28046b9151 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx
@@ -11,10 +11,7 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-boar
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
-import { isDialogOpenedComponentState } from '@/ui/layout/dialog/states/isDialogOpenedComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
@@ -56,13 +53,6 @@ export const RecordBoardContainer = ({
...args,
});
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
- const isDialogOpened = useAtomComponentStateValue(
- isDialogOpenedComponentState,
- getRecordIndexRemoveSortingModalId(recordIndexId),
- );
-
if (!isDefined(recordIndexGroupFieldMetadataItem)) {
return null;
}
@@ -83,7 +73,7 @@ export const RecordBoardContainer = ({
value={{ instanceId: recordBoardId }}
>
<RecordBoard />
- {isDialogOpened && <RecordIndexRemoveSortingModal />}
+ <RecordIndexRemoveSortingModal />
<RecordBoardHotkeyEffect />
<RecordBoardBodyEscapeHotkeyEffect />
</RecordBoardComponentInstanceContext.Provider>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts
index b0f84e8b1f9..f32a580c3f6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts
@@ -6,9 +6,7 @@ import { useRecordBoardSelectAllHotkeys } from '@/object-record/record-board/hoo
import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';
import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';
import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
-import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useContext } from 'react';
import { Key } from 'ts-key-enum';
@@ -25,11 +23,6 @@ export const useRecordBoardCardHotkeys = (focusId: string) => {
const { resetRecordSelection } = useResetRecordSelection();
const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);
- const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(
- isAtLeastOneRecordSelectedComponentSelector,
- recordBoardId,
- );
-
const handleSelectCard = () => {
toggleRecordSelection({ recordId });
};
@@ -54,9 +47,7 @@ export const useRecordBoardCardHotkeys = (focusId: string) => {
const handleEscape = () => {
unfocusBoardCard();
- if (isAtLeastOneRecordSelected) {
- resetRecordSelection();
- }
+ resetRecordSelection();
};
useHotkeysOnFocusedElement({
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
deleted file mode 100644
index 0a45c434191..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';
-import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';
-import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-
-export const useRecordBoardSelection = (recordBoardId?: string) => {
- const instanceIdFromProps = useAvailableComponentInstanceIdOrThrow(
- RecordBoardComponentInstanceContext,
- recordBoardId,
- );
-
- const selectedRecordIds = useAtomComponentSelectorCallbackState(
- selectedRecordIdsComponentSelector,
- recordBoardId,
- );
-
- const { closeDropdown } = useCloseDropdown();
- const store = useStore();
-
- const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(
- getCommandMenuIdFromRecordIndexId(instanceIdFromProps),
- );
-
- const checkIfLastUnselectAndCloseDropdown = useCallback(() => {
- const recordIds = store.get(selectedRecordIds);
-
- if (recordIds.length === 0) {
- closeDropdown(dropdownId);
- }
- }, [selectedRecordIds, store, closeDropdown, dropdownId]);
-
- return {
- checkIfLastUnselectAndCloseDropdown,
- };
-};
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 dc04a9313bf..0a3f547fa4d 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
@@ -16,11 +16,9 @@ import { recordBoardCardIsExpandedComponentState } from '@/object-record/record-
import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
-import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
@@ -53,20 +51,17 @@ export const RecordBoardCard = () => {
RecordBoardComponentInstanceContext,
);
- const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- { recordId },
- );
-
const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
isRecordIdSecondaryDragMultipleComponentFamilyState,
{ recordId },
);
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
+ const draggedRecordIds = useAtomComponentStateValue(
+ draggedRecordIdsComponentState,
);
+ const isMultiDragOverlay = isDragOverlay && draggedRecordIds.length > 1;
+
const { currentView } = useGetCurrentViewOnly();
const isCompactModeActive = currentView?.isCompact ?? false;
@@ -104,16 +99,6 @@ export const RecordBoardCard = () => {
const { activateBoardCard } = useActiveRecordBoardCard(recordBoardId);
const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);
- const {
- onPointerCancel: handlePointerCancel,
- onPointerDown: handlePointerDown,
- onPointerUp: handlePointerUp,
- } = useDisableDragSelectOnPointerDown();
-
- const handleContextMenuOpen = (event: React.MouseEvent) => {
- openRecordContextMenu({ event, recordId });
- };
-
const handleCardClick = () => {
activateBoardCard({ rowIndex, columnIndex });
unfocusBoardCard();
@@ -126,12 +111,6 @@ export const RecordBoardCard = () => {
}
}, 800);
- const isDraggingThisCard =
- !isDragOverlay &&
- (isRecordIdPrimaryDragMultiple ||
- isRecordIdSecondaryDragMultiple ||
- primaryDraggedRecordId === recordId);
-
return (
<RecordBoardCardComponentInstanceContext.Provider
value={{
@@ -140,24 +119,17 @@ export const RecordBoardCard = () => {
>
<StyledBoardCardWrapper
data-click-outside-id={RECORD_BOARD_CARD_CLICK_OUTSIDE_ID}
- onContextMenu={handleContextMenuOpen}
- onPointerCancel={handlePointerCancel}
- onPointerDown={handlePointerDown}
- onPointerUp={handlePointerUp}
+ onContextMenu={(event) => openRecordContextMenu({ event, recordId })}
>
- <StyledCardContainer
- isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
- >
- {isDragOverlay && isRecordIdPrimaryDragMultiple && (
- <RecordDragMultiDragStack />
- )}
+ <StyledCardContainer isPrimaryMultiDrag={isMultiDragOverlay}>
+ {isMultiDragOverlay && <RecordDragMultiDragStack />}
<RecordCard
data-selected={isRecordSelected}
data-focused={isRecordBoardCardFocused}
data-active={isRecordBoardCardActive}
onMouseLeave={onMouseLeaveBoard}
onClick={handleCardClick}
- isDragging={isDraggingThisCard}
+ isDragging={!isDragOverlay && isRecordIdSecondaryDragMultiple}
>
<RecordBoardCardHeader />
<Collapsible
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
index ef8c747510a..2131cbe46f9 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
@@ -73,7 +73,9 @@ export const RecordBoardCardContextProvider = ({
group={group}
type={RECORD_BOARD_CARD_DND_TYPE}
accept={RECORD_BOARD_CARD_DND_TYPE}
+ data={{ recordId }}
disabled={isRecordBoardDropProcessing || isRecordBoardCellsNonEditable}
+ fadeSourceWhileDragging
>
<StyledDraggableContainer
isDragDisabled={
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent.tsx
index cf0c7af45e5..6aad74e1da0 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent.tsx
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { RecordBoardCard } from '@/object-record/record-board/record-board-card/components/RecordBoardCard';
-import { RecordBoardCardMultiDragPreview } from '@/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview';
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
@@ -77,7 +77,7 @@ export const RecordBoardCardDragOverlayContent = ({
}}
>
<RecordBoardCard />
- <RecordBoardCardMultiDragPreview />
+ <RecordDragMultiDragCounterChip />
</RecordBoardCardContext.Provider>
</RecordBoardColumnContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
index e2752a92602..a42f8686493 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
@@ -1,5 +1,4 @@
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';
@@ -60,9 +59,6 @@ export const RecordBoardCardHeader = () => {
const [recordBoardCardIsExpanded, setRecordBoardCardIsExpanded] =
useAtomComponentState(recordBoardCardIsExpandedComponentState);
- const { checkIfLastUnselectAndCloseDropdown } =
- useRecordBoardSelection(recordBoardId);
-
const isRecordSelected = useAtomComponentFamilyStateValue(
isRecordSelectedComponentFamilyState,
recordId,
@@ -133,7 +129,6 @@ export const RecordBoardCardHeader = () => {
recordId,
shouldSelectRange: event.shiftKey,
});
- checkIfLastUnselectAndCloseDropdown();
}}
variant="outline"
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx
deleted file mode 100644
index 3904387326d..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
-import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { useContext } from 'react';
-
-// TODO: use the same concept as PortalHovered components in the app
-export const RecordBoardCardMultiDragPreview = () => {
- const { recordId } = useContext(RecordBoardCardContext);
-
- const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- { recordId },
- );
-
- if (!isRecordIdPrimaryDragMultiple) {
- return null;
- }
-
- return <RecordDragMultiDragCounterChip />;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts
deleted file mode 100644
index d23389b485a..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import { useStore } from 'jotai';
-import { useContext, useState } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-
-import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
-import { isRecordBoardDropProcessingComponentState } from '@/object-record/record-board/states/isRecordBoardDropProcessingComponentState';
-import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
-import { getBoardCardDropBehavior } from '@/object-record/record-board/utils/getBoardCardDropBehavior';
-import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
-import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';
-import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
-import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
-import { useProcessBoardCardDrop } from '@/object-record/record-drag/hooks/useProcessBoardCardDrop';
-import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
-import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
-import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';
-import { type DragDropProviderDragMoveEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragMoveEvent';
-import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';
-
-type DragStartPayload = DragDropProviderDragStartEvent<DragDropItemData>;
-type DragMovePayload = DragDropProviderDragMoveEvent<DragDropItemData>;
-type DragEndPayload = DragDropProviderDragEndEvent<DragDropItemData>;
-
-export type RecordBoardDndKitContextValues = {
- activeDropTargetIndex: number | null;
- activeDroppableId: string | null;
-};
-
-export const useRecordBoardDndKit = (): {
- contextValues: RecordBoardDndKitContextValues;
- handlers: {
- onDragStart: (event: DragStartPayload) => void;
- onDragMove: (event: DragMovePayload) => void;
- onDragEnd: (event: DragEndPayload) => void;
- };
-} => {
- const store = useStore();
-
- const { recordBoardId } = useContext(RecordBoardContext);
-
- const currentRecordSorts = useAtomComponentStateCallbackState(
- currentRecordSortsComponentState,
- recordBoardId,
- );
-
- const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(
- selectedRecordIdsComponentSelector,
- recordBoardId,
- );
-
- const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- );
-
- const recordIdsByGroupCallbackState =
- useAtomComponentFamilyStateCallbackState(
- recordIndexRecordIdsByGroupComponentFamilyState,
- recordBoardId,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
- const { endRecordDrag } = useEndRecordDrag();
-
- const { processBoardCardDrop } = useProcessBoardCardDrop();
-
- const isRecordBoardDropProcessingCallbackState =
- useAtomComponentStateCallbackState(
- isRecordBoardDropProcessingComponentState,
- );
-
- const { openDialog } = useDialog();
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
- const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<
- number | null
- >(null);
-
- const [activeDroppableId, setActiveDroppableId] = useState<string | null>(
- null,
- );
-
- const getDroppableItemCount = (droppableId: string) =>
- store.get(recordIdsByGroupCallbackState(droppableId)).length;
-
- const clearDragState = () => {
- endRecordDrag();
- setActiveDropTargetIndex(null);
- setActiveDroppableId(null);
- };
-
- const resetDragState = () => {
- store.set(isRecordBoardDropProcessingCallbackState, false);
- clearDragState();
- };
-
- const handleDragStart = (event: DragStartPayload) => {
- const draggedRecordId = event.operation.source?.id;
-
- if (!isDefined(draggedRecordId)) {
- return;
- }
-
- const currentSelectedRecordIds = store.get(recordBoardSelectedRecordIds);
-
- startRecordDrag(String(draggedRecordId), currentSelectedRecordIds);
- };
-
- const handleDragMove = (event: DragMovePayload) => {
- const { target, position } = event.operation;
-
- const resolvedDrop = resolveDropFromPointer({
- target,
- pointer: position.current,
- defaultOrientation: 'horizontal',
- getDroppableItemCount,
- });
-
- if (!isDefined(resolvedDrop)) {
- setActiveDropTargetIndex(null);
- setActiveDroppableId(null);
- return;
- }
-
- setActiveDropTargetIndex(resolvedDrop.dropTargetIndex);
- setActiveDroppableId(resolvedDrop.droppableId);
- };
-
- const handleDragEnd = (event: DragEndPayload) => {
- const { source, target, position } = event.operation;
-
- if (event.canceled || !isDefined(source)) {
- resetDragState();
- return;
- }
-
- const sourceId = source.id;
- const sourceDroppableId = (source.data as DragDropItemData).droppableId;
- const sourceIndex = (source.data as DragDropItemData).index;
-
- const resolvedDrop = resolveDropFromPointer({
- target,
- pointer: position.current,
- defaultOrientation: 'horizontal',
- getDroppableItemCount,
- });
- if (!isDefined(resolvedDrop)) {
- resetDragState();
- return;
- }
-
- const destinationDroppableId = resolvedDrop.droppableId;
-
- const existingRecordSorts = store.get(currentRecordSorts);
- const boardCardDropBehavior = getBoardCardDropBehavior({
- hasRecordSorts: existingRecordSorts.length > 0,
- sourceDroppableId,
- destinationDroppableId,
- });
-
- if (boardCardDropBehavior.shouldBlockDrop) {
- resetDragState();
- openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
- return;
- }
-
- const destinationIndex = getDestinationIndex({
- dropTargetIndex: resolvedDrop.dropTargetIndex,
- sourceIndex,
- sourceDroppableId,
- destinationDroppableId,
- });
-
- const isSameColumn = sourceDroppableId === destinationDroppableId;
-
- if (isSameColumn && destinationIndex === sourceIndex) {
- resetDragState();
- return;
- }
-
- const originalDragSelection = store.get(originalDragSelectionCallbackState);
-
- store.set(isRecordBoardDropProcessingCallbackState, true);
-
- try {
- processBoardCardDrop(
- destinationDroppableId,
- sourceId as string,
- destinationIndex,
- originalDragSelection,
- {
- shouldUpdatePosition: boardCardDropBehavior.shouldUpdatePosition,
- },
- );
- } catch (error) {
- resetDragState();
- throw error;
- }
-
- clearDragState();
- };
-
- const contextValues: RecordBoardDndKitContextValues = {
- activeDropTargetIndex,
- activeDroppableId,
- };
-
- return {
- contextValues,
- handlers: {
- onDragStart: handleDragStart,
- onDragMove: handleDragMove,
- onDragEnd: handleDragEnd,
- },
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider.tsx
index a25decd8e6e..72834c41f11 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider.tsx
@@ -1,12 +1,11 @@
-import { DragDropProvider, DragOverlay } from '@dnd-kit/react';
+import { useStore } from 'jotai';
import type { ReactNode } from 'react';
import { RecordBoardCardDragOverlayContent } from '@/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent';
-import { useRecordBoardDndKit } from '@/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit';
-import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
-import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
-import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
-import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { RecordDragDropContextProvider } from '@/object-record/record-drag/components/RecordDragDropContextProvider';
+import { useProcessBoardCardDrop } from '@/object-record/record-drag/hooks/useProcessBoardCardDrop';
+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
type RecordBoardDndKitProviderProps = {
children: ReactNode;
@@ -15,22 +14,26 @@ type RecordBoardDndKitProviderProps = {
export const RecordBoardDndKitProvider = ({
children,
}: RecordBoardDndKitProviderProps) => {
- const { contextValues, handlers } = useRecordBoardDndKit();
+ const store = useStore();
+
+ const recordIdsByGroupCallbackState =
+ useAtomComponentFamilyStateCallbackState(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ );
+
+ const { processBoardCardDrop } = useProcessBoardCardDrop();
return (
- <DragDropItemDndContext.Provider value={contextValues}>
- <DragDropProvider<DragDropItemData>
- sensors={DND_KIT_SENSORS}
- plugins={DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION}
- onDragStart={handlers.onDragStart}
- onDragMove={handlers.onDragMove}
- onDragEnd={handlers.onDragEnd}
- >
- {children}
- <DragOverlay>
- {(source) => <RecordBoardCardDragOverlayContent source={source} />}
- </DragOverlay>
- </DragDropProvider>
- </DragDropItemDndContext.Provider>
+ <RecordDragDropContextProvider
+ getDroppableItemCount={(droppableId) =>
+ store.get(recordIdsByGroupCallbackState(droppableId)).length
+ }
+ onRecordDrop={processBoardCardDrop}
+ renderDragOverlay={(source) => (
+ <RecordBoardCardDragOverlayContent source={source} />
+ )}
+ >
+ {children}
+ </RecordDragDropContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/utils/__tests__/getBoardCardDropBehavior.test.ts b/packages/twenty-front/src/modules/object-record/record-board/utils/__tests__/getBoardCardDropBehavior.test.ts
deleted file mode 100644
index 24443c6452c..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/utils/__tests__/getBoardCardDropBehavior.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { getBoardCardDropBehavior } from '@/object-record/record-board/utils/getBoardCardDropBehavior';
-
-describe('getBoardCardDropBehavior', () => {
- it('should block same-column drops when record sorting is active', () => {
- expect(
- getBoardCardDropBehavior({
- hasRecordSorts: true,
- sourceDroppableId: 'new',
- destinationDroppableId: 'new',
- }),
- ).toEqual({
- shouldBlockDrop: true,
- shouldUpdatePosition: false,
- });
- });
-
- it('should allow cross-column drops without position updates when record sorting is active', () => {
- expect(
- getBoardCardDropBehavior({
- hasRecordSorts: true,
- sourceDroppableId: 'new',
- destinationDroppableId: 'won',
- }),
- ).toEqual({
- shouldBlockDrop: false,
- shouldUpdatePosition: false,
- });
- });
-
- it('should allow drops with position updates when record sorting is inactive', () => {
- expect(
- getBoardCardDropBehavior({
- hasRecordSorts: false,
- sourceDroppableId: 'new',
- destinationDroppableId: 'won',
- }),
- ).toEqual({
- shouldBlockDrop: false,
- shouldUpdatePosition: true,
- });
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/utils/getBoardCardDropBehavior.ts b/packages/twenty-front/src/modules/object-record/record-board/utils/getBoardCardDropBehavior.ts
deleted file mode 100644
index 35654e5cc42..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/utils/getBoardCardDropBehavior.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export const getBoardCardDropBehavior = ({
- hasRecordSorts,
- sourceDroppableId,
- destinationDroppableId,
-}: {
- hasRecordSorts: boolean;
- sourceDroppableId: string;
- destinationDroppableId: string;
-}) => {
- const isMovingInsideSameRecordGroup =
- sourceDroppableId === destinationDroppableId;
-
- return {
- shouldBlockDrop: hasRecordSorts && isMovingInsideSameRecordGroup,
- shouldUpdatePosition: !hasRecordSorts,
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
index b45e0349c38..5e7b9747a05 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
@@ -10,7 +10,7 @@ import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-recor
import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
import { useProcessCalendarCardDrop } from '@/object-record/record-drag/hooks/useProcessCalendarCardDrop';
import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';
@@ -60,8 +60,8 @@ export const useRecordCalendarDndKit = (): {
recordCalendarSelectedRecordIdsComponentSelector,
);
- const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
+ draggedRecordIdsComponentState,
);
const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<
@@ -162,14 +162,14 @@ export const useRecordCalendarDndKit = (): {
return;
}
- const originalDragSelection = store.get(originalDragSelectionCallbackState);
+ const draggedRecordIds = store.get(draggedRecordIdsCallbackState);
void processCalendarCardDrop({
recordId: sourceRecordId,
sourceDate: sourceDroppableId,
destinationDate: destinationDroppableId,
destinationIndex,
- selectedRecordIds: originalDragSelection,
+ draggedRecordIds,
}).catch((error) => {
logError(error);
enqueueToast({ variant: 'error', children: t`Failed to move record` });
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 f04f3f7b952..e533f741e2e 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
@@ -9,9 +9,8 @@ import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-recor
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
@@ -55,25 +54,16 @@ export const RecordCalendarCard = ({
isDraggingRecordComponentState,
);
- const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- { recordId },
- );
-
const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
isRecordIdSecondaryDragMultipleComponentFamilyState,
{ recordId },
);
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
+ const draggedRecordIds = useAtomComponentStateValue(
+ draggedRecordIdsComponentState,
);
- const isDraggingThisCard =
- !isDragOverlay &&
- (isRecordIdPrimaryDragMultiple ||
- isRecordIdSecondaryDragMultiple ||
- primaryDraggedRecordId === recordId);
+ const isMultiDragOverlay = isDragOverlay && draggedRecordIds.length > 1;
const { openRecordFromIndexView } = useOpenRecordFromIndexView();
@@ -83,7 +73,7 @@ export const RecordCalendarCard = ({
recordId,
);
- const { isCommandMenuAvailable, openCommandMenuDropdownAtCursor } =
+ const { openCommandMenuDropdownAtCursor } =
useOpenCommandMenuDropdownAtCursor();
const handleCardClick = () => {
@@ -95,12 +85,9 @@ export const RecordCalendarCard = ({
};
const handleContextMenuOpen = (event: React.MouseEvent) => {
- if (!isCommandMenuAvailable) {
- return;
+ if (openCommandMenuDropdownAtCursor(event)) {
+ setIsRecordCalendarCardSelected(true);
}
-
- openCommandMenuDropdownAtCursor(event);
- setIsRecordCalendarCardSelected(true);
};
return (
@@ -111,17 +98,13 @@ export const RecordCalendarCard = ({
>
<StyledContainer onContextMenu={handleContextMenuOpen}>
<StyledRecordCardContainer>
- <StyledCardContainer
- isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
- >
- {isDragOverlay && isRecordIdPrimaryDragMultiple && (
- <RecordDragMultiDragStack />
- )}
+ <StyledCardContainer isPrimaryMultiDrag={isMultiDragOverlay}>
+ {isMultiDragOverlay && <RecordDragMultiDragStack />}
<RecordCard
data-selected={isRecordCalendarCardSelected}
data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}
onClick={isCompactModeActive ? handleCardClick : undefined}
- isDragging={isDraggingThisCard}
+ isDragging={!isDragOverlay && isRecordIdSecondaryDragMultiple}
>
<RecordCalendarCardHeader recordId={recordId} />
<Collapsible isExpanded={!isCompactModeActive}>
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx
index 7612c414605..d75c11e87a8 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardDragOverlayCalendarDay';
import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';
import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
-import { RecordCalendarCardMultiDragPreview } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview';
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
type RecordCalendarCardDragOverlayContentProps = {
source: Draggable | null;
@@ -27,7 +27,7 @@ export const RecordCalendarCardDragOverlayContent = ({
calendarDay={RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY}
isDragOverlay
/>
- <RecordCalendarCardMultiDragPreview recordId={recordId} />
+ <RecordDragMultiDragCounterChip />
</>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx
deleted file mode 100644
index 1e938848d3c..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-
-export const RecordCalendarCardMultiDragPreview = ({
- recordId,
-}: {
- recordId: string;
-}) => {
- const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- { recordId },
- );
-
- if (!isRecordIdPrimaryDragMultiple) {
- return null;
- }
-
- return <RecordDragMultiDragCounterChip />;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
index f32f73dc1ec..037f1188a0d 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
@@ -8,8 +8,7 @@ import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecord
import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';
import { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';
-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
@@ -21,6 +20,7 @@ import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-dro
import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';
import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
type RecordDragDropContextProviderProps = {
getDroppableItemCount: (droppableId: string) => number;
@@ -35,16 +35,18 @@ export const RecordDragDropContextProvider = ({
renderDragOverlay,
children,
}: RecordDragDropContextProviderProps) => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
const selectedRecordIds = useAtomComponentSelectorCallbackState(
selectedRecordIdsComponentSelector,
);
+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
+ draggedRecordIdsComponentState,
+ );
+
const store = useStore();
- const { startRecordDrag } = useStartRecordDrag(recordIndexId);
- const { endRecordDrag } = useEndRecordDrag(recordIndexId);
+ const { startRecordDrag } = useStartRecordDrag();
+ const { endRecordDrag } = useEndRecordDrag();
const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<
number | null
@@ -123,11 +125,8 @@ export const RecordDragDropContextProvider = ({
const isSameDroppable = sourceData.droppableId === resolvedDrop.droppableId;
- const isMultiDrag =
- getDragOperationType({
- draggedRecordId: sourceData.recordId,
- selectedRecordIds: store.get(selectedRecordIds),
- }) === 'multi';
+ // A multi-drag dropped in place still gathers the other dragged records
+ const isMultiDrag = store.get(draggedRecordIdsCallbackState).length > 1;
if (
isSameDroppable &&
@@ -140,15 +139,10 @@ export const RecordDragDropContextProvider = ({
try {
onRecordDrop({
- draggableId: sourceData.recordId,
- source: {
- droppableId: sourceData.droppableId,
- index: sourceData.index,
- },
- destination: {
- droppableId: resolvedDrop.droppableId,
- index: destinationIndex,
- },
+ draggedRecordId: sourceData.recordId,
+ sourceDroppableId: sourceData.droppableId,
+ destinationDroppableId: resolvedDrop.droppableId,
+ destinationIndex,
});
} finally {
clearDragState();
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragEndDropZone.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragEndDropZone.tsx
new file mode 100644
index 00000000000..8b769a5eaa5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragEndDropZone.tsx
@@ -0,0 +1,55 @@
+import { pointerIntersection } from '@dnd-kit/collision';
+import { useDroppable } from '@dnd-kit/react';
+import { styled } from '@linaria/react';
+import { type ReactNode } from 'react';
+
+import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
+import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+
+const StyledEndDropZone = styled.div`
+ position: relative;
+ width: 100%;
+`;
+
+type RecordDragEndDropZoneProps = {
+ droppableId: string;
+ dndType: string;
+ index: number;
+ children?: ReactNode;
+};
+
+// Catches drops past the last record, where no record is under the pointer
+export const RecordDragEndDropZone = ({
+ droppableId,
+ dndType,
+ index,
+ children,
+}: RecordDragEndDropZoneProps) => {
+ const isDraggingRecord = useAtomComponentStateValue(
+ isDraggingRecordComponentState,
+ );
+
+ const { ref } = useDroppable({
+ id: droppableId,
+ accept: dndType,
+ collisionPriority: DND_KIT_COLLISION_PRIORITY,
+ collisionDetector: pointerIntersection,
+ data: { droppableId },
+ });
+
+ return (
+ <StyledEndDropZone ref={ref}>
+ {/* Expands during a drag so the zone stays droppable when nothing renders below it */}
+ <DragDropItemDropTarget
+ index={index}
+ droppableId={droppableId}
+ orientation="horizontal"
+ compact={!isDraggingRecord}
+ seamAligned
+ />
+ {children}
+ </StyledEndDropZone>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
index b789bec732a..2137b6b8b98 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
@@ -1,4 +1,4 @@
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { NotificationCounter } from 'twenty-ui/components';
@@ -10,29 +10,18 @@ const StyledNotificationCounterContainer = styled.div`
z-index: 1000;
`;
-type RecordDragMultiDragCounterChipProps = {
- contextStoreInstanceId?: string;
-};
-
-export const RecordDragMultiDragCounterChip = ({
- contextStoreInstanceId,
-}: RecordDragMultiDragCounterChipProps) => {
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- contextStoreInstanceId,
+export const RecordDragMultiDragCounterChip = () => {
+ const draggedRecordIds = useAtomComponentStateValue(
+ draggedRecordIdsComponentState,
);
- const selectedCount = originalDragSelection.length ?? 0;
-
- const shouldShow = selectedCount > 1;
-
- if (!shouldShow) {
+ if (draggedRecordIds.length <= 1) {
return null;
}
return (
<StyledNotificationCounterContainer>
- <NotificationCounter count={selectedCount} />
+ <NotificationCounter count={draggedRecordIds.length} />
</StyledNotificationCounterContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx
deleted file mode 100644
index 61ba3284860..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-
-type RecordDragMultiDragPreviewProps = {
- recordId: string;
-};
-
-export const RecordDragMultiDragPreview = ({
- recordId,
-}: RecordDragMultiDragPreviewProps) => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
- const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- { recordId },
- recordIndexId,
- );
-
- if (!isRecordIdPrimaryDragMultiple) {
- return null;
- }
-
- return (
- <RecordDragMultiDragCounterChip contextStoreInstanceId={recordIndexId} />
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
index fd7d8aa39aa..d16225714f0 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
@@ -1,4 +1,4 @@
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -18,18 +18,16 @@ const StyledRecordDragMultiDragStackCard = styled.div<{ offset: number }>`
`;
export const RecordDragMultiDragStack = () => {
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
+ const draggedRecordIds = useAtomComponentStateValue(
+ draggedRecordIdsComponentState,
);
- const shouldShow = originalDragSelection.length > 1;
-
- if (!shouldShow) {
+ if (draggedRecordIds.length <= 1) {
return null;
}
return Array.from({
- length: Math.min(MAX_STACK_CARDS, originalDragSelection.length - 1),
+ length: Math.min(MAX_STACK_CARDS, draggedRecordIds.length - 1),
}).map((_, index) => (
<StyledRecordDragMultiDragStackCard key={index} offset={index + 1} />
));
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx
deleted file mode 100644
index 7c1d5a7aa13..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { act } from 'react';
-
-import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
-import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
-import { isMultiDragActiveComponentState } from '@/object-record/record-drag/states/isMultiDragActiveComponentState';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
-import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-
-describe('useEndRecordDrag', () => {
- const Wrapper = getJestMetadataAndApolloMocksWrapper({});
-
- it('should clear all board drag states', () => {
- const { result } = renderHook(
- () => {
- const [isMultiDragActive, setIsMultiDragActive] = useAtomComponentState(
- isMultiDragActiveComponentState,
- );
-
- const [draggedRecordIds, setDraggedRecordIds] = useAtomComponentState(
- draggedRecordIdsComponentState,
- );
-
- const [primaryDraggedRecordId, setPrimaryDraggedRecordId] =
- useAtomComponentState(primaryDraggedRecordIdComponentState);
-
- const [originalDragSelection, setOriginalDragSelection] =
- useAtomComponentState(originalDragSelectionComponentState);
-
- const { endRecordDrag } = useEndRecordDrag();
-
- return {
- endRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- setIsMultiDragActive,
- setDraggedRecordIds,
- setPrimaryDraggedRecordId,
- setOriginalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- act(() => {
- result.current.setIsMultiDragActive(true);
- result.current.setDraggedRecordIds(['record-1', 'record-2']);
- result.current.setPrimaryDraggedRecordId('record-1');
- result.current.setOriginalDragSelection([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual(['record-1', 'record-2']);
- expect(result.current.primaryDraggedRecordId).toBe('record-1');
- expect(result.current.originalDragSelection).toEqual([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
-
- act(() => {
- result.current.endRecordDrag();
- });
-
- expect(result.current.isMultiDragActive).toBe(false);
- expect(result.current.draggedRecordIds).toEqual([]);
- expect(result.current.primaryDraggedRecordId).toBeNull();
- expect(result.current.originalDragSelection).toEqual([]);
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartAndEndRecordDrag.test.tsx b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartAndEndRecordDrag.test.tsx
new file mode 100644
index 00000000000..334c02ab50c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartAndEndRecordDrag.test.tsx
@@ -0,0 +1,97 @@
+import { act, renderHook } from '@testing-library/react';
+import { Provider as JotaiProvider } from 'jotai';
+import { type ReactNode } from 'react';
+
+import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
+import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
+import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
+import {
+ jotaiStore,
+ resetJotaiStore,
+} from '@/ui/utilities/state/jotai/jotaiStore';
+
+const instanceId = 'record-index-id';
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+ <JotaiProvider store={jotaiStore}>
+ <RecordSelectionComponentInstanceContext.Provider value={{ instanceId }}>
+ {children}
+ </RecordSelectionComponentInstanceContext.Provider>
+ </JotaiProvider>
+);
+
+const getDraggedRecordIds = () =>
+ jotaiStore.get(draggedRecordIdsComponentState.atomFamily({ instanceId }));
+
+const isDraggingRecord = () =>
+ jotaiStore.get(isDraggingRecordComponentState.atomFamily({ instanceId }));
+
+const isSecondaryDragged = (recordId: string) =>
+ jotaiStore.get(
+ isRecordIdSecondaryDragMultipleComponentFamilyState.atomFamily({
+ instanceId,
+ familyKey: { recordId },
+ }),
+ );
+
+const renderDragHooks = () =>
+ renderHook(
+ () => ({
+ ...useStartRecordDrag(),
+ ...useEndRecordDrag(),
+ }),
+ { wrapper: Wrapper },
+ );
+
+describe('useStartRecordDrag and useEndRecordDrag', () => {
+ beforeEach(() => {
+ resetJotaiStore();
+ });
+
+ it('should drag only the dragged record when it is not selected', () => {
+ const { result } = renderDragHooks();
+
+ act(() => {
+ result.current.startRecordDrag('record-1', ['record-2', 'record-3']);
+ });
+
+ expect(isDraggingRecord()).toBe(true);
+ expect(getDraggedRecordIds()).toEqual(['record-1']);
+ expect(isSecondaryDragged('record-2')).toBe(false);
+ });
+
+ it('should drag the whole selection when the dragged record is selected', () => {
+ const { result } = renderDragHooks();
+
+ act(() => {
+ result.current.startRecordDrag('record-2', [
+ 'record-1',
+ 'record-2',
+ 'record-3',
+ ]);
+ });
+
+ expect(getDraggedRecordIds()).toEqual(['record-1', 'record-2', 'record-3']);
+ expect(isSecondaryDragged('record-1')).toBe(true);
+ expect(isSecondaryDragged('record-2')).toBe(false);
+ expect(isSecondaryDragged('record-3')).toBe(true);
+ });
+
+ it('should clear the drag state when the drag ends', () => {
+ const { result } = renderDragHooks();
+
+ act(() => {
+ result.current.startRecordDrag('record-2', ['record-1', 'record-2']);
+ });
+ act(() => {
+ result.current.endRecordDrag();
+ });
+
+ expect(isDraggingRecord()).toBe(false);
+ expect(getDraggedRecordIds()).toEqual([]);
+ expect(isSecondaryDragged('record-1')).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx
deleted file mode 100644
index 7e5a29de151..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx
+++ /dev/null
@@ -1,282 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { act } from 'react';
-
-import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
-import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
-import { isMultiDragActiveComponentState } from '@/object-record/record-drag/states/isMultiDragActiveComponentState';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-
-describe('useStartRecordDrag', () => {
- const Wrapper = getJestMetadataAndApolloMocksWrapper({});
-
- it('should set single drag state when dragged record is not in selection', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-1';
- const selectedRecordIds = ['record-2', 'record-3'];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual(['record-1']);
- expect(result.current.primaryDraggedRecordId).toBe('record-1');
- expect(result.current.originalDragSelection).toEqual(['record-1']);
- });
-
- it('should set single drag state when only one record is selected', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-1';
- const selectedRecordIds = ['record-1'];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual(['record-1']);
- expect(result.current.primaryDraggedRecordId).toBe('record-1');
- expect(result.current.originalDragSelection).toEqual(['record-1']);
- });
-
- it('should set multi drag state when multiple records are selected', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-2';
- const selectedRecordIds = ['record-1', 'record-2', 'record-3'];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
- expect(result.current.primaryDraggedRecordId).toBe('record-2');
- expect(result.current.originalDragSelection).toEqual([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
- });
-
- it('should handle empty selection', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-1';
- const selectedRecordIds: string[] = [];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual(['record-1']);
- expect(result.current.primaryDraggedRecordId).toBe('record-1');
- expect(result.current.originalDragSelection).toEqual(['record-1']);
- });
-
- it('should set single drag state when dragged record is not in selection', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-1';
- const selectedRecordIds = ['record-2', 'record-3'];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual(['record-1']);
- expect(result.current.primaryDraggedRecordId).toBe('record-1');
- expect(result.current.originalDragSelection).toEqual(['record-1']);
- });
-
- it('should set multi drag state when multiple records are selected', () => {
- const { result } = renderHook(
- () => {
- const isMultiDragActive = useAtomComponentStateValue(
- isMultiDragActiveComponentState,
- );
- const draggedRecordIds = useAtomComponentStateValue(
- draggedRecordIdsComponentState,
- );
- const primaryDraggedRecordId = useAtomComponentStateValue(
- primaryDraggedRecordIdComponentState,
- );
- const originalDragSelection = useAtomComponentStateValue(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
-
- return {
- startRecordDrag,
- isMultiDragActive,
- draggedRecordIds,
- primaryDraggedRecordId,
- originalDragSelection,
- };
- },
- { wrapper: Wrapper },
- );
-
- const draggedRecordId = 'record-2';
- const selectedRecordIds = ['record-1', 'record-2', 'record-3'];
-
- act(() => {
- result.current.startRecordDrag(draggedRecordId, selectedRecordIds);
- });
-
- expect(result.current.isMultiDragActive).toBe(true);
- expect(result.current.draggedRecordIds).toEqual([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
- expect(result.current.primaryDraggedRecordId).toBe('record-2');
- expect(result.current.originalDragSelection).toEqual([
- 'record-1',
- 'record-2',
- 'record-3',
- ]);
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useEndRecordDrag.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useEndRecordDrag.ts
index c97a7b8c489..efe2cfe6d4c 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useEndRecordDrag.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useEndRecordDrag.ts
@@ -1,105 +1,41 @@
-import { useCallback } from 'react';
import { useStore } from 'jotai';
-
-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-
-import { isMultiDragActiveComponentState } from '@/object-record/record-drag/states/isMultiDragActiveComponentState';
+import { useCallback } from 'react';
import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { isDefined } from 'twenty-shared/utils';
+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-export const useEndRecordDrag = (contextStoreInstanceId?: string) => {
+export const useEndRecordDrag = () => {
const store = useStore();
- const isMultiDragActiveCallbackState = useAtomComponentStateCallbackState(
- isMultiDragActiveComponentState,
- contextStoreInstanceId,
- );
+ const isDraggingRecordCallbackState = useAtomComponentStateCallbackState(
+ isDraggingRecordComponentState,
+ );
const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
draggedRecordIdsComponentState,
- contextStoreInstanceId,
- );
-
- const primaryDraggedRecordIdCallbackState =
- useAtomComponentStateCallbackState(
- primaryDraggedRecordIdComponentState,
- contextStoreInstanceId,
- );
-
- const originalSelection = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- contextStoreInstanceId,
);
-
- const isRecordIdPrimaryDragMultipleCallbackState =
- useAtomComponentFamilyStateCallbackState(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- contextStoreInstanceId,
- );
-
const isRecordIdSecondaryDragMultipleCallbackState =
useAtomComponentFamilyStateCallbackState(
isRecordIdSecondaryDragMultipleComponentFamilyState,
- contextStoreInstanceId,
);
- const isDraggingRecord = useAtomComponentStateCallbackState(
- isDraggingRecordComponentState,
- contextStoreInstanceId,
- );
-
const endRecordDrag = useCallback(() => {
- store.set(isDraggingRecord, false);
-
- const currentlyDraggedRecordIds = store.get(draggedRecordIdsCallbackState);
-
- const primaryDraggedRecordId = store.get(
- primaryDraggedRecordIdCallbackState,
- );
-
- if (currentlyDraggedRecordIds.length > 0) {
- const secondaryDraggedIds = currentlyDraggedRecordIds.filter(
- (recordIdToFilter) => recordIdToFilter !== primaryDraggedRecordId,
- );
-
- for (const secondaryDraggedId of secondaryDraggedIds) {
- store.set(
- isRecordIdSecondaryDragMultipleCallbackState({
- recordId: secondaryDraggedId,
- }),
- false,
- );
- }
- }
-
- if (isDefined(primaryDraggedRecordId)) {
+ for (const recordId of store.get(draggedRecordIdsCallbackState)) {
store.set(
- isRecordIdPrimaryDragMultipleCallbackState({
- recordId: primaryDraggedRecordId,
- }),
+ isRecordIdSecondaryDragMultipleCallbackState({ recordId }),
false,
);
}
- store.set(isMultiDragActiveCallbackState, false);
store.set(draggedRecordIdsCallbackState, []);
- store.set(primaryDraggedRecordIdCallbackState, null);
- store.set(originalSelection, []);
+ store.set(isDraggingRecordCallbackState, false);
}, [
store,
- isMultiDragActiveCallbackState,
+ isDraggingRecordCallbackState,
draggedRecordIdsCallbackState,
- primaryDraggedRecordIdCallbackState,
- originalSelection,
- isRecordIdPrimaryDragMultipleCallbackState,
isRecordIdSecondaryDragMultipleCallbackState,
- isDraggingRecord,
]);
return { endRecordDrag };
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts
deleted file mode 100644
index 2787565a463..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { type Nullable } from 'twenty-shared/types';
-
-export const useIsRecordSecondaryDragged = (recordId: Nullable<string>) => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
- const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
- isRecordIdSecondaryDragMultipleComponentFamilyState,
- { recordId: recordId ?? '' },
- recordIndexId,
- );
-
- return {
- isSecondaryDragged: isRecordIdSecondaryDragMultiple,
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessBoardCardDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessBoardCardDrop.ts
index bd288052cb7..3fcf968e63d 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessBoardCardDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessBoardCardDrop.ts
@@ -1,28 +1,40 @@
import { useStore } from 'jotai';
import { useCallback, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-
-import { processGroupDrop } from '@/object-record/record-drag/utils/processGroupDrop';
+import { useDebouncedCallback } from 'use-debounce';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { isRecordBoardDropProcessingComponentState } from '@/object-record/record-board/states/isRecordBoardDropProcessingComponentState';
import { useUpdateDroppedRecordOnBoard } from '@/object-record/record-drag/hooks/useUpdateDroppedRecordOnBoard';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
+import { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';
+import { computeDroppedRecordPositions } from '@/object-record/record-drag/utils/computeDroppedRecordPositions';
+import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
+import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useDebouncedCallback } from 'use-debounce';
export const useProcessBoardCardDrop = () => {
const store = useStore();
const { selectFieldMetadataItem } = useContext(RecordBoardContext);
+ const { recordIndexId } = useRecordIndexContextOrThrow();
+ const { openDialog } = useDialog();
+ const { updateDroppedRecordOnBoard } = useUpdateDroppedRecordOnBoard();
- const recordIndexRecordIdsByGroupCallbackFamilyState =
+ const recordIdsByGroupCallbackState =
useAtomComponentFamilyStateCallbackState(
recordIndexRecordIdsByGroupComponentFamilyState,
);
-
- const { updateDroppedRecordOnBoard } = useUpdateDroppedRecordOnBoard();
-
+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
+ draggedRecordIdsComponentState,
+ );
+ const currentRecordSortsCallbackState = useAtomComponentStateCallbackState(
+ currentRecordSortsComponentState,
+ );
const isRecordBoardDropProcessingCallbackState =
useAtomComponentStateCallbackState(
isRecordBoardDropProcessingComponentState,
@@ -39,48 +51,70 @@ export const useProcessBoardCardDrop = () => {
);
const processBoardCardDrop = useCallback(
- (
- droppableId: string,
- draggableId: string,
- targetIndex: number,
- selectedRecordIds: string[],
- options?: { shouldUpdatePosition?: boolean },
- ) => {
- if (!isDefined(selectFieldMetadataItem)) return;
+ ({
+ draggedRecordId,
+ sourceDroppableId,
+ destinationDroppableId,
+ destinationIndex,
+ }: RecordDragDropResult) => {
+ if (!isDefined(selectFieldMetadataItem)) {
+ return;
+ }
+
+ const hasRecordSorts =
+ store.get(currentRecordSortsCallbackState).length > 0;
+
+ // A sorted board can still move a card to another column, only not
+ // reorder it within one
+ if (hasRecordSorts && sourceDroppableId === destinationDroppableId) {
+ openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
+ return;
+ }
+
+ const destinationRecordGroup = store.get(
+ recordGroupDefinitionFamilyState.atomFamily(destinationDroppableId),
+ );
- const shouldUpdatePosition = options?.shouldUpdatePosition ?? true;
+ if (!isDefined(destinationRecordGroup)) {
+ throw new Error('Record group is not defined');
+ }
- processGroupDrop({
- droppableId,
- draggableId,
- targetIndex,
- store,
- selectedRecordIds,
- recordIdsByGroupFamilyState:
- recordIndexRecordIdsByGroupCallbackFamilyState,
- onUpdateRecord: ({ recordId, position }, targetRecordGroupValue) => {
+ store.set(isRecordBoardDropProcessingCallbackState, true);
+
+ try {
+ const updatedRecords = computeDroppedRecordPositions({
+ destinationRecordIds: store.get(
+ recordIdsByGroupCallbackState(destinationDroppableId),
+ ),
+ destinationIndex,
+ draggedRecordId,
+ draggedRecordIds: store.get(draggedRecordIdsCallbackState),
+ store,
+ });
+
+ for (const { id, position } of updatedRecords) {
updateDroppedRecordOnBoard(
- {
- recordId,
- position: shouldUpdatePosition ? position : undefined,
- },
- targetRecordGroupValue,
+ { recordId: id, position: hasRecordSorts ? undefined : position },
+ destinationRecordGroup.value,
);
- },
- });
-
- debouncedUpdateDropProcessing(false);
+ }
+ } finally {
+ debouncedUpdateDropProcessing(false);
+ }
},
[
store,
selectFieldMetadataItem,
- recordIndexRecordIdsByGroupCallbackFamilyState,
+ recordIndexId,
+ openDialog,
updateDroppedRecordOnBoard,
debouncedUpdateDropProcessing,
+ recordIdsByGroupCallbackState,
+ draggedRecordIdsCallbackState,
+ currentRecordSortsCallbackState,
+ isRecordBoardDropProcessingCallbackState,
],
);
- return {
- processBoardCardDrop,
- };
+ return { processBoardCardDrop };
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts
index f4812f37598..8803e5e2bf7 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts
@@ -17,7 +17,6 @@ import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-recor
import { Temporal } from 'temporal-polyfill';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
export const useProcessCalendarCardDrop = () => {
const store = useStore();
@@ -40,21 +39,16 @@ export const useProcessCalendarCardDrop = () => {
sourceDate,
destinationDate,
destinationIndex,
- selectedRecordIds,
+ draggedRecordIds,
}: {
recordId: string;
sourceDate: string;
destinationDate: string;
destinationIndex: number;
- selectedRecordIds: string[];
+ draggedRecordIds: string[];
}) => {
if (!recordIndexCalendarFieldMetadataId) return;
- const dragOperationType = getDragOperationType({
- draggedRecordId: recordId,
- selectedRecordIds,
- });
-
const destinationPlainDate = Temporal.PlainDate.from(destinationDate);
const sourcePlainDate = Temporal.PlainDate.from(sourceDate);
@@ -127,10 +121,7 @@ export const useProcessCalendarCardDrop = () => {
const dayOffset = sourcePlainDate.until(destinationPlainDate).days;
- const recordIdsToShift =
- dragOperationType === 'single' ? [recordId] : selectedRecordIds;
-
- for (const idToUpdate of recordIdsToShift) {
+ for (const idToUpdate of draggedRecordIds) {
const recordToShift = store.get(
recordStoreFamilyState.atomFamily(idToUpdate),
);
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
index 7df9eadc901..6398fb2f3a1 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
@@ -2,131 +2,99 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { processGroupDrop } from '@/object-record/record-drag/utils/processGroupDrop';
+import { computeDroppedRecordPositions } from '@/object-record/record-drag/utils/computeDroppedRecordPositions';
import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
-import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
export const useProcessRecordGroupDrop = () => {
const store = useStore();
- const { recordIndexId, objectNameSingular, objectMetadataItem } =
- useRecordIndexContextOrThrow();
-
+ const { recordIndexId, objectNameSingular } = useRecordIndexContextOrThrow();
const { updateOneRecord } = useUpdateOneRecord();
-
const { openDialog } = useDialog();
- const recordIdsByGroupFamilyState = useAtomComponentFamilyStateCallbackState(
- recordIndexRecordIdsByGroupComponentFamilyState,
+ const recordIdsByGroupCallbackState =
+ useAtomComponentFamilyStateCallbackState(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ );
+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
+ draggedRecordIdsComponentState,
);
-
- const currentRecordSorts = useAtomComponentStateCallbackState(
+ const currentRecordSortsCallbackState = useAtomComponentStateCallbackState(
currentRecordSortsComponentState,
);
-
- const selectedRecordIdsCallbackState = useAtomComponentSelectorCallbackState(
- selectedRecordIdsComponentSelector,
- );
-
- const isDraggingRecord = useAtomComponentStateCallbackState(
- isDraggingRecordComponentState,
- recordIndexId,
- );
-
- const originalDragSelection = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- recordIndexId,
- );
-
const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(
recordIndexGroupFieldMetadataItemComponentState,
);
const processRecordGroupDrop = useCallback(
- (result: RecordDragDropResult) => {
- if (!result.destination) return;
+ ({
+ draggedRecordId,
+ destinationDroppableId,
+ destinationIndex,
+ }: RecordDragDropResult) => {
+ if (store.get(currentRecordSortsCallbackState).length > 0) {
+ openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
+ return;
+ }
- const destinationRecordGroupId = result.destination.droppableId;
const destinationRecordGroup = store.get(
- recordGroupDefinitionFamilyState.atomFamily(destinationRecordGroupId),
+ recordGroupDefinitionFamilyState.atomFamily(destinationDroppableId),
);
- if (!isDefined(destinationRecordGroup)) {
+ if (
+ !isDefined(destinationRecordGroup) ||
+ !isDefined(recordIndexGroupFieldMetadataItem)
+ ) {
throw new Error('Record group is not defined');
}
- const fieldMetadata = objectMetadataItem.fields.find(
- (field) => field.id === recordIndexGroupFieldMetadataItem?.id,
- );
-
- if (!isDefined(fieldMetadata)) {
- throw new Error('Field metadata is not defined');
- }
-
- const recordGroupColumnName =
- getFieldMetadataItemGqlFieldName(fieldMetadata);
-
- const existingOriginalDragSelection = store.get(originalDragSelection);
-
- const isCurrentlyDraggingRecord = store.get(isDraggingRecord);
-
- const selectedRecordIds = isCurrentlyDraggingRecord
- ? existingOriginalDragSelection
- : store.get(selectedRecordIdsCallbackState);
+ const updatedRecords = computeDroppedRecordPositions({
+ destinationRecordIds: store.get(
+ recordIdsByGroupCallbackState(destinationDroppableId),
+ ),
+ destinationIndex,
+ draggedRecordId,
+ draggedRecordIds: store.get(draggedRecordIdsCallbackState),
+ store,
+ });
- const existingRecordSorts = store.get(currentRecordSorts);
+ const recordGroupFieldName = getFieldMetadataItemGqlFieldName(
+ recordIndexGroupFieldMetadataItem,
+ );
- if (existingRecordSorts.length > 0) {
- openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
- return;
+ for (const { id, position } of updatedRecords) {
+ updateOneRecord({
+ objectNameSingular,
+ idToUpdate: id,
+ updateOneRecordInput: {
+ position,
+ [recordGroupFieldName]: destinationRecordGroup.value,
+ },
+ });
}
-
- processGroupDrop({
- droppableId: destinationRecordGroupId,
- draggableId: result.draggableId,
- targetIndex: result.destination.index,
- store,
- selectedRecordIds,
- recordIdsByGroupFamilyState,
- onUpdateRecord: ({ recordId, position }) => {
- updateOneRecord({
- objectNameSingular,
- idToUpdate: recordId,
- updateOneRecordInput: {
- position,
- [recordGroupColumnName]: destinationRecordGroup.value,
- },
- });
- },
- });
},
[
- currentRecordSorts,
- recordIndexId,
store,
+ recordIndexId,
objectNameSingular,
- objectMetadataItem.fields,
- originalDragSelection,
- isDraggingRecord,
- selectedRecordIdsCallbackState,
- recordIdsByGroupFamilyState,
- recordIndexGroupFieldMetadataItem?.id,
openDialog,
updateOneRecord,
+ recordIndexGroupFieldMetadataItem,
+ recordIdsByGroupCallbackState,
+ draggedRecordIdsCallbackState,
+ currentRecordSortsCallbackState,
],
);
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
index cb136d12b36..fa3f12fe0fb 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
@@ -1,25 +1,18 @@
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { useStore } from 'jotai';
+import { useCallback } from 'react';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
-import { processMultiDrag } from '@/object-record/record-drag/utils/processMultiDrag';
-import { processSingleDrag } from '@/object-record/record-drag/utils/processSingleDrag';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
+import { computeDroppedRecordPositions } from '@/object-record/record-drag/utils/computeDroppedRecordPositions';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { allRecordIdsWithoutGroupsComponentSelector } from '@/object-record/record-index/states/selectors/allRecordIdsWithoutGroupsComponentSelector';
+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
-import { useStore } from 'jotai';
-
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
type UseProcessRecordWithoutGroupDropProps = {
onBeforeRecordsUpdate?: (updatedRecords: RecordWithPosition[]) => void;
@@ -30,139 +23,55 @@ export const useProcessRecordWithoutGroupDrop = ({
}: UseProcessRecordWithoutGroupDropProps = {}) => {
const store = useStore();
const { recordIndexId, objectNameSingular } = useRecordIndexContextOrThrow();
-
const { updateOneRecord } = useUpdateOneRecord();
+ const { openDialog } = useDialog();
- const allRecordIdsWithoutGroup = useAtomComponentSelectorCallbackState(
- allRecordIdsWithoutGroupsComponentSelector,
- );
-
- const selectedRowIds = useAtomComponentSelectorCallbackState(
- selectedRecordIdsComponentSelector,
- );
-
- const originalDragSelection = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- recordIndexId,
+ const allRecordIdsWithoutGroupCallbackState =
+ useAtomComponentSelectorCallbackState(
+ allRecordIdsWithoutGroupsComponentSelector,
+ );
+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
+ draggedRecordIdsComponentState,
);
-
- const currentRecordSorts = useAtomComponentStateValue(
+ const currentRecordSortsCallbackState = useAtomComponentStateCallbackState(
currentRecordSortsComponentState,
);
- const { openDialog } = useDialog();
-
const processRecordWithoutGroupDrop = useCallback(
- async (recordDropResult: RecordDragDropResult) => {
- if (!recordDropResult.destination) return;
-
- if (currentRecordSorts.length > 0) {
+ ({ draggedRecordId, destinationIndex }: RecordDragDropResult) => {
+ if (store.get(currentRecordSortsCallbackState).length > 0) {
openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
return;
}
- const allSparseRecordIds = store.get(allRecordIdsWithoutGroup);
-
- const draggedRecordId = recordDropResult.draggableId;
- const selectedRecordIds = store.get(selectedRowIds);
-
- const isDroppedAfterList =
- recordDropResult.destination.index + 1 >= allSparseRecordIds.length;
-
- const recordsWithPosition: RecordWithPosition[] = allSparseRecordIds
- .filter((recordId): recordId is string => isDefined(recordId))
- .map((recordId: string) => {
- const record = store.get(recordStoreFamilyState.atomFamily(recordId));
- return {
- id: recordId,
- position: record?.position ?? 0,
- };
- });
-
- const contiguousRecordsWithPosition =
- recordsWithPosition.filter(isDefined);
-
- const dragOperationType = getDragOperationType({
+ const updatedRecords = computeDroppedRecordPositions({
+ destinationRecordIds: store.get(allRecordIdsWithoutGroupCallbackState),
+ destinationIndex,
draggedRecordId,
- selectedRecordIds,
+ draggedRecordIds: store.get(draggedRecordIdsCallbackState),
+ store,
});
- if (dragOperationType === 'single') {
- const targetRecordId = allSparseRecordIds.at(
- recordDropResult.destination.index,
- );
-
- if (!isDefined(targetRecordId)) {
- throw new Error(
- `Target record id cannot be found, this should not happen`,
- );
- }
-
- const singleDragResult = processSingleDrag({
- sourceRecordId: draggedRecordId,
- targetRecordId: targetRecordId ?? '',
- recordsWithPosition: contiguousRecordsWithPosition,
- isDroppedAfterList,
- });
-
- if (!isDefined(singleDragResult.position)) {
- return;
- }
-
- onBeforeRecordsUpdate?.([singleDragResult]);
+ onBeforeRecordsUpdate?.(updatedRecords);
+ for (const { id, position } of updatedRecords) {
updateOneRecord({
objectNameSingular,
- idToUpdate: singleDragResult.id,
- updateOneRecordInput: {
- position: singleDragResult.position,
- },
+ idToUpdate: id,
+ updateOneRecordInput: { position },
});
- } else {
- const targetRecordId = allSparseRecordIds.at(
- recordDropResult.destination.index,
- );
-
- if (!isDefined(targetRecordId)) {
- throw new Error(
- `Target record id cannot be found, this should not happen`,
- );
- }
-
- const existingOriginalDragSelection = store.get(originalDragSelection);
-
- const multiDragResult = processMultiDrag({
- draggedRecordId,
- targetRecordId: targetRecordId ?? '',
- selectedRecordIds: existingOriginalDragSelection,
- recordsWithPosition: contiguousRecordsWithPosition,
- isDroppedAfterList,
- });
-
- onBeforeRecordsUpdate?.(multiDragResult.recordUpdates);
-
- for (const update of multiDragResult.recordUpdates) {
- updateOneRecord({
- objectNameSingular,
- idToUpdate: update.id,
- updateOneRecordInput: {
- position: update.position,
- },
- });
- }
}
},
[
- objectNameSingular,
- recordIndexId,
- selectedRowIds,
store,
- updateOneRecord,
+ recordIndexId,
+ objectNameSingular,
openDialog,
- currentRecordSorts,
- originalDragSelection,
- allRecordIdsWithoutGroup,
+ updateOneRecord,
onBeforeRecordsUpdate,
+ allRecordIdsWithoutGroupCallbackState,
+ draggedRecordIdsCallbackState,
+ currentRecordSortsCallbackState,
],
);
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useStartRecordDrag.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useStartRecordDrag.ts
index b9453990a61..158bf2384d6 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useStartRecordDrag.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useStartRecordDrag.ts
@@ -3,110 +3,52 @@ import { useCallback } from 'react';
import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
-import { isMultiDragActiveComponentState } from '@/object-record/record-drag/states/isMultiDragActiveComponentState';
-import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
-
-import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-export const useStartRecordDrag = (contextStoreInstanceId?: string) => {
+export const useStartRecordDrag = () => {
const store = useStore();
- const isMultiDragActiveCallbackState = useAtomComponentStateCallbackState(
- isMultiDragActiveComponentState,
- contextStoreInstanceId,
- );
+ const isDraggingRecordCallbackState = useAtomComponentStateCallbackState(
+ isDraggingRecordComponentState,
+ );
const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(
draggedRecordIdsComponentState,
- contextStoreInstanceId,
);
-
- const isRecordIdPrimaryDragMultipleCallbackState =
- useAtomComponentFamilyStateCallbackState(
- isRecordIdPrimaryDragMultipleComponentFamilyState,
- contextStoreInstanceId,
- );
-
const isRecordIdSecondaryDragMultipleCallbackState =
useAtomComponentFamilyStateCallbackState(
isRecordIdSecondaryDragMultipleComponentFamilyState,
- contextStoreInstanceId,
- );
-
- const primaryDraggedRecordIdCallbackState =
- useAtomComponentStateCallbackState(
- primaryDraggedRecordIdComponentState,
- contextStoreInstanceId,
);
- const originalSelection = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- contextStoreInstanceId,
- );
-
- const isDraggingRecord = useAtomComponentStateCallbackState(
- isDraggingRecordComponentState,
- contextStoreInstanceId,
- );
-
const startRecordDrag = useCallback(
(draggedRecordId: string, selectedRecordIds: string[]) => {
- store.set(isDraggingRecord, true);
-
- const dragOperationType = getDragOperationType({
- draggedRecordId,
- selectedRecordIds,
- });
-
- if (dragOperationType === 'multi') {
- store.set(isMultiDragActiveCallbackState, true);
- store.set(draggedRecordIdsCallbackState, selectedRecordIds);
- store.set(primaryDraggedRecordIdCallbackState, draggedRecordId);
- store.set(originalSelection, selectedRecordIds);
-
- store.set(
- isRecordIdPrimaryDragMultipleCallbackState({
- recordId: draggedRecordId,
- }),
- true,
- );
-
- const secondaryDraggedIds = selectedRecordIds.filter(
- (recordIdToFilter) => recordIdToFilter !== draggedRecordId,
- );
-
- for (const secondaryDraggedId of secondaryDraggedIds) {
+ // Dragging a selected record moves the whole selection
+ const draggedRecordIds =
+ selectedRecordIds.includes(draggedRecordId) &&
+ selectedRecordIds.length > 1
+ ? selectedRecordIds
+ : [draggedRecordId];
+
+ store.set(isDraggingRecordCallbackState, true);
+ store.set(draggedRecordIdsCallbackState, draggedRecordIds);
+
+ for (const recordId of draggedRecordIds) {
+ if (recordId !== draggedRecordId) {
store.set(
- isRecordIdSecondaryDragMultipleCallbackState({
- recordId: secondaryDraggedId,
- }),
+ isRecordIdSecondaryDragMultipleCallbackState({ recordId }),
true,
);
}
- } else {
- store.set(isMultiDragActiveCallbackState, true);
- store.set(draggedRecordIdsCallbackState, [draggedRecordId]);
- store.set(primaryDraggedRecordIdCallbackState, draggedRecordId);
- store.set(originalSelection, [draggedRecordId]);
}
},
[
store,
- isMultiDragActiveCallbackState,
+ isDraggingRecordCallbackState,
draggedRecordIdsCallbackState,
- primaryDraggedRecordIdCallbackState,
- originalSelection,
- isDraggingRecord,
isRecordIdSecondaryDragMultipleCallbackState,
- isRecordIdPrimaryDragMultipleCallbackState,
],
);
- return {
- startRecordDrag,
- };
+ return { startRecordDrag };
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/draggedRecordIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/draggedRecordIdsComponentState.ts
index d13d347150e..8c3de0e0be5 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/draggedRecordIdsComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/states/draggedRecordIdsComponentState.ts
@@ -1,4 +1,4 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
export const draggedRecordIdsComponentState = createAtomComponentState<
@@ -6,5 +6,5 @@ export const draggedRecordIdsComponentState = createAtomComponentState<
>({
key: 'draggedRecordIdsComponentState',
defaultValue: [],
- componentInstanceContext: ContextStoreComponentInstanceContext,
+ componentInstanceContext: RecordSelectionComponentInstanceContext,
});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/isDraggingRecordComponentState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/isDraggingRecordComponentState.ts
index e6bd49cdabd..f8b02ea3f32 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/isDraggingRecordComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/states/isDraggingRecordComponentState.ts
@@ -1,10 +1,10 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
export const isDraggingRecordComponentState = createAtomComponentState<boolean>(
{
key: 'isDraggingRecordComponentState',
defaultValue: false,
- componentInstanceContext: ContextStoreComponentInstanceContext,
+ componentInstanceContext: RecordSelectionComponentInstanceContext,
},
);
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/isMultiDragActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/isMultiDragActiveComponentState.ts
deleted file mode 100644
index 0a504be4e27..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/isMultiDragActiveComponentState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-
-export const isMultiDragActiveComponentState =
- createAtomComponentState<boolean>({
- key: 'isMultiDragActiveComponentState',
- defaultValue: false,
- componentInstanceContext: ContextStoreComponentInstanceContext,
- });
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState.ts
deleted file mode 100644
index ec39565de8d..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';
-
-export const isRecordIdPrimaryDragMultipleComponentFamilyState =
- createAtomComponentFamilyState<boolean, { recordId: string }>({
- key: 'isRecordIdPrimaryDragMultipleComponentFamilyState',
- defaultValue: false,
- componentInstanceContext: ContextStoreComponentInstanceContext,
- });
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState.ts
index 658ec18f545..d7940c17316 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState.ts
@@ -1,9 +1,9 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';
export const isRecordIdSecondaryDragMultipleComponentFamilyState =
createAtomComponentFamilyState<boolean, { recordId: string }>({
key: 'isRecordIdSecondaryDragMultipleComponentFamilyState',
defaultValue: false,
- componentInstanceContext: ContextStoreComponentInstanceContext,
+ componentInstanceContext: RecordSelectionComponentInstanceContext,
});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/originalDragSelectionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/originalDragSelectionComponentState.ts
deleted file mode 100644
index 2a1f7fc09f2..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/originalDragSelectionComponentState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-
-export const originalDragSelectionComponentState = createAtomComponentState<
- string[]
->({
- key: 'originalDragSelectionComponentState',
- defaultValue: [],
- componentInstanceContext: ContextStoreComponentInstanceContext,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/states/primaryDraggedRecordIdComponentState.ts b/packages/twenty-front/src/modules/object-record/record-drag/states/primaryDraggedRecordIdComponentState.ts
deleted file mode 100644
index bc226059b17..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/states/primaryDraggedRecordIdComponentState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-
-export const primaryDraggedRecordIdComponentState = createAtomComponentState<
- string | null
->({
- key: 'primaryDraggedRecordIdComponentState',
- defaultValue: null,
- componentInstanceContext: ContextStoreComponentInstanceContext,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/types/DragOperationType.ts b/packages/twenty-front/src/modules/object-record/record-drag/types/DragOperationType.ts
deleted file mode 100644
index c4ef561b110..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/types/DragOperationType.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type DragOperationType = 'single' | 'multi';
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/types/MultiDragResult.ts b/packages/twenty-front/src/modules/object-record/record-drag/types/MultiDragResult.ts
deleted file mode 100644
index 0d09a6c8cab..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/types/MultiDragResult.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
-
-export type MultiDragResult = {
- recordUpdates: RecordWithPosition[];
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragDropResult.ts b/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragDropResult.ts
index c67b07f97f0..42c6bf3bb3f 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragDropResult.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragDropResult.ts
@@ -1,11 +1,6 @@
export type RecordDragDropResult = {
- draggableId: string;
- source: {
- droppableId: string;
- index: number;
- };
- destination: {
- droppableId: string;
- index: number;
- } | null;
+ draggedRecordId: string;
+ sourceDroppableId: string;
+ destinationDroppableId: string;
+ destinationIndex: number;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/computeDroppedRecordPositions.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/computeDroppedRecordPositions.test.ts
new file mode 100644
index 00000000000..824fd1d900f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/computeDroppedRecordPositions.test.ts
@@ -0,0 +1,119 @@
+import { computeDroppedRecordPositions } from '@/object-record/record-drag/utils/computeDroppedRecordPositions';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import {
+ jotaiStore,
+ resetJotaiStore,
+} from '@/ui/utilities/state/jotai/jotaiStore';
+
+const setRecordPositions = (positionByRecordId: Record<string, number>) => {
+ for (const [recordId, position] of Object.entries(positionByRecordId)) {
+ jotaiStore.set(recordStoreFamilyState.atomFamily(recordId), {
+ id: recordId,
+ position,
+ __typename: 'Record',
+ } as ObjectRecord);
+ }
+};
+
+const getPosition = (
+ positions: { id: string; position: number }[],
+ recordId: string,
+) => positions.find(({ id }) => id === recordId)?.position;
+
+describe('computeDroppedRecordPositions', () => {
+ beforeEach(() => {
+ resetJotaiStore();
+ setRecordPositions({ a: 1, b: 2, c: 3, x: 10, y: 11 });
+ });
+
+ it('should place records in order in an empty destination', () => {
+ expect(
+ computeDroppedRecordPositions({
+ destinationRecordIds: [],
+ destinationIndex: 0,
+ draggedRecordId: 'x',
+ draggedRecordIds: ['x', 'y'],
+ store: jotaiStore,
+ }),
+ ).toEqual([
+ { id: 'x', position: 1 },
+ { id: 'y', position: 2 },
+ ]);
+ });
+
+ it('should place a record from another group before the record at the drop index', () => {
+ const positions = computeDroppedRecordPositions({
+ destinationRecordIds: ['a', 'b', 'c'],
+ destinationIndex: 1,
+ draggedRecordId: 'x',
+ draggedRecordIds: ['x'],
+ store: jotaiStore,
+ });
+
+ const position = getPosition(positions, 'x');
+
+ expect(position).toBeGreaterThan(1);
+ expect(position).toBeLessThan(2);
+ });
+
+ it('should place a record dropped past the end after the last record', () => {
+ const positions = computeDroppedRecordPositions({
+ destinationRecordIds: ['a', 'b', 'c'],
+ destinationIndex: 3,
+ draggedRecordId: 'x',
+ draggedRecordIds: ['x'],
+ store: jotaiStore,
+ });
+
+ expect(getPosition(positions, 'x')).toBeGreaterThan(3);
+ });
+
+ it('should place a record moved down within its group after the target record', () => {
+ const positions = computeDroppedRecordPositions({
+ destinationRecordIds: ['a', 'b', 'c'],
+ destinationIndex: 1,
+ draggedRecordId: 'a',
+ draggedRecordIds: ['a'],
+ store: jotaiStore,
+ });
+
+ const position = getPosition(positions, 'a');
+
+ expect(position).toBeGreaterThan(2);
+ expect(position).toBeLessThan(3);
+ });
+
+ it('should keep dragged records together and in order in another group', () => {
+ const positions = computeDroppedRecordPositions({
+ destinationRecordIds: ['a', 'b', 'c'],
+ destinationIndex: 1,
+ draggedRecordId: 'x',
+ draggedRecordIds: ['x', 'y'],
+ store: jotaiStore,
+ });
+
+ const xPosition = getPosition(positions, 'x') ?? 0;
+ const yPosition = getPosition(positions, 'y') ?? 0;
+
+ expect(xPosition).toBeGreaterThan(1);
+ expect(yPosition).toBeGreaterThan(xPosition);
+ expect(yPosition).toBeLessThan(2);
+ });
+
+ it('should keep dragged records together after the last record when dropped past the end', () => {
+ const positions = computeDroppedRecordPositions({
+ destinationRecordIds: ['a', 'b', 'c'],
+ destinationIndex: 3,
+ draggedRecordId: 'x',
+ draggedRecordIds: ['x', 'y'],
+ store: jotaiStore,
+ });
+
+ const xPosition = getPosition(positions, 'x') ?? 0;
+ const yPosition = getPosition(positions, 'y') ?? 0;
+
+ expect(xPosition).toBeGreaterThan(3);
+ expect(yPosition).toBeGreaterThan(xPosition);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getDragOperationType.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getDragOperationType.test.ts
deleted file mode 100644
index 603f33374e6..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getDragOperationType.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
-
-describe('getDragOperationType', () => {
- it('should return single when dragged record is not selected', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-1',
- selectedRecordIds: ['record-2', 'record-3'],
- });
-
- expect(result).toBe('single');
- });
-
- it('should return single when dragged record is selected but only one record is selected', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-1',
- selectedRecordIds: ['record-1'],
- });
-
- expect(result).toBe('single');
- });
-
- it('should return multi when dragged record is selected and multiple records are selected', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-1',
- selectedRecordIds: ['record-1', 'record-2', 'record-3'],
- });
-
- expect(result).toBe('multi');
- });
-
- it('should return single when no records are selected', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-1',
- selectedRecordIds: [],
- });
-
- expect(result).toBe('single');
- });
-
- it('should return multi when dragged record is in middle of selection', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-2',
- selectedRecordIds: ['record-1', 'record-2', 'record-3'],
- });
-
- expect(result).toBe('multi');
- });
-
- it('should return multi when dragged record is last in selection', () => {
- const result = getDragOperationType({
- draggedRecordId: 'record-3',
- selectedRecordIds: ['record-1', 'record-2', 'record-3'],
- });
-
- expect(result).toBe('multi');
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processMultiDrag.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processMultiDrag.test.ts
deleted file mode 100644
index 5532e0388bf..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processMultiDrag.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { processMultiDrag } from '@/object-record/record-drag/utils/processMultiDrag';
-import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
-
-describe('processMultiDrag', () => {
- const recordsWithPosition: RecordWithPosition[] = [
- { id: 'record-1', position: 1000 },
- { id: 'record-2', position: 2000 },
- { id: 'record-3', position: 3000 },
- { id: 'record-4', position: 4000 },
- ];
-
- it('should process multi drag for table and drop at the end', () => {
- const selectedRecordIds = ['record-1', 'record-2', 'record-3'];
-
- const dragResult = processMultiDrag({
- draggedRecordId: 'record-2',
- targetRecordId: 'record-4',
- selectedRecordIds,
- recordsWithPosition,
- isDroppedAfterList: true,
- });
-
- expect(dragResult.recordUpdates).toEqual([
- { id: 'record-1', position: 4001 },
- { id: 'record-2', position: 4002 },
- { id: 'record-3', position: 4003 },
- ]);
- });
-
- it('should throw error when destination is null', () => {
- const selectedRecordIds = ['record-1', 'record-2'];
-
- expect(() => {
- processMultiDrag({
- draggedRecordId: 'record-1',
- targetRecordId: '',
- selectedRecordIds,
- recordsWithPosition,
- isDroppedAfterList: false,
- });
- }).toThrow('Cannot find item to move for id : ');
- });
-
- it('should handle single record in selection', () => {
- const selectedRecordIds = ['record-1'];
-
- const dragResult = processMultiDrag({
- draggedRecordId: 'record-1',
- targetRecordId: 'record-3',
- selectedRecordIds,
- recordsWithPosition,
- isDroppedAfterList: false,
- });
-
- expect(dragResult.recordUpdates).toEqual([
- { id: 'record-1', position: 3500 },
- ]);
- });
-
- it('should handle empty selection', () => {
- const selectedRecordIds: string[] = [];
-
- const dragResult = processMultiDrag({
- draggedRecordId: 'record-1',
- targetRecordId: 'record-3',
- selectedRecordIds,
- recordsWithPosition,
- isDroppedAfterList: false,
- });
-
- expect(dragResult.recordUpdates).toEqual([]);
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processSingleDrag.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processSingleDrag.test.ts
deleted file mode 100644
index e467fc57271..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/processSingleDrag.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { processSingleDrag } from '@/object-record/record-drag/utils/processSingleDrag';
-import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
-
-describe('processSingleDrag', () => {
- const mockRecordPositionData: RecordWithPosition[] = [
- { id: 'record-1', position: 1000 },
- { id: 'record-2', position: 2000 },
- { id: 'record-3', position: 3000 },
- ];
-
- it('should process single drag at end of list', () => {
- const dragResult = processSingleDrag({
- sourceRecordId: 'record-1',
- targetRecordId: 'record-3',
- recordsWithPosition: mockRecordPositionData,
- isDroppedAfterList: true,
- });
-
- expect(dragResult).toEqual({
- id: 'record-1',
- position: 3001,
- });
- });
-
- it('should process single drag at beginning', () => {
- const dragResult = processSingleDrag({
- sourceRecordId: 'record-3',
- targetRecordId: 'record-1',
- recordsWithPosition: mockRecordPositionData,
- isDroppedAfterList: false,
- });
-
- expect(dragResult).toEqual({
- id: 'record-3',
- position: 999,
- });
- });
-
- it('should process single drag in between from before', () => {
- const dragResult = processSingleDrag({
- sourceRecordId: 'record-1',
- targetRecordId: 'record-2',
- recordsWithPosition: mockRecordPositionData,
- isDroppedAfterList: false,
- });
-
- expect(dragResult).toEqual({
- id: 'record-1',
- position: 2500,
- });
- });
-
- it('should process single drag in between from after', () => {
- const dragResult = processSingleDrag({
- sourceRecordId: 'record-3',
- targetRecordId: 'record-2',
- recordsWithPosition: mockRecordPositionData,
- isDroppedAfterList: false,
- });
-
- expect(dragResult).toEqual({
- id: 'record-3',
- position: 1500,
- });
- });
-
- it('should process single drag from other list', () => {
- const dragResult = processSingleDrag({
- sourceRecordId: 'record-4',
- targetRecordId: 'record-2',
- recordsWithPosition: mockRecordPositionData,
- isDroppedAfterList: false,
- });
-
- expect(dragResult).toEqual({
- id: 'record-4',
- position: 1500,
- });
- });
-
- it('should handle empty record list', () => {
- expect(() =>
- processSingleDrag({
- sourceRecordId: 'record-1',
- targetRecordId: 'record-1',
- recordsWithPosition: [],
- isDroppedAfterList: false,
- }),
- ).toThrow('Cannot find item to move for id : record-1');
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/computeDroppedRecordPositions.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/computeDroppedRecordPositions.ts
new file mode 100644
index 00000000000..2ba73f9be01
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/computeDroppedRecordPositions.ts
@@ -0,0 +1,69 @@
+import type { Store } from 'jotai/vanilla/store';
+import { isDefined } from 'twenty-shared/utils';
+
+import { extractRecordPositions } from '@/object-record/record-drag/utils/extractRecordPositions';
+import {
+ computeNewPositionOfDraggedRecord,
+ type RecordWithPosition,
+} from '@/object-record/utils/computeNewPositionOfDraggedRecord';
+import { computeNewPositionsOfDraggedRecords } from '@/object-record/utils/computeNewPositionsOfDraggedRecords';
+
+type ComputeDroppedRecordPositionsArgs = {
+ destinationRecordIds: string[];
+ destinationIndex: number;
+ draggedRecordId: string;
+ draggedRecordIds: string[];
+ store: Store;
+};
+
+export const computeDroppedRecordPositions = ({
+ destinationRecordIds,
+ destinationIndex,
+ draggedRecordId,
+ draggedRecordIds,
+ store,
+}: ComputeDroppedRecordPositionsArgs): RecordWithPosition[] => {
+ if (destinationRecordIds.length === 0) {
+ return draggedRecordIds.map((recordId, index) => ({
+ id: recordId,
+ position: index + 1,
+ }));
+ }
+
+ const isDroppedAfterList = destinationIndex >= destinationRecordIds.length;
+
+ const targetRecordId = isDroppedAfterList
+ ? destinationRecordIds.at(-1)
+ : destinationRecordIds.at(destinationIndex);
+
+ if (!isDefined(targetRecordId)) {
+ throw new Error('Target record id cannot be found, this should not happen');
+ }
+
+ const recordsWithPosition = extractRecordPositions(
+ destinationRecordIds.filter(isDefined),
+ store,
+ );
+
+ if (draggedRecordIds.length > 1) {
+ return computeNewPositionsOfDraggedRecords({
+ arrayOfRecordsWithPosition: recordsWithPosition,
+ draggedRecordId,
+ targetRecordId,
+ sourceRecordIds: draggedRecordIds,
+ isDroppedAfterList,
+ });
+ }
+
+ return [
+ {
+ id: draggedRecordId,
+ position: computeNewPositionOfDraggedRecord({
+ arrayOfRecordsWithPosition: recordsWithPosition,
+ idOfItemToMove: draggedRecordId,
+ idOfTargetItem: targetRecordId,
+ isDroppedAfterList,
+ }),
+ },
+ ];
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getDragOperationType.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getDragOperationType.ts
deleted file mode 100644
index 46a2bb02ed9..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getDragOperationType.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { type DragOperationType } from '@/object-record/record-drag/types/DragOperationType';
-
-type DragOperationContext = {
- draggedRecordId: string;
- selectedRecordIds: string[];
-};
-
-export const getDragOperationType = ({
- draggedRecordId,
- selectedRecordIds,
-}: DragOperationContext): DragOperationType => {
- const isDraggedItemSelected = selectedRecordIds.includes(draggedRecordId);
- const hasMultipleSelected = selectedRecordIds.length > 1;
-
- return isDraggedItemSelected && hasMultipleSelected ? 'multi' : 'single';
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/processGroupDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/processGroupDrop.ts
deleted file mode 100644
index 610666e878d..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/processGroupDrop.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import type { Store } from 'jotai/vanilla/store';
-import { isDefined } from 'twenty-shared/utils';
-
-import { processSingleDrag } from '@/object-record/record-drag/utils/processSingleDrag';
-import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
-import { type RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition';
-import { extractRecordPositions } from './extractRecordPositions';
-import { getDragOperationType } from './getDragOperationType';
-import { processMultiDrag } from './processMultiDrag';
-
-type ProcessGroupDropParams = {
- droppableId: string;
- draggableId: string;
- targetIndex: number;
- store: Store;
- selectedRecordIds: string[];
- recordIdsByGroupFamilyState: any;
- onUpdateRecord: (
- update: {
- recordId: string;
- position?: number;
- },
- targetRecordGroupId: RecordGroupDefinition['value'],
- ) => void;
-};
-
-export const processGroupDrop = ({
- droppableId,
- draggableId,
- targetIndex,
- store,
- selectedRecordIds,
- recordIdsByGroupFamilyState,
- onUpdateRecord,
-}: ProcessGroupDropParams) => {
- const recordGroup = store.get(
- recordGroupDefinitionFamilyState.atomFamily(droppableId),
- );
-
- if (!isDefined(recordGroup)) {
- throw new Error('Record group is not defined');
- }
-
- const targetRecordIds = store.get(
- recordIdsByGroupFamilyState(droppableId),
- ) as string[];
-
- const dragOperationType = getDragOperationType({
- draggedRecordId: draggableId,
- selectedRecordIds,
- });
-
- const targetGroupIsEmpty = targetRecordIds.length === 0;
-
- if (targetGroupIsEmpty) {
- if (dragOperationType === 'single') {
- onUpdateRecord(
- {
- recordId: draggableId,
- position: 1,
- },
- recordGroup.value,
- );
- } else {
- for (const [index, selectedRecordId] of selectedRecordIds.entries()) {
- onUpdateRecord(
- {
- recordId: selectedRecordId,
- position: index + 1,
- },
- recordGroup.value,
- );
- }
- }
-
- return;
- }
-
- const recordsWithPosition = extractRecordPositions(targetRecordIds, store);
-
- const isDroppedAfterList = targetIndex >= recordsWithPosition.length;
-
- const targetRecord = isDroppedAfterList
- ? recordsWithPosition.at(-1)
- : recordsWithPosition.at(targetIndex);
-
- if (!isDefined(targetRecord)) {
- throw new Error(
- `targetRecord cannot be found in passed recordsWithPosition, this should not happen.`,
- );
- }
-
- if (dragOperationType === 'single') {
- const singleDragResult = processSingleDrag({
- sourceRecordId: draggableId,
- targetRecordId: targetRecord.id,
- recordsWithPosition: recordsWithPosition,
- isDroppedAfterList,
- });
-
- if (!isDefined(singleDragResult.position)) {
- return;
- }
-
- onUpdateRecord(
- {
- recordId: singleDragResult.id,
- position: singleDragResult.position,
- },
- recordGroup.value,
- );
- } else {
- const multiDragResult = processMultiDrag({
- draggedRecordId: draggableId,
- selectedRecordIds,
- recordsWithPosition,
- targetRecordId: targetRecord.id,
- isDroppedAfterList,
- });
-
- for (const update of multiDragResult.recordUpdates) {
- onUpdateRecord(
- {
- recordId: update.id,
- position: update.position,
- },
- recordGroup.value,
- );
- }
- }
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/processMultiDrag.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/processMultiDrag.ts
deleted file mode 100644
index 77853ed9b11..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/processMultiDrag.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { type MultiDragResult } from '@/object-record/record-drag/types/MultiDragResult';
-import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
-import { computeNewPositionsOfDraggedRecords } from '@/object-record/utils/computeNewPositionsOfDraggedRecords';
-
-type MultiDragContext = {
- draggedRecordId: string;
- targetRecordId: string;
- selectedRecordIds: string[];
- recordsWithPosition: RecordWithPosition[];
- isDroppedAfterList: boolean;
-};
-
-export const processMultiDrag = ({
- draggedRecordId,
- targetRecordId,
- selectedRecordIds,
- recordsWithPosition,
- isDroppedAfterList,
-}: MultiDragContext): MultiDragResult => {
- const newPositionOfDraggedRecords = computeNewPositionsOfDraggedRecords({
- arrayOfRecordsWithPosition: recordsWithPosition,
- draggedRecordId,
- targetRecordId,
- sourceRecordIds: selectedRecordIds,
- isDroppedAfterList,
- });
-
- return {
- recordUpdates: newPositionOfDraggedRecords ?? [],
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/processSingleDrag.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/processSingleDrag.ts
deleted file mode 100644
index 5cac8a3b477..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/processSingleDrag.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
- computeNewPositionOfDraggedRecord,
- type RecordWithPosition,
-} from '@/object-record/utils/computeNewPositionOfDraggedRecord';
-
-type SingleDragContext = {
- targetRecordId: string;
- sourceRecordId: string;
- recordsWithPosition: RecordWithPosition[];
- isDroppedAfterList: boolean;
-};
-
-export const processSingleDrag = ({
- targetRecordId,
- sourceRecordId,
- recordsWithPosition,
- isDroppedAfterList,
-}: SingleDragContext): RecordWithPosition => {
- const newPosition = computeNewPositionOfDraggedRecord({
- arrayOfRecordsWithPosition: recordsWithPosition,
- idOfItemToMove: sourceRecordId,
- idOfTargetItem: targetRecordId,
- isDroppedAfterList,
- });
-
- return {
- id: sourceRecordId,
- position: newPosition,
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
index 88b4e83a91e..7d988b902e3 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
@@ -11,7 +11,7 @@ import { RecordIndexCalendarContainer } from '@/object-record/record-index/compo
import { RecordIndexEmptyStateNotShared } from '@/object-record/record-index/components/RecordIndexEmptyStateNotShared';
import { RecordIndexFiltersToContextStoreEffect } from '@/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect';
import { useHasCurrentViewNonReadableFields } from '@/object-record/record-index/hooks/useHasCurrentViewNonReadableFields';
-import { RecordListContainer } from '@/object-record/record-list/components/RecordListContainer';
+import { RecordList } from '@/object-record/record-list/components/RecordList';
import { ViewType } from '@/views/types/ViewType';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -69,10 +69,7 @@ export const RecordIndexContainer = () => {
)}
{recordIndexViewType === ViewType.LIST && (
<StyledContainerWithPadding>
- <RecordListContainer
- objectNameSingular={objectNameSingular}
- viewBarInstanceId={recordIndexId}
- />
+ <RecordList />
</StyledContainerWithPadding>
)}
</>
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
index cfc4a1eb3d7..1b77140dd2a 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx
@@ -16,7 +16,7 @@ import { RecordIndexViewFieldsSSESyncEffect } from '@/object-record/record-index
import { useHandleIndexIdentifierClick } from '@/object-record/record-index/hooks/useHandleIndexIdentifierClick';
import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record-index/hooks/useRecordIndexFieldMetadataDerivedStates';
import { useRecordIndexIdFromCurrentContextStore } from '@/object-record/record-index/hooks/useRecordIndexIdFromCurrentContextStore';
-import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass';
+import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndexDragSelectBoundaryClass';
import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx
index 7f86d218baf..66c5b5552d6 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx
@@ -1,27 +1,22 @@
-import { useEffect, useMemo } from 'react';
+import { type PrimitiveAtom, useStore } from 'jotai';
+import { useEffect } from 'react';
import { contextStoreAnyFieldFilterValueComponentState } from '@/context-store/states/contextStoreAnyFieldFilterValueComponentState';
import { contextStoreFilterGroupsComponentState } from '@/context-store/states/contextStoreFilterGroupsComponentState';
import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
import { contextStoreRecordIdsInSelectionOrderComponentState } from '@/context-store/states/contextStoreRecordIdsInSelectionOrderComponentState';
-import {
- contextStoreTargetedRecordsRuleComponentState,
- type ContextStoreTargetedRecordsRule,
-} from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
import { orderRecordIdsBySelection } from '@/context-store/utils/orderRecordIdsBySelection';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
-import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';
import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
-import { unselectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { atom, useStore } from 'jotai';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
export const RecordIndexFiltersToContextStoreEffect = () => {
@@ -49,13 +44,13 @@ export const RecordIndexFiltersToContextStoreEffect = () => {
recordIndexId,
);
- const selectedRecordIds = useAtomComponentSelectorValue(
- selectedRecordIdsComponentSelector,
+ const recordIndexAllRecordIds = useAtomComponentSelectorValue(
+ recordIndexAllRecordIdsComponentSelector,
recordIndexId,
);
- const unselectedRecordIds = useAtomComponentSelectorValue(
- unselectedRecordIdsComponentSelector,
+ const selectedRecordIds = useAtomComponentSelectorValue(
+ selectedRecordIdsComponentSelector,
recordIndexId,
);
@@ -82,139 +77,66 @@ export const RecordIndexFiltersToContextStoreEffect = () => {
contextStoreAnyFieldFilterValueComponentState,
);
- const syncWriteAtom = useMemo(
- () =>
- atom(
- null,
- (
- get,
- set,
- payload: {
- filters: RecordFilter[];
- filterGroups: RecordFilterGroup[];
- anyFieldFilterValue: string;
- },
- ) => {
- let newRule: ContextStoreTargetedRecordsRule;
-
- if (hasUserSelectedAllRecords) {
- newRule = {
- mode: 'exclusion',
- excludedRecordIds: unselectedRecordIds,
- };
- } else {
- newRule = {
- mode: 'selection',
- selectedRecordIds,
- };
- }
-
- const currentRule = get(contextStoreTargetedRecordsRuleAtom);
- if (!isDeeplyEqual(currentRule, newRule)) {
- set(contextStoreTargetedRecordsRuleAtom, newRule);
- }
-
- const currentRecordIdsInSelectionOrder = get(
- contextStoreRecordIdsInSelectionOrderAtom,
- );
- const newRecordIdsInSelectionOrder = orderRecordIdsBySelection({
- previousRecordIdsInSelectionOrder: currentRecordIdsInSelectionOrder,
- selectedRecordIds: hasUserSelectedAllRecords
- ? []
- : selectedRecordIds,
- });
- if (
- !isDeeplyEqual(
- currentRecordIdsInSelectionOrder,
- newRecordIdsInSelectionOrder,
- )
- ) {
- set(
- contextStoreRecordIdsInSelectionOrderAtom,
- newRecordIdsInSelectionOrder,
- );
- }
+ useEffect(() => {
+ const setIfChanged = <TValue,>(
+ atom: PrimitiveAtom<TValue>,
+ value: TValue,
+ ) => {
+ if (!isDeeplyEqual(store.get(atom), value)) {
+ store.set(atom, value);
+ }
+ };
- const currentFilters = get(contextStoreFiltersAtom);
- if (!isDeeplyEqual(currentFilters, payload.filters)) {
- set(contextStoreFiltersAtom, payload.filters);
- }
+ const selectedRecordIdSet = new Set(selectedRecordIds);
- const currentFilterGroups = get(contextStoreFilterGroupsAtom);
- if (!isDeeplyEqual(currentFilterGroups, payload.filterGroups)) {
- set(contextStoreFilterGroupsAtom, payload.filterGroups);
+ setIfChanged(
+ contextStoreTargetedRecordsRuleAtom,
+ hasUserSelectedAllRecords
+ ? {
+ mode: 'exclusion',
+ excludedRecordIds: recordIndexAllRecordIds.filter(
+ (recordId) => !selectedRecordIdSet.has(recordId),
+ ),
}
+ : { mode: 'selection', selectedRecordIds },
+ );
- const currentAnyFieldFilter = get(
- contextStoreAnyFieldFilterValueAtom,
- );
- if (currentAnyFieldFilter !== payload.anyFieldFilterValue) {
- set(
- contextStoreAnyFieldFilterValueAtom,
- payload.anyFieldFilterValue,
- );
- }
- },
- ),
- [
- hasUserSelectedAllRecords,
- selectedRecordIds,
- unselectedRecordIds,
- contextStoreTargetedRecordsRuleAtom,
+ setIfChanged(
contextStoreRecordIdsInSelectionOrderAtom,
- contextStoreFiltersAtom,
- contextStoreFilterGroupsAtom,
- contextStoreAnyFieldFilterValueAtom,
- ],
- );
-
- const resetWriteAtom = useMemo(
- () =>
- atom(null, (get, set) => {
- const currentRule = get(contextStoreTargetedRecordsRuleAtom);
- const resetRule: ContextStoreTargetedRecordsRule = {
- mode: 'selection',
- selectedRecordIds: [],
- };
- if (!isDeeplyEqual(currentRule, resetRule)) {
- set(contextStoreTargetedRecordsRuleAtom, resetRule);
- }
-
- const currentFilters = get(contextStoreFiltersAtom);
- if (!isDeeplyEqual(currentFilters, [])) {
- set(contextStoreFiltersAtom, []);
- }
-
- const currentAnyFieldFilter = get(contextStoreAnyFieldFilterValueAtom);
- if (currentAnyFieldFilter !== '') {
- set(contextStoreAnyFieldFilterValueAtom, '');
- }
+ orderRecordIdsBySelection({
+ previousRecordIdsInSelectionOrder: store.get(
+ contextStoreRecordIdsInSelectionOrderAtom,
+ ),
+ selectedRecordIds: hasUserSelectedAllRecords ? [] : selectedRecordIds,
}),
- [
- contextStoreTargetedRecordsRuleAtom,
- contextStoreFiltersAtom,
- contextStoreAnyFieldFilterValueAtom,
- ],
- );
+ );
- useEffect(() => {
- store.set(syncWriteAtom, {
- filters: currentRecordFilters,
- filterGroups: currentRecordFilterGroups,
- anyFieldFilterValue,
- });
+ setIfChanged(contextStoreFiltersAtom, currentRecordFilters);
+ setIfChanged(contextStoreFilterGroupsAtom, currentRecordFilterGroups);
+ setIfChanged(contextStoreAnyFieldFilterValueAtom, anyFieldFilterValue);
return () => {
- store.set(resetWriteAtom);
+ setIfChanged(contextStoreTargetedRecordsRuleAtom, {
+ mode: 'selection',
+ selectedRecordIds: [],
+ });
+ setIfChanged(contextStoreFiltersAtom, []);
+ setIfChanged(contextStoreAnyFieldFilterValueAtom, '');
};
}, [
- currentRecordFilters,
- currentRecordFilterGroups,
anyFieldFilterValue,
+ contextStoreAnyFieldFilterValueAtom,
+ contextStoreFilterGroupsAtom,
+ contextStoreFiltersAtom,
+ contextStoreRecordIdsInSelectionOrderAtom,
+ contextStoreTargetedRecordsRuleAtom,
+ currentRecordFilterGroups,
+ currentRecordFilters,
+ hasUserSelectedAllRecords,
+ recordIndexAllRecordIds,
+ selectedRecordIds,
store,
- syncWriteAtom,
- resetWriteAtom,
]);
- return <></>;
+ return null;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx
index 5fdda57ae62..2d2ea8aeb2a 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx
@@ -1,10 +1,7 @@
import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';
import { RecordIndexTableContainerEffect } from '@/object-record/record-index/components/RecordIndexTableContainerEffect';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';
-import { isDialogOpenedComponentState } from '@/ui/layout/dialog/states/isDialogOpenedComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
type RecordIndexTableContainerProps = {
recordTableId: string;
@@ -13,14 +10,9 @@ type RecordIndexTableContainerProps = {
export const RecordIndexTableContainer = ({
recordTableId,
}: RecordIndexTableContainerProps) => {
- const { objectNameSingular, viewBarInstanceId, recordIndexId } =
+ const { objectNameSingular, viewBarInstanceId } =
useRecordIndexContextOrThrow();
- const isDialogOpened = useAtomComponentStateValue(
- isDialogOpenedComponentState,
- getRecordIndexRemoveSortingModalId(recordIndexId),
- );
-
return (
<>
<RecordIndexTableContainerEffect />
@@ -29,7 +21,7 @@ export const RecordIndexTableContainer = ({
objectNameSingular={objectNameSingular}
viewBarId={viewBarInstanceId}
/>
- {isDialogOpened && <RecordIndexRemoveSortingModal />}
+ <RecordIndexRemoveSortingModal />
</>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx b/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx
index ea247ffd32b..71a0f602260 100644
--- a/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx
@@ -1,5 +1,4 @@
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { RecordListContainer } from '@/object-record/record-list/components/RecordListContainer';
+import { RecordList } from '@/object-record/record-list/components/RecordList';
import { styled } from '@linaria/react';
const StyledListContainer = styled.div`
@@ -11,15 +10,9 @@ const StyledListContainer = styled.div`
`;
export const RecordListWidget = () => {
- const { objectNameSingular, viewBarInstanceId } =
- useRecordIndexContextOrThrow();
-
return (
<StyledListContainer>
- <RecordListContainer
- objectNameSingular={objectNameSingular}
- viewBarInstanceId={viewBarInstanceId}
- />
+ <RecordList />
</StyledListContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx
index 0d415039b10..40419c1533f 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx
@@ -1,9 +1,11 @@
+import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';
import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
import { RecordListBody } from '@/object-record/record-list/components/RecordListBody';
import { RecordListDragDropProvider } from '@/object-record/record-list/components/RecordListDragDropProvider';
import { RecordListFieldTooltip } from '@/object-record/record-list/components/RecordListFieldTooltip';
import { RecordListRecordGroupsBody } from '@/object-record/record-list/components/RecordListRecordGroupsBody';
import { RecordListResponsiveFieldsEffect } from '@/object-record/record-list/components/RecordListResponsiveFieldsEffect';
+import { RecordListSSESubscribeEffect } from '@/object-record/record-list/components/RecordListSSESubscribeEffect';
import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';
import { RecordSelectionEscapeHotkeyEffect } from '@/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
@@ -38,6 +40,8 @@ export const RecordList = () => {
<StyledContainer ref={setContainerElement}>
<RecordListResponsiveFieldsEffect containerElement={containerElement} />
<RecordSelectionEscapeHotkeyEffect />
+ <RecordListSSESubscribeEffect />
+ <RecordIndexRemoveSortingModal />
<RecordListFieldTooltip>
<ScrollWrapper
componentInstanceId={`scroll-wrapper-record-list-${recordListId}`}
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
index 71d21ec02e2..128996451b4 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
@@ -3,7 +3,7 @@ import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPe
import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
import { useCurrentRecordGroupDefinition } from '@/object-record/record-group/hooks/useCurrentRecordGroupDefinition';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
@@ -37,7 +37,7 @@ const StyledAddNewRow = styled.button`
export const RecordListAddNew = () => {
const theme = useTheme();
- const { objectMetadataItem } = useRecordListContextOrThrow();
+ const { objectMetadataItem } = useRecordIndexContextOrThrow();
const { enqueueToast } = useToast();
const { createNewIndexRecord } = useCreateNewIndexRecord({
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
index eb93448c2c2..de03206d496 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
@@ -1,8 +1,8 @@
import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useRecordIndexTableQuery';
import { RecordListEmptyState } from '@/object-record/record-list/components/RecordListEmptyState';
import { RecordListRecords } from '@/object-record/record-list/components/RecordListRecords';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
-import { RecordSelectionRecordIdsEffect } from '@/object-record/record-selection/components/RecordSelectionRecordIdsEffect';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { RecordListRecordsEffect } from '@/object-record/record-list/components/RecordListRecordsEffect';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
@@ -12,29 +12,34 @@ const StyledBody = styled.div`
`;
export const RecordListBody = () => {
- const { objectNameSingular } = useRecordListContextOrThrow();
+ const { objectNameSingular } = useRecordIndexContextOrThrow();
const { records, loading, error, hasNextPage, fetchMoreRecords } =
useRecordIndexTableQuery(objectNameSingular);
const isEmpty = !loading && !isDefined(error) && records.length === 0;
- if (isEmpty) {
- return <RecordListEmptyState />;
- }
-
return (
- <StyledBody>
- {!isDefined(error) && (
- <RecordSelectionRecordIdsEffect records={records} />
- )}
- <RecordListRecords
+ <>
+ <RecordListRecordsEffect
records={records}
loading={loading}
error={error}
- hasNextPage={hasNextPage}
- fetchMoreRecords={fetchMoreRecords}
/>
- </StyledBody>
+ {isEmpty ? (
+ <RecordListEmptyState />
+ ) : (
+ <StyledBody>
+ {!isDefined(error) && (
+ <RecordListRecords
+ records={records}
+ loading={loading}
+ hasNextPage={hasNextPage}
+ fetchMoreRecords={fetchMoreRecords}
+ />
+ )}
+ </StyledBody>
+ )}
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListContainer.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListContainer.tsx
deleted file mode 100644
index fcb0d00acbf..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListContainer.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
-import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';
-import { RecordList } from '@/object-record/record-list/components/RecordList';
-import { RecordListSSESubscribeEffect } from '@/object-record/record-list/components/RecordListSSESubscribeEffect';
-import { RecordListContextProvider } from '@/object-record/record-list/contexts/RecordListContext';
-import { isDialogOpenedComponentState } from '@/ui/layout/dialog/states/isDialogOpenedComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-
-type RecordListContainerProps = {
- objectNameSingular: string;
- viewBarInstanceId: string;
-};
-
-export const RecordListContainer = ({
- objectNameSingular,
- viewBarInstanceId,
-}: RecordListContainerProps) => {
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular,
- });
-
- const objectPermissions = useObjectPermissionsForObject(
- objectMetadataItem.id,
- );
-
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
- const isDialogOpened = useAtomComponentStateValue(
- isDialogOpenedComponentState,
- getRecordIndexRemoveSortingModalId(recordIndexId),
- );
-
- return (
- <RecordListContextProvider
- value={{
- viewBarInstanceId,
- objectNameSingular,
- objectMetadataItem,
- objectPermissions,
- }}
- >
- <RecordList />
- <RecordListSSESubscribeEffect />
- {isDialogOpened && <RecordIndexRemoveSortingModal />}
- </RecordListContextProvider>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDraggableRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDraggableRow.tsx
index 099704a5897..893601baab9 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDraggableRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDraggableRow.tsx
@@ -1,10 +1,12 @@
import { useSortable } from '@dnd-kit/react/sortable';
import { styled } from '@linaria/react';
-import { useIsRecordSecondaryDragged } from '@/object-record/record-drag/hooks/useIsRecordSecondaryDragged';
+import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';
import { RecordListRow } from '@/object-record/record-list/components/RecordListRow';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { RECORD_LIST_ROW_DND_TYPE } from '@/object-record/record-list/constants/RecordListRowDndType';
import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
import { DND_KIT_PLUGINS_WITHOUT_OPTIMISTIC } from '@/ui/utilities/drag-and-drop/constants/DndKitPluginsWithoutOptimistic';
@@ -35,8 +37,14 @@ export const RecordListDraggableRow = ({
index,
droppableId,
}: RecordListDraggableRowProps) => {
- const { objectPermissions } = useRecordListContextOrThrow();
- const { isSecondaryDragged } = useIsRecordSecondaryDragged(recordId);
+ const { objectMetadataItem } = useRecordIndexContextOrThrow();
+ const objectPermissions = useObjectPermissionsForObject(
+ objectMetadataItem.id,
+ );
+ const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
+ isRecordIdSecondaryDragMultipleComponentFamilyState,
+ { recordId },
+ );
const rowDragData: RecordDragData = {
droppableId,
@@ -59,7 +67,7 @@ export const RecordListDraggableRow = ({
return (
<StyledDraggableRow
- $isDragSourceFaded={isDragSource || isSecondaryDragged}
+ $isDragSourceFaded={isDragSource || isRecordIdSecondaryDragMultiple}
onDragStart={preventNativeDragStart}
>
<RecordListRow recordId={recordId} rowRef={ref} />
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyRecordGroupEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyRecordGroupEffect.tsx
deleted file mode 100644
index 470109875f1..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyRecordGroupEffect.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
-import { emptyRecordGroupByIdComponentFamilyState } from '@/object-record/record-group/states/emptyRecordGroupByIdComponentFamilyState';
-import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
-import { useEffect } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-
-type RecordListEmptyRecordGroupEffectProps = {
- loading: boolean;
- error?: Error;
- records: ObjectRecord[];
-};
-
-export const RecordListEmptyRecordGroupEffect = ({
- loading,
- error,
- records,
-}: RecordListEmptyRecordGroupEffectProps) => {
- const currentRecordGroupId = useCurrentRecordGroupId();
-
- const [, setEmptyRecordGroupById] = useAtomComponentFamilyState(
- emptyRecordGroupByIdComponentFamilyState,
- currentRecordGroupId,
- );
-
- const [, setRecordIndexRecordIdsByGroup] = useAtomComponentFamilyState(
- recordIndexRecordIdsByGroupComponentFamilyState,
- currentRecordGroupId,
- );
-
- useEffect(() => {
- if (loading || isDefined(error)) {
- return;
- }
-
- setRecordIndexRecordIdsByGroup(records.map((record) => record.id));
- setEmptyRecordGroupById(records.length === 0);
- }, [
- loading,
- error,
- records,
- setEmptyRecordGroupById,
- setRecordIndexRecordIdsByGroup,
- ]);
-
- return null;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx
index bc4b2acfde5..4c7757512f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx
@@ -5,7 +5,8 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filte
import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
import { RecordIndexEmptyState } from '@/object-record/record-index/components/RecordIndexEmptyState';
import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { SettingsPath } from 'twenty-shared/types';
@@ -13,12 +14,12 @@ import { isDefined } from 'twenty-shared/utils';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const RecordListEmptyState = () => {
- const {
- objectMetadataItem,
- objectNameSingular,
- objectPermissions,
- viewBarInstanceId,
- } = useRecordListContextOrThrow();
+ const { objectMetadataItem, objectNameSingular, viewBarInstanceId } =
+ useRecordIndexContextOrThrow();
+
+ const objectPermissions = useObjectPermissionsForObject(
+ objectMetadataItem.id,
+ );
const navigate = useNavigateSettings();
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroup.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroup.tsx
index 588ed4eae69..1a4d591f617 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroup.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroup.tsx
@@ -1,13 +1,14 @@
import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
import { useShouldHideRecordGroup } from '@/object-record/record-group/hooks/useShouldHideRecordGroup';
import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useRecordIndexTableQuery';
-import { RecordListEmptyRecordGroupEffect } from '@/object-record/record-list/components/RecordListEmptyRecordGroupEffect';
import { RecordListRecordGroupSection } from '@/object-record/record-list/components/RecordListRecordGroupSection';
import { RecordListRecords } from '@/object-record/record-list/components/RecordListRecords';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { RecordListRecordsEffect } from '@/object-record/record-list/components/RecordListRecordsEffect';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { isRecordListGroupSectionToggledComponentState } from '@/object-record/record-list/states/isRecordListGroupSectionToggledComponentState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { styled } from '@linaria/react';
+import { isDefined } from 'twenty-shared/utils';
const StyledSection = styled.div`
display: flex;
@@ -16,7 +17,7 @@ const StyledSection = styled.div`
`;
export const RecordListRecordGroup = () => {
- const { objectNameSingular } = useRecordListContextOrThrow();
+ const { objectNameSingular } = useRecordIndexContextOrThrow();
const currentRecordGroupId = useCurrentRecordGroupId();
@@ -30,26 +31,26 @@ export const RecordListRecordGroup = () => {
currentRecordGroupId,
);
- if (shouldHideRecordGroup) {
- return null;
- }
-
return (
- <StyledSection>
- <RecordListEmptyRecordGroupEffect
- loading={loading}
- error={error}
- records={records}
- />
- <RecordListRecordGroupSection />
- <RecordListRecords
+ <>
+ <RecordListRecordsEffect
records={records}
loading={loading}
error={error}
- hasNextPage={hasNextPage}
- fetchMoreRecords={fetchMoreRecords}
- isVisible={isRecordListGroupSectionToggled}
/>
- </StyledSection>
+ {!shouldHideRecordGroup && (
+ <StyledSection>
+ <RecordListRecordGroupSection />
+ {isRecordListGroupSectionToggled && !isDefined(error) && (
+ <RecordListRecords
+ records={records}
+ loading={loading}
+ hasNextPage={hasNextPage}
+ fetchMoreRecords={fetchMoreRecords}
+ />
+ )}
+ </StyledSection>
+ )}
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroupSection.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroupSection.tsx
index 839f359ebea..9c0aaa8fe5b 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroupSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordGroupSection.tsx
@@ -5,7 +5,7 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s
import { recordIndexAggregateDisplayLabelComponentState } from '@/object-record/record-index/states/recordIndexAggregateDisplayLabelComponentState';
import { recordIndexAggregateDisplayValueForGroupValueComponentFamilyState } from '@/object-record/record-index/states/recordIndexAggregateDisplayValueForGroupValueComponentFamilyState';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { isRecordListGroupSectionToggledComponentState } from '@/object-record/record-list/states/isRecordListGroupSectionToggledComponentState';
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
@@ -24,7 +24,7 @@ const StyledSectionHeader = styled.div`
`;
export const RecordListRecordGroupSection = () => {
- const { objectMetadataItem } = useRecordListContextOrThrow();
+ const { objectMetadataItem } = useRecordIndexContextOrThrow();
const currentRecordGroupId = useCurrentRecordGroupId();
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecords.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecords.tsx
index 771c0fb94fc..5c675dfaa63 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecords.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecords.tsx
@@ -1,17 +1,10 @@
-import { pointerIntersection } from '@dnd-kit/collision';
-import { useDroppable } from '@dnd-kit/react';
-import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { RecordDragEndDropZone } from '@/object-record/record-drag/components/RecordDragEndDropZone';
import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
import { RecordListAddNew } from '@/object-record/record-list/components/RecordListAddNew';
import { RecordListDraggableRow } from '@/object-record/record-list/components/RecordListDraggableRow';
-import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';
import { RECORD_LIST_ROW_DND_TYPE } from '@/object-record/record-list/constants/RecordListRowDndType';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
-import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { useInView } from 'react-intersection-observer';
@@ -21,49 +14,25 @@ const StyledFetchMoreTrigger = styled.div`
height: 0;
`;
-const StyledEndDropZone = styled.div`
- position: relative;
- width: 100%;
-`;
-
type RecordListRecordsProps = {
records: ObjectRecord[];
loading: boolean;
- error?: Error;
hasNextPage: boolean;
fetchMoreRecords: () => void;
- isVisible?: boolean;
};
export const RecordListRecords = ({
records,
loading,
- error,
hasNextPage,
fetchMoreRecords,
- isVisible = true,
}: RecordListRecordsProps) => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
const { recordGroupId } = useContext(RecordGroupContext);
const droppableId = isDefined(recordGroupId)
? recordGroupId
: NO_RECORD_GROUP_FAMILY_KEY;
- const isDraggingRecord = useAtomComponentStateValue(
- isDraggingRecordComponentState,
- recordIndexId,
- );
-
- // Catches drops past the last row, where no row is under the pointer
- const { ref: endDropZoneRef } = useDroppable({
- id: droppableId,
- accept: RECORD_LIST_ROW_DND_TYPE,
- collisionPriority: DND_KIT_COLLISION_PRIORITY,
- collisionDetector: pointerIntersection,
- data: { droppableId },
- });
-
const { ref: fetchMoreRef } = useInView({
onChange: (inView) => {
if (inView && hasNextPage && !loading) {
@@ -74,32 +43,22 @@ export const RecordListRecords = ({
return (
<>
- <RecordListUpsertRecordsInStoreEffect records={records} />
- {isVisible && !isDefined(error) && (
- <>
- {records.map((record, index) => (
- <RecordListDraggableRow
- key={record.id}
- recordId={record.id}
- index={index}
- droppableId={droppableId}
- />
- ))}
- {hasNextPage && !loading && (
- <StyledFetchMoreTrigger ref={fetchMoreRef} />
- )}
- <StyledEndDropZone ref={endDropZoneRef}>
- <DragDropItemDropTarget
- index={records.length}
- droppableId={droppableId}
- orientation="horizontal"
- compact={!isDraggingRecord}
- seamAligned
- />
- {!loading && <RecordListAddNew />}
- </StyledEndDropZone>
- </>
- )}
+ {records.map((record, index) => (
+ <RecordListDraggableRow
+ key={record.id}
+ recordId={record.id}
+ index={index}
+ droppableId={droppableId}
+ />
+ ))}
+ {hasNextPage && !loading && <StyledFetchMoreTrigger ref={fetchMoreRef} />}
+ <RecordDragEndDropZone
+ droppableId={droppableId}
+ dndType={RECORD_LIST_ROW_DND_TYPE}
+ index={records.length}
+ >
+ {!loading && <RecordListAddNew />}
+ </RecordDragEndDropZone>
</>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordsEffect.tsx
new file mode 100644
index 00000000000..39e61e4f5c6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRecordsEffect.tsx
@@ -0,0 +1,57 @@
+import { useContext, useEffect } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';
+import { emptyRecordGroupByIdComponentFamilyState } from '@/object-record/record-group/states/emptyRecordGroupByIdComponentFamilyState';
+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
+import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';
+
+type RecordListRecordsEffectProps = {
+ records: ObjectRecord[];
+ loading: boolean;
+ error?: Error;
+};
+
+export const RecordListRecordsEffect = ({
+ records,
+ loading,
+ error,
+}: RecordListRecordsEffectProps) => {
+ const { recordGroupId } = useContext(RecordGroupContext);
+ const recordGroupFamilyKey = recordGroupId ?? NO_RECORD_GROUP_FAMILY_KEY;
+
+ const { upsertRecordsInStore } = useUpsertRecordsInStore();
+
+ const setRecordIndexRecordIdsByGroup = useSetAtomComponentFamilyState(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ recordGroupFamilyKey,
+ );
+
+ const setEmptyRecordGroupById = useSetAtomComponentFamilyState(
+ emptyRecordGroupByIdComponentFamilyState,
+ recordGroupFamilyKey,
+ );
+
+ useEffect(() => {
+ upsertRecordsInStore({ partialRecords: records });
+
+ if (loading || isDefined(error)) {
+ return;
+ }
+
+ setRecordIndexRecordIdsByGroup(records.map((record) => record.id));
+ setEmptyRecordGroupById(records.length === 0);
+ }, [
+ error,
+ loading,
+ records,
+ setEmptyRecordGroupById,
+ setRecordIndexRecordIdsByGroup,
+ upsertRecordsInStore,
+ ]);
+
+ return null;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
index e266224253d..6853d1a5528 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
@@ -7,7 +7,6 @@ import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/u
import { RecordListRowField } from '@/object-record/record-list/components/RecordListRowField';
import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';
import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';
import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';
import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';
@@ -81,7 +80,7 @@ type RecordListRowProps = {
};
export const RecordListRow = ({ recordId, rowRef }: RecordListRowProps) => {
- const { objectNameSingular } = useRecordListContextOrThrow();
+ const { objectNameSingular } = useRecordIndexContextOrThrow();
const {
labelIdentifierFieldMetadataItem,
fieldDefinitionByFieldMetadataItemId,
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowDragOverlay.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowDragOverlay.tsx
index 7d3c03b2251..e0f255de70c 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowDragOverlay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowDragOverlay.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme';
-import { RecordDragMultiDragPreview } from '@/object-record/record-drag/components/RecordDragMultiDragPreview';
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';
import { RecordListRow } from '@/object-record/record-list/components/RecordListRow';
@@ -30,7 +30,7 @@ export const RecordListRowDragOverlay = ({
return (
<StyledRowDragOverlay>
<RecordListRow recordId={sourceData.recordId} />
- <RecordDragMultiDragPreview recordId={sourceData.recordId} />
+ <RecordDragMultiDragCounterChip />
</StyledRowDragOverlay>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListSSESubscribeEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListSSESubscribeEffect.tsx
index a3ab570a10c..b286d7fac3f 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListSSESubscribeEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListSSESubscribeEffect.tsx
@@ -1,6 +1,6 @@
import { useRefetchFindManyRecords } from '@/object-record/hooks/useRefetchFindManyRecords';
import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams';
-import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';
import { useListenToEventsForQuery } from '@/sse-db-event/hooks/useListenToEventsForQuery';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
@@ -11,7 +11,7 @@ export const RecordListSSESubscribeEffect = () => {
);
const { objectNameSingular, objectMetadataItem } =
- useRecordListContextOrThrow();
+ useRecordIndexContextOrThrow();
const { filter, orderBy } =
useFindManyRecordIndexTableParams(objectNameSingular);
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx
index bd52c528884..f6e284af865 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx
@@ -1,10 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fireEvent, userEvent, waitFor, within } from 'storybook/test';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { RecordList } from '@/object-record/record-list/components/RecordList';
-import { RecordListContextProvider } from '@/object-record/record-list/contexts/RecordListContext';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
import { FileUploadDecorator } from '~/testing/decorators/FileUploadDecorator';
@@ -15,27 +12,7 @@ import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
-const RecordListRowStory = () => {
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: 'company',
- });
- const objectPermissions = useObjectPermissionsForObject(
- objectMetadataItem.id,
- );
-
- return (
- <RecordListContextProvider
- value={{
- viewBarInstanceId: 'view-bar',
- objectNameSingular: 'company',
- objectMetadataItem,
- objectPermissions,
- }}
- >
- <RecordList />
- </RecordListContextProvider>
- );
-};
+const RecordListRowStory = () => <RecordList />;
const meta: Meta<typeof RecordListRowStory> = {
title: 'Modules/ObjectRecord/RecordList/RecordListRow',
diff --git a/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts b/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts
deleted file mode 100644
index a7c5f5c9603..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
-import { createRequiredContext } from '~/utils/createRequiredContext';
-
-type RecordListContextValue = {
- viewBarInstanceId: string;
- objectNameSingular: string;
- objectMetadataItem: EnrichedObjectMetadataItem;
- objectPermissions: ObjectPermissionsWithObjectMetadataId;
-};
-
-export const [RecordListContextProvider, useRecordListContextOrThrow] =
- createRequiredContext<RecordListContextValue>('RecordListContext');
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx
index cb22007156b..dd15b492036 100644
--- a/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx
@@ -3,19 +3,17 @@ import { type RefObject, useCallback } from 'react';
import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
-import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass';
+import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndexDragSelectBoundaryClass';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
type RecordSelectionDragSelectProps = {
selectableItemsContainerRef: RefObject<HTMLElement | null>;
- scrollWrapperComponentInstanceId?: string;
onDragSelectionStart?: () => void;
onDragSelectionEnd?: () => void;
};
export const RecordSelectionDragSelect = ({
selectableItemsContainerRef,
- scrollWrapperComponentInstanceId,
onDragSelectionStart,
onDragSelectionEnd,
}: RecordSelectionDragSelectProps) => {
@@ -64,7 +62,6 @@ export const RecordSelectionDragSelect = ({
return (
<DragSelect
selectableItemsContainerRef={selectableItemsContainerRef}
- scrollWrapperComponentInstanceId={scrollWrapperComponentInstanceId}
onDragSelectionStart={onDragSelectionStart}
onDragSelectionChange={handleDragSelectionChange}
onDragSelectionEnd={handleDragSelectionEnd}
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsx
index 08f70da7f02..fe74571eedd 100644
--- a/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsx
@@ -1,32 +1,17 @@
import { Key } from 'ts-key-enum';
import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';
-import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';
import { PageFocusId } from '@/types/PageFocusId';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
export const RecordSelectionEscapeHotkeyEffect = () => {
const { resetRecordSelection } = useResetRecordSelection();
- const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(
- isAtLeastOneRecordSelectedComponentSelector,
- );
-
- const handleEscape = () => {
- if (isAtLeastOneRecordSelected) {
- resetRecordSelection();
- }
- };
-
useHotkeysOnFocusedElement({
keys: [Key.Escape],
- callback: handleEscape,
+ callback: resetRecordSelection,
focusId: PageFocusId.RecordIndex,
- dependencies: [handleEscape],
- options: {
- preventDefault: true,
- },
+ dependencies: [resetRecordSelection],
});
return null;
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts
index 0fecc85be6c..300380423a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts
+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts
@@ -15,7 +15,7 @@ export const useOpenRecordContextMenu = () => {
isRecordSelectedComponentFamilyState,
);
- const { isCommandMenuAvailable, openCommandMenuDropdownAtCursor } =
+ const { openCommandMenuDropdownAtCursor } =
useOpenCommandMenuDropdownAtCursor();
const openRecordContextMenu = useCallback(
@@ -26,22 +26,15 @@ export const useOpenRecordContextMenu = () => {
event: CommandMenuDropdownTriggerEvent;
recordId: string;
}) => {
- if (!isCommandMenuAvailable) {
- return;
- }
-
// Opening the menu can close the side panel, which resets the selection
// in layout customization mode
- openCommandMenuDropdownAtCursor(event);
+ if (!openCommandMenuDropdownAtCursor(event)) {
+ return;
+ }
store.set(isRecordSelectedFamilyState(recordId), true);
},
- [
- isCommandMenuAvailable,
- isRecordSelectedFamilyState,
- openCommandMenuDropdownAtCursor,
- store,
- ],
+ [isRecordSelectedFamilyState, openCommandMenuDropdownAtCursor, store],
);
return { openRecordContextMenu };
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.ts
deleted file mode 100644
index 6e20d39ee7e..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
-import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
-import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';
-
-export const isAtLeastOneRecordSelectedComponentSelector =
- createAtomComponentSelector<boolean>({
- key: 'isAtLeastOneRecordSelectedComponentSelector',
- componentInstanceContext: RecordSelectionComponentInstanceContext,
- get:
- ({ instanceId }) =>
- ({ get }) => {
- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {
- instanceId,
- });
-
- return allRecordIds.some((recordId) =>
- get(isRecordSelectedComponentFamilyState, {
- instanceId,
- familyKey: recordId,
- }),
- );
- },
- });
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.ts
deleted file mode 100644
index 542cd980bc9..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
-import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
-import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';
-
-export const unselectedRecordIdsComponentSelector = createAtomComponentSelector<
- string[]
->({
- key: 'unselectedRecordIdsComponentSelector',
- componentInstanceContext: RecordSelectionComponentInstanceContext,
- areEqual: isDeeplyEqual,
- get:
- ({ instanceId }) =>
- ({ get }) => {
- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {
- instanceId,
- });
-
- return allRecordIds.filter(
- (recordId) =>
- get(isRecordSelectedComponentFamilyState, {
- instanceId,
- familyKey: recordId,
- }) === false,
- );
- },
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-store/components/UpsertRecordsInStoreEffect.tsx
similarity index 74%
rename from packages/twenty-front/src/modules/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect.tsx
rename to packages/twenty-front/src/modules/object-record/record-store/components/UpsertRecordsInStoreEffect.tsx
index 83cc58ff2a0..cb6d9380283 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-store/components/UpsertRecordsInStoreEffect.tsx
@@ -2,13 +2,13 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { useEffect } from 'react';
-type RecordListUpsertRecordsInStoreEffectProps = {
+type UpsertRecordsInStoreEffectProps = {
records: ObjectRecord[];
};
-export const RecordListUpsertRecordsInStoreEffect = ({
+export const UpsertRecordsInStoreEffect = ({
records,
-}: RecordListUpsertRecordsInStoreEffectProps) => {
+}: UpsertRecordsInStoreEffectProps) => {
const { upsertRecordsInStore } = useUpsertRecordsInStore();
useEffect(() => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyContextProvider.tsx
new file mode 100644
index 00000000000..c9b13607078
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyContextProvider.tsx
@@ -0,0 +1,46 @@
+import { RecordTableBodyContextValueProvider } 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 { useCloseRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCell';
+import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';
+import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';
+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { type ReactNode } from 'react';
+
+type RecordTableBodyContextProviderProps = {
+ children?: ReactNode;
+};
+
+export const RecordTableBodyContextProvider = ({
+ children,
+}: RecordTableBodyContextProviderProps) => {
+ const { recordTableId } = useRecordTableContextOrThrow();
+
+ const { openTableCell } = useOpenRecordTableCell(recordTableId);
+ const { moveFocus } = useRecordTableMoveFocusedCell(recordTableId);
+ const { closeTableCell } = useCloseRecordTableCell();
+ const { moveHoverToCurrentCell } = useMoveHoverToCurrentCell(recordTableId);
+ const { openRecordContextMenu } = useOpenRecordContextMenu();
+
+ const hasUserSelectedAllRecords = useAtomComponentStateValue(
+ hasUserSelectedAllRecordsComponentState,
+ recordTableId,
+ );
+
+ return (
+ <RecordTableBodyContextValueProvider
+ value={{
+ onOpenTableCell: openTableCell,
+ onMoveFocus: moveFocus,
+ onCloseTableCell: closeTableCell,
+ onMoveHoverToCurrentCell: moveHoverToCurrentCell,
+ openRecordContextMenu,
+ hasUserSelectedAllRecords,
+ }}
+ >
+ {children}
+ </RecordTableBodyContextValueProvider>
+ );
+};
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
deleted file mode 100644
index bb461d4f66f..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-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 { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
-import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';
-import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';
-import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';
-import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { type ReactNode } from 'react';
-
-type RecordTableNoRecordGroupBodyContextProviderProps = {
- children?: ReactNode;
-};
-
-export const RecordTableNoRecordGroupBodyContextProvider = ({
- children,
-}: RecordTableNoRecordGroupBodyContextProviderProps) => {
- const { recordTableId } = useRecordTableContextOrThrow();
-
- const { openTableCell } = useOpenRecordTableCell(recordTableId);
-
- const handleOpenTableCell = (args: OpenTableCellArgs) => {
- openTableCell(args);
- };
-
- const { moveFocus } = useRecordTableMoveFocusedCell(recordTableId);
-
- const handleMoveFocus = (direction: MoveFocusDirection) => {
- moveFocus(direction);
- };
-
- const { closeTableCellNoGroup } = useCloseRecordTableCellNoGroup();
-
- const handleCloseTableCell = () => {
- closeTableCellNoGroup();
- };
-
- const { moveHoverToCurrentCell } = useMoveHoverToCurrentCell(recordTableId);
-
- const handleMoveHoverToCurrentCell = (cellPosition: TableCellPosition) => {
- moveHoverToCurrentCell(cellPosition);
- };
-
- const { openRecordContextMenu } = useOpenRecordContextMenu();
-
- const handleCommandMenuDropdown = (
- event: React.MouseEvent,
- recordId: string,
- ) => {
- openRecordContextMenu({ event, recordId });
- };
-
- const hasUserSelectedAllRecords = useAtomComponentStateValue(
- hasUserSelectedAllRecordsComponentState,
- recordTableId,
- );
-
- return (
- <RecordTableBodyContextProvider
- value={{
- onOpenTableCell: handleOpenTableCell,
- onMoveFocus: handleMoveFocus,
- onCloseTableCell: handleCloseTableCell,
- onMoveHoverToCurrentCell: handleMoveHoverToCurrentCell,
- onCommandMenuDropdownOpened: handleCommandMenuDropdown,
- hasUserSelectedAllRecords,
- }}
- >
- {children}
- </RecordTableBodyContextProvider>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
index a250282a006..21841ae8b62 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
@@ -1,20 +1,15 @@
-import { pointerIntersection } from '@dnd-kit/collision';
-import { useDroppable } from '@dnd-kit/react';
import { styled } from '@linaria/react';
import { getContiguousIncrementalValues } from 'twenty-shared/utils';
-import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { RecordTableNoRecordGroupAddNew } from '@/object-record/record-table/components/RecordTableNoRecordGroupAddNew';
-import { RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID } from '@/object-record/record-table/constants/RecordTableNoRecordGroupDroppableId';
+import { RecordDragEndDropZone } from '@/object-record/record-drag/components/RecordDragEndDropZone';
+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';
import { RecordTableRowVirtualizedContainer } from '@/object-record/record-table/virtualization/components/RecordTableRowVirtualizedContainer';
import { RecordTableVirtualizedBodyPlaceholder } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedBodyPlaceholder';
import { RecordTableVirtualizedDebugHelper } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedDebugHelper';
import { NUMBER_OF_VIRTUALIZED_ROWS } from '@/object-record/record-table/virtualization/constants/NumberOfVirtualizedRows';
import { totalNumberOfRecordsToVirtualizeComponentState } from '@/object-record/record-table/virtualization/states/totalNumberOfRecordsToVirtualizeComponentState';
-import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
-import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
const StyledNoRecordGroupContainer = styled.div`
@@ -23,24 +18,12 @@ const StyledNoRecordGroupContainer = styled.div`
width: 100%;
`;
-const StyledEndDropZone = styled.div`
- position: relative;
- width: 100%;
-`;
-
export const RecordTableNoRecordGroupRows = () => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
const totalNumberOfRecordsToVirtualize =
useAtomComponentStateValue(
totalNumberOfRecordsToVirtualizeComponentState,
) ?? 0;
- const isDraggingRecord = useAtomComponentStateValue(
- isDraggingRecordComponentState,
- recordIndexId,
- );
-
const numberOfRows = Math.min(
totalNumberOfRecordsToVirtualize,
NUMBER_OF_VIRTUALIZED_ROWS,
@@ -48,15 +31,6 @@ export const RecordTableNoRecordGroupRows = () => {
const virtualRowIndices = getContiguousIncrementalValues(numberOfRows);
- // Catches drops past the last row, where no row sortable is under the pointer.
- const { ref: endDropZoneRef } = useDroppable({
- id: RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID,
- accept: RECORD_TABLE_ROW_DND_TYPE,
- collisionPriority: DND_KIT_COLLISION_PRIORITY,
- collisionDetector: pointerIntersection,
- data: { droppableId: RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID },
- });
-
return (
<StyledNoRecordGroupContainer>
<RecordTableVirtualizedBodyPlaceholder />
@@ -68,17 +42,13 @@ export const RecordTableNoRecordGroupRows = () => {
/>
);
})}
- <StyledEndDropZone ref={endDropZoneRef}>
- {/* Expands during a row drag so the zone stays droppable when the add-new row is hidden. */}
- <DragDropItemDropTarget
- index={totalNumberOfRecordsToVirtualize}
- droppableId={RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID}
- orientation="horizontal"
- compact={!isDraggingRecord}
- seamAligned
- />
+ <RecordDragEndDropZone
+ droppableId={NO_RECORD_GROUP_FAMILY_KEY}
+ dndType={RECORD_TABLE_ROW_DND_TYPE}
+ index={totalNumberOfRecordsToVirtualize}
+ >
<RecordTableNoRecordGroupAddNew />
- </StyledEndDropZone>
+ </RecordDragEndDropZone>
<RecordTableVirtualizedDebugHelper />
</StyledNoRecordGroupContainer>
);
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
deleted file mode 100644
index c54234a023d..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-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 { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
-import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';
-import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';
-import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
-import { type ReactNode } from 'react';
-
-type RecordTableRecordGroupBodyContextProviderProps = {
- children?: ReactNode;
-};
-
-export const RecordTableRecordGroupBodyContextProvider = ({
- children,
-}: RecordTableRecordGroupBodyContextProviderProps) => {
- const { recordTableId } = useRecordTableContextOrThrow();
-
- const { openTableCell } = useOpenRecordTableCell(recordTableId);
-
- const handleOpenTableCell = (args: OpenTableCellArgs) => {
- openTableCell(args);
- };
-
- const { moveFocus } = useRecordTableMoveFocusedCell(recordTableId);
-
- const handleMoveFocus = (direction: MoveFocusDirection) => {
- moveFocus(direction);
- };
-
- const { closeTableCellInGroup } = useCloseRecordTableCellInGroup();
-
- const handlecloseTableCellInGroup = () => {
- closeTableCellInGroup();
- };
-
- const { moveHoverToCurrentCell } = useMoveHoverToCurrentCell(recordTableId);
-
- const handleMoveHoverToCurrentCell = (cellPosition: TableCellPosition) => {
- moveHoverToCurrentCell(cellPosition);
- };
-
- const { openRecordContextMenu } = useOpenRecordContextMenu();
-
- const handleCommandMenuDropdown = (
- event: React.MouseEvent,
- recordId: string,
- ) => {
- openRecordContextMenu({ event, recordId });
- };
-
- return (
- <RecordTableBodyContextProvider
- value={{
- onOpenTableCell: handleOpenTableCell,
- onMoveFocus: handleMoveFocus,
- onCloseTableCell: handlecloseTableCellInGroup,
- onMoveHoverToCurrentCell: handleMoveHoverToCurrentCell,
- onCommandMenuDropdownOpened: handleCommandMenuDropdown,
- }}
- >
- {children}
- </RecordTableBodyContextProvider>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
index 82cd02d1348..aea88aeba02 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
@@ -1,10 +1,6 @@
-import { pointerIntersection } from '@dnd-kit/collision';
-import { useDroppable } from '@dnd-kit/react';
-
-import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { RecordDragEndDropZone } from '@/object-record/record-drag/components/RecordDragEndDropZone';
import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
import { useShouldHideRecordGroup } from '@/object-record/record-group/hooks/useShouldHideRecordGroup';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';
@@ -13,32 +9,16 @@ import { RecordTableRow } from '@/object-record/record-table/record-table-row/co
import { RecordTableRecordGroupSectionAddNew } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew';
import { RecordTableRecordGroupSectionLoadMore } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore';
import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState';
-import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
-import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { styled } from '@linaria/react';
import { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-const StyledRecordGroupDropTarget = styled.div`
- position: relative;
- width: 100%;
-`;
-
export const RecordTableRecordGroupRows = () => {
- const { recordIndexId } = useRecordIndexContextOrThrow();
-
const currentRecordGroupId = useCurrentRecordGroupId();
const shouldHide = useShouldHideRecordGroup(currentRecordGroupId);
- const isDraggingRecord = useAtomComponentStateValue(
- isDraggingRecordComponentState,
- recordIndexId,
- );
-
const allRecordIds = useAtomComponentSelectorValue(
recordIndexAllRecordIdsComponentSelector,
);
@@ -58,14 +38,6 @@ export const RecordTableRecordGroupRows = () => {
[allRecordIds],
);
- const { ref: endDropZoneRef } = useDroppable({
- id: currentRecordGroupId,
- accept: RECORD_TABLE_ROW_DND_TYPE,
- collisionPriority: DND_KIT_COLLISION_PRIORITY,
- collisionDetector: pointerIntersection,
- data: { droppableId: currentRecordGroupId },
- });
-
if (shouldHide) {
return null;
}
@@ -92,19 +64,14 @@ export const RecordTableRecordGroupRows = () => {
/>
);
})}
- <StyledRecordGroupDropTarget ref={endDropZoneRef}>
- {/* Zero footprint at rest; expands during a row drag so the zone
- stays droppable even when neither action row below renders. */}
- <DragDropItemDropTarget
- index={recordIndexRecordIdsByGroup.length}
- droppableId={currentRecordGroupId}
- orientation="horizontal"
- compact={!isDraggingRecord}
- seamAligned
- />
+ <RecordDragEndDropZone
+ droppableId={currentRecordGroupId}
+ dndType={RECORD_TABLE_ROW_DND_TYPE}
+ index={recordIndexRecordIdsByGroup.length}
+ >
<RecordTableRecordGroupSectionLoadMore />
<RecordTableRecordGroupSectionAddNew />
- </StyledRecordGroupDropTarget>
+ </RecordDragEndDropZone>
<RecordTableAggregateFooter
key={currentRecordGroupId}
currentRecordGroupId={currentRecordGroupId}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
index c0a2ad1fb3f..ed7bb3c5a14 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
@@ -4,12 +4,11 @@ import { RecordTable } from '@/object-record/record-table/components/RecordTable
import { RecordTableComponentInstance } from '@/object-record/record-table/components/RecordTableComponentInstance';
import { RecordTableContextProvider } from '@/object-record/record-table/components/RecordTableContextProvider';
import { EntityDeleteContext } from '@/object-record/record-table/contexts/EntityDeleteHookContext';
-import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';
+import { useRecordTableSelectAllHotkeys } from '@/object-record/record-table/hooks/useRecordTableSelectAllHotkeys';
import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow';
import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';
import { RecordTableRecordLimitReloadEffect } from '@/object-record/record-table/virtualization/components/RecordTableRecordLimitReloadEffect';
import { PageFocusId } from '@/types/PageFocusId';
-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { styled } from '@linaria/react';
@@ -39,20 +38,9 @@ export const RecordTableWithWrappers = ({
recordTableId,
viewBarId,
}: RecordTableWithWrappersProps) => {
- const { selectAllRows } = useSelectAllRows(recordTableId);
-
- const handleSelectAllRows = () => {
- selectAllRows();
- };
-
- useHotkeysOnFocusedElement({
- keys: ['ctrl+a,meta+a'],
- callback: handleSelectAllRows,
+ useRecordTableSelectAllHotkeys({
+ recordTableId,
focusId: PageFocusId.RecordIndex,
- dependencies: [handleSelectAllRows],
- options: {
- enableOnFormTags: false,
- },
});
const { activateRecordTableRow } = useActiveRecordTableRow(recordTableId);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
index b790e624ce8..15048b9d7b1 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
@@ -24,7 +24,7 @@ import { visibleRecordFieldsComponentSelector } from '@/object-record/record-fie
import { type RecordField } from '@/object-record/record-field/types/RecordField';
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
import { mockPerformance } from '@/object-record/record-table/components/__stories__/perf/mock';
-import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
+import { RecordTableBodyContextValueProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { RecordTableContextProvider } from '@/object-record/record-table/contexts/RecordTableContext';
import { RecordTableRowContextProvider } from '@/object-record/record-table/contexts/RecordTableRowContext';
@@ -187,13 +187,13 @@ const meta: Meta = {
}}
>
<RecordTableComponentInstance recordTableId="recordTableId">
- <RecordTableBodyContextProvider
+ <RecordTableBodyContextValueProvider
value={{
onOpenTableCell: () => {},
onMoveFocus: () => {},
onCloseTableCell: () => {},
onMoveHoverToCurrentCell: () => {},
- onCommandMenuDropdownOpened: () => {},
+ openRecordContextMenu: () => {},
}}
>
<RecordTableRowContextProvider
@@ -249,7 +249,7 @@ const meta: Meta = {
</RecordTableCellContext.Provider>
</RecordTableRowDraggableContextProvider>
</RecordTableRowContextProvider>
- </RecordTableBodyContextProvider>
+ </RecordTableBodyContextValueProvider>
</RecordTableComponentInstance>
</RecordTableContextProvider>
</RecordComponentInstanceContextsWrapper>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/constants/RecordTableNoRecordGroupDroppableId.ts b/packages/twenty-front/src/modules/object-record/record-table/constants/RecordTableNoRecordGroupDroppableId.ts
deleted file mode 100644
index b1a0525d905..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/constants/RecordTableNoRecordGroupDroppableId.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID =
- 'record-table-no-record-group';
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 086c4067cab..6ee06eeef37 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,25 +1,23 @@
import { type OpenTableCellArgs } from '@/object-record/record-table/types/OpenTableCellArgs';
-import type React from 'react';
-
+import { type CommandMenuDropdownTriggerEvent } from '@/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor';
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';
export type RecordTableBodyContextProps = {
- recordGroupId?: string;
onOpenTableCell: (args: OpenTableCellArgs) => void;
onMoveFocus: (direction: MoveFocusDirection) => void;
onCloseTableCell: () => void;
onMoveHoverToCurrentCell: (cellPosition: TableCellPosition) => void;
- onCommandMenuDropdownOpened: (
- event: React.MouseEvent,
- recordId: string,
- ) => void;
+ openRecordContextMenu: (args: {
+ event: CommandMenuDropdownTriggerEvent;
+ recordId: string;
+ }) => void;
hasUserSelectedAllRecords?: boolean;
};
export const [
- RecordTableBodyContextProvider,
+ RecordTableBodyContextValueProvider,
useRecordTableBodyContextOrThrow,
] = createRequiredContext<RecordTableBodyContextProps>(
'RecordTableBodyContext',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableSelectAllHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableSelectAllHotkeys.ts
new file mode 100644
index 00000000000..95213cb9e77
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableSelectAllHotkeys.ts
@@ -0,0 +1,22 @@
+import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';
+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
+
+export const useRecordTableSelectAllHotkeys = ({
+ recordTableId,
+ focusId,
+}: {
+ recordTableId?: string;
+ focusId: string;
+}) => {
+ const { selectAllRows } = useSelectAllRows(recordTableId);
+
+ useHotkeysOnFocusedElement({
+ keys: ['ctrl+a', 'meta+a'],
+ callback: selectAllRows,
+ focusId,
+ dependencies: [selectAllRows],
+ options: {
+ enableOnFormTags: false,
+ },
+ });
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx
index 3593153208b..fb3f57368a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx
@@ -4,7 +4,7 @@ import { type ReactNode } from 'react';
import { RecordDragDropContextProvider } from '@/object-record/record-drag/components/RecordDragDropContextProvider';
import { useProcessRecordGroupDrop } from '@/object-record/record-drag/hooks/useProcessRecordGroupDrop';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
-import { RecordTableRecordGroupBodyContextProvider } from '@/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider';
+import { RecordTableBodyContextProvider } from '@/object-record/record-table/components/RecordTableBodyContextProvider';
import { RecordTableRowDragOverlayContent } from '@/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
@@ -31,9 +31,9 @@ export const RecordTableBodyRecordGroupDragDropContextProvider = ({
}
onRecordDrop={processRecordGroupDrop}
renderDragOverlay={(source) => (
- <RecordTableRecordGroupBodyContextProvider>
+ <RecordTableBodyContextProvider>
<RecordTableRowDragOverlayContent source={source} />
- </RecordTableRecordGroupBodyContextProvider>
+ </RecordTableBodyContextProvider>
)}
>
{children}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
index 835d27699ed..21678769864 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
@@ -1,5 +1,5 @@
import { recordIndexHasRecordsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexHasRecordsComponentSelector';
-import { RecordTableNoRecordGroupBodyContextProvider } from '@/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider';
+import { RecordTableBodyContextProvider } from '@/object-record/record-table/components/RecordTableBodyContextProvider';
import { RecordTableNoRecordGroupRows } from '@/object-record/record-table/components/RecordTableNoRecordGroupRows';
import { RecordTableBody } from '@/object-record/record-table/record-table-body/components/RecordTableBody';
@@ -29,7 +29,7 @@ export const RecordTableNoRecordGroupBody = () => {
}
return (
- <RecordTableNoRecordGroupBodyContextProvider>
+ <RecordTableBodyContextProvider>
<RecordTableBodyNoRecordGroupDragDropContextProvider>
<RecordTableBody>
<RecordTableNoRecordGroupRows />
@@ -43,6 +43,6 @@ export const RecordTableNoRecordGroupBody = () => {
<RecordTableVirtualizedJunctionDataChangedEffect />
<RecordTableVirtualizedSSESubscribeEffect />
</RecordTableBodyNoRecordGroupDragDropContextProvider>
- </RecordTableNoRecordGroupBodyContextProvider>
+ </RecordTableBodyContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
index c4d4abcb3d3..9d29e4b2953 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
@@ -2,7 +2,7 @@ import { RecordGroupContext } from '@/object-record/record-group/states/context/
import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
import { RecordIndexGroupAggregatesDataLoader } from '@/object-record/record-index/components/RecordIndexGroupAggregatesDataLoader';
import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
-import { RecordTableRecordGroupBodyContextProvider } from '@/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider';
+import { RecordTableBodyContextProvider } from '@/object-record/record-table/components/RecordTableBodyContextProvider';
import { RecordTableRecordGroupRows } from '@/object-record/record-table/components/RecordTableRecordGroupRows';
import { RecordTableBody } from '@/object-record/record-table/record-table-body/components/RecordTableBody';
import { RecordTableBodyLoading } from '@/object-record/record-table/record-table-body/components/RecordTableBodyLoading';
@@ -38,7 +38,7 @@ export const RecordTableRecordGroupsBody = () => {
<>
<RecordTableBodyRecordGroupDragDropContextProvider>
{visibleRecordGroupIds.map((recordGroupId, index) => (
- <RecordTableRecordGroupBodyContextProvider key={recordGroupId}>
+ <RecordTableBodyContextProvider key={recordGroupId}>
<RecordGroupContext.Provider value={{ recordGroupId }}>
<RecordTableBody data-replay-ignore-mutations="true">
<RecordTableRecordGroupSection />
@@ -46,7 +46,7 @@ export const RecordTableRecordGroupsBody = () => {
{index === 0 && <RecordTableCellPortals />}
</RecordTableBody>
</RecordGroupContext.Provider>
- </RecordTableRecordGroupBodyContextProvider>
+ </RecordTableBodyContextProvider>
))}
<RecordTableRecordGroupAddNewGroup />
<RecordIndexGroupAggregatesDataLoader />
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
index adf975aab7a..b46c2e2ab01 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
@@ -1,11 +1,16 @@
import { FieldDisplay } from '@/object-record/record-field/ui/components/FieldDisplay';
import { FieldFocusStaticUnfocusedProvider } from '@/object-record/record-field/ui/contexts/FieldFocusContextProvider';
-import { RecordTableCellContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellContainer';
+import { RecordTableCellBaseContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer';
+import { RecordTableCellDisplayMode } from '@/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode';
export const RecordTableCell = () => {
return (
<FieldFocusStaticUnfocusedProvider>
- <RecordTableCellContainer nonEditModeContent={<FieldDisplay />} />
+ <RecordTableCellBaseContainer>
+ <RecordTableCellDisplayMode>
+ <FieldDisplay />
+ </RecordTableCellDisplayMode>
+ </RecordTableCellBaseContainer>
</FieldFocusStaticUnfocusedProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
deleted file mode 100644
index dbe5a35152b..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { type ReactElement } from 'react';
-
-import { RecordTableCellBaseContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer';
-
-import { RecordTableCellDisplayMode } from './RecordTableCellDisplayMode';
-
-export type RecordTableCellContainerProps = {
- nonEditModeContent: ReactElement;
- transparent?: boolean;
- maxContentWidth?: number;
- onSubmit?: () => void;
- onCancel?: () => void;
-};
-
-export const RecordTableCellContainer = ({
- nonEditModeContent,
-}: RecordTableCellContainerProps) => {
- return (
- <RecordTableCellBaseContainer>
- <RecordTableCellDisplayMode>
- {nonEditModeContent}
- </RecordTableCellDisplayMode>
- </RecordTableCellBaseContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
index 8a15b1e369e..682055c1b1f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
@@ -13,16 +13,12 @@ export const RecordTableCellDisplayMode = ({
const { recordId, isRecordFieldReadOnly: isReadOnly } =
useContext(FieldContext);
- const { onCommandMenuDropdownOpened } = useRecordTableBodyContextOrThrow();
+ const { openRecordContextMenu } = useRecordTableBodyContextOrThrow();
const { openTableCell } = useOpenRecordTableCellFromCell();
const isFieldInputOnly = useIsFieldInputOnly();
- const handleCommandMenuDropdown = (event: React.MouseEvent) => {
- onCommandMenuDropdownOpened(event, recordId);
- };
-
const handleClick = (event: React.MouseEvent) => {
event.stopPropagation();
if (!isFieldInputOnly && !isReadOnly) {
@@ -32,7 +28,7 @@ export const RecordTableCellDisplayMode = ({
return (
<RecordTableCellDisplayContainer
- onContextMenu={handleCommandMenuDropdown}
+ onContextMenu={(event) => openRecordContextMenu({ event, recordId })}
onClick={handleClick}
>
{children}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHotkeysEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHotkeysEffect.tsx
index f1cadf38e06..571f0a066a3 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHotkeysEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHotkeysEffect.tsx
@@ -7,7 +7,7 @@ import { useIsFieldClearable } from '@/object-record/record-field/ui/hooks/useIs
import { useIsFieldInputOnly } from '@/object-record/record-field/ui/hooks/useIsFieldInputOnly';
import { useToggleEditOnlyInput } from '@/object-record/record-field/ui/hooks/useToggleEditOnlyInput';
import { useRecordTableBodyContextOrThrow } from '@/object-record/record-table/contexts/RecordTableBodyContext';
-import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';
+import { useRecordTableSelectAllHotkeys } from '@/object-record/record-table/hooks/useRecordTableSelectAllHotkeys';
import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';
import { useOpenRecordTableCellFromCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellFromCell';
import { useListenToSidePanelOpening } from '@/ui/layout/side-panel/hooks/useListenToSidePanelOpening';
@@ -109,21 +109,7 @@ export const RecordTableCellHotkeysEffect = ({
},
});
- const { selectAllRows } = useSelectAllRows();
-
- const handleSelectAllRows = () => {
- selectAllRows();
- };
-
- useHotkeysOnFocusedElement({
- keys: ['ctrl+a,meta+a'],
- callback: handleSelectAllRows,
- focusId: cellFocusId,
- dependencies: [handleSelectAllRows],
- options: {
- enableOnFormTags: false,
- },
- });
+ useRecordTableSelectAllHotkeys({ focusId: cellFocusId });
return null;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCell.test.tsx
similarity index 93%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx
rename to packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCell.test.tsx
index 0aded5568b0..01712af9d06 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCell.test.tsx
@@ -17,7 +17,7 @@ import {
recordTableRowContextValue,
recordTableRowDraggableContextValue,
} from '@/object-record/record-table/record-table-cell/hooks/__mocks__/cell';
-import { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup';
+import { useCloseRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCell';
import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState';
import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -75,7 +75,7 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => {
);
};
-describe('useCloseRecordTableCellNoGroup', () => {
+describe('useCloseRecordTableCell', () => {
it('should work as expected', async () => {
const { result } = renderHook(
() => {
@@ -85,7 +85,7 @@ describe('useCloseRecordTableCellNoGroup', () => {
);
return {
- ...useCloseRecordTableCellNoGroup(),
+ ...useCloseRecordTableCell(),
...useDragSelect(),
recordTableCellEditModePosition,
};
@@ -96,7 +96,7 @@ describe('useCloseRecordTableCellNoGroup', () => {
);
act(() => {
- result.current.closeTableCellNoGroup();
+ result.current.closeTableCell();
});
expect(result.current.isDragSelectionStartEnabled()).toBe(true);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx
deleted file mode 100644
index b409092b11e..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing/react';
-import { act, renderHook } from '@testing-library/react';
-import { Provider as JotaiProvider } from 'jotai';
-
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';
-import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
-import { textfieldDefinition } from '@/object-record/record-field/ui/__mocks__/fieldDefinitions';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import { RecordTableComponentInstance } from '@/object-record/record-table/components/RecordTableComponentInstance';
-import { RecordTableContextProvider } from '@/object-record/record-table/components/RecordTableContextProvider';
-import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
-import { RecordTableRowContextProvider } from '@/object-record/record-table/contexts/RecordTableRowContext';
-import { RecordTableRowDraggableContextProvider } from '@/object-record/record-table/contexts/RecordTableRowDraggableContext';
-import {
- recordTableCellContextValue,
- recordTableRowContextValue,
- recordTableRowDraggableContextValue,
-} from '@/object-record/record-table/record-table-cell/hooks/__mocks__/cell';
-import { useCloseRecordTableCellInGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup';
-import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState';
-import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
-
-const recordTableId = 'record-table-id';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => {
- setTestObjectMetadataItemsInMetadataStore(
- jotaiStore,
- getTestEnrichedObjectMetadataItemsMock(),
- );
-
- return (
- <JotaiProvider store={jotaiStore}>
- <MockedProvider>
- <RecordComponentInstanceContextsWrapper
- componentInstanceId={recordTableId}
- >
- <RecordTableComponentInstance recordTableId={recordTableId}>
- <RecordTableContextProvider
- recordTableId={recordTableId}
- viewBarId="viewBarId"
- objectNameSingular={CoreObjectNameSingular.Person}
- >
- <FieldContext.Provider
- value={{
- fieldDefinition: textfieldDefinition,
- recordId: 'recordId',
- isLabelIdentifier: false,
- isRecordFieldReadOnly: false,
- }}
- >
- <RecordTableRowContextProvider
- value={recordTableRowContextValue}
- >
- <RecordTableRowDraggableContextProvider
- value={recordTableRowDraggableContextValue}
- >
- <RecordTableCellContext.Provider
- value={{ ...recordTableCellContextValue }}
- >
- {children}
- </RecordTableCellContext.Provider>
- </RecordTableRowDraggableContextProvider>
- </RecordTableRowContextProvider>
- </FieldContext.Provider>
- </RecordTableContextProvider>
- </RecordTableComponentInstance>
- </RecordComponentInstanceContextsWrapper>
- </MockedProvider>
- </JotaiProvider>
- );
-};
-
-describe('useCloseRecordTableCellInGroup', () => {
- it('should work as expected', async () => {
- const { result } = renderHook(
- () => {
- const recordTableCellEditModePosition = useAtomComponentStateValue(
- recordTableCellEditModePositionComponentState,
- recordTableId,
- );
- return {
- ...useCloseRecordTableCellInGroup(),
- ...useDragSelect(),
- recordTableCellEditModePosition,
- };
- },
- {
- wrapper: Wrapper,
- },
- );
-
- act(() => {
- result.current.closeTableCellInGroup();
- });
-
- expect(result.current.isDragSelectionStartEnabled()).toBe(true);
- expect(result.current.recordTableCellEditModePosition).toBe(null);
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCell.ts
similarity index 92%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts
rename to packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCell.ts
index 16ff90b33d3..6c38d843eb8 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCell.ts
@@ -9,7 +9,7 @@ import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/po
import { useStore } from 'jotai';
import { useCallback } from 'react';
-export const useCloseRecordTableCellNoGroup = () => {
+export const useCloseRecordTableCell = () => {
const { recordTableId } = useRecordTableContextOrThrow();
const store = useStore();
@@ -22,7 +22,7 @@ export const useCloseRecordTableCellNoGroup = () => {
const closeCurrentTableCellInEditMode =
useCloseCurrentTableCellInEditMode(recordTableId);
- const closeTableCellNoGroup = useCallback(() => {
+ const closeTableCell = useCallback(() => {
toggleClickOutside(true);
setDragSelectionStartEnabled(true);
closeCurrentTableCellInEditMode();
@@ -40,6 +40,6 @@ export const useCloseRecordTableCellNoGroup = () => {
]);
return {
- closeTableCellNoGroup,
+ closeTableCell,
};
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts
deleted file mode 100644
index a99a6c02bd2..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { FOCUS_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/FocusClickOutsideListenerId';
-import { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/RecordTableClickOutsideListenerId';
-import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
-import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
-
-import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
-import { useCloseCurrentTableCellInEditMode } from '@/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode';
-import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-
-export const useCloseRecordTableCellInGroup = () => {
- const { recordTableId } = useRecordTableContextOrThrow();
- const store = useStore();
-
- const { setDragSelectionStartEnabled } = useDragSelect();
-
- const { toggleClickOutside } = useClickOutsideListener(
- FOCUS_CLICK_OUTSIDE_LISTENER_ID,
- );
-
- const closeCurrentTableCellInEditMode =
- useCloseCurrentTableCellInEditMode(recordTableId);
-
- const closeTableCellInGroup = useCallback(() => {
- toggleClickOutside(true);
- setDragSelectionStartEnabled(true);
- closeCurrentTableCellInEditMode();
- store.set(
- clickOutsideListenerIsActivatedComponentState.atomFamily({
- instanceId: RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID,
- }),
- true,
- );
- }, [
- closeCurrentTableCellInEditMode,
- setDragSelectionStartEnabled,
- toggleClickOutside,
- store,
- ]);
-
- return {
- closeTableCellInGroup,
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
index 677b2224852..84d86325305 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
@@ -5,12 +5,13 @@ import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';
-import { RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID } from '@/object-record/record-table/constants/RecordTableNoRecordGroupDroppableId';
+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
import { RecordTableRowDraggableContextProvider } from '@/object-record/record-table/contexts/RecordTableRowDraggableContext';
import { RecordTableTr } from '@/object-record/record-table/record-table-row/components/RecordTableTr';
-import { useIsRecordSecondaryDragged } from '@/object-record/record-drag/hooks/useIsRecordSecondaryDragged';
+import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { type RecordTableRowDragData } from '@/object-record/record-table/types/RecordTableRowDragData';
import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
import { DND_KIT_PLUGINS_WITHOUT_OPTIMISTIC } from '@/ui/utilities/drag-and-drop/constants/DndKitPluginsWithoutOptimistic';
@@ -45,13 +46,16 @@ export const RecordTableDraggableTr = ({
onClick,
children,
}: RecordTableDraggableTrProps) => {
- const { isSecondaryDragged } = useIsRecordSecondaryDragged(recordId);
+ const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
+ isRecordIdSecondaryDragMultipleComponentFamilyState,
+ { recordId },
+ );
const { recordGroupId } = useContext(RecordGroupContext);
const droppableId = isDefined(recordGroupId)
? recordGroupId
- : RECORD_TABLE_NO_RECORD_GROUP_DROPPABLE_ID;
+ : NO_RECORD_GROUP_FAMILY_KEY;
const rowDragData: RecordTableRowDragData = {
droppableId,
@@ -84,7 +88,9 @@ export const RecordTableDraggableTr = ({
className={className}
style={{
opacity:
- isDragSource || isSecondaryDragged ? DRAG_SOURCE_OPACITY : undefined,
+ isDragSource || isRecordIdSecondaryDragMultiple
+ ? DRAG_SOURCE_OPACITY
+ : undefined,
}}
isDragging={false}
data-testid={`row-id-${recordId}`}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent.tsx
index 74cc127784f..780782bdd5e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent.tsx
@@ -29,7 +29,7 @@ import { RecordTableCellDragAndDrop } from '@/object-record/record-table/record-
import { RecordTableLastEmptyCell } from '@/object-record/record-table/record-table-cell/components/RecordTableLastEmptyCell';
import { RecordTablePlusButtonCellPlaceholder } from '@/object-record/record-table/record-table-cell/components/RecordTablePlusButtonCellPlaceholder';
import { RecordTableFieldsCells } from '@/object-record/record-table/record-table-row/components/RecordTableFieldsCells';
-import { RecordDragMultiDragPreview } from '@/object-record/record-drag/components/RecordDragMultiDragPreview';
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
import { RecordTableTr } from '@/object-record/record-table/record-table-row/components/RecordTableTr';
import { type RecordTableRowDragData } from '@/object-record/record-table/types/RecordTableRowDragData';
import { getRecordTableColumnFieldWidthClassName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthClassName';
@@ -202,7 +202,7 @@ export const RecordTableRowDragOverlayContent = ({
</RecordTableRowDraggableContextProvider>
</RecordTableTr>
</StyledRowClipContainer>
- <RecordDragMultiDragPreview recordId={recordId} />
+ <RecordDragMultiDragCounterChip />
</StyledRowDragOverlayCSSBridge>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts
index 71a902d3c95..9e6a0f44943 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts
@@ -2,18 +2,16 @@ import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSide
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext';
import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';
-import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';
+import { useRecordTableSelectAllHotkeys } from '@/object-record/record-table/hooks/useRecordTableSelectAllHotkeys';
import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow';
import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';
import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell';
import { getRecordTableCellFocusId } from '@/object-record/record-table/record-table-cell/utils/getRecordTableCellFocusId';
import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';
-import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';
import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { Key } from 'ts-key-enum';
@@ -81,16 +79,9 @@ export const useRecordTableRowHotkeys = (focusId: string) => {
const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId);
- const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(
- isAtLeastOneRecordSelectedComponentSelector,
- recordTableId,
- );
-
const handleEscape = () => {
unfocusRecordTableRow();
- if (isAtLeastOneRecordSelected) {
- resetRecordSelection();
- }
+ resetRecordSelection();
};
useHotkeysOnFocusedElement({
@@ -128,19 +119,5 @@ export const useRecordTableRowHotkeys = (focusId: string) => {
dependencies: [handleEscape],
});
- const { selectAllRows } = useSelectAllRows();
-
- const handleSelectAllRows = () => {
- selectAllRows();
- };
-
- useHotkeysOnFocusedElement({
- keys: ['ctrl+a,meta+a'],
- callback: handleSelectAllRows,
- focusId,
- dependencies: [handleSelectAllRows],
- options: {
- enableOnFormTags: false,
- },
- });
+ useRecordTableSelectAllHotkeys({ focusId });
};
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/computeNewPositionsOfDraggedRecords.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/computeNewPositionsOfDraggedRecords.test.ts
index 06c194f4117..95577d0f53a 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/computeNewPositionsOfDraggedRecords.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/computeNewPositionsOfDraggedRecords.test.ts
@@ -18,7 +18,7 @@ describe('computeNewPositionsOfDraggedRecords', () => {
});
const positionById = new Map(
- result?.map(({ id, position }) => [id, position]),
+ result.map(({ id, position }) => [id, position]),
);
expect(positionById.get('a')).toBeGreaterThan(2);
@@ -36,10 +36,27 @@ describe('computeNewPositionsOfDraggedRecords', () => {
});
const positionById = new Map(
- result?.map(({ id, position }) => [id, position]),
+ result.map(({ id, position }) => [id, position]),
);
expect(positionById.get('a')).toBeGreaterThan(3);
expect(positionById.get('d')).toBeGreaterThan(positionById.get('a') ?? 0);
});
+
+ it('should place the selection after the last record when moving down onto it', () => {
+ const result = computeNewPositionsOfDraggedRecords({
+ arrayOfRecordsWithPosition: records,
+ draggedRecordId: 'a',
+ targetRecordId: 'd',
+ sourceRecordIds: ['a', 'b'],
+ isDroppedAfterList: false,
+ });
+
+ const positionById = new Map(
+ result.map(({ id, position }) => [id, position]),
+ );
+
+ expect(positionById.get('a')).toBeGreaterThan(4);
+ expect(positionById.get('b')).toBeGreaterThan(positionById.get('a') ?? 0);
+ });
});
diff --git a/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts b/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts
index 102796b3305..3d888e7e876 100644
--- a/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts
@@ -2,7 +2,6 @@ import { computeNewEvenlySpacedPositions } from '@/object-record/utils/computeNe
import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
import { isDefined } from 'twenty-shared/utils';
-// TODO : refactor this
export const computeNewPositionsOfDraggedRecords = ({
arrayOfRecordsWithPosition,
draggedRecordId,
@@ -15,143 +14,70 @@ export const computeNewPositionsOfDraggedRecords = ({
targetRecordId: string;
sourceRecordIds: string[];
isDroppedAfterList: boolean;
-}): RecordWithPosition[] | null => {
- const targetItem = arrayOfRecordsWithPosition.find(
+}): RecordWithPosition[] => {
+ const indexOfTargetItem = arrayOfRecordsWithPosition.findIndex(
(recordToFind) => recordToFind.id === targetRecordId,
);
+ const targetItem = arrayOfRecordsWithPosition[indexOfTargetItem];
+
if (!isDefined(targetItem)) {
throw new Error(`Cannot find item to move for id : ${targetRecordId}`);
}
- const targetPosition = targetItem.position;
-
- // Dropping the dragged record where it was still gathers the rest of the
- // selection around it
- if (targetRecordId === draggedRecordId) {
- const sourceRecordIdSet = new Set(sourceRecordIds);
- const indexOfDraggedRecord = arrayOfRecordsWithPosition.findIndex(
- (recordToFind) => recordToFind.id === draggedRecordId,
- );
-
- const previousUnselectedRecord = arrayOfRecordsWithPosition
- .slice(0, indexOfDraggedRecord)
- .findLast((record) => !sourceRecordIdSet.has(record.id));
- const nextUnselectedRecord = arrayOfRecordsWithPosition
- .slice(indexOfDraggedRecord + 1)
- .find((record) => !sourceRecordIdSet.has(record.id));
-
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition:
- previousUnselectedRecord?.position ?? targetPosition - 1,
- endingPosition:
- nextUnselectedRecord?.position ??
- targetPosition + sourceRecordIds.length + 1,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- return sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
- }
-
const indexOfItemToMove = arrayOfRecordsWithPosition.findIndex(
(recordToFind) => recordToFind.id === draggedRecordId,
);
- const itemToMoveIsNotInTable = indexOfItemToMove === -1;
-
- const indexOfTargetItem = arrayOfRecordsWithPosition.findIndex(
- (recordToFind) => recordToFind.id === targetRecordId,
- );
-
- const shouldGoToFirstPosition = indexOfTargetItem === 0;
-
- if (shouldGoToFirstPosition) {
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition: targetPosition - 1,
- endingPosition: targetPosition,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- const newSourceRecordsWithPosition: RecordWithPosition[] =
- sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
-
- return newSourceRecordsWithPosition;
- } else if (isDroppedAfterList) {
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition: targetPosition,
- endingPosition: targetPosition + sourceRecordIds.length + 1,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- const newSourceRecordsWithPosition: RecordWithPosition[] =
- sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
-
- return newSourceRecordsWithPosition;
- } else {
- if (itemToMoveIsNotInTable) {
- const itemBeforeTargetItem =
- arrayOfRecordsWithPosition[indexOfTargetItem - 1];
-
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition: itemBeforeTargetItem.position,
- endingPosition: targetItem.position,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- const newSourceRecordsWithPosition: RecordWithPosition[] =
- sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
-
- return newSourceRecordsWithPosition;
+ const positionAfterTarget = targetItem.position + sourceRecordIds.length + 1;
+
+ const getInsertionRange = (): [number, number] => {
+ // Dropping the dragged record where it was still gathers the rest of the
+ // selection around it
+ if (targetRecordId === draggedRecordId) {
+ const sourceRecordIdSet = new Set(sourceRecordIds);
+
+ const previousUnselectedRecord = arrayOfRecordsWithPosition
+ .slice(0, indexOfTargetItem)
+ .findLast((record) => !sourceRecordIdSet.has(record.id));
+ const nextUnselectedRecord = arrayOfRecordsWithPosition
+ .slice(indexOfTargetItem + 1)
+ .find((record) => !sourceRecordIdSet.has(record.id));
+
+ return [
+ previousUnselectedRecord?.position ?? targetItem.position - 1,
+ nextUnselectedRecord?.position ?? positionAfterTarget,
+ ];
}
- const shouldGoAfterTargetItem = indexOfItemToMove < indexOfTargetItem;
-
- if (shouldGoAfterTargetItem) {
- const itemAfterTargetItem =
- arrayOfRecordsWithPosition[indexOfTargetItem + 1];
+ const isMovingDown =
+ indexOfItemToMove !== -1 && indexOfItemToMove < indexOfTargetItem;
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition: targetItem.position,
- endingPosition: itemAfterTargetItem.position,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- const newSourceRecordsWithPosition: RecordWithPosition[] =
- sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
-
- return newSourceRecordsWithPosition;
- } else {
- const itemBeforeTargetItem =
- arrayOfRecordsWithPosition[indexOfTargetItem - 1];
-
- const newPositions = computeNewEvenlySpacedPositions({
- startingPosition: itemBeforeTargetItem.position,
- endingPosition: targetItem.position,
- numberOfRecordsToInsertBetween: sourceRecordIds.length,
- });
-
- const newSourceRecordsWithPosition: RecordWithPosition[] =
- sourceRecordIds.map((recordId, index) => ({
- id: recordId,
- position: newPositions[index],
- }));
-
- return newSourceRecordsWithPosition;
+ if (isDroppedAfterList || isMovingDown) {
+ return [
+ targetItem.position,
+ arrayOfRecordsWithPosition[indexOfTargetItem + 1]?.position ??
+ positionAfterTarget,
+ ];
}
- }
+
+ return [
+ arrayOfRecordsWithPosition[indexOfTargetItem - 1]?.position ??
+ targetItem.position - 1,
+ targetItem.position,
+ ];
+ };
+
+ const [startingPosition, endingPosition] = getInsertionRange();
+
+ const newPositions = computeNewEvenlySpacedPositions({
+ startingPosition,
+ endingPosition,
+ numberOfRecordsToInsertBetween: sourceRecordIds.length,
+ });
+
+ return sourceRecordIds.map((recordId, index) => ({
+ id: recordId,
+ position: newPositions[index],
+ }));
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/chat-threads/components/ChatThreadsCardContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/chat-threads/components/ChatThreadsCardContent.tsx
index 13199a21310..091fc662355 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/chat-threads/components/ChatThreadsCardContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/chat-threads/components/ChatThreadsCardContent.tsx
@@ -7,7 +7,6 @@ import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { AiChatThreadList } from '@/ai/components/AiChatThreadList';
-import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
@@ -100,7 +99,6 @@ export const ChatThreadsCardContent = ({
<StyledThreadsContainer>
<AiChatThreadList
threads={threads}
- surface={AI_CHAT_THREAD_ACTIONS_SURFACE.RECORD_PAGE}
selectedThreadIds={
isDefined(sidePanelThreadId) ? [sidePanelThreadId] : []
}
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
index c60892d460b..75952eac497 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
@@ -14,7 +14,6 @@ type DragSelectProps = {
onDragSelectionChange: (id: string, selected: boolean) => void;
onDragSelectionStart?: (event: MouseEvent | TouchEvent) => void;
onDragSelectionEnd?: (event: MouseEvent | TouchEvent) => void;
- scrollWrapperComponentInstanceId?: string;
selectionBoundaryClass?: string;
};
@@ -42,7 +41,6 @@ export const DragSelect = ({
onDragSelectionChange,
onDragSelectionStart,
onDragSelectionEnd,
- scrollWrapperComponentInstanceId,
selectionBoundaryClass,
}: DragSelectProps) => {
const { isDragSelectionStartEnabled } = useDragSelect();
@@ -59,9 +57,7 @@ export const DragSelect = ({
[],
);
- const { handleAutoScroll } = useDragSelectWithAutoScroll({
- scrollWrapperComponentInstanceId,
- });
+ const { handleAutoScroll } = useDragSelectWithAutoScroll();
const [startPoint, setStartPoint] = useState<Position | null>(null);
const [endPoint, setEndPoint] = useState<Position | null>(null);
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
index ae4aef6afcc..ffa958c45bf 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
@@ -168,7 +168,6 @@ const ScrollableDragSelectDemo = () => {
<DragSelect
selectableItemsContainerRef={containerRef}
onDragSelectionChange={handleSelectionChange}
- scrollWrapperComponentInstanceId="scrollable-demo"
/>
</div>
</ScrollWrapper>
@@ -197,7 +196,7 @@ The DragSelect component enables users to select multiple items by dragging a se
**Usage:**
- Items must have \`data-selectable-id\` attribute
- Use \`data-select-disable="true"\` to disable selection on specific elements
-- For auto-scroll functionality, wrap in ScrollWrapper and provide \`scrollWrapperComponentInstanceId\`
+- For auto-scroll functionality, render inside a ScrollWrapper
- Can work without ScrollWrapper for basic drag selection (auto-scroll gracefully disabled)
`,
},
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
index a3647aca796..669a6b0f962 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
@@ -144,7 +144,7 @@ describe('DragSelect', () => {
);
});
- it('should work without scrollWrapperComponentInstanceId (universal compatibility)', () => {
+ it('should work outside a ScrollWrapper', () => {
expect(() => {
render(
<DragSelect
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass.ts b/packages/twenty-front/src/modules/ui/utilities/drag-select/constants/RecordIndexDragSelectBoundaryClass.ts
similarity index 100%
rename from packages/twenty-front/src/modules/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass.ts
rename to packages/twenty-front/src/modules/ui/utilities/drag-select/constants/RecordIndexDragSelectBoundaryClass.ts
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
index c436c32b696..a98ad521003 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
@@ -45,33 +45,7 @@ describe('useDragSelectWithAutoScroll', () => {
});
describe('instance ID resolution', () => {
- it('should prioritize explicit scrollWrapperComponentInstanceId over context', () => {
- mockUseComponentInstanceStateContext.mockReturnValue({
- instanceId: 'context-instance',
- });
-
- const mockElement = createMockScrollElement();
- document.getElementById = jest
- .fn()
- .mockImplementation((id) =>
- id === 'scroll-wrapper-explicit-instance' ? mockElement : null,
- );
-
- const { result } = renderHook(() =>
- useDragSelectWithAutoScroll({
- scrollWrapperComponentInstanceId: 'explicit-instance',
- }),
- );
-
- result.current.handleAutoScroll(105, 250);
-
- expect(document.getElementById).toHaveBeenCalledWith(
- 'scroll-wrapper-explicit-instance',
- );
- expect(mockElement.scrollTo).toHaveBeenCalled();
- });
-
- it('should use context instance ID when no explicit ID provided', () => {
+ it('should scroll the ScrollWrapper from context', () => {
mockUseComponentInstanceStateContext.mockReturnValue({
instanceId: 'context-instance',
});
@@ -83,7 +57,7 @@ describe('useDragSelectWithAutoScroll', () => {
id === 'scroll-wrapper-context-instance' ? mockElement : null,
);
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(105, 250);
@@ -97,7 +71,7 @@ describe('useDragSelectWithAutoScroll', () => {
mockUseComponentInstanceStateContext.mockReturnValue(null);
document.getElementById = jest.fn();
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(105, 105);
@@ -124,7 +98,7 @@ describe('useDragSelectWithAutoScroll', () => {
});
it('should calculate correct scroll amounts for vertical scrolling', () => {
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(300, 105);
@@ -142,7 +116,7 @@ describe('useDragSelectWithAutoScroll', () => {
});
it('should calculate correct scroll amounts for horizontal scrolling', () => {
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(105, 250);
@@ -165,7 +139,7 @@ describe('useDragSelectWithAutoScroll', () => {
mockElement.scrollTop = 5;
mockElement.scrollLeft = 3;
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(105, 105);
@@ -180,7 +154,7 @@ describe('useDragSelectWithAutoScroll', () => {
});
it('should not scroll when mouse is in safe zone', () => {
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(350, 250);
@@ -195,7 +169,7 @@ describe('useDragSelectWithAutoScroll', () => {
});
it('should handle exact edge threshold boundaries', () => {
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
result.current.handleAutoScroll(119, 250);
@@ -222,7 +196,7 @@ describe('useDragSelectWithAutoScroll', () => {
it('should handle missing DOM element gracefully', () => {
document.getElementById = jest.fn().mockReturnValue(null);
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
expect(() => {
result.current.handleAutoScroll(105, 105);
@@ -233,7 +207,7 @@ describe('useDragSelectWithAutoScroll', () => {
const brokenElement = { scrollTo: jest.fn() };
document.getElementById = jest.fn().mockReturnValue(brokenElement);
- const { result } = renderHook(() => useDragSelectWithAutoScroll({}));
+ const { result } = renderHook(() => useDragSelectWithAutoScroll());
expect(() => {
result.current.handleAutoScroll(105, 105);
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
index 3b6fb295870..7ac886581fc 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
@@ -1,39 +1,19 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback } from 'react';
import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/states/contexts/ScrollWrapperComponentInstanceContext';
import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
import { isNonEmptyString } from '@sniptt/guards';
-import { isDefined } from 'twenty-shared/utils';
import { AUTO_SCROLL_EDGE_THRESHOLD_PX } from '@/ui/utilities/drag-select/constants/AutoScrollEdgeThresholdPx';
import { AUTO_SCROLL_MAX_SPEED_PX } from '@/ui/utilities/drag-select/constants/AutoScrollMaxSpeedPx';
-type UseDragSelectWithAutoScrollProps = {
- scrollWrapperComponentInstanceId?: string;
-};
-
-export const useDragSelectWithAutoScroll = ({
- scrollWrapperComponentInstanceId,
-}: UseDragSelectWithAutoScrollProps) => {
- const instanceStateContext = useComponentInstanceStateContext(
+export const useDragSelectWithAutoScroll = () => {
+ const scrollWrapperInstanceId = useComponentInstanceStateContext(
ScrollWrapperComponentInstanceContext,
- );
-
- const instanceIdFromContext = instanceStateContext?.instanceId;
-
- const scrollWrapperInstanceId = useMemo(() => {
- if (isNonEmptyString(scrollWrapperComponentInstanceId)) {
- return scrollWrapperComponentInstanceId;
- } else if (isNonEmptyString(instanceIdFromContext)) {
- return instanceIdFromContext;
- }
- return null;
- }, [scrollWrapperComponentInstanceId, instanceIdFromContext]);
-
- const hasScrollWrapper = isDefined(scrollWrapperInstanceId);
+ )?.instanceId;
const handleAutoScroll = useCallback(
(mouseX: number, mouseY: number) => {
- if (!hasScrollWrapper || !scrollWrapperInstanceId) {
+ if (!isNonEmptyString(scrollWrapperInstanceId)) {
return;
}
@@ -87,7 +67,7 @@ export const useDragSelectWithAutoScroll = ({
});
}
},
- [hasScrollWrapper, scrollWrapperInstanceId],
+ [scrollWrapperInstanceId],
);
return {
diff --git a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
index 1a8a2c3a753..1ab05e04e98 100644
--- a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
@@ -16,7 +16,7 @@ import { currentRecordFieldsComponentState } from '@/object-record/record-field/
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useLoadRecordIndexStates } from '@/object-record/record-index/hooks/useLoadRecordIndexStates';
-import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
+import { RecordTableBodyContextValueProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
import {
RecordTableContextProvider,
useRecordTableContextOrThrow,
@@ -190,17 +190,17 @@ const InternalTableContextProviders = ({
triggerEvent,
}}
>
- <RecordTableBodyContextProvider
+ <RecordTableBodyContextValueProvider
value={{
onCloseTableCell: () => {},
onOpenTableCell: () => {},
- onCommandMenuDropdownOpened: () => {},
+ openRecordContextMenu: () => {},
onMoveFocus: () => {},
onMoveHoverToCurrentCell: () => {},
}}
>
{children}
- </RecordTableBodyContextProvider>
+ </RecordTableBodyContextValueProvider>
</RecordTableContextProvider>
</RecordIndexContextProvider>
);