Skip to content

The open alternative to Salesforce, designed for AI.

Record Board & Record Calendar Drag Drop `dnd-kit` rewrite. (#23071)

Priyanshu Bartwalb4aa3238895e
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
index 79434f30c46..2dd55890071 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
@@ -5,7 +5,6 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
import { RecordBoardColumnWidthEffect } from '@/object-record/record-board/components/RecordBoardColumnWidthEffect';
import { RecordBoardColumns } from '@/object-record/record-board/components/RecordBoardColumns';
-import { RecordBoardDragDropContext } from '@/object-record/record-board/components/RecordBoardDragDropContext';
import { RecordBoardDragSelect } from '@/object-record/record-board/components/RecordBoardDragSelect';
import { RecordBoardEffects } from '@/object-record/record-board/components/RecordBoardEffects';
import { RecordBoardFetchMoreInViewTriggerComponent } from '@/object-record/record-board/components/RecordBoardFetchMoreInViewTriggerComponent';
@@ -16,6 +15,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { getRecordBoardHtmlId } from '@/object-record/record-board/utils/getRecordBoardHtmlId';
+import { RecordBoardDndKitProvider } from '@/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider';
const StyledContainer = styled.div`
display: flex;
@@ -57,9 +57,9 @@ export const RecordBoard = () => {
<RecordBoardHeader />
<StyledBoardContentContainer>
<StyledContainer ref={boardRef}>
- <RecordBoardDragDropContext>
+ <RecordBoardDndKitProvider>
<RecordBoardColumns />
- </RecordBoardDragDropContext>
+ </RecordBoardDndKitProvider>
{!isRecordBoardViewSettingsReadOnly && (
<RecordBoardDragSelect boardRef={boardRef} />
)}
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragDropContext.tsx
deleted file mode 100644
index faf10ef2623..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragDropContext.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { isRecordBoardDropProcessingComponentState } from '@/object-record/record-board/states/isRecordBoardDropProcessingComponentState';
-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';
-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 { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';
-import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
-import { getBoardCardDropBehavior } from '@/object-record/record-board/utils/getBoardCardDropBehavior';
-import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import {
- DragDropContext,
- type DragStart,
- type OnDragEndResponder,
-} from '@hello-pangea/dnd';
-import { useStore } from 'jotai';
-import { useCallback, useContext } from 'react';
-
-export const RecordBoardDragDropContext = ({
- children,
-}: React.PropsWithChildren) => {
- const { recordBoardId } = useContext(RecordBoardContext);
-
- const currentRecordSorts = useAtomComponentStateCallbackState(
- currentRecordSortsComponentState,
- recordBoardId,
- );
-
- const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(
- recordBoardSelectedRecordIdsComponentSelector,
- recordBoardId,
- );
-
- const store = useStore();
-
- const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
- originalDragSelectionComponentState,
- );
-
- const { startRecordDrag } = useStartRecordDrag();
- const { endRecordDrag } = useEndRecordDrag();
-
- const { processBoardCardDrop } = useProcessBoardCardDrop();
-
- const isRecordBoardDropProcessingCallbackState =
- useAtomComponentStateCallbackState(
- isRecordBoardDropProcessingComponentState,
- );
-
- const { openModal } = useModal();
-
- const handleDragStart = useCallback(
- (start: DragStart) => {
- const currentSelectedRecordIds = store.get(recordBoardSelectedRecordIds);
-
- store.set(isRecordBoardDropProcessingCallbackState, true);
-
- startRecordDrag(start, currentSelectedRecordIds);
- },
- [
- recordBoardSelectedRecordIds,
- startRecordDrag,
- store,
- isRecordBoardDropProcessingCallbackState,
- ],
- );
-
- const handleDragEnd: OnDragEndResponder = useCallback(
- (result) => {
- const originalDragSelection = store.get(
- originalDragSelectionCallbackState,
- );
-
- if (!result.destination) {
- store.set(isRecordBoardDropProcessingCallbackState, false);
- endRecordDrag();
- return;
- }
-
- const existingRecordSorts = store.get(currentRecordSorts);
- const boardCardDropBehavior = getBoardCardDropBehavior({
- hasRecordSorts: existingRecordSorts.length > 0,
- sourceDroppableId: result.source.droppableId,
- destinationDroppableId: result.destination.droppableId,
- });
-
- if (boardCardDropBehavior.shouldBlockDrop) {
- store.set(isRecordBoardDropProcessingCallbackState, false);
- endRecordDrag();
- openModal(RECORD_INDEX_REMOVE_SORTING_MODAL_ID);
- return;
- }
-
- try {
- processBoardCardDrop(result, originalDragSelection, {
- shouldUpdatePosition: boardCardDropBehavior.shouldUpdatePosition,
- });
- } catch (error) {
- store.set(isRecordBoardDropProcessingCallbackState, false);
- endRecordDrag();
-
- throw error;
- }
-
- store.set(isRecordBoardDropProcessingCallbackState, false);
- endRecordDrag();
- },
- [
- processBoardCardDrop,
- endRecordDrag,
- currentRecordSorts,
- openModal,
- store,
- originalDragSelectionCallbackState,
- isRecordBoardDropProcessingCallbackState,
- ],
- );
-
- return (
- <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
- {children}
- </DragDropContext>
- );
-};
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 1f6f63708d3..b8e640450b5 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
@@ -21,6 +21,7 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-boar
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
+import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
@@ -28,6 +29,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { styled } from '@linaria/react';
@@ -35,6 +37,7 @@ import { useContext } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AnimatedEaseInOut } from 'twenty-ui/layout';
import { useDebouncedCallback } from 'use-debounce';
+import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
const StyledCardContainer = styled.div<{ isPrimaryMultiDrag?: boolean }>`
position: relative;
@@ -49,7 +52,7 @@ const StyledBoardCardWrapper = styled.div`
`;
export const RecordBoardCard = () => {
- const { recordId, rowIndex, columnIndex } = useContext(
+ const { recordId, rowIndex, columnIndex, isDragOverlay } = useContext(
RecordBoardCardContext,
);
@@ -67,6 +70,10 @@ export const RecordBoardCard = () => {
{ recordId },
);
+ const primaryDraggedRecordId = useAtomComponentStateValue(
+ primaryDraggedRecordIdComponentState,
+ );
+
const { currentView } = useGetCurrentViewOnly();
const isCompactModeActive = currentView?.isCompact ?? false;
@@ -115,6 +122,12 @@ export const RecordBoardCard = () => {
const { activateBoardCard } = useActiveRecordBoardCard(recordBoardId);
const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);
+ const {
+ onPointerCancel: handlePointerCancel,
+ onPointerDown: handlePointerDown,
+ onPointerUp: handlePointerUp,
+ } = useDisableDragSelectOnPointerDown();
+
const handleContextMenuOpen = (event: React.MouseEvent) => {
event.preventDefault();
setIsRecordBoardCardSelected(true);
@@ -144,7 +157,10 @@ export const RecordBoardCard = () => {
}, 800);
const isDraggingThisCard =
- isRecordIdPrimaryDragMultiple || isRecordIdSecondaryDragMultiple;
+ !isDragOverlay &&
+ (isRecordIdPrimaryDragMultiple ||
+ isRecordIdSecondaryDragMultiple ||
+ primaryDraggedRecordId === recordId);
return (
<RecordBoardCardComponentInstanceContext.Provider
@@ -158,19 +174,22 @@ export const RecordBoardCard = () => {
<StyledBoardCardWrapper
data-click-outside-id={RECORD_BOARD_CARD_CLICK_OUTSIDE_ID}
onContextMenu={handleContextMenuOpen}
+ onPointerCancel={handlePointerCancel}
+ onPointerDown={handlePointerDown}
+ onPointerUp={handlePointerUp}
>
<StyledCardContainer
- isPrimaryMultiDrag={isRecordIdPrimaryDragMultiple}
+ isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
>
- {isRecordIdPrimaryDragMultiple && <RecordBoardCardMultiDragStack />}
+ {isDragOverlay && isRecordIdPrimaryDragMultiple && (
+ <RecordBoardCardMultiDragStack />
+ )}
<RecordCard
data-selected={isRecordBoardCardSelected}
data-focused={isRecordBoardCardFocused}
data-active={isRecordBoardCardActive}
onMouseLeave={onMouseLeaveBoard}
onClick={handleCardClick}
- isPrimaryMultiDrag={isRecordIdPrimaryDragMultiple}
- isSecondaryDragged={isRecordIdSecondaryDragMultiple}
isDragging={isDraggingThisCard}
>
<RecordBoardCardHeader />
@@ -182,8 +201,12 @@ export const RecordBoardCard = () => {
</AnimatedEaseInOut>
</RecordCard>
</StyledCardContainer>
- <RecordBoardCardCellHoveredPortal />
- <RecordBoardCardCellEditModePortal />
+ {!isDragOverlay && (
+ <>
+ <RecordBoardCardCellHoveredPortal />
+ <RecordBoardCardCellEditModePortal />
+ </>
+ )}
</StyledBoardCardWrapper>
</RecordFieldsScopeContextProvider>
</RecordBoardCardComponentInstanceContext.Provider>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
index aba2f69082d..efab2d7b597 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
@@ -21,7 +21,9 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { useContext } from 'react';
export const RecordBoardCardBody = () => {
- const { recordId, isRecordReadOnly } = useContext(RecordBoardCardContext);
+ const { recordId, isRecordReadOnly, isDragOverlay } = useContext(
+ RecordBoardCardContext,
+ );
const { updateOneRecord, objectPermissions, objectMetadataItem } =
useContext(RecordBoardContext);
@@ -97,7 +99,9 @@ export const RecordBoardCardBody = () => {
useUpdateRecord: useUpdateOneRecordHook,
isDisplayModeFixHeight: true,
triggerEvent: 'CLICK',
- anchorId: `${RECORD_BOARD_CARD_INPUT_ID_PREFIX}-${recordId}-${correspondingFieldDefinition.metadata.fieldName}`,
+ anchorId: isDragOverlay
+ ? undefined
+ : `${RECORD_BOARD_CARD_INPUT_ID_PREFIX}-${recordId}-${correspondingFieldDefinition.metadata.fieldName}`,
onMouseEnter: () => handleMouseEnter(index),
}}
>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
similarity index 50%
rename from packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx
rename to packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
index d0f1c308a3e..783d9767e12 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider.tsx
@@ -1,21 +1,18 @@
-import { Draggable } from '@hello-pangea/dnd';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { createPortal } from 'react-dom';
-import { getCssCompatibleDraggableProps } from '@/ui/layout/draggable-list/utils/getCssCompatibleDraggableProps';
+import { RecordBoardCardHotkeysEffect } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHotkeysEffect';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
+import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { RecordBoardCard } from '@/object-record/record-board/record-board-card/components/RecordBoardCard';
-import { RecordBoardCardHotkeysEffect } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHotkeysEffect';
-import { RecordBoardCardMultiDragPreview } from '@/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview';
-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 { isRecordBoardCardFocusedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState';
import { isRecordBoardDropProcessingComponentState } from '@/object-record/record-board/states/isRecordBoardDropProcessingComponentState';
-import { DragAndDropLibraryLegacyReRenderBreaker } from '@/ui/drag-and-drop/components/DragAndDropReRenderBreaker';
-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
+import { DragDropItemSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableCell';
+import { RECORD_BOARD_CARD_DND_TYPE } from '@/object-record/record-board/record-board-dnd/constants/RecordBoardCardDndType';
const StyledDraggableContainer = styled.div<{
isDragDisabled: boolean;
@@ -27,26 +24,25 @@ const StyledDraggableContainer = styled.div<{
scroll-margin-top: 40px;
`;
-export const RecordBoardCardDraggableContainer = ({
- recordId,
- rowIndex,
-}: {
+type RecordBoardCardContextProviderProps = {
recordId: string;
rowIndex: number;
-}) => {
+ group: string;
+};
+
+export const RecordBoardCardContextProvider = ({
+ recordId,
+ rowIndex,
+ group,
+}: RecordBoardCardContextProviderProps) => {
const { objectMetadataItem } = useContext(RecordBoardContext);
+ const { columnIndex } = useContext(RecordBoardColumnContext);
const isRecordReadOnly = useIsRecordReadOnly({
recordId,
objectMetadataId: objectMetadataItem.id,
});
- const isRecordBoardDropProcessing = useAtomComponentStateValue(
- isRecordBoardDropProcessingComponentState,
- );
-
- const { columnIndex } = useContext(RecordBoardColumnContext);
-
const isRecordBoardCardFocused = useAtomComponentFamilyStateValue(
isRecordBoardCardFocusedComponentFamilyState,
{
@@ -55,51 +51,32 @@ export const RecordBoardCardDraggableContainer = ({
},
);
+ const isRecordBoardDropProcessing = useAtomComponentStateValue(
+ isRecordBoardDropProcessingComponentState,
+ );
+
return (
<RecordBoardCardContext.Provider
value={{ recordId, isRecordReadOnly, rowIndex, columnIndex }}
>
- <Draggable
- key={recordId}
- draggableId={recordId}
+ <DragDropItemSortableCell
+ id={recordId}
index={rowIndex}
- isDragDisabled={isRecordBoardDropProcessing}
+ group={group}
+ type={RECORD_BOARD_CARD_DND_TYPE}
+ accept={RECORD_BOARD_CARD_DND_TYPE}
+ disabled={isRecordBoardDropProcessing}
>
- {(draggableProvided, draggableSnapshot) => {
- const draggableContent = (
- <StyledDraggableContainer
- isDragDisabled={isRecordBoardDropProcessing}
- id={`record-board-card-${columnIndex}-${rowIndex}`}
- ref={draggableProvided?.innerRef}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...draggableProvided?.dragHandleProps}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...getCssCompatibleDraggableProps(
- draggableProvided.draggableProps,
- )}
- data-selectable-id={recordId}
- data-select-disable
- >
- <DragAndDropLibraryLegacyReRenderBreaker memoizationId={recordId}>
- {isRecordBoardCardFocused && <RecordBoardCardHotkeysEffect />}
- <RecordBoardCard />
- <RecordBoardCardMultiDragPreview />
- </DragAndDropLibraryLegacyReRenderBreaker>
- </StyledDraggableContainer>
- );
-
- // The drag clone is position: fixed, which resolves against the
- // nearest transformed ancestor — dashboard widgets are translated
- // by react-grid-layout, offsetting the clone from the pointer.
- // Portal it to the body while dragging so the viewport stays its
- // containing block.
- if (draggableSnapshot.isDragging) {
- return createPortal(draggableContent, document.body);
- }
-
- return draggableContent;
- }}
- </Draggable>
+ <StyledDraggableContainer
+ isDragDisabled={isRecordBoardDropProcessing}
+ id={`record-board-card-${columnIndex}-${rowIndex}`}
+ data-selectable-id={recordId}
+ data-select-disable
+ >
+ {isRecordBoardCardFocused && <RecordBoardCardHotkeysEffect />}
+ <RecordBoardCard />
+ </StyledDraggableContainer>
+ </DragDropItemSortableCell>
</RecordBoardCardContext.Provider>
);
};
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
new file mode 100644
index 00000000000..cf0c7af45e5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDragOverlayContent.tsx
@@ -0,0 +1,84 @@
+import { type Draggable } from '@dnd-kit/dom';
+import { useContext } from 'react';
+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 { 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';
+import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
+import { ViewType } from '@/views/types/ViewType';
+
+type RecordBoardCardDragOverlayContentProps = {
+ source: Draggable | null;
+};
+
+export const RecordBoardCardDragOverlayContent = ({
+ source,
+}: RecordBoardCardDragOverlayContentProps) => {
+ const { objectMetadataItem } = useContext(RecordBoardContext);
+
+ const sourceData = source?.data as DragDropItemData | undefined;
+
+ const columnId = sourceData?.droppableId ?? '';
+ const rowIndex = sourceData?.index ?? 0;
+ const recordId = isDefined(source) ? String(source.id) : '';
+
+ const visibleRecordGroupIds = useAtomComponentFamilySelectorValue(
+ visibleRecordGroupIdsComponentFamilySelector,
+ ViewType.KANBAN,
+ );
+
+ const columnIndex = visibleRecordGroupIds.indexOf(columnId);
+
+ const recordGroupDefinition = useAtomFamilyStateValue(
+ recordGroupDefinitionFamilyState,
+ columnId,
+ );
+
+ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ columnId,
+ );
+
+ const isRecordReadOnly = useIsRecordReadOnly({
+ recordId,
+ objectMetadataId: objectMetadataItem.id,
+ });
+
+ if (!isDefined(source) || !isDefined(recordGroupDefinition)) {
+ return null;
+ }
+
+ return (
+ <RecordBoardColumnContext.Provider
+ value={{
+ columnDefinition: recordGroupDefinition,
+ columnId,
+ recordIds: recordIndexRecordIdsByGroup,
+ columnIndex,
+ }}
+ >
+ <RecordBoardCardContext.Provider
+ value={{
+ recordId,
+ isRecordReadOnly,
+ rowIndex,
+ columnIndex,
+ isDragOverlay: true,
+ }}
+ >
+ <RecordBoardCard />
+ <RecordBoardCardMultiDragPreview />
+ </RecordBoardCardContext.Provider>
+ </RecordBoardColumnContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/contexts/RecordBoardCardContext.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/contexts/RecordBoardCardContext.ts
index ac038962fe6..8a00deaa946 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/contexts/RecordBoardCardContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/contexts/RecordBoardCardContext.ts
@@ -5,6 +5,7 @@ type RecordBoardCardContextProps = {
isRecordReadOnly: boolean;
rowIndex: number;
columnIndex: number;
+ isDragOverlay?: boolean;
};
export const RecordBoardCardContext =
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
index eb15fcd1e0d..7842f8891bd 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
@@ -1,5 +1,4 @@
import { styled } from '@linaria/react';
-import { Droppable } from '@hello-pangea/dnd';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { RECORD_BOARD_COLUMN_WIDTH } from '@/object-record/record-board/constants/RecordBoardColumnWidth';
@@ -9,10 +8,14 @@ import { RecordBoardColumnContext } from '@/object-record/record-board/record-bo
import { useShouldHideRecordGroup } from '@/object-record/record-group/hooks/useShouldHideRecordGroup';
import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
-import { DragAndDropLibraryLegacyReRenderBreaker } from '@/ui/drag-and-drop/components/DragAndDropReRenderBreaker';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { isDefined } from 'twenty-shared/utils';
+import { useDroppable } from '@dnd-kit/react';
+import { pointerIntersection } from '@dnd-kit/collision';
+import { RECORD_BOARD_CARD_DND_TYPE } from '@/object-record/record-board/record-board-dnd/constants/RecordBoardCardDndType';
+import { RECORD_BOARD_COLUMN_DND_TYPE } from '@/object-record/record-board/record-board-dnd/constants/RecordBoardColumnDndType';
+import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
const StyledColumn = styled.div`
background-color: ${themeCssVariables.background.primary};
@@ -51,6 +54,14 @@ export const RecordBoardColumn = ({
const shouldHide = useShouldHideRecordGroup(recordBoardColumnId);
+ const { ref } = useDroppable({
+ id: recordBoardColumnId,
+ collisionPriority: DND_KIT_COLLISION_PRIORITY,
+ collisionDetector: pointerIntersection,
+ type: RECORD_BOARD_COLUMN_DND_TYPE,
+ accept: RECORD_BOARD_CARD_DND_TYPE,
+ });
+
if (shouldHide) {
return null;
}
@@ -68,24 +79,11 @@ export const RecordBoardColumn = ({
columnIndex: recordBoardColumnIndex,
}}
>
- <Droppable droppableId={recordBoardColumnId} ignoreContainerClipping>
- {(droppableProvided) => (
- <StyledColumn
- ref={droppableProvided.innerRef}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...droppableProvided.droppableProps}
- >
- <DragAndDropLibraryLegacyReRenderBreaker
- memoizationId={recordBoardColumnId}
- >
- <RecordBoardColumnCardsContainer
- recordBoardColumnId={recordBoardColumnId}
- />
- </DragAndDropLibraryLegacyReRenderBreaker>
- {droppableProvided.placeholder}
- </StyledColumn>
- )}
- </Droppable>
+ <StyledColumn ref={ref} data-record-board-column-id={recordBoardColumnId}>
+ <RecordBoardColumnCardsContainer
+ recordBoardColumnId={recordBoardColumnId}
+ />
+ </StyledColumn>
</RecordBoardColumnContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx
index 896efb37f01..f3b90b1f5ce 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx
@@ -1,18 +1,14 @@
-import { Draggable } from '@hello-pangea/dnd';
import { styled } from '@linaria/react';
-import { useContext } from 'react';
+import { Fragment } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { getCssCompatibleDraggableProps } from '@/ui/layout/draggable-list/utils/getCssCompatibleDraggableProps';
-import { RecordBoardCardDraggableContainer } from '@/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer';
-
import { RecordBoardColumnNewRecordButton } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton';
-import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
-
import { RecordBoardColumnLoadingSkeletonCards } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnLoadingSkeletonCards';
import { recordBoardShouldFetchMoreInColumnComponentFamilyState } from '@/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState';
import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
+import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
+import { RecordBoardCardContextProvider } from '@/object-record/record-board/record-board-card/components/RecordBoardCardContextProvider';
const StyledColumnCardsContainer = styled.div`
display: flex;
@@ -31,8 +27,6 @@ type RecordBoardColumnCardsContainerProps = {
export const RecordBoardColumnCardsContainer = ({
recordBoardColumnId,
}: RecordBoardColumnCardsContainerProps) => {
- const { columnDefinition } = useContext(RecordBoardColumnContext);
-
const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(
recordIndexRecordIdsByGroupComponentFamilyState,
recordBoardColumnId,
@@ -46,30 +40,29 @@ export const RecordBoardColumnCardsContainer = ({
return (
<StyledColumnCardsContainer data-replay-ignore-mutations="true">
{recordIndexRecordIdsByGroup.map((recordId, index) => (
- <RecordBoardCardDraggableContainer
- key={recordId}
- recordId={recordId}
- rowIndex={index}
- />
+ <Fragment key={recordId}>
+ <DragDropItemDropTarget
+ index={index}
+ droppableId={recordBoardColumnId}
+ orientation="horizontal"
+ compact
+ />
+ <RecordBoardCardContextProvider
+ recordId={recordId}
+ rowIndex={index}
+ group={recordBoardColumnId}
+ />
+ </Fragment>
))}
{recordBoardShouldFetchMoreInColumn ? (
<RecordBoardColumnLoadingSkeletonCards />
) : null}
- <Draggable
- draggableId={`new-${columnDefinition.id}-bottom`}
+ <DragDropItemDropTarget
index={recordIndexRecordIdsByGroup.length}
- isDragDisabled={true}
- >
- {(draggableProvided) => (
- <div
- ref={draggableProvided.innerRef}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...getCssCompatibleDraggableProps(
- draggableProvided.draggableProps,
- )}
- ></div>
- )}
- </Draggable>
+ droppableId={recordBoardColumnId}
+ orientation="horizontal"
+ compact
+ />
<StyledNewButtonContainer>
<RecordBoardColumnNewRecordButton />
</StyledNewButtonContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDnd.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDnd.tsx
index 80b4079156d..1565c42a015 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDnd.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDnd.tsx
@@ -6,9 +6,9 @@ import { RECORD_BOARD_COLUMN_DROPPABLE_ID } from '@/object-record/record-board/r
import { RecordBoardColumnDndKitProvider } from '@/object-record/record-board/record-board-column/dnd/providers/RecordBoardColumnDndKitProvider';
import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';
-import { DragDropColumnDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropColumnDropTarget';
-import { DragDropColumnDroppableSlot } from '@/ui/utilities/drag-and-drop/components/DragDropColumnDroppableSlot';
-import { DragDropColumnSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropColumnSortableCell';
+import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
+import { DragDropItemDroppableSlot } from '@/ui/utilities/drag-and-drop/components/DragDropItemDroppableSlot';
+import { DragDropItemSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableCell';
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
import { ViewType } from '@/views/types/ViewType';
@@ -20,19 +20,20 @@ export const RecordBoardColumnDnd = () => {
return (
<RecordBoardColumnDndKitProvider>
- <DragDropColumnDroppableSlot
+ <DragDropItemDroppableSlot
droppableId={RECORD_BOARD_COLUMN_DROPPABLE_ID}
index={0}
>
- <DragDropColumnDropTarget index={0} compact overlay />
- </DragDropColumnDroppableSlot>
+ <DragDropItemDropTarget index={0} orientation="vertical" overlay />
+ </DragDropItemDroppableSlot>
{visibleRecordGroupIds.map((recordGroupId, index) => (
<Fragment key={recordGroupId}>
- <DragDropColumnSortableCell
+ <DragDropItemSortableCell
id={recordGroupId}
index={index}
group={RECORD_BOARD_COLUMN_DROPPABLE_ID}
fill
+ restrictMovementTo="x"
>
<RecordGroupContext.Provider value={{ recordGroupId }}>
<RecordBoardColumnHeaderWrapper
@@ -40,13 +41,17 @@ export const RecordBoardColumnDnd = () => {
columnIndex={index}
/>
</RecordGroupContext.Provider>
- </DragDropColumnSortableCell>
- <DragDropColumnDroppableSlot
+ </DragDropItemSortableCell>
+ <DragDropItemDroppableSlot
droppableId={RECORD_BOARD_COLUMN_DROPPABLE_ID}
index={index + 1}
>
- <DragDropColumnDropTarget index={index + 1} compact overlay />
- </DragDropColumnDroppableSlot>
+ <DragDropItemDropTarget
+ index={index + 1}
+ orientation="vertical"
+ overlay
+ />
+ </DragDropItemDroppableSlot>
</Fragment>
))}
<RecordBoardAddGroupColumn />
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index fcaff026942..cbd1d415df1 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -7,7 +7,7 @@ import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPe
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { RecordBoardColumnDropdownMenu } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu';
import { RecordBoardColumnHeaderAggregateDropdown } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown';
-import { DragDropColumnSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle';
+import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import { RECORD_BOARD_COLUMN_WIDTH } from '@/object-record/record-board/constants/RecordBoardColumnWidth';
import { RECORD_BOARD_COLUMN_WIDTH_CSS_VARIABLE_NAME } from '@/object-record/record-board/constants/RecordBoardColumnWidthCssVariableName';
import { RecordBoardColumnResizeHandler } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler';
@@ -186,7 +186,7 @@ export const RecordBoardColumnHeader = () => {
return (
<StyledColumn data-has-left-border={columnIndex > 0 ? 'true' : undefined}>
- <DragDropColumnSortableHandle fill>
+ <DragDropItemSortableHandle fill>
<StyledHeader
onPointerCancel={handlePointerCancel}
onPointerDown={handlePointerDown}
@@ -261,7 +261,7 @@ export const RecordBoardColumnHeader = () => {
)}
</StyledHeaderContainer>
</StyledHeader>
- </DragDropColumnSortableHandle>
+ </DragDropItemSortableHandle>
{!isRecordBoardViewSettingsReadOnly && <RecordBoardColumnResizeHandler />}
</StyledColumn>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts
index af59de5579a..69080e749ba 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts
@@ -11,8 +11,8 @@ import { recordIndexKanbanColumnWidthComponentState } from '@/object-record/reco
import { recordIndexRecordGroupIsDraggableSortComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexRecordGroupIsDraggableSortComponentSelector';
import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { type DragDropColumnData } from '@/ui/utilities/drag-and-drop/types/DragDropColumnData';
-import { resolveDragDropColumnDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { resolveDragDropItemDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop';
import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
@@ -23,17 +23,17 @@ import { ViewType } from '@/views/types/ViewType';
type DragStartPayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragStart']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragStart']
>
>[0];
type DragMovePayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragMove']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragMove']
>
>[0];
type DragEndPayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragEnd']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragEnd']
>
>[0];
@@ -107,7 +107,7 @@ export const useRecordBoardColumnDndKit = (): {
return null;
}
- return resolveDragDropColumnDrop({
+ return resolveDragDropItemDrop({
pointerX,
sourceIndex,
scrollWrapperElement,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/providers/RecordBoardColumnDndKitProvider.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/providers/RecordBoardColumnDndKitProvider.tsx
index bf0f50d0b47..3fd9e9b1449 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/providers/RecordBoardColumnDndKitProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/providers/RecordBoardColumnDndKitProvider.tsx
@@ -5,9 +5,9 @@ import { isRecordBoardViewSettingsReadOnlyComponentState } from '@/object-record
import { useRecordBoardColumnDndKit } from '@/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { RecordGroupReorderConfirmationModal } from '@/object-record/record-group/components/RecordGroupReorderConfirmationModal';
-import { DragDropColumnDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropColumnDndContext';
+import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
-import { type DragDropColumnData } from '@/ui/utilities/drag-and-drop/types/DragDropColumnData';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
type RecordBoardColumnDndKitProviderProps = {
children: ReactNode;
@@ -25,8 +25,8 @@ export const RecordBoardColumnDndKitProvider = ({
return (
<>
- <DragDropColumnDndContext.Provider value={contextValues}>
- <DragDropProvider<DragDropColumnData>
+ <DragDropItemDndContext.Provider value={contextValues}>
+ <DragDropProvider<DragDropItemData>
sensors={isRecordBoardViewSettingsReadOnly ? [] : DND_KIT_SENSORS}
onDragStart={handlers.onDragStart}
onDragMove={handlers.onDragMove}
@@ -34,7 +34,7 @@ export const RecordBoardColumnDndKitProvider = ({
>
{children}
</DragDropProvider>
- </DragDropColumnDndContext.Provider>
+ </DragDropItemDndContext.Provider>
<RecordGroupReorderConfirmationModal
onConfirmClick={handlePendingReorderConfirmClick}
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardCardDndType.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardCardDndType.ts
new file mode 100644
index 00000000000..df709994864
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardCardDndType.ts
@@ -0,0 +1 @@
+export const RECORD_BOARD_CARD_DND_TYPE = 'card';
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardColumnDndType.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardColumnDndType.ts
new file mode 100644
index 00000000000..154bdd4eaf1
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/constants/RecordBoardColumnDndType.ts
@@ -0,0 +1 @@
+export const RECORD_BOARD_COLUMN_DND_TYPE = 'column';
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
new file mode 100644
index 00000000000..33a438a06a4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts
@@ -0,0 +1,229 @@
+import { type DragDropProvider } from '@dnd-kit/react';
+import { useStore } from 'jotai';
+import { type ComponentProps, 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 { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';
+import { getBoardCardDropBehavior } from '@/object-record/record-board/utils/getBoardCardDropBehavior';
+import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
+import { resolveDropFromPointerY } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointerY';
+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 { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';
+import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
+
+type DragStartPayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragStart']
+ >
+>[0];
+type DragMovePayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragMove']
+ >
+>[0];
+type DragEndPayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragEnd']
+ >
+>[0];
+
+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(
+ recordBoardSelectedRecordIdsComponentSelector,
+ recordBoardId,
+ );
+
+ const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
+ originalDragSelectionComponentState,
+ );
+
+ const recordIdsByGroupCallbackState =
+ useAtomComponentFamilyStateCallbackState(
+ recordIndexRecordIdsByGroupComponentFamilyState,
+ recordBoardId,
+ );
+
+ const { startRecordDrag } = useStartRecordDrag();
+ const { endRecordDrag } = useEndRecordDrag();
+
+ const { processBoardCardDrop } = useProcessBoardCardDrop();
+
+ const isRecordBoardDropProcessingCallbackState =
+ useAtomComponentStateCallbackState(
+ isRecordBoardDropProcessingComponentState,
+ );
+
+ const { openModal } = useModal();
+
+ 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 = resolveDropFromPointerY({
+ target,
+ pointerY: position.current.y,
+ 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 = resolveDropFromPointerY({
+ target,
+ pointerY: position.current.y,
+ 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();
+ openModal(RECORD_INDEX_REMOVE_SORTING_MODAL_ID);
+ 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
new file mode 100644
index 00000000000..30463b6b344
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/providers/RecordBoardDndKitProvider.tsx
@@ -0,0 +1,34 @@
+import { DragDropProvider, DragOverlay } from '@dnd-kit/react';
+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_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';
+
+type RecordBoardDndKitProviderProps = {
+ children: ReactNode;
+};
+
+export const RecordBoardDndKitProvider = ({
+ children,
+}: RecordBoardDndKitProviderProps) => {
+ const { contextValues, handlers } = useRecordBoardDndKit();
+
+ return (
+ <DragDropItemDndContext.Provider value={contextValues}>
+ <DragDropProvider<DragDropItemData>
+ sensors={DND_KIT_SENSORS}
+ onDragStart={handlers.onDragStart}
+ onDragMove={handlers.onDragMove}
+ onDragEnd={handlers.onDragEnd}
+ >
+ {children}
+ <DragOverlay>
+ {(source) => <RecordBoardCardDragOverlayContent source={source} />}
+ </DragOverlay>
+ </DragDropProvider>
+ </DragDropItemDndContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx
index ec5ac17e90f..ae6394c27dc 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx
@@ -1,19 +1,11 @@
import { RecordCalendarMonthBody } from '@/object-record/record-calendar/month/components/RecordCalendarMonthBody';
+import { RecordCalendarMonthDragDropContext } from '@/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext';
import { RecordCalendarMonthHeader } from '@/object-record/record-calendar/month/components/RecordCalendarMonthHeader';
import { RecordCalendarMonthContextProvider } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';
import { useRecordCalendarMonthDaysRange } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange';
import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';
-import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
-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 { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
-import {
- DragDropContext,
- type DragStart,
- type OnDragEndResponder,
-} from '@hello-pangea/dnd';
import { isDefined } from 'twenty-shared/utils';
const StyledContainer = styled.div`
@@ -32,10 +24,6 @@ export const RecordCalendarMonth = () => {
throw new Error(`Cannot show RecordCalendarMonth without a selected date`);
}
- const { processCalendarCardDrop } = useProcessCalendarCardDrop();
- const { startRecordDrag } = useStartRecordDrag();
- const { endRecordDrag } = useEndRecordDrag();
-
const {
firstDayOfMonth,
lastDayOfMonth,
@@ -46,26 +34,6 @@ export const RecordCalendarMonth = () => {
weekStartsOnDayIndex,
} = useRecordCalendarMonthDaysRange(recordCalendarSelectedDate);
- const handleDragStart = (start: DragStart) => {
- startRecordDrag(
- {
- ...start,
- draggableId: getRecordIdFromRecordCalendarCardDraggableId(
- start.draggableId,
- ),
- },
- [],
- );
- };
-
- const handleDragEnd: OnDragEndResponder = (result) => {
- endRecordDrag();
-
- if (!result.destination) return;
-
- processCalendarCardDrop(result);
- };
-
return (
<RecordCalendarMonthContextProvider
value={{
@@ -78,12 +46,12 @@ export const RecordCalendarMonth = () => {
weekStartsOnDayIndex,
}}
>
- <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
+ <RecordCalendarMonthDragDropContext>
<StyledContainer>
<RecordCalendarMonthHeader />
<RecordCalendarMonthBody />
</StyledContainer>
- </DragDropContext>
+ </RecordCalendarMonthDragDropContext>
</RecordCalendarMonthContextProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
index 2b3befdaa08..4a8e63a77da 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
@@ -6,8 +6,9 @@ import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUs
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
-import { Droppable } from '@hello-pangea/dnd';
-import { useState } from 'react';
+import { pointerIntersection } from '@dnd-kit/collision';
+import { useDroppable } from '@dnd-kit/react';
+import { Fragment, useState } from 'react';
import { Temporal } from 'temporal-polyfill';
import {
isDefined,
@@ -16,6 +17,9 @@ import {
isSamePlainDate,
} from 'twenty-shared/utils';
import { RecordCalendarAddNew } from '@/object-record/record-calendar/components/RecordCalendarAddNew';
+import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/month/constants/RecordCalendarCardDndType';
+import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
+import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div<{
@@ -90,7 +94,6 @@ const StyledCardsContainer = styled.div<{ isDraggedOver?: boolean }>`
display: flex;
flex: 1;
flex-direction: column;
- gap: ${themeCssVariables.spacing['0.5']};
min-height: 60px;
transition: background-color 0.1s ease;
`;
@@ -131,6 +134,19 @@ export const RecordCalendarMonthBodyDay = ({
const isDayOfWeekend = isPlainDateInWeekend(day);
+ const { isDropTarget, ref: dropRef } = useDroppable({
+ id: dayKey,
+ collisionPriority: DND_KIT_COLLISION_PRIORITY,
+ collisionDetector: pointerIntersection,
+ type: RECORD_CALENDAR_CARD_DND_TYPE,
+ accept: RECORD_CALENDAR_CARD_DND_TYPE,
+ });
+
+ const visibleRecordIds = recordIds.slice(
+ 0,
+ RECORD_CALENDAR_MONTH_VISIBLE_RECORD_LIMIT,
+ );
+
return (
<StyledContainer
isOtherMonth={isOtherMonth}
@@ -144,28 +160,29 @@ export const RecordCalendarMonthBodyDay = ({
<StyledDayHeaderDay isToday={isToday}>{day.day}</StyledDayHeaderDay>
</StyledDayHeaderDayContainer>
</StyledDayHeader>
- <Droppable droppableId={dayKey}>
- {(droppableProvided, droppableSnapshot) => (
- <StyledCardsContainer
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...droppableProvided.droppableProps}
- ref={droppableProvided.innerRef}
- isDraggedOver={droppableSnapshot.isDraggingOver}
- >
- {recordIds
- .slice(0, RECORD_CALENDAR_MONTH_VISIBLE_RECORD_LIMIT)
- .map((recordId, index) => (
- <RecordCalendarCardDraggableContainer
- key={`${recordId}-${dayKey}`}
- calendarDay={dayKey}
- recordId={recordId}
- index={index}
- />
- ))}
- {droppableProvided.placeholder}
- </StyledCardsContainer>
- )}
- </Droppable>
+ <StyledCardsContainer ref={dropRef} isDraggedOver={isDropTarget}>
+ {visibleRecordIds.map((recordId, index) => (
+ <Fragment key={`${recordId}-${dayKey}`}>
+ <DragDropItemDropTarget
+ index={index}
+ droppableId={dayKey}
+ orientation="horizontal"
+ compact
+ />
+ <RecordCalendarCardDraggableContainer
+ calendarDay={dayKey}
+ recordId={recordId}
+ index={index}
+ />
+ </Fragment>
+ ))}
+ <DragDropItemDropTarget
+ index={visibleRecordIds.length}
+ droppableId={dayKey}
+ orientation="horizontal"
+ compact
+ />
+ </StyledCardsContainer>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsx
new file mode 100644
index 00000000000..897e91d0a06
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsx
@@ -0,0 +1,30 @@
+import { DragDropProvider } from '@dnd-kit/react';
+import type { ReactNode } from 'react';
+
+import { useRecordCalendarMonthDndKit } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit';
+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';
+
+type RecordCalendarMonthDragDropContextProps = {
+ children: ReactNode;
+};
+
+export const RecordCalendarMonthDragDropContext = ({
+ children,
+}: RecordCalendarMonthDragDropContextProps) => {
+ const { contextValues, handlers } = useRecordCalendarMonthDndKit();
+
+ return (
+ <DragDropItemDndContext.Provider value={contextValues}>
+ <DragDropProvider<DragDropItemData>
+ sensors={DND_KIT_SENSORS}
+ onDragStart={handlers.onDragStart}
+ onDragMove={handlers.onDragMove}
+ onDragEnd={handlers.onDragEnd}
+ >
+ {children}
+ </DragDropProvider>
+ </DragDropItemDndContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarCardDndType.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarCardDndType.ts
new file mode 100644
index 00000000000..2e0982704cb
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarCardDndType.ts
@@ -0,0 +1 @@
+export const RECORD_CALENDAR_CARD_DND_TYPE = 'calendar-card';
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.ts
new file mode 100644
index 00000000000..fdd461e3809
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.ts
@@ -0,0 +1,178 @@
+import { type DragDropProvider } from '@dnd-kit/react';
+import { useStore } from 'jotai';
+import { type ComponentProps, useState } from 'react';
+import { Temporal } from 'temporal-polyfill';
+import { isDefined } from 'twenty-shared/utils';
+
+import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
+import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';
+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 { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
+import { resolveDropFromPointerY } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointerY';
+import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';
+
+type DragStartPayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragStart']
+ >
+>[0];
+type DragMovePayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragMove']
+ >
+>[0];
+type DragEndPayload = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragEnd']
+ >
+>[0];
+
+export type RecordCalendarDndKitContextValues = {
+ activeDropTargetIndex: number | null;
+ activeDroppableId: string | null;
+};
+
+export const useRecordCalendarMonthDndKit = (): {
+ contextValues: RecordCalendarDndKitContextValues;
+ handlers: {
+ onDragStart: (event: DragStartPayload) => void;
+ onDragMove: (event: DragMovePayload) => void;
+ onDragEnd: (event: DragEndPayload) => void;
+ };
+} => {
+ const store = useStore();
+
+ const { userTimezone } = useUserTimezone();
+
+ const { startRecordDrag } = useStartRecordDrag();
+ const { endRecordDrag } = useEndRecordDrag();
+ const { processCalendarCardDrop } = useProcessCalendarCardDrop();
+
+ const calendarDayRecordIdsSelector =
+ useAtomComponentFamilySelectorCallbackState(
+ calendarDayRecordIdsComponentFamilySelector,
+ );
+
+ const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<
+ number | null
+ >(null);
+
+ const [activeDroppableId, setActiveDroppableId] = useState<string | null>(
+ null,
+ );
+
+ const getDroppableItemCount = (droppableId: string) =>
+ store.get(
+ calendarDayRecordIdsSelector({
+ day: Temporal.PlainDate.from(droppableId),
+ timeZone: userTimezone,
+ }),
+ ).length;
+
+ const clearDragState = () => {
+ endRecordDrag();
+ setActiveDropTargetIndex(null);
+ setActiveDroppableId(null);
+ };
+
+ const handleDragStart = (event: DragStartPayload) => {
+ const draggedId = event.operation.source?.id;
+
+ if (!isDefined(draggedId)) {
+ return;
+ }
+
+ const draggedRecordId = getRecordIdFromRecordCalendarCardDraggableId(
+ String(draggedId),
+ );
+
+ startRecordDrag(draggedRecordId, []);
+ };
+
+ const handleDragMove = (event: DragMovePayload) => {
+ const { target, position } = event.operation;
+
+ const resolvedDrop = resolveDropFromPointerY({
+ target,
+ pointerY: position.current.y,
+ 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)) {
+ clearDragState();
+ return;
+ }
+
+ const sourceRecordId = getRecordIdFromRecordCalendarCardDraggableId(
+ String(source.id),
+ );
+ const sourceDroppableId = (source.data as DragDropItemData).droppableId;
+ const sourceIndex = (source.data as DragDropItemData).index;
+
+ const resolvedDrop = resolveDropFromPointerY({
+ target,
+ pointerY: position.current.y,
+ getDroppableItemCount,
+ });
+ if (!isDefined(resolvedDrop)) {
+ clearDragState();
+ return;
+ }
+
+ const destinationDroppableId = resolvedDrop.droppableId;
+
+ const destinationIndex = getDestinationIndex({
+ dropTargetIndex: resolvedDrop.dropTargetIndex,
+ sourceIndex,
+ sourceDroppableId,
+ destinationDroppableId,
+ });
+
+ const isSameDay = sourceDroppableId === destinationDroppableId;
+
+ if (isSameDay && destinationIndex === sourceIndex) {
+ clearDragState();
+ return;
+ }
+
+ processCalendarCardDrop({
+ recordId: sourceRecordId,
+ sourceDate: sourceDroppableId,
+ destinationDate: destinationDroppableId,
+ destinationIndex,
+ });
+
+ clearDragState();
+ };
+
+ const contextValues: RecordCalendarDndKitContextValues = {
+ activeDropTargetIndex,
+ activeDroppableId,
+ };
+
+ return {
+ contextValues,
+ handlers: {
+ onDragStart: handleDragStart,
+ onDragMove: handleDragMove,
+ onDragEnd: handleDragEnd,
+ },
+ };
+};
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 9c2b7085dd1..3820cb37b1b 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
@@ -20,6 +20,7 @@ import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/us
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { styled } from '@linaria/react';
import { AnimatedEaseInOut } from 'twenty-ui/layout';
@@ -28,6 +29,7 @@ const StyledContainer = styled.div`
`;
const StyledRecordCardContainer = styled.div`
+ padding-bottom: ${themeCssVariables.spacing[2]};
width: calc(100% - 2px);
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx
index 3049c12bb84..e0a89597885 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx
@@ -1,11 +1,11 @@
import { styled } from '@linaria/react';
-import { Draggable } from '@hello-pangea/dnd';
-import { getCssCompatibleDraggableProps } from '@/ui/layout/draggable-list/utils/getCssCompatibleDraggableProps';
+import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/month/constants/RecordCalendarCardDndType';
import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';
import { useIsRecordCalendarCardDragDisabled } from '@/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled';
import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';
import { getRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
+import { DragDropItemSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableCell';
const StyledDraggableContainer = styled.div`
position: relative;
@@ -34,28 +34,21 @@ export const RecordCalendarCardDraggableContainer = ({
<RecordCalendarCardComponentInstanceContext.Provider
value={{ instanceId: recordId }}
>
- <Draggable
- key={draggableId}
- draggableId={draggableId}
+ <DragDropItemSortableCell
+ id={draggableId}
index={index}
- isDragDisabled={dragIsDisabled}
+ group={calendarDay}
+ type={RECORD_CALENDAR_CARD_DND_TYPE}
+ accept={RECORD_CALENDAR_CARD_DND_TYPE}
+ disabled={dragIsDisabled}
>
- {(draggableProvided) => (
- <StyledDraggableContainer
- id={`record-calendar-card-${recordId}-${calendarDay}`}
- ref={draggableProvided?.innerRef}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...draggableProvided?.dragHandleProps}
- // oxlint-disable-next-line react/jsx-props-no-spreading
- {...getCssCompatibleDraggableProps(
- draggableProvided.draggableProps,
- )}
- data-selectable-id={recordId}
- >
- <RecordCalendarCard recordId={recordId} />
- </StyledDraggableContainer>
- )}
- </Draggable>
+ <StyledDraggableContainer
+ id={`record-calendar-card-${recordId}-${calendarDay}`}
+ data-selectable-id={recordId}
+ >
+ <RecordCalendarCard recordId={recordId} />
+ </StyledDraggableContainer>
+ </DragDropItemSortableCell>
</RecordCalendarCardComponentInstanceContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCard.tsx b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCard.tsx
index 5d38a2becc4..f9cf7267616 100644
--- a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCard.tsx
@@ -3,8 +3,6 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledBoardCard = styled.div<{
isDragging?: boolean;
- isSecondaryDragged?: boolean;
- isPrimaryMultiDrag?: boolean;
}>`
--record-card-background-color: ${themeCssVariables.background.secondary};
@@ -13,7 +11,7 @@ const StyledBoardCard = styled.div<{
border-radius: ${themeCssVariables.border.radius.sm};
color: ${themeCssVariables.font.color.primary};
cursor: pointer;
- opacity: ${({ isSecondaryDragged }) => (isSecondaryDragged ? '0.3' : '1')};
+ opacity: ${({ isDragging }) => (isDragging ? '0.3' : '1')};
width: 100%;
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
index 8a4973aec93..a68a29deb5b 100644
--- 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
@@ -56,7 +56,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds = ['record-2', 'record-3'];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
@@ -98,7 +98,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds = ['record-1'];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
@@ -140,7 +140,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds = ['record-1', 'record-2', 'record-3'];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
@@ -190,7 +190,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds: string[] = [];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
@@ -232,7 +232,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds = ['record-2', 'record-3'];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
@@ -274,7 +274,7 @@ describe('useStartRecordDrag', () => {
const selectedRecordIds = ['record-1', 'record-2', 'record-3'];
act(() => {
- result.current.startRecordDrag(dragStart, selectedRecordIds);
+ result.current.startRecordDrag(dragStart.draggableId, selectedRecordIds);
});
expect(result.current.isMultiDragActive).toBe(true);
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 64c2e844876..bd288052cb7 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,4 +1,3 @@
-import { type DropResult } from '@hello-pangea/dnd';
import { useStore } from 'jotai';
import { useCallback, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -41,7 +40,9 @@ export const useProcessBoardCardDrop = () => {
const processBoardCardDrop = useCallback(
(
- boardCardDropResult: DropResult,
+ droppableId: string,
+ draggableId: string,
+ targetIndex: number,
selectedRecordIds: string[],
options?: { shouldUpdatePosition?: boolean },
) => {
@@ -50,7 +51,9 @@ export const useProcessBoardCardDrop = () => {
const shouldUpdatePosition = options?.shouldUpdatePosition ?? true;
processGroupDrop({
- groupDropResult: boardCardDropResult,
+ droppableId,
+ draggableId,
+ targetIndex,
store,
selectedRecordIds,
recordIdsByGroupFamilyState:
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 f613842d843..2fa5de26bdb 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
@@ -1,12 +1,10 @@
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { type DropResult } from '@hello-pangea/dnd';
import { useCallback } from 'react';
import { useStore } from 'jotai';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';
import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';
-import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
import { extractRecordPositions } from '@/object-record/record-drag/utils/extractRecordPositions';
import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTime';
@@ -37,19 +35,18 @@ export const useProcessCalendarCardDrop = () => {
);
const processCalendarCardDrop = useCallback(
- async (calendarCardDropResult: DropResult) => {
- if (
- !calendarCardDropResult.destination ||
- !currentView?.calendarFieldMetadataId
- )
- return;
-
- const recordId = getRecordIdFromRecordCalendarCardDraggableId(
- calendarCardDropResult.draggableId,
- );
- const destinationDate = calendarCardDropResult.destination.droppableId;
- const destinationIndex = calendarCardDropResult.destination.index;
- const sourceDate = calendarCardDropResult.source.droppableId;
+ async ({
+ recordId,
+ sourceDate,
+ destinationDate,
+ destinationIndex,
+ }: {
+ recordId: string;
+ sourceDate: string;
+ destinationDate: string;
+ destinationIndex: number;
+ }) => {
+ if (!currentView?.calendarFieldMetadataId) return;
const destinationPlainDate = Temporal.PlainDate.from(destinationDate);
const sourcePlainDate = Temporal.PlainDate.from(sourceDate);
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/useProcessTableWithGroupRecordDrop.ts
index dba83d0e0c3..01c86ca5a40 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/useProcessTableWithGroupRecordDrop.ts
@@ -100,7 +100,9 @@ export const useProcessTableWithGroupRecordDrop = () => {
}
processGroupDrop({
- groupDropResult: result,
+ droppableId: destinationRecordGroupId,
+ draggableId: result.draggableId,
+ targetIndex: result.destination.index,
store,
selectedRecordIds,
recordIdsByGroupFamilyState,
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 25a1295b214..b9453990a61 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
@@ -12,7 +12,6 @@ import { primaryDraggedRecordIdComponentState } from '@/object-record/record-dra
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';
-import { type DragStart } from '@hello-pangea/dnd';
export const useStartRecordDrag = (contextStoreInstanceId?: string) => {
const store = useStore();
@@ -55,11 +54,9 @@ export const useStartRecordDrag = (contextStoreInstanceId?: string) => {
);
const startRecordDrag = useCallback(
- (start: DragStart, selectedRecordIds: string[]) => {
+ (draggedRecordId: string, selectedRecordIds: string[]) => {
store.set(isDraggingRecord, true);
- const draggedRecordId = start.draggableId;
-
const dragOperationType = getDragOperationType({
draggedRecordId,
selectedRecordIds,
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
index 0b8266de9a5..610666e878d 100644
--- 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
@@ -1,4 +1,3 @@
-import { type DropResult } from '@hello-pangea/dnd';
import type { Store } from 'jotai/vanilla/store';
import { isDefined } from 'twenty-shared/utils';
@@ -10,7 +9,9 @@ import { getDragOperationType } from './getDragOperationType';
import { processMultiDrag } from './processMultiDrag';
type ProcessGroupDropParams = {
- groupDropResult: DropResult;
+ droppableId: string;
+ draggableId: string;
+ targetIndex: number;
store: Store;
selectedRecordIds: string[];
recordIdsByGroupFamilyState: any;
@@ -24,44 +25,38 @@ type ProcessGroupDropParams = {
};
export const processGroupDrop = ({
- groupDropResult,
+ droppableId,
+ draggableId,
+ targetIndex,
store,
selectedRecordIds,
recordIdsByGroupFamilyState,
onUpdateRecord,
}: ProcessGroupDropParams) => {
- if (!groupDropResult.destination) {
- return;
- }
-
- const destinationGroupId = groupDropResult.destination.droppableId;
-
const recordGroup = store.get(
- recordGroupDefinitionFamilyState.atomFamily(destinationGroupId),
+ recordGroupDefinitionFamilyState.atomFamily(droppableId),
);
if (!isDefined(recordGroup)) {
throw new Error('Record group is not defined');
}
- const destinationRecordIds = store.get(
- recordIdsByGroupFamilyState(destinationGroupId),
+ const targetRecordIds = store.get(
+ recordIdsByGroupFamilyState(droppableId),
) as string[];
- const draggedRecordId = groupDropResult.draggableId;
-
const dragOperationType = getDragOperationType({
- draggedRecordId,
+ draggedRecordId: draggableId,
selectedRecordIds,
});
- const targetGroupIsEmpty = destinationRecordIds.length === 0;
+ const targetGroupIsEmpty = targetRecordIds.length === 0;
if (targetGroupIsEmpty) {
if (dragOperationType === 'single') {
onUpdateRecord(
{
- recordId: draggedRecordId,
+ recordId: draggableId,
position: 1,
},
recordGroup.value,
@@ -81,18 +76,13 @@ export const processGroupDrop = ({
return;
}
- const recordsWithPosition = extractRecordPositions(
- destinationRecordIds,
- store,
- );
-
- const destinationIndex = groupDropResult.destination.index;
+ const recordsWithPosition = extractRecordPositions(targetRecordIds, store);
- const isDroppedAfterList = destinationIndex >= recordsWithPosition.length;
+ const isDroppedAfterList = targetIndex >= recordsWithPosition.length;
const targetRecord = isDroppedAfterList
? recordsWithPosition.at(-1)
- : recordsWithPosition.at(groupDropResult.destination.index);
+ : recordsWithPosition.at(targetIndex);
if (!isDefined(targetRecord)) {
throw new Error(
@@ -102,7 +92,7 @@ export const processGroupDrop = ({
if (dragOperationType === 'single') {
const singleDragResult = processSingleDrag({
- sourceRecordId: draggedRecordId,
+ sourceRecordId: draggableId,
targetRecordId: targetRecord.id,
recordsWithPosition: recordsWithPosition,
isDroppedAfterList,
@@ -121,7 +111,7 @@ export const processGroupDrop = ({
);
} else {
const multiDragResult = processMultiDrag({
- draggedRecordId,
+ draggedRecordId: draggableId,
selectedRecordIds,
recordsWithPosition,
targetRecordId: targetRecord.id,
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 df40ceadfd8..b13a609344d 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
@@ -39,7 +39,7 @@ export const RecordTableBodyNoRecordGroupDragDropContextProvider = ({
(start: DragStart) => {
const currentSelectedRecordIds = store.get(selectedRowIds) as string[];
- startRecordDrag(start, currentSelectedRecordIds);
+ startRecordDrag(start.draggableId, currentSelectedRecordIds);
},
[selectedRowIds, startRecordDrag, store],
);
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 ceffbd806b9..729128a18df 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
@@ -38,7 +38,7 @@ export const RecordTableBodyRecordGroupDragDropContextProvider = ({
(start: DragStart) => {
const currentSelectedRecordIds = store.get(selectedRowIds) as string[];
- startRecordDrag(start, currentSelectedRecordIds);
+ startRecordDrag(start.draggableId, currentSelectedRecordIds);
},
[selectedRowIds, startRecordDrag, store],
);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
index 10b094168d5..c00a67733d4 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
@@ -6,7 +6,7 @@ import { RecordTableColumnHead } from '@/object-record/record-table/record-table
import { RecordTableColumnHeadWithDropdown } from '@/object-record/record-table/record-table-header/components/RecordTableColumnHeadWithDropdown';
import { RecordTableHeaderCellContainer } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderCellContainer';
import { RecordTableHeaderResizeHandler } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler';
-import { DragDropColumnSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle';
+import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import { isRecordTableColumnHeadersReadOnlyComponentState } from '@/object-record/record-table/states/isRecordTableColumnHeadersReadOnlyComponentState';
import { isRecordTableColumnResizableComponentState } from '@/object-record/record-table/states/isRecordTableColumnResizableComponentState';
import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState';
@@ -104,7 +104,7 @@ export const RecordTableHeaderCell = ({
position="left"
/>
)}
- <DragDropColumnSortableHandle>
+ <DragDropItemSortableHandle>
{isRecordTableColumnHeadersReadOnly ? (
<RecordTableColumnHead recordField={recordField} />
) : (
@@ -113,7 +113,7 @@ export const RecordTableHeaderCell = ({
objectMetadataId={objectMetadataItem.id}
/>
)}
- </DragDropColumnSortableHandle>
+ </DragDropItemSortableHandle>
{isRecordTableColumnResizable && (
<RecordTableHeaderResizeHandler
recordFieldIndex={recordFieldIndex}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDnd.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDnd.tsx
index 7407c3fd5bb..90399274349 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDnd.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDnd.tsx
@@ -9,9 +9,9 @@ import { RecordTableHeaderLastEmptyColumn } from '@/object-record/record-table/r
import { RECORD_TABLE_HEADER_DROPPABLE_ID } from '@/object-record/record-table/record-table-header/dnd/constants/RecordTableHeaderDroppableId';
import { RecordTableHeaderDndKitProvider } from '@/object-record/record-table/record-table-header/dnd/providers/RecordTableHeaderDndKitProvider';
import { isRecordTableColumnHeadersReadOnlyComponentState } from '@/object-record/record-table/states/isRecordTableColumnHeadersReadOnlyComponentState';
-import { DragDropColumnDroppableSlot } from '@/ui/utilities/drag-and-drop/components/DragDropColumnDroppableSlot';
-import { DragDropColumnDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropColumnDropTarget';
-import { DragDropColumnSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropColumnSortableCell';
+import { DragDropItemDroppableSlot } from '@/ui/utilities/drag-and-drop/components/DragDropItemDroppableSlot';
+import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
+import { DragDropItemSortableCell } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableCell';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
@@ -28,61 +28,68 @@ export const RecordTableHeaderDnd = () => {
return (
<RecordTableHeaderDndKitProvider>
- <DragDropColumnDroppableSlot
+ <DragDropItemDroppableSlot
droppableId={RECORD_TABLE_HEADER_DROPPABLE_ID}
index={0}
disabled={isRecordTableColumnHeadersReadOnly}
>
- <DragDropColumnDropTarget index={0} compact />
- </DragDropColumnDroppableSlot>
+ <DragDropItemDropTarget index={0} orientation="vertical" compact />
+ </DragDropItemDroppableSlot>
{isDefined(firstScrollableRecordField) && (
- <DragDropColumnSortableCell
+ <DragDropItemSortableCell
key={firstScrollableRecordField.fieldMetadataItemId}
id={firstScrollableRecordField.fieldMetadataItemId}
index={0}
group={RECORD_TABLE_HEADER_DROPPABLE_ID}
disabled={isRecordTableColumnHeadersReadOnly}
+ restrictMovementTo="x"
>
<RecordTableHeaderFirstScrollableCell
firstScrollableRecordField={firstScrollableRecordField}
/>
- </DragDropColumnSortableCell>
+ </DragDropItemSortableCell>
)}
{recordFieldsWithoutFirstTwo.map((recordField, index) => (
<React.Fragment key={recordField.fieldMetadataItemId}>
- <DragDropColumnDroppableSlot
+ <DragDropItemDroppableSlot
droppableId={RECORD_TABLE_HEADER_DROPPABLE_ID}
index={index + 1}
disabled={isRecordTableColumnHeadersReadOnly}
>
- <DragDropColumnDropTarget index={index + 1} compact />
- </DragDropColumnDroppableSlot>
- <DragDropColumnSortableCell
+ <DragDropItemDropTarget
+ index={index + 1}
+ orientation="vertical"
+ compact
+ />
+ </DragDropItemDroppableSlot>
+ <DragDropItemSortableCell
id={recordField.fieldMetadataItemId}
index={index + 1}
group={RECORD_TABLE_HEADER_DROPPABLE_ID}
disabled={isRecordTableColumnHeadersReadOnly}
+ restrictMovementTo="x"
>
<RecordTableHeaderCell
key={recordField.fieldMetadataItemId}
recordField={recordField}
recordFieldIndex={index + 2}
/>
- </DragDropColumnSortableCell>
+ </DragDropItemSortableCell>
</React.Fragment>
))}
- <DragDropColumnDroppableSlot
+ <DragDropItemDroppableSlot
droppableId={RECORD_TABLE_HEADER_DROPPABLE_ID}
index={visibleRecordFields.length - 1}
disabled={isRecordTableColumnHeadersReadOnly}
>
- <DragDropColumnDropTarget
+ <DragDropItemDropTarget
index={visibleRecordFields.length - 1}
+ orientation="vertical"
compact
/>
- </DragDropColumnDroppableSlot>
+ </DragDropItemDroppableSlot>
{isRecordTableColumnHeadersReadOnly ? (
<RecordTableHeaderEmptyLastColumn />
) : (
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
index 9a013792293..f5eead242c0 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
@@ -8,7 +8,7 @@ import { RecordTableHeaderResizeHandler } from '@/object-record/record-table/rec
import { RecordTableHeaderCellContainer } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderCellContainer';
import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
-import { DragDropColumnSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle';
+import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import { isRecordTableColumnHeadersReadOnlyComponentState } from '@/object-record/record-table/states/isRecordTableColumnHeadersReadOnlyComponentState';
import { isRecordTableColumnResizableComponentState } from '@/object-record/record-table/states/isRecordTableColumnResizableComponentState';
import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState';
@@ -99,7 +99,7 @@ export const RecordTableHeaderFirstScrollableCell = ({
{isRecordTableColumnResizable && (
<RecordTableHeaderResizeHandler recordFieldIndex={1} position="left" />
)}
- <DragDropColumnSortableHandle>
+ <DragDropItemSortableHandle>
{isRecordTableColumnHeadersReadOnly ? (
<RecordTableColumnHead recordField={firstScrollableRecordField} />
) : (
@@ -108,7 +108,7 @@ export const RecordTableHeaderFirstScrollableCell = ({
objectMetadataId={objectMetadataItem.id}
/>
)}
- </DragDropColumnSortableHandle>
+ </DragDropItemSortableHandle>
{isRecordTableColumnResizable && (
<RecordTableHeaderResizeHandler recordFieldIndex={1} position="right" />
)}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts
index 7e6852fc518..021edcfce4d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts
@@ -13,23 +13,23 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';
import { isRecordTableCheckboxColumnHiddenComponentState } from '@/object-record/record-table/states/isRecordTableCheckboxColumnHiddenComponentState';
import { isRecordTableDragColumnHiddenComponentState } from '@/object-record/record-table/states/isRecordTableDragColumnHiddenComponentState';
-import { type DragDropColumnData } from '@/ui/utilities/drag-and-drop/types/DragDropColumnData';
-import { resolveDragDropColumnDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { resolveDragDropItemDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
type DragStartPayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragStart']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragStart']
>
>[0];
type DragMovePayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragMove']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragMove']
>
>[0];
type DragEndPayload = Parameters<
NonNullable<
- ComponentProps<typeof DragDropProvider<DragDropColumnData>>['onDragEnd']
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragEnd']
>
>[0];
@@ -95,7 +95,7 @@ export const useRecordTableHeaderDndKit = (): {
const { scrollWrapperElement } = getScrollWrapperElement();
if (!isDefined(scrollWrapperElement)) return null;
- return resolveDragDropColumnDrop({
+ return resolveDragDropItemDrop({
pointerX,
sourceIndex,
scrollWrapperElement,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/providers/RecordTableHeaderDndKitProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/providers/RecordTableHeaderDndKitProvider.tsx
index 2ea9d55348f..ab2f5e92fff 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/providers/RecordTableHeaderDndKitProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/providers/RecordTableHeaderDndKitProvider.tsx
@@ -2,9 +2,9 @@ import { DragDropProvider } from '@dnd-kit/react';
import type { ReactNode } from 'react';
import { useRecordTableHeaderDndKit } from '@/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit';
-import { DragDropColumnDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropColumnDndContext';
+import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
-import { type DragDropColumnData } from '@/ui/utilities/drag-and-drop/types/DragDropColumnData';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
type RecordTableHeaderDndKitProviderProps = {
children: ReactNode;
@@ -16,8 +16,8 @@ export const RecordTableHeaderDndKitProvider = ({
const { contextValues, handlers } = useRecordTableHeaderDndKit();
return (
- <DragDropColumnDndContext.Provider value={contextValues}>
- <DragDropProvider<DragDropColumnData>
+ <DragDropItemDndContext.Provider value={contextValues}>
+ <DragDropProvider<DragDropItemData>
sensors={DND_KIT_SENSORS}
onDragStart={handlers.onDragStart}
onDragMove={handlers.onDragMove}
@@ -25,6 +25,6 @@ export const RecordTableHeaderDndKitProvider = ({
>
{children}
</DragDropProvider>
- </DragDropColumnDndContext.Provider>
+ </DragDropItemDndContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/ui/drag-and-drop/components/DragAndDropReRenderBreaker.tsx b/packages/twenty-front/src/modules/ui/drag-and-drop/components/DragAndDropReRenderBreaker.tsx
deleted file mode 100644
index c6b7ff19755..00000000000
--- a/packages/twenty-front/src/modules/ui/drag-and-drop/components/DragAndDropReRenderBreaker.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { memo } from 'react';
-
-/**
- * THIS IS REQUIRED BY THE DND LYBRARY ONLY
- * DO NOT USE THIS PATTERN ELSEWHERE IN THE APPLICATION
- *
- * @deprecated This should be replaced by a more recent dnd library that does not force the re-render of its dragged components, which is a bad practice in React.
- */
-export const DragAndDropLibraryLegacyReRenderBreaker = memo(
- ({
- children,
- }: React.PropsWithChildren<{
- memoizationId: string;
- }>) => {
- return <>{children}</>;
- },
- (prev, next) => {
- return prev.memoizationId === next.memoizationId;
- },
-);
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDropTarget.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDropTarget.tsx
deleted file mode 100644
index 56df635e5e0..00000000000
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDropTarget.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { styled } from '@linaria/react';
-import { type ReactNode, useContext } from 'react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-import { DragDropColumnDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropColumnDndContext';
-
-const StyledDropTarget = styled.div<{
- $compact?: boolean;
- $overlay?: boolean;
-}>`
- height: 100%;
- min-height: ${({ $compact }) =>
- $compact ? '100%' : themeCssVariables.spacing[2]};
- position: ${({ $overlay }) => ($overlay ? 'absolute' : 'relative')};
- transition: background-color 120ms ease-out;
- width: 100%;
-
- &::before {
- background-color: ${themeCssVariables.color.blue};
- border-radius: 0 ${themeCssVariables.border.radius.sm}
- ${themeCssVariables.border.radius.sm} 0;
- content: '';
- height: 100%;
- left: 0;
- opacity: 0;
- position: absolute;
- top: 0;
- transform: scaleY(0.7);
- transform-origin: center;
- transition:
- opacity 120ms ease-out,
- transform 120ms ease-out;
- width: 2px;
- }
-
- &[data-drag-over='true'] {
- background-color: ${themeCssVariables.background.transparent.blue};
- }
-
- &[data-drag-over='true']::before {
- opacity: 1;
- transform: scaleY(1);
- }
-`;
-
-type DragDropColumnDropTargetProps = {
- children?: ReactNode;
- compact?: boolean;
- index: number;
- overlay?: boolean;
-};
-
-export const DragDropColumnDropTarget = ({
- children,
- compact = false,
- index,
- overlay = false,
-}: DragDropColumnDropTargetProps) => {
- const { activeDropTargetIndex } = useContext(DragDropColumnDndContext);
-
- const isDragOver = activeDropTargetIndex === index;
-
- return (
- <StyledDropTarget
- $compact={compact}
- $overlay={overlay}
- data-drag-over={isDragOver ? 'true' : undefined}
- >
- {children}
- </StyledDropTarget>
- );
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDropTarget.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDropTarget.tsx
new file mode 100644
index 00000000000..4b0c52cf765
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDropTarget.tsx
@@ -0,0 +1,122 @@
+import { styled } from '@linaria/react';
+import { type ReactNode, useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
+
+type DragDropItemDropTargetOrientation = 'vertical' | 'horizontal';
+
+const StyledDropTarget = styled.div<{
+ $compact?: boolean;
+ $overlay?: boolean;
+}>`
+ min-height: ${({ $compact }) =>
+ $compact ? '0' : themeCssVariables.spacing[2]};
+ position: ${({ $overlay }) => ($overlay ? 'absolute' : 'relative')};
+ transition: background-color 120ms ease-out;
+
+ &[data-orientation='vertical'] {
+ height: 100%;
+ width: 100%;
+ }
+
+ &[data-orientation='horizontal'] {
+ width: 100%;
+ }
+
+ &::before {
+ background-color: ${themeCssVariables.color.blue};
+ border-radius: ${themeCssVariables.border.radius.sm};
+ content: '';
+ opacity: 0;
+ position: absolute;
+ transform-origin: center;
+ transition:
+ opacity 120ms ease-out,
+ transform 120ms ease-out;
+ }
+
+ &[data-orientation='vertical']::before {
+ height: 100%;
+ left: 50%;
+ top: 0;
+ transform: translateX(-50%) scaleY(0.7);
+ width: 2px;
+ }
+
+ &[data-orientation='horizontal']::before {
+ height: 2px;
+ left: 0;
+ top: 50%;
+ transform: translateY(calc(-50% - ${themeCssVariables.spacing[1]}))
+ scaleX(0.7);
+ width: 100%;
+ }
+
+ &[data-drag-over='true'] {
+ background-color: ${themeCssVariables.background.transparent.blue};
+ }
+
+ &[data-orientation='vertical'][data-drag-over='true']::before {
+ opacity: 1;
+ transform: translateX(-50%) scaleY(1);
+ }
+
+ &[data-orientation='horizontal'][data-drag-over='true']::before {
+ opacity: 1;
+ transform: translateY(calc(-50% - ${themeCssVariables.spacing[1]}))
+ scaleX(1);
+ }
+
+ &[data-orientation='horizontal'][data-leading='true']::before {
+ top: 0;
+ transform: scaleX(0.7);
+ z-index: 1;
+ }
+
+ &[data-orientation='horizontal'][data-leading='true'][data-drag-over='true']::before {
+ transform: scaleX(1);
+ }
+`;
+
+type DragDropItemDropTargetProps = {
+ children?: ReactNode;
+ compact?: boolean;
+ droppableId?: string;
+ index: number;
+ orientation?: DragDropItemDropTargetOrientation;
+ overlay?: boolean;
+};
+
+export const DragDropItemDropTarget = ({
+ children,
+ compact = false,
+ droppableId,
+ index,
+ orientation,
+ overlay = false,
+}: DragDropItemDropTargetProps) => {
+ const { activeDropTargetIndex, activeDroppableId } = useContext(
+ DragDropItemDndContext,
+ );
+
+ const matchesDroppable =
+ !isDefined(droppableId) || activeDroppableId === droppableId;
+
+ const isDragOver = activeDropTargetIndex === index && matchesDroppable;
+
+ return (
+ <StyledDropTarget
+ $compact={compact}
+ $overlay={overlay}
+ data-orientation={orientation}
+ data-leading={
+ orientation === 'horizontal' && index === 0 ? 'true' : undefined
+ }
+ data-drag-over={isDragOver ? 'true' : undefined}
+ >
+ {children}
+ </StyledDropTarget>
+ );
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDroppableSlot.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDroppableSlot.tsx
similarity index 64%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDroppableSlot.tsx
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDroppableSlot.tsx
index 358cdf1f4cf..3f977d471ad 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnDroppableSlot.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemDroppableSlot.tsx
@@ -3,7 +3,8 @@ import { useDroppable } from '@dnd-kit/react';
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { type DragDropColumnData } from '@/ui/utilities/drag-and-drop/types/DragDropColumnData';
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { DND_KIT_COLLISION_PRIORITY } from '@/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority';
const StyledSlotWrapper = styled.div`
align-self: stretch;
@@ -15,9 +16,7 @@ const StyledSlotWrapper = styled.div`
z-index: 100;
`;
-const SLOT_COLLISION_PRIORITY = 1;
-
-type DragDropColumnDroppableSlotProps = {
+type DragDropItemDroppableSlotProps = {
children?: ReactNode;
collisionPriority?: number;
disabled?: boolean;
@@ -25,15 +24,15 @@ type DragDropColumnDroppableSlotProps = {
index: number;
};
-export const DragDropColumnDroppableSlot = ({
+export const DragDropItemDroppableSlot = ({
children,
- collisionPriority = SLOT_COLLISION_PRIORITY,
+ collisionPriority = DND_KIT_COLLISION_PRIORITY,
disabled = false,
droppableId,
index,
-}: DragDropColumnDroppableSlotProps) => {
+}: DragDropItemDroppableSlotProps) => {
const id = `${droppableId}::${index}`;
- const data: DragDropColumnData = { droppableId, index };
+ const data: DragDropItemData = { droppableId, index };
const { ref } = useDroppable({
id,
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableCell.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx
similarity index 52%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableCell.tsx
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx
index cfc7e9b0091..37e3e5dbbda 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableCell.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx
@@ -1,24 +1,30 @@
-import { RestrictToHorizontalAxis } from '@dnd-kit/abstract/modifiers';
+import {
+ RestrictToHorizontalAxis,
+ RestrictToVerticalAxis,
+} from '@dnd-kit/abstract/modifiers';
import { SortableKeyboardPlugin } from '@dnd-kit/dom/sortable';
import { useSortable } from '@dnd-kit/react/sortable';
import { styled } from '@linaria/react';
-import { type ReactNode } from 'react';
+import { type DragEvent, type ReactNode } from 'react';
-import { DragDropColumnSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropColumnSortableHandleRefContext';
+import { DragDropItemSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext';
const SORTABLE_COLLISION_PRIORITY = 3;
const PLUGINS_WITHOUT_OPTIMISTIC = [SortableKeyboardPlugin];
-// Columns can only be reordered horizontally, so keep the drag preview locked to the header row.
-const SORTABLE_MODIFIERS = [RestrictToHorizontalAxis];
-
const SORTABLE_TRANSITION = {
duration: 180,
easing: 'cubic-bezier(0.2, 0, 0, 1)',
idle: true,
};
+// Links and images inside sortable items are natively draggable, which lets
+// the browser start a URL drag that cancels the dnd-kit pointer drag.
+const preventNativeDragStart = (event: DragEvent) => {
+ event.preventDefault();
+};
+
const StyledSortableRoot = styled.div<{ $fill?: boolean }>`
display: ${({ $fill }) => ($fill ? 'flex' : 'block')};
flex-shrink: ${({ $fill }) => ($fill ? 0 : 'initial')};
@@ -30,27 +36,35 @@ const StyledSortableRoot = styled.div<{ $fill?: boolean }>`
will-change: transform;
`;
-type DragDropColumnSortableCellProps = {
+type DragDropItemSortableCellProps = {
+ accept?: string;
children: ReactNode;
disabled?: boolean;
fill?: boolean;
group: string;
id: string;
index: number;
+ restrictMovementTo?: 'x' | 'y' | 'none';
+ type?: string;
};
-export const DragDropColumnSortableCell = ({
+export const DragDropItemSortableCell = ({
+ accept,
children,
disabled = false,
fill = false,
group,
id,
index,
-}: DragDropColumnSortableCellProps) => {
+ restrictMovementTo = 'none',
+ type,
+}: DragDropItemSortableCellProps) => {
const { handleRef, ref } = useSortable({
id,
index,
group,
+ type,
+ accept,
collisionPriority: SORTABLE_COLLISION_PRIORITY,
data: {
droppableId: group,
@@ -59,15 +73,22 @@ export const DragDropColumnSortableCell = ({
disabled,
transition: SORTABLE_TRANSITION,
plugins: PLUGINS_WITHOUT_OPTIMISTIC,
- modifiers: SORTABLE_MODIFIERS,
+ modifiers: [
+ ...(restrictMovementTo === 'x' ? [RestrictToHorizontalAxis] : []),
+ ...(restrictMovementTo === 'y' ? [RestrictToVerticalAxis] : []),
+ ],
feedback: 'clone',
});
return (
- <DragDropColumnSortableHandleRefContext.Provider value={handleRef}>
- <StyledSortableRoot ref={ref} $fill={fill}>
+ <DragDropItemSortableHandleRefContext.Provider value={handleRef}>
+ <StyledSortableRoot
+ ref={ref}
+ $fill={fill}
+ onDragStart={preventNativeDragStart}
+ >
{children}
</StyledSortableRoot>
- </DragDropColumnSortableHandleRefContext.Provider>
+ </DragDropItemSortableHandleRefContext.Provider>
);
};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle.tsx
similarity index 66%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle.tsx
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle.tsx
index f279547a486..b3000777167 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropColumnSortableHandle.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { DragDropColumnSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropColumnSortableHandleRefContext';
+import { DragDropItemSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext';
const StyledSortableHandle = styled.div<{ $fill?: boolean }>`
display: ${({ $fill }) => ($fill ? 'flex' : 'block')};
@@ -10,23 +10,22 @@ const StyledSortableHandle = styled.div<{ $fill?: boolean }>`
min-width: 0;
outline: none;
width: ${({ $fill }) => ($fill ? '100%' : 'auto')};
-
&:focus-visible {
outline: 2px solid ${themeCssVariables.color.blue};
outline-offset: -2px;
}
`;
-type DragDropColumnSortableHandleProps = {
+type DragDropItemSortableHandleProps = {
children: ReactNode;
fill?: boolean;
};
-export const DragDropColumnSortableHandle = ({
+export const DragDropItemSortableHandle = ({
children,
fill = false,
-}: DragDropColumnSortableHandleProps) => {
- const sortableHandleRef = useContext(DragDropColumnSortableHandleRefContext);
+}: DragDropItemSortableHandleProps) => {
+ const sortableHandleRef = useContext(DragDropItemSortableHandleRefContext);
return (
<StyledSortableHandle ref={sortableHandleRef} $fill={fill}>
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority.ts
new file mode 100644
index 00000000000..e2057a53cc3
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitCollisionPriority.ts
@@ -0,0 +1 @@
+export const DND_KIT_COLLISION_PRIORITY = 1;
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitSensors.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitSensors.ts
index aec2c38b8eb..9d7af274bb6 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitSensors.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/constants/DndKitSensors.ts
@@ -1,12 +1,15 @@
import { PointerActivationConstraints } from '@dnd-kit/dom';
import { KeyboardSensor, PointerSensor } from '@dnd-kit/react';
+import { shouldPreventDragActivation } from '@/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation';
+
// Pointer drags only start past 8px so clicks on draggable items still register.
export const DND_KIT_SENSORS = [
PointerSensor.configure({
activationConstraints: [
new PointerActivationConstraints.Distance({ value: 8 }),
],
+ preventActivation: shouldPreventDragActivation,
}),
KeyboardSensor,
];
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnDndContext.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnDndContext.tsx
deleted file mode 100644
index f4e3245081a..00000000000
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnDndContext.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createContext } from 'react';
-
-type DragDropColumnDndContextValue = {
- activeDropTargetIndex: number | null;
-};
-
-export const DragDropColumnDndContext =
- createContext<DragDropColumnDndContextValue>({
- activeDropTargetIndex: null,
- });
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemDndContext.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemDndContext.tsx
new file mode 100644
index 00000000000..48ed92b6607
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemDndContext.tsx
@@ -0,0 +1,12 @@
+import { createContext } from 'react';
+
+type DragDropItemDndContextValue = {
+ activeDropTargetIndex: number | null;
+ activeDroppableId?: string | null;
+};
+
+export const DragDropItemDndContext =
+ createContext<DragDropItemDndContextValue>({
+ activeDropTargetIndex: null,
+ activeDroppableId: null,
+ });
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnSortableHandleRefContext.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext.tsx
similarity index 60%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnSortableHandleRefContext.tsx
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext.tsx
index bc6b3824232..c43bc54b6c7 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropColumnSortableHandleRefContext.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext.tsx
@@ -1,5 +1,5 @@
import { createContext } from 'react';
-export const DragDropColumnSortableHandleRefContext = createContext<
+export const DragDropItemSortableHandleRefContext = createContext<
((element: Element | null) => void) | undefined
>(undefined);
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropColumnData.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropItemData.ts
similarity index 55%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropColumnData.ts
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropItemData.ts
index 840f5270a52..7cbfedcccc3 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropColumnData.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/types/DragDropItemData.ts
@@ -1,4 +1,4 @@
-export type DragDropColumnData = {
+export type DragDropItemData = {
droppableId: string;
index: number;
};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/getDestinationIndex.test.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/getDestinationIndex.test.ts
new file mode 100644
index 00000000000..b9efc2451d4
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/getDestinationIndex.test.ts
@@ -0,0 +1,47 @@
+import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
+
+describe('getDestinationIndex', () => {
+ it('should return the drop target index unchanged across columns', () => {
+ const result = getDestinationIndex({
+ dropTargetIndex: 2,
+ sourceIndex: 5,
+ sourceDroppableId: 'column-a',
+ destinationDroppableId: 'column-b',
+ });
+
+ expect(result).toBe(2);
+ });
+
+ it('should decrement the index when moving down within the same column', () => {
+ const result = getDestinationIndex({
+ dropTargetIndex: 4,
+ sourceIndex: 1,
+ sourceDroppableId: 'column-a',
+ destinationDroppableId: 'column-a',
+ });
+
+ expect(result).toBe(3);
+ });
+
+ it('should keep the index when moving up within the same column', () => {
+ const result = getDestinationIndex({
+ dropTargetIndex: 1,
+ sourceIndex: 4,
+ sourceDroppableId: 'column-a',
+ destinationDroppableId: 'column-a',
+ });
+
+ expect(result).toBe(1);
+ });
+
+ it('should keep the index when dropping onto the source position', () => {
+ const result = getDestinationIndex({
+ dropTargetIndex: 3,
+ sourceIndex: 3,
+ sourceDroppableId: 'column-a',
+ destinationDroppableId: 'column-a',
+ });
+
+ expect(result).toBe(3);
+ });
+});
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropColumnDrop.test.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropItemDrop.test.ts
similarity index 84%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropColumnDrop.test.ts
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropItemDrop.test.ts
index d6cd3aa1c47..b8ccc958118 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropColumnDrop.test.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDragDropItemDrop.test.ts
@@ -1,4 +1,4 @@
-import { resolveDragDropColumnDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop';
+import { resolveDragDropItemDrop } from '@/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop';
const createScrollWrapperElement = ({
left = 0,
@@ -14,9 +14,9 @@ const createScrollWrapperElement = ({
const COLUMN_WIDTHS = [100, 100, 100];
-describe('resolveDragDropColumnDrop', () => {
+describe('resolveDragDropItemDrop', () => {
it('should target the column under the pointer before its midpoint', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 40,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({}),
@@ -31,7 +31,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should target the next slot once the pointer passes a column midpoint', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 120,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({}),
@@ -43,7 +43,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should target the trailing slot when the pointer is past every column', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 400,
sourceIndex: 0,
scrollWrapperElement: createScrollWrapperElement({}),
@@ -55,7 +55,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should decrement destinationIndex when dropping to the right of the source', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 160,
sourceIndex: 0,
scrollWrapperElement: createScrollWrapperElement({}),
@@ -67,7 +67,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should keep destinationIndex equal to dropTargetIndex when dropping to the left of the source', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 120,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({}),
@@ -79,7 +79,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should offset the pointer by the scroll position', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 40,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({ scrollLeft: 100 }),
@@ -90,7 +90,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should offset the pointer by the container left', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 90,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({ left: 50 }),
@@ -101,7 +101,7 @@ describe('resolveDragDropColumnDrop', () => {
});
it('should subtract the leading offset before resolving the column', () => {
- const result = resolveDragDropColumnDrop({
+ const result = resolveDragDropItemDrop({
pointerX: 140,
sourceIndex: 2,
scrollWrapperElement: createScrollWrapperElement({}),
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDropTarget.test.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDropTarget.test.ts
new file mode 100644
index 00000000000..1f2bcd39d12
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/resolveDropTarget.test.ts
@@ -0,0 +1,55 @@
+import { resolveDropTarget } from '@/ui/utilities/drag-and-drop/utils/resolveDropTarget';
+
+const cardShape = { boundingRectangle: { top: 100, height: 40 } };
+
+describe('resolveDropTarget', () => {
+ it('should target the card position when the pointer is above its midpoint', () => {
+ const result = resolveDropTarget({
+ pointerY: 110,
+ cardPosition: 2,
+ cardShape,
+ });
+
+ expect(result.dropTargetIndex).toBe(2);
+ });
+
+ it('should target the slot after the card when the pointer is below its midpoint', () => {
+ const result = resolveDropTarget({
+ pointerY: 130,
+ cardPosition: 2,
+ cardShape,
+ });
+
+ expect(result.dropTargetIndex).toBe(3);
+ });
+
+ it('should target the slot after the card when the pointer is exactly on the midpoint', () => {
+ const result = resolveDropTarget({
+ pointerY: 120,
+ cardPosition: 2,
+ cardShape,
+ });
+
+ expect(result.dropTargetIndex).toBe(3);
+ });
+
+ it('should target the card position when the pointer is above the card top', () => {
+ const result = resolveDropTarget({
+ pointerY: 80,
+ cardPosition: 2,
+ cardShape,
+ });
+
+ expect(result.dropTargetIndex).toBe(2);
+ });
+
+ it('should target the slot after the card when the pointer is below the card bottom', () => {
+ const result = resolveDropTarget({
+ pointerY: 180,
+ cardPosition: 2,
+ cardShape,
+ });
+
+ expect(result.dropTargetIndex).toBe(3);
+ });
+});
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/getDestinationIndex.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/getDestinationIndex.ts
new file mode 100644
index 00000000000..389ec858d5a
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/getDestinationIndex.ts
@@ -0,0 +1,21 @@
+// In same-column moves the source card is removed first, so gaps after it
+// shift down by one; convert the gap index into the final array index.
+export const getDestinationIndex = ({
+ dropTargetIndex,
+ sourceIndex,
+ sourceDroppableId,
+ destinationDroppableId,
+}: {
+ dropTargetIndex: number;
+ sourceIndex: number;
+ sourceDroppableId: string;
+ destinationDroppableId: string;
+}) => {
+ const isSameColumn = sourceDroppableId === destinationDroppableId;
+
+ if (!isSameColumn) {
+ return dropTargetIndex;
+ }
+
+ return dropTargetIndex > sourceIndex ? dropTargetIndex - 1 : dropTargetIndex;
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop.ts
similarity index 87%
rename from packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop.ts
rename to packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop.ts
index d1c1f52ab20..c7b0e304683 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropColumnDrop.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDragDropItemDrop.ts
@@ -1,4 +1,4 @@
-type ResolveDragDropColumnDropArgs = {
+type ResolveDragDropItemDropArgs = {
pointerX: number;
sourceIndex: number;
scrollWrapperElement: HTMLElement;
@@ -6,7 +6,7 @@ type ResolveDragDropColumnDropArgs = {
leadingOffset?: number;
};
-type ResolvedDragDropColumnDrop = {
+type ResolvedDragDropItemDrop = {
sourceIndex: number;
dropTargetIndex: number;
destinationIndex: number;
@@ -20,13 +20,13 @@ const getDestinationIndexFromDropTargetIndex = ({
dropTargetIndex: number;
}) => (dropTargetIndex > sourceIndex ? dropTargetIndex - 1 : dropTargetIndex);
-export const resolveDragDropColumnDrop = ({
+export const resolveDragDropItemDrop = ({
pointerX,
sourceIndex,
scrollWrapperElement,
columnWidths,
leadingOffset = 0,
-}: ResolveDragDropColumnDropArgs): ResolvedDragDropColumnDrop => {
+}: ResolveDragDropItemDropArgs): ResolvedDragDropItemDrop => {
const scrollContainerRect = scrollWrapperElement.getBoundingClientRect();
const contentX =
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropFromPointerY.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropFromPointerY.ts
new file mode 100644
index 00000000000..62f8abf8830
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropFromPointerY.ts
@@ -0,0 +1,54 @@
+import { type DragDropProvider } from '@dnd-kit/react';
+import { isSortable } from '@dnd-kit/react/sortable';
+import { type ComponentProps } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';
+import { resolveDropTarget } from '@/ui/utilities/drag-and-drop/utils/resolveDropTarget';
+
+type DropTarget = Parameters<
+ NonNullable<
+ ComponentProps<typeof DragDropProvider<DragDropItemData>>['onDragEnd']
+ >
+>[0]['operation']['target'];
+
+export type ResolvedDrop = {
+ droppableId: string;
+ dropTargetIndex: number;
+};
+
+export const resolveDropFromPointerY = ({
+ target,
+ pointerY,
+ getDroppableItemCount,
+}: {
+ target: DropTarget;
+ pointerY: number;
+ getDroppableItemCount: (droppableId: string) => number;
+}): ResolvedDrop | null => {
+ if (!isDefined(target)) {
+ return null;
+ }
+
+ if (isSortable(target)) {
+ const targetData = target.data as DragDropItemData | undefined;
+ const cardShape = target.shape;
+
+ if (!isDefined(targetData) || !isDefined(cardShape)) {
+ return null;
+ }
+
+ const { dropTargetIndex } = resolveDropTarget({
+ pointerY,
+ cardPosition: targetData.index,
+ cardShape,
+ });
+
+ return { droppableId: targetData.droppableId, dropTargetIndex };
+ }
+
+ // Dropped over an empty droppable or the empty space below the cards
+ const droppableId = String(target.id);
+
+ return { droppableId, dropTargetIndex: getDroppableItemCount(droppableId) };
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropTarget.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropTarget.ts
new file mode 100644
index 00000000000..4c5d6c9569b
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/resolveDropTarget.ts
@@ -0,0 +1,26 @@
+type DropTargetShape = {
+ boundingRectangle: {
+ top: number;
+ height: number;
+ };
+};
+
+export const resolveDropTarget = ({
+ pointerY,
+ cardPosition,
+ cardShape,
+}: {
+ pointerY: number;
+ cardPosition: number;
+ cardShape: DropTargetShape;
+}): {
+ dropTargetIndex: number;
+} => {
+ const { top, height } = cardShape.boundingRectangle;
+ const cardMidpointY = top + height / 2;
+
+ const dropTargetIndex =
+ pointerY < cardMidpointY ? cardPosition : cardPosition + 1;
+
+ return { dropTargetIndex };
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts
new file mode 100644
index 00000000000..6991b116950
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts
@@ -0,0 +1,38 @@
+import { isDefined } from 'twenty-shared/utils';
+
+// Unlike the dnd-kit default, links are not in this list: record chips render
+// native anchors and the whole card must stay draggable. Clicks under the
+// activation distance still navigate.
+const NON_DRAGGABLE_TARGET_SELECTOR = [
+ 'input:not([disabled])',
+ 'select:not([disabled])',
+ 'textarea:not([disabled])',
+ 'button:not([disabled])',
+ '[contenteditable]:not([contenteditable="false"])',
+].join(', ');
+
+type DragActivationSource = {
+ element?: Element | null;
+ handle?: Element | null;
+};
+
+export const shouldPreventDragActivation = (
+ event: PointerEvent,
+ source: DragActivationSource,
+): boolean => {
+ const target = event.target;
+
+ if (!(target instanceof Element)) {
+ return false;
+ }
+
+ if (target === source.element || target === source.handle) {
+ return false;
+ }
+
+ if (isDefined(source.handle) && source.handle.contains(target)) {
+ return false;
+ }
+
+ return Boolean(target.closest(NON_DRAGGABLE_TARGET_SELECTOR));
+};