Skip to content

The open alternative to Salesforce, designed for AI.

Drag to reorder records in list views (#27187)

Félix Malfait301578b22f9e
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
similarity index 85%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx
rename to packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
index a005f65fa00..f32f73dc1ec 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragDropContextProvider.tsx
@@ -6,11 +6,11 @@ import { isDefined } from 'twenty-shared/utils';
import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
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 { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
-import { type RecordTableRowDragData } from '@/object-record/record-table/types/RecordTableRowDragData';
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';
@@ -22,25 +22,23 @@ import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDesti
import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';
import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
-type RecordTableBodyDragDropContextProviderProps = {
+type RecordDragDropContextProviderProps = {
getDroppableItemCount: (droppableId: string) => number;
onRecordDrop: (result: RecordDragDropResult) => void;
renderDragOverlay: (source: Draggable) => ReactNode;
children: ReactNode;
};
-export const RecordTableBodyDragDropContextProvider = ({
+export const RecordDragDropContextProvider = ({
getDroppableItemCount,
onRecordDrop,
renderDragOverlay,
children,
-}: RecordTableBodyDragDropContextProviderProps) => {
+}: RecordDragDropContextProviderProps) => {
const { recordIndexId } = useRecordIndexContextOrThrow();
- const { recordTableId } = useRecordTableContextOrThrow();
- const selectedRowIds = useAtomComponentSelectorCallbackState(
+ const selectedRecordIds = useAtomComponentSelectorCallbackState(
selectedRecordIdsComponentSelector,
- recordTableId,
);
const store = useStore();
@@ -65,13 +63,13 @@ export const RecordTableBodyDragDropContextProvider = ({
event: DragDropProviderDragStartEvent<DragDropItemData>,
) => {
const source = event.operation.source;
- const sourceData = source?.data as RecordTableRowDragData | undefined;
+ const sourceData = source?.data as RecordDragData | undefined;
if (!isDefined(source) || !isDefined(sourceData)) {
return;
}
- const currentSelectedRecordIds = store.get(selectedRowIds) as string[];
+ const currentSelectedRecordIds = store.get(selectedRecordIds);
startRecordDrag(sourceData.recordId, currentSelectedRecordIds);
};
@@ -96,7 +94,7 @@ export const RecordTableBodyDragDropContextProvider = ({
event: DragDropProviderDragEndEvent<DragDropItemData>,
) => {
const { source, target, position } = event.operation;
- const sourceData = source?.data as RecordTableRowDragData | undefined;
+ const sourceData = source?.data as RecordDragData | undefined;
if (event.canceled || !isDefined(source) || !isDefined(sourceData)) {
clearDragState();
@@ -115,7 +113,7 @@ export const RecordTableBodyDragDropContextProvider = ({
return;
}
- // Drop targets mark the gap before them; convert it to the dragged row's final index.
+ // Drop targets mark the gap before them; convert it to the dragged record's final index.
const destinationIndex = getDestinationIndex({
dropTargetIndex: resolvedDrop.dropTargetIndex,
sourceIndex: sourceData.index,
@@ -125,7 +123,17 @@ export const RecordTableBodyDragDropContextProvider = ({
const isSameDroppable = sourceData.droppableId === resolvedDrop.droppableId;
- if (isSameDroppable && destinationIndex === sourceData.index) {
+ const isMultiDrag =
+ getDragOperationType({
+ draggedRecordId: sourceData.recordId,
+ selectedRecordIds: store.get(selectedRecordIds),
+ }) === 'multi';
+
+ if (
+ isSameDroppable &&
+ destinationIndex === sourceData.index &&
+ !isMultiDrag
+ ) {
clearDragState();
return;
}
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 afa7007e9be..b789bec732a 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
@@ -10,9 +10,16 @@ const StyledNotificationCounterContainer = styled.div`
z-index: 1000;
`;
-export const RecordDragMultiDragCounterChip = () => {
+type RecordDragMultiDragCounterChipProps = {
+ contextStoreInstanceId?: string;
+};
+
+export const RecordDragMultiDragCounterChip = ({
+ contextStoreInstanceId,
+}: RecordDragMultiDragCounterChipProps) => {
const originalDragSelection = useAtomComponentStateValue(
originalDragSelectionComponentState,
+ contextStoreInstanceId,
);
const selectedCount = originalDragSelection.length ?? 0;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx
similarity index 79%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx
rename to packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx
index cc47610094b..61ba3284860 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragPreview.tsx
@@ -3,13 +3,13 @@ import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-reco
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-type RecordTableRowMultiDragPreviewProps = {
+type RecordDragMultiDragPreviewProps = {
recordId: string;
};
-export const RecordTableRowMultiDragPreview = ({
+export const RecordDragMultiDragPreview = ({
recordId,
-}: RecordTableRowMultiDragPreviewProps) => {
+}: RecordDragMultiDragPreviewProps) => {
const { recordIndexId } = useRecordIndexContextOrThrow();
const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
@@ -22,5 +22,7 @@ export const RecordTableRowMultiDragPreview = ({
return null;
}
- return <RecordDragMultiDragCounterChip />;
+ return (
+ <RecordDragMultiDragCounterChip contextStoreInstanceId={recordIndexId} />
+ );
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts
similarity index 90%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts
rename to packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts
index fe8a5eda2b7..2787565a463 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useIsRecordSecondaryDragged.ts
@@ -3,7 +3,7 @@ import { useRecordIndexContextOrThrow } from '@/object-record/record-index/conte
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { type Nullable } from 'twenty-shared/types';
-export const useIsTableRowSecondaryDragged = (recordId: Nullable<string>) => {
+export const useIsRecordSecondaryDragged = (recordId: Nullable<string>) => {
const { recordIndexId } = useRecordIndexContextOrThrow();
const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
similarity index 89%
rename from packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts
rename to packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
index 44339ef9cc1..7df9eadc901 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordGroupDrop.ts
@@ -14,7 +14,6 @@ import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
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';
@@ -22,11 +21,10 @@ import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jota
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-export const useProcessTableWithGroupRecordDrop = () => {
+export const useProcessRecordGroupDrop = () => {
const store = useStore();
- const { recordIndexId } = useRecordIndexContextOrThrow();
- const { objectNameSingular, objectMetadataItem, recordTableId } =
- useRecordTableContextOrThrow();
+ const { recordIndexId, objectNameSingular, objectMetadataItem } =
+ useRecordIndexContextOrThrow();
const { updateOneRecord } = useUpdateOneRecord();
@@ -38,12 +36,10 @@ export const useProcessTableWithGroupRecordDrop = () => {
const currentRecordSorts = useAtomComponentStateCallbackState(
currentRecordSortsComponentState,
- recordTableId,
);
- const selectedRowIds = useAtomComponentSelectorCallbackState(
+ const selectedRecordIdsCallbackState = useAtomComponentSelectorCallbackState(
selectedRecordIdsComponentSelector,
- recordTableId,
);
const isDraggingRecord = useAtomComponentStateCallbackState(
@@ -60,7 +56,7 @@ export const useProcessTableWithGroupRecordDrop = () => {
recordIndexGroupFieldMetadataItemComponentState,
);
- const processTableWithGroupRecordDrop = useCallback(
+ const processRecordGroupDrop = useCallback(
(result: RecordDragDropResult) => {
if (!result.destination) return;
@@ -90,7 +86,7 @@ export const useProcessTableWithGroupRecordDrop = () => {
const selectedRecordIds = isCurrentlyDraggingRecord
? existingOriginalDragSelection
- : store.get(selectedRowIds);
+ : store.get(selectedRecordIdsCallbackState);
const existingRecordSorts = store.get(currentRecordSorts);
@@ -126,7 +122,7 @@ export const useProcessTableWithGroupRecordDrop = () => {
objectMetadataItem.fields,
originalDragSelection,
isDraggingRecord,
- selectedRowIds,
+ selectedRecordIdsCallbackState,
recordIdsByGroupFamilyState,
recordIndexGroupFieldMetadataItem?.id,
openDialog,
@@ -134,5 +130,5 @@ export const useProcessTableWithGroupRecordDrop = () => {
],
);
- return { processTableWithGroupRecordDrop };
+ return { processRecordGroupDrop };
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
similarity index 80%
rename from packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts
rename to packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
index 31cdc763c24..cb136d12b36 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop.ts
@@ -1,6 +1,5 @@
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { useTriggerTableWithoutGroupDragAndDropOptimisticUpdate } from '@/object-record/record-drag/hooks/useTriggerTableWithoutGroupDragAndDropOptimisticUpdate';
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';
@@ -13,7 +12,6 @@ import { useStore } from 'jotai';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
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';
@@ -23,10 +21,15 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-export const useProcessTableWithoutGroupRecordDrop = () => {
+type UseProcessRecordWithoutGroupDropProps = {
+ onBeforeRecordsUpdate?: (updatedRecords: RecordWithPosition[]) => void;
+};
+
+export const useProcessRecordWithoutGroupDrop = ({
+ onBeforeRecordsUpdate,
+}: UseProcessRecordWithoutGroupDropProps = {}) => {
const store = useStore();
- const { recordIndexId } = useRecordIndexContextOrThrow();
- const { objectNameSingular } = useRecordTableContextOrThrow();
+ const { recordIndexId, objectNameSingular } = useRecordIndexContextOrThrow();
const { updateOneRecord } = useUpdateOneRecord();
@@ -49,12 +52,9 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
const { openDialog } = useDialog();
- const { triggerTableWithoutGroupDragAndDropOptimisticUpdate } =
- useTriggerTableWithoutGroupDragAndDropOptimisticUpdate();
-
- const processTableWithoutGroupRecordDrop = useCallback(
- async (tableRecordDropResult: RecordDragDropResult) => {
- if (!tableRecordDropResult.destination) return;
+ const processRecordWithoutGroupDrop = useCallback(
+ async (recordDropResult: RecordDragDropResult) => {
+ if (!recordDropResult.destination) return;
if (currentRecordSorts.length > 0) {
openDialog(getRecordIndexRemoveSortingModalId(recordIndexId));
@@ -63,12 +63,11 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
const allSparseRecordIds = store.get(allRecordIdsWithoutGroup);
- const draggedRecordId = tableRecordDropResult.draggableId;
+ const draggedRecordId = recordDropResult.draggableId;
const selectedRecordIds = store.get(selectedRowIds);
const isDroppedAfterList =
- tableRecordDropResult.destination.index + 1 >=
- allSparseRecordIds.length;
+ recordDropResult.destination.index + 1 >= allSparseRecordIds.length;
const recordsWithPosition: RecordWithPosition[] = allSparseRecordIds
.filter((recordId): recordId is string => isDefined(recordId))
@@ -90,7 +89,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
if (dragOperationType === 'single') {
const targetRecordId = allSparseRecordIds.at(
- tableRecordDropResult.destination.index,
+ recordDropResult.destination.index,
);
if (!isDefined(targetRecordId)) {
@@ -110,7 +109,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
return;
}
- triggerTableWithoutGroupDragAndDropOptimisticUpdate([singleDragResult]);
+ onBeforeRecordsUpdate?.([singleDragResult]);
updateOneRecord({
objectNameSingular,
@@ -121,7 +120,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
});
} else {
const targetRecordId = allSparseRecordIds.at(
- tableRecordDropResult.destination.index,
+ recordDropResult.destination.index,
);
if (!isDefined(targetRecordId)) {
@@ -140,9 +139,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
isDroppedAfterList,
});
- triggerTableWithoutGroupDragAndDropOptimisticUpdate(
- multiDragResult.recordUpdates,
- );
+ onBeforeRecordsUpdate?.(multiDragResult.recordUpdates);
for (const update of multiDragResult.recordUpdates) {
updateOneRecord({
@@ -165,9 +162,9 @@ export const useProcessTableWithoutGroupRecordDrop = () => {
currentRecordSorts,
originalDragSelection,
allRecordIdsWithoutGroup,
- triggerTableWithoutGroupDragAndDropOptimisticUpdate,
+ onBeforeRecordsUpdate,
],
);
- return { processTableWithoutGroupRecordDrop };
+ return { processRecordWithoutGroupDrop };
};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragData.ts b/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragData.ts
new file mode 100644
index 00000000000..e7c18b11692
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/types/RecordDragData.ts
@@ -0,0 +1,5 @@
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+
+export type RecordDragData = DragDropItemData & {
+ recordId: string;
+};
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 6a7c5423024..0d415039b10 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,5 +1,6 @@
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';
@@ -42,11 +43,13 @@ export const RecordList = () => {
componentInstanceId={`scroll-wrapper-record-list-${recordListId}`}
defaultEnableXScroll={false}
>
- {hasRecordGroups ? (
- <RecordListRecordGroupsBody />
- ) : (
- <RecordListBody />
- )}
+ <RecordListDragDropProvider>
+ {hasRecordGroups ? (
+ <RecordListRecordGroupsBody />
+ ) : (
+ <RecordListBody />
+ )}
+ </RecordListDragDropProvider>
</ScrollWrapper>
</RecordListFieldTooltip>
</StyledContainer>
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
index eaabb7e25a2..fcb0d00acbf 100644
--- 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
@@ -1,8 +1,13 @@
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;
@@ -21,6 +26,13 @@ export const RecordListContainer = ({
objectMetadataItem.id,
);
+ const { recordIndexId } = useRecordIndexContextOrThrow();
+
+ const isDialogOpened = useAtomComponentStateValue(
+ isDialogOpenedComponentState,
+ getRecordIndexRemoveSortingModalId(recordIndexId),
+ );
+
return (
<RecordListContextProvider
value={{
@@ -32,6 +44,7 @@ export const RecordListContainer = ({
>
<RecordList />
<RecordListSSESubscribeEffect />
+ {isDialogOpened && <RecordIndexRemoveSortingModal />}
</RecordListContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDragDropProvider.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDragDropProvider.tsx
new file mode 100644
index 00000000000..5c6bd560362
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDragDropProvider.tsx
@@ -0,0 +1,49 @@
+import { useStore } from 'jotai';
+import { type ReactNode } from 'react';
+
+import { RecordDragDropContextProvider } from '@/object-record/record-drag/components/RecordDragDropContextProvider';
+import { useProcessRecordGroupDrop } from '@/object-record/record-drag/hooks/useProcessRecordGroupDrop';
+import { useProcessRecordWithoutGroupDrop } from '@/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop';
+import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { RecordListRowDragOverlay } from '@/object-record/record-list/components/RecordListRowDragOverlay';
+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
+import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+
+type RecordListDragDropProviderProps = {
+ children: ReactNode;
+};
+
+export const RecordListDragDropProvider = ({
+ children,
+}: RecordListDragDropProviderProps) => {
+ const store = useStore();
+
+ const hasRecordGroups = useAtomComponentSelectorValue(
+ hasRecordGroupsComponentSelector,
+ );
+
+ const recordIdsByGroupCallbackState =
+ useAtomComponentFamilyStateCallbackState(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ );
+
+ const { processRecordGroupDrop } = useProcessRecordGroupDrop();
+ const { processRecordWithoutGroupDrop } = useProcessRecordWithoutGroupDrop();
+
+ return (
+ <RecordDragDropContextProvider
+ getDroppableItemCount={(droppableId) =>
+ store.get(recordIdsByGroupCallbackState(droppableId)).length
+ }
+ onRecordDrop={
+ hasRecordGroups ? processRecordGroupDrop : processRecordWithoutGroupDrop
+ }
+ renderDragOverlay={(source) => (
+ <RecordListRowDragOverlay source={source} />
+ )}
+ >
+ {children}
+ </RecordDragDropContextProvider>
+ );
+};
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
new file mode 100644
index 00000000000..099704a5897
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListDraggableRow.tsx
@@ -0,0 +1,79 @@
+import { useSortable } from '@dnd-kit/react/sortable';
+import { styled } from '@linaria/react';
+
+import { useIsRecordSecondaryDragged } from '@/object-record/record-drag/hooks/useIsRecordSecondaryDragged';
+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 { 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';
+import { DRAG_SOURCE_OPACITY } from '@/ui/utilities/drag-and-drop/constants/DragSourceOpacity';
+import { preventNativeDragStart } from '@/ui/utilities/drag-and-drop/utils/preventNativeDragStart';
+
+const StyledDraggableRow = styled.div<{ $isDragSourceFaded: boolean }>`
+ opacity: ${({ $isDragSourceFaded }) =>
+ $isDragSourceFaded ? DRAG_SOURCE_OPACITY : 1};
+ position: relative;
+`;
+
+const StyledRowDropTargetSlot = styled.div`
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: -1px;
+`;
+
+type RecordListDraggableRowProps = {
+ recordId: string;
+ index: number;
+ droppableId: string;
+};
+
+export const RecordListDraggableRow = ({
+ recordId,
+ index,
+ droppableId,
+}: RecordListDraggableRowProps) => {
+ const { objectPermissions } = useRecordListContextOrThrow();
+ const { isSecondaryDragged } = useIsRecordSecondaryDragged(recordId);
+
+ const rowDragData: RecordDragData = {
+ droppableId,
+ index,
+ recordId,
+ };
+
+ const { ref, isDragSource } = useSortable({
+ id: recordId,
+ index,
+ group: droppableId,
+ type: RECORD_LIST_ROW_DND_TYPE,
+ accept: RECORD_LIST_ROW_DND_TYPE,
+ data: rowDragData,
+ disabled: !objectPermissions.canUpdateObjectRecords,
+ transition: null,
+ plugins: DND_KIT_PLUGINS_WITHOUT_OPTIMISTIC,
+ feedback: 'clone',
+ });
+
+ return (
+ <StyledDraggableRow
+ $isDragSourceFaded={isDragSource || isSecondaryDragged}
+ onDragStart={preventNativeDragStart}
+ >
+ <RecordListRow recordId={recordId} rowRef={ref} />
+ {!isDragSource && (
+ <StyledRowDropTargetSlot>
+ <DragDropItemDropTarget
+ index={index}
+ droppableId={droppableId}
+ orientation="horizontal"
+ compact
+ seamAligned
+ />
+ </StyledRowDropTargetSlot>
+ )}
+ </StyledDraggableRow>
+ );
+};
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 4d42e8104b9..771c0fb94fc 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,8 +1,19 @@
+import { pointerIntersection } from '@dnd-kit/collision';
+import { useDroppable } from '@dnd-kit/react';
+import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+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 { RecordListRow } from '@/object-record/record-list/components/RecordListRow';
+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';
import { isDefined } from 'twenty-shared/utils';
@@ -10,6 +21,11 @@ const StyledFetchMoreTrigger = styled.div`
height: 0;
`;
+const StyledEndDropZone = styled.div`
+ position: relative;
+ width: 100%;
+`;
+
type RecordListRecordsProps = {
records: ObjectRecord[];
loading: boolean;
@@ -27,6 +43,27 @@ export const RecordListRecords = ({
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) {
@@ -40,13 +77,27 @@ export const RecordListRecords = ({
<RecordListUpsertRecordsInStoreEffect records={records} />
{isVisible && !isDefined(error) && (
<>
- {records.map((record) => (
- <RecordListRow key={record.id} recordId={record.id} />
+ {records.map((record, index) => (
+ <RecordListDraggableRow
+ key={record.id}
+ recordId={record.id}
+ index={index}
+ droppableId={droppableId}
+ />
))}
{hasNextPage && !loading && (
<StyledFetchMoreTrigger ref={fetchMoreRef} />
)}
- {!loading && <RecordListAddNew />}
+ <StyledEndDropZone ref={endDropZoneRef}>
+ <DragDropItemDropTarget
+ index={records.length}
+ droppableId={droppableId}
+ orientation="horizontal"
+ compact={!isDraggingRecord}
+ seamAligned
+ />
+ {!loading && <RecordListAddNew />}
+ </StyledEndDropZone>
</>
)}
</>
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 1da9f5acbf0..375a468c201 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
@@ -22,7 +22,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { type MouseEvent } from 'react';
+import { type MouseEvent, type Ref } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { Chip } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -76,9 +76,10 @@ const StyledOverflowChipContainer = styled.div`
type RecordListRowProps = {
recordId: string;
+ rowRef?: Ref<HTMLDivElement>;
};
-export const RecordListRow = ({ recordId }: RecordListRowProps) => {
+export const RecordListRow = ({ recordId, rowRef }: RecordListRowProps) => {
const { objectNameSingular } = useRecordListContextOrThrow();
const {
labelIdentifierFieldMetadataItem,
@@ -170,6 +171,7 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {
return (
<StyledRowContainer
+ ref={rowRef}
role="button"
tabIndex={0}
aria-label={t`Open record`}
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
new file mode 100644
index 00000000000..7d3c03b2251
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowDragOverlay.tsx
@@ -0,0 +1,36 @@
+import { type Draggable } from '@dnd-kit/dom';
+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 { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';
+import { RecordListRow } from '@/object-record/record-list/components/RecordListRow';
+
+const StyledRowDragOverlay = styled.div`
+ background: ${themeCssVariables.background.secondary};
+ border: 1px solid ${themeCssVariables.border.color.medium};
+ border-radius: ${themeCssVariables.border.radius.sm};
+ position: relative;
+`;
+
+type RecordListRowDragOverlayProps = {
+ source: Draggable | null;
+};
+
+export const RecordListRowDragOverlay = ({
+ source,
+}: RecordListRowDragOverlayProps) => {
+ const sourceData = source?.data as RecordDragData | undefined;
+
+ if (!isDefined(sourceData)) {
+ return null;
+ }
+
+ return (
+ <StyledRowDragOverlay>
+ <RecordListRow recordId={sourceData.recordId} />
+ <RecordDragMultiDragPreview recordId={sourceData.recordId} />
+ </StyledRowDragOverlay>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowDndType.ts b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowDndType.ts
new file mode 100644
index 00000000000..11a3eb25efa
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowDndType.ts
@@ -0,0 +1 @@
+export const RECORD_LIST_ROW_DND_TYPE = 'record-list-row';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
index 4b8cd816d51..0dea88be312 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
@@ -1,9 +1,10 @@
import { useStore } from 'jotai';
import { type ReactNode } from 'react';
-import { useProcessTableWithoutGroupRecordDrop } from '@/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop';
+import { RecordDragDropContextProvider } from '@/object-record/record-drag/components/RecordDragDropContextProvider';
+import { useProcessRecordWithoutGroupDrop } from '@/object-record/record-drag/hooks/useProcessRecordWithoutGroupDrop';
+import { useTriggerTableWithoutGroupDragAndDropOptimisticUpdate } from '@/object-record/record-drag/hooks/useTriggerTableWithoutGroupDragAndDropOptimisticUpdate';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
-import { RecordTableBodyDragDropContextProvider } from '@/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider';
import { RecordTableRowDragOverlayContent } from '@/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent';
import { totalNumberOfRecordsToVirtualizeComponentState } from '@/object-record/record-table/virtualization/states/totalNumberOfRecordsToVirtualizeComponentState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
@@ -24,20 +25,24 @@ export const RecordTableBodyNoRecordGroupDragDropContextProvider = ({
const store = useStore();
- const { processTableWithoutGroupRecordDrop } =
- useProcessTableWithoutGroupRecordDrop();
+ const { triggerTableWithoutGroupDragAndDropOptimisticUpdate } =
+ useTriggerTableWithoutGroupDragAndDropOptimisticUpdate();
+
+ const { processRecordWithoutGroupDrop } = useProcessRecordWithoutGroupDrop({
+ onBeforeRecordsUpdate: triggerTableWithoutGroupDragAndDropOptimisticUpdate,
+ });
return (
- <RecordTableBodyDragDropContextProvider
+ <RecordDragDropContextProvider
getDroppableItemCount={() =>
store.get(totalNumberOfRecordsToVirtualize) ?? 0
}
- onRecordDrop={processTableWithoutGroupRecordDrop}
+ onRecordDrop={processRecordWithoutGroupDrop}
renderDragOverlay={(source) => (
<RecordTableRowDragOverlayContent source={source} />
)}
>
{children}
- </RecordTableBodyDragDropContextProvider>
+ </RecordDragDropContextProvider>
);
};
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 a536f6c0de1..3593153208b 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
@@ -1,10 +1,10 @@
import { useStore } from 'jotai';
import { type ReactNode } from 'react';
-import { useProcessTableWithGroupRecordDrop } from '@/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop';
+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 { RecordTableBodyDragDropContextProvider } from '@/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider';
import { RecordTableRowDragOverlayContent } from '@/object-record/record-table/record-table-row/components/RecordTableRowDragOverlayContent';
import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
@@ -22,15 +22,14 @@ export const RecordTableBodyRecordGroupDragDropContextProvider = ({
const store = useStore();
- const { processTableWithGroupRecordDrop } =
- useProcessTableWithGroupRecordDrop();
+ const { processRecordGroupDrop } = useProcessRecordGroupDrop();
return (
- <RecordTableBodyDragDropContextProvider
+ <RecordDragDropContextProvider
getDroppableItemCount={(droppableId) =>
store.get(recordIdsByGroupCallbackState(droppableId)).length
}
- onRecordDrop={processTableWithGroupRecordDrop}
+ onRecordDrop={processRecordGroupDrop}
renderDragOverlay={(source) => (
<RecordTableRecordGroupBodyContextProvider>
<RecordTableRowDragOverlayContent source={source} />
@@ -38,6 +37,6 @@ export const RecordTableBodyRecordGroupDragDropContextProvider = ({
)}
>
{children}
- </RecordTableBodyDragDropContextProvider>
+ </RecordDragDropContextProvider>
);
};
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 ecc16daa522..677b2224852 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
@@ -10,7 +10,7 @@ import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constant
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 { useIsTableRowSecondaryDragged } from '@/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged';
+import { useIsRecordSecondaryDragged } from '@/object-record/record-drag/hooks/useIsRecordSecondaryDragged';
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,7 +45,7 @@ export const RecordTableDraggableTr = ({
onClick,
children,
}: RecordTableDraggableTrProps) => {
- const { isSecondaryDragged } = useIsTableRowSecondaryDragged(recordId);
+ const { isSecondaryDragged } = useIsRecordSecondaryDragged(recordId);
const { recordGroupId } = useContext(RecordGroupContext);
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 56c15d63d3b..74cc127784f 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 { RecordTableRowMultiDragPreview } from '@/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview';
+import { RecordDragMultiDragPreview } from '@/object-record/record-drag/components/RecordDragMultiDragPreview';
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>
- <RecordTableRowMultiDragPreview recordId={recordId} />
+ <RecordDragMultiDragPreview recordId={recordId} />
</StyledRowDragOverlayCSSBridge>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/types/RecordTableRowDragData.ts b/packages/twenty-front/src/modules/object-record/record-table/types/RecordTableRowDragData.ts
index 8bd3468a689..c5b357afaf2 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/types/RecordTableRowDragData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/types/RecordTableRowDragData.ts
@@ -1,6 +1,5 @@
-import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';
-export type RecordTableRowDragData = DragDropItemData & {
- recordId: string;
+export type RecordTableRowDragData = RecordDragData & {
focusIndex: number;
};
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
new file mode 100644
index 00000000000..06c194f4117
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/computeNewPositionsOfDraggedRecords.test.ts
@@ -0,0 +1,45 @@
+import { computeNewPositionsOfDraggedRecords } from '@/object-record/utils/computeNewPositionsOfDraggedRecords';
+
+describe('computeNewPositionsOfDraggedRecords', () => {
+ const records = [
+ { id: 'a', position: 1 },
+ { id: 'b', position: 2 },
+ { id: 'c', position: 3 },
+ { id: 'd', position: 4 },
+ ];
+
+ it('should gather the selection around the dragged record when it is dropped where it was', () => {
+ const result = computeNewPositionsOfDraggedRecords({
+ arrayOfRecordsWithPosition: records,
+ draggedRecordId: 'c',
+ targetRecordId: 'c',
+ sourceRecordIds: ['a', 'c'],
+ isDroppedAfterList: false,
+ });
+
+ const positionById = new Map(
+ result?.map(({ id, position }) => [id, position]),
+ );
+
+ expect(positionById.get('a')).toBeGreaterThan(2);
+ expect(positionById.get('a')).toBeLessThan(positionById.get('c') ?? 0);
+ expect(positionById.get('c')).toBeLessThan(4);
+ });
+
+ it('should gather the selection at the end when the dragged record is the last one', () => {
+ const result = computeNewPositionsOfDraggedRecords({
+ arrayOfRecordsWithPosition: records,
+ draggedRecordId: 'd',
+ targetRecordId: 'd',
+ sourceRecordIds: ['a', 'd'],
+ isDroppedAfterList: true,
+ });
+
+ const positionById = new Map(
+ result?.map(({ id, position }) => [id, position]),
+ );
+
+ expect(positionById.get('a')).toBeGreaterThan(3);
+ expect(positionById.get('d')).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 8c3fc805a7a..102796b3305 100644
--- a/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/computeNewPositionsOfDraggedRecords.ts
@@ -24,11 +24,37 @@ export const computeNewPositionsOfDraggedRecords = ({
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) {
- return null;
- }
+ 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 targetPosition = targetItem.position;
+ 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,