The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix: Calendar drop issue & drop target resolution at list extremes (#24082)
Priyanshu Bartwal6b04aefb6580
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.tsxindex a14ffde11db..a9de02cfca8 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@@ -1,5 +1,6 @@import { Fragment } from 'react';+import { closestCenter } from '@dnd-kit/collision';import { RecordBoardAddGroupColumn } from '@/object-record/record-board/components/RecordBoardAddGroupColumn';import { RecordBoardColumnHeaderWrapper } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper';import { RECORD_BOARD_COLUMN_DROPPABLE_ID } from '@/object-record/record-board/record-board-column/dnd/constants/RecordBoardColumnDroppableId';@@ -31,6 +32,7 @@ export const RecordBoardColumnDnd = () => {group={RECORD_BOARD_COLUMN_DROPPABLE_ID}fillrestrictMovementTo="x"+ collisionDetector={closestCenter}><RecordGroupContext.Provider value={{ recordGroupId }}><RecordBoardColumnHeaderWrapperdiff --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.tsindex 9a74ef08272..a26e41cfe4d 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@@ -1,4 +1,4 @@-import { useRef, useState } from 'react';+import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId';@@ -72,24 +72,16 @@ export const useRecordBoardColumnDndKit = (): {null,);- // The pointer can leave every sortable (column bodies, trailing empty- // space); the last resolved boundary is kept so the drop always lands where- // the insertion indicator was last shown. A ref because it is- // gesture-scoped bookkeeping read back inside drag callbacks.- // oxlint-disable-next-line twenty/no-state-useref- const lastDropTargetIndexRef = useRef<number | null>(null);-const lastIndex = visibleRecordGroupIds.length;const handleDragStart = (_event: DragStartPayload) => {- lastDropTargetIndexRef.current = null;setActiveDropTargetIndex(null);};const handleDragMove = (event: DragMovePayload) => {const { target, position } = event.operation;- const resolvedDropTargetIndex =+ const dropTargetIndex =resolveDropFromPointer({target,pointer: position.current,@@ -97,13 +89,6 @@ export const useRecordBoardColumnDndKit = (): {getDroppableItemCount: () => lastIndex,})?.dropTargetIndex ?? null;- if (isDefined(resolvedDropTargetIndex)) {- lastDropTargetIndexRef.current = resolvedDropTargetIndex;- }-- const dropTargetIndex =- resolvedDropTargetIndex ?? lastDropTargetIndexRef.current;-setActiveDropTargetIndex((currentActiveDropTargetIndex) =>currentActiveDropTargetIndex === dropTargetIndex? currentActiveDropTargetIndex@@ -114,9 +99,6 @@ export const useRecordBoardColumnDndKit = (): {const handleDragEnd = (event: DragEndPayload) => {const { source, target, position } = event.operation;- const lastDropTargetIndex = lastDropTargetIndexRef.current;- lastDropTargetIndexRef.current = null;-setActiveDropTargetIndex(null);setDragSelectionStartEnabled(true);@@ -126,13 +108,12 @@ export const useRecordBoardColumnDndKit = (): {const sourceIndex = source.data.index;- const dropTargetIndex =- resolveDropFromPointer({- target,- pointer: position.current,- defaultOrientation: 'vertical',- getDroppableItemCount: () => lastIndex,- })?.dropTargetIndex ?? lastDropTargetIndex;+ const dropTargetIndex = resolveDropFromPointer({+ target,+ pointer: position.current,+ defaultOrientation: 'vertical',+ getDroppableItemCount: () => lastIndex,+ })?.dropTargetIndex;if (!isDefined(dropTargetIndex)) {return;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.tsxindex 9e05a83013e..7bf55e3385a 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,3 +1,4 @@+import { pointerIntersection } from '@dnd-kit/collision';import { styled } from '@linaria/react';import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/constants/RecordCalendarCardDndType';@@ -36,6 +37,7 @@ export const RecordCalendarCardDraggableContainer = ({group={calendarDay}type={RECORD_CALENDAR_CARD_DND_TYPE}accept={RECORD_CALENDAR_CARD_DND_TYPE}+ collisionDetector={pointerIntersection}disabled={dragIsDisabled}fadeSourceWhileDragging>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.tsxindex 12afab399f2..5f4d96c8ded 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@@ -1,5 +1,6 @@import React from 'react';+import { closestCenter } from '@dnd-kit/collision';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { RecordTableHeaderAddColumnButton } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton';import { RecordTableHeaderCell } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderCell';@@ -40,6 +41,7 @@ export const RecordTableHeaderDnd = () => {group={RECORD_TABLE_HEADER_DROPPABLE_ID}disabled={isRecordTableColumnHeadersReadOnly}restrictMovementTo="x"+ collisionDetector={closestCenter}><RecordTableHeaderFirstScrollableCellfirstScrollableRecordField={firstScrollableRecordField}@@ -62,6 +64,7 @@ export const RecordTableHeaderDnd = () => {group={RECORD_TABLE_HEADER_DROPPABLE_ID}disabled={isRecordTableColumnHeadersReadOnly}restrictMovementTo="x"+ collisionDetector={closestCenter}><RecordTableHeaderCellkey={recordField.fieldMetadataItemId}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.tsindex 0179e811c2f..31e43c7e25a 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@@ -1,4 +1,4 @@-import { useRef, useState } from 'react';+import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { useReorderVisibleRecordFields } from '@/object-record/record-field/hooks/useReorderVisibleRecordFields';@@ -38,24 +38,16 @@ export const useRecordTableHeaderDndKit = (): {number | null>(null);- // The pointer can leave every sortable (sticky pinned column, table body,- // trailing empty space); the last resolved boundary is kept so the drop- // always lands where the insertion indicator was last shown. A ref because- // it is gesture-scoped bookkeeping read back inside drag callbacks.- // oxlint-disable-next-line twenty/no-state-useref- const lastDropTargetIndexRef = useRef<number | null>(null);-const lastIndex = visibleRecordFields.length - 1;const handleDragStart = (_event: DragStartPayload) => {- lastDropTargetIndexRef.current = null;setActiveDropTargetIndex(null);};const handleDragMove = (event: DragMovePayload) => {const { target, position } = event.operation;- const resolvedDropTargetIndex =+ const dropTargetIndex =resolveDropFromPointer({target,pointer: position.current,@@ -63,13 +55,6 @@ export const useRecordTableHeaderDndKit = (): {getDroppableItemCount: () => lastIndex,})?.dropTargetIndex ?? null;- if (isDefined(resolvedDropTargetIndex)) {- lastDropTargetIndexRef.current = resolvedDropTargetIndex;- }-- const dropTargetIndex =- resolvedDropTargetIndex ?? lastDropTargetIndexRef.current;-setActiveDropTargetIndex((currentActiveDropTargetIndex) =>currentActiveDropTargetIndex === dropTargetIndex? currentActiveDropTargetIndex@@ -80,9 +65,6 @@ export const useRecordTableHeaderDndKit = (): {const handleDragEnd = (event: DragEndPayload) => {const { source, target, position } = event.operation;- const lastDropTargetIndex = lastDropTargetIndexRef.current;- lastDropTargetIndexRef.current = null;-setActiveDropTargetIndex(null);setDragSelectionStartEnabled(true);@@ -92,13 +74,12 @@ export const useRecordTableHeaderDndKit = (): {const sourceIndex = source.data.index;- const dropTargetIndex =- resolveDropFromPointer({- target,- pointer: position.current,- defaultOrientation: 'vertical',- getDroppableItemCount: () => lastIndex,- })?.dropTargetIndex ?? lastDropTargetIndex;+ const dropTargetIndex = resolveDropFromPointer({+ target,+ pointer: position.current,+ defaultOrientation: 'vertical',+ getDroppableItemCount: () => lastIndex,+ })?.dropTargetIndex;if (!isDefined(dropTargetIndex)) {return;diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsxindex 6a874692a9b..e94adf25663 100644--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsx+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/DraggableItem.tsx@@ -2,6 +2,7 @@ import { useDragDropMonitor } from '@dnd-kit/react';import { isFunction } from '@sniptt/guards';import { Fragment, type JSX, useContext, useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';+import { closestCenter } from '@dnd-kit/collision';import { DraggableListGroupContext } from '@/ui/layout/draggable-list/contexts/DraggableListGroupContext';import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';@@ -80,6 +81,7 @@ export const DraggableItem = ({highlightWhileDragging={!disableDraggingBackground}orientation="horizontal"restrictMovementTo={restrictMovementTo}+ collisionDetector={closestCenter}>{isFunction(itemComponent)? itemComponent({ isDragging })diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsxindex 8c389b9647d..0e9a3754b89 100644--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/components/DragDropItemSortableCell.tsx@@ -1,3 +1,5 @@+import { type CollisionDetector } from '@dnd-kit/abstract';+import { defaultCollisionDetection } from '@dnd-kit/collision';import {RestrictToHorizontalAxis,RestrictToVerticalAxis,@@ -58,6 +60,7 @@ type DragDropItemSortableCellProps = {accept?: UseSortableInput['accept'];allowNativeDragWhenDisabled?: boolean;children: ReactNode;+ collisionDetector?: CollisionDetector;data?: Record<string, unknown>;disabled?: boolean;fadeSourceWhileDragging?: boolean;@@ -78,6 +81,7 @@ export const DragDropItemSortableCell = ({accept,allowNativeDragWhenDisabled = false,children,+ collisionDetector = defaultCollisionDetection,data,disabled = false,fadeSourceWhileDragging = false,@@ -98,6 +102,7 @@ export const DragDropItemSortableCell = ({type,accept,collisionPriority: SORTABLE_COLLISION_PRIORITY,+ collisionDetector,// Sortable metadata stays authoritative over consumer data so drag// handlers always resolve the cell's real group and position.data: {