Skip to content

The open alternative to Salesforce, designed for AI.

Twenty-front: Record Calendar multi drag functionality (#23316)

Priyanshu Bartwala807304b652b
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 b8e640450b5..a90609dc781 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
@@ -12,7 +12,7 @@ import { RecordBoardCardCellEditModePortal } from '@/object-record/record-board/
import { RecordBoardCardCellHoveredPortal } from '@/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellHoveredPortal';
import { RecordBoardCardBody } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBody';
import { RecordBoardCardHeader } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeader';
-import { RecordBoardCardMultiDragStack } from '@/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragStack';
+import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { RECORD_BOARD_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardClickOutsideId';
import { RECORD_BOARD_CARD_INPUT_ID_PREFIX } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardInputIdPrefix';
import { RecordBoardCardComponentInstanceContext } from '@/object-record/record-board/record-board-card/states/contexts/RecordBoardCardComponentInstanceContext';
@@ -182,7 +182,7 @@ export const RecordBoardCard = () => {
isPrimaryMultiDrag={isDragOverlay && isRecordIdPrimaryDragMultiple}
>
{isDragOverlay && isRecordIdPrimaryDragMultiple && (
- <RecordBoardCardMultiDragStack />
+ <RecordDragMultiDragStack />
)}
<RecordCard
data-selected={isRecordBoardCardSelected}
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx
index 42bca8d7e6c..3904387326d 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragPreview.tsx
@@ -1,5 +1,5 @@
-import { RecordBoardCardMultiDragCounterChip } from '@/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip';
import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useContext } from 'react';
@@ -17,5 +17,5 @@ export const RecordBoardCardMultiDragPreview = () => {
return null;
}
- return <RecordBoardCardMultiDragCounterChip />;
+ return <RecordDragMultiDragCounterChip />;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
index dfde069fb67..c18d13bacb6 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
@@ -5,6 +5,7 @@ import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/cons
import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';
import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';
import { RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-calendar/constants/RecordCalendarClickOutsideListenerId';
+import { RecordCalendarEscapeHotkeyEffect } from '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect';
import { RecordCalendarDay } from '@/object-record/record-calendar/day/components/RecordCalendarDay';
import { RecordCalendarMonth } from '@/object-record/record-calendar/month/components/RecordCalendarMonth';
import { RecordCalendarWeek } from '@/object-record/record-calendar/week/components/RecordCalendarWeek';
@@ -42,7 +43,8 @@ export const RecordCalendar = () => {
RecordCalendarComponentInstanceContext,
);
- const { resetRecordSelection } = useRecordCalendarSelection(recordCalendarId);
+ const { resetRecordCalendarSelection } =
+ useRecordCalendarSelection(recordCalendarId);
const recordIndexCalendarLayout = useAtomComponentStateValue(
recordIndexCalendarLayoutComponentState,
@@ -56,8 +58,8 @@ export const RecordCalendar = () => {
});
useEffect(() => {
- resetRecordSelection();
- }, [resetRecordSelection, supportedCalendarLayout]);
+ resetRecordCalendarSelection();
+ }, [resetRecordCalendarSelection, supportedCalendarLayout]);
useListenClickOutside({
excludedClickOutsideIds: [
@@ -71,12 +73,13 @@ export const RecordCalendar = () => {
listenerId: RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID,
refs: [],
callback: () => {
- resetRecordSelection();
+ resetRecordCalendarSelection();
},
});
return (
<StyledContainerContainer>
+ <RecordCalendarEscapeHotkeyEffect recordCalendarId={recordCalendarId} />
<RecordCalendarTopBar />
<ScrollWrapper
componentInstanceId={`scroll-wrapper-record-calendar-${recordCalendarId}`}
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect.tsx
new file mode 100644
index 00000000000..5a42a30574f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect.tsx
@@ -0,0 +1,44 @@
+import { Key } from 'ts-key-enum';
+
+import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';
+import { useRecordCalendarSelection } from '@/object-record/record-calendar/states/selectors/useRecordCalendarSelection';
+import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex';
+import { PageFocusId } from '@/types/PageFocusId';
+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
+import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+
+type RecordCalendarEscapeHotkeyEffectProps = {
+ recordCalendarId: string;
+};
+
+export const RecordCalendarEscapeHotkeyEffect = ({
+ recordCalendarId,
+}: RecordCalendarEscapeHotkeyEffectProps) => {
+ const { resetRecordCalendarSelection } =
+ useRecordCalendarSelection(recordCalendarId);
+ const { resetFocusStackToRecordIndex } = useResetFocusStackToRecordIndex();
+
+ const selectedRecordIds = useAtomComponentSelectorValue(
+ recordCalendarSelectedRecordIdsComponentSelector,
+ recordCalendarId,
+ );
+
+ const isAtLeastOneRecordSelected = selectedRecordIds.length > 0;
+
+ const handleEscape = () => {
+ if (isAtLeastOneRecordSelected) {
+ resetRecordCalendarSelection();
+ }
+
+ resetFocusStackToRecordIndex();
+ };
+
+ useHotkeysOnFocusedElement({
+ keys: [Key.Escape],
+ callback: handleEscape,
+ focusId: PageFocusId.RecordIndex,
+ dependencies: [handleEscape],
+ });
+
+ return null;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx
index 0516d9bbf53..b66d7646c93 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx
@@ -43,7 +43,7 @@ jest.mock(
'@/object-record/record-calendar/states/selectors/useRecordCalendarSelection',
() => ({
useRecordCalendarSelection: jest.fn(() => ({
- resetRecordSelection: jest.fn(),
+ resetRecordCalendarSelection: jest.fn(),
})),
}),
);
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 4a8e63a77da..5dff11fd5b6 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
@@ -18,7 +18,7 @@ import {
} 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 { RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY } from '@/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority';
import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -136,7 +136,7 @@ export const RecordCalendarMonthBodyDay = ({
const { isDropTarget, ref: dropRef } = useDroppable({
id: dayKey,
- collisionPriority: DND_KIT_COLLISION_PRIORITY,
+ collisionPriority: RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY,
collisionDetector: pointerIntersection,
type: RECORD_CALENDAR_CARD_DND_TYPE,
accept: RECORD_CALENDAR_CARD_DND_TYPE,
@@ -149,6 +149,7 @@ export const RecordCalendarMonthBodyDay = ({
return (
<StyledContainer
+ ref={dropRef}
isOtherMonth={isOtherMonth}
isDayOfWeekend={isDayOfWeekend}
onMouseEnter={() => setHovered(true)}
@@ -160,7 +161,7 @@ export const RecordCalendarMonthBodyDay = ({
<StyledDayHeaderDay isToday={isToday}>{day.day}</StyledDayHeaderDay>
</StyledDayHeaderDayContainer>
</StyledDayHeader>
- <StyledCardsContainer ref={dropRef} isDraggedOver={isDropTarget}>
+ <StyledCardsContainer isDraggedOver={isDropTarget}>
{visibleRecordIds.map((recordId, index) => (
<Fragment key={`${recordId}-${dayKey}`}>
<DragDropItemDropTarget
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
index 6ecb69ad15b..69d9ced3061 100644
--- 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
@@ -1,7 +1,8 @@
-import { DragDropProvider } from '@dnd-kit/react';
+import { DragDropProvider, DragOverlay } from '@dnd-kit/react';
import type { ReactNode } from 'react';
import { useRecordCalendarMonthDndKit } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit';
+import { RecordCalendarCardDragOverlayContent } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
@@ -26,6 +27,9 @@ export const RecordCalendarMonthDragDropContext = ({
onDragEnd={handlers.onDragEnd}
>
{children}
+ <DragOverlay>
+ {(source) => <RecordCalendarCardDragOverlayContent source={source} />}
+ </DragOverlay>
</DragDropProvider>
</DragDropItemDndContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.ts
new file mode 100644
index 00000000000..e7cd8839771
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.ts
@@ -0,0 +1 @@
+export const RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY = 2.5;
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
index 7425c2eba83..a543482618b 100644
--- 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
@@ -1,3 +1,4 @@
+import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { useState } from 'react';
import { Temporal } from 'temporal-polyfill';
@@ -13,9 +14,15 @@ import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDr
import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';
import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';
import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';
+import { recordCalendarMonthSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector';
+import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';
import { type DragDropProviderDragMoveEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragMoveEvent';
import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { logError } from '~/utils/logError';
type DragStartPayload = DragDropProviderDragStartEvent<DragDropItemData>;
type DragMovePayload = DragDropProviderDragMoveEvent<DragDropItemData>;
@@ -38,6 +45,8 @@ export const useRecordCalendarMonthDndKit = (): {
const { userTimezone } = useUserTimezone();
+ const { enqueueErrorSnackBar } = useSnackBar();
+
const { startRecordDrag } = useStartRecordDrag();
const { endRecordDrag } = useEndRecordDrag();
const { processCalendarCardDrop } = useProcessCalendarCardDrop();
@@ -47,6 +56,14 @@ export const useRecordCalendarMonthDndKit = (): {
calendarDayRecordIdsComponentFamilySelector,
);
+ const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(
+ recordCalendarMonthSelectedRecordIdsComponentSelector,
+ );
+
+ const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
+ originalDragSelectionComponentState,
+ );
+
const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<
number | null
>(null);
@@ -80,7 +97,8 @@ export const useRecordCalendarMonthDndKit = (): {
String(draggedId),
);
- startRecordDrag(draggedRecordId, []);
+ const currentSelectedRecordIds = store.get(recordCalendarSelectedRecordIds);
+ startRecordDrag(draggedRecordId, currentSelectedRecordIds);
};
const handleDragMove = (event: DragMovePayload) => {
@@ -144,11 +162,17 @@ export const useRecordCalendarMonthDndKit = (): {
return;
}
- processCalendarCardDrop({
+ const originalDragSelection = store.get(originalDragSelectionCallbackState);
+
+ void processCalendarCardDrop({
recordId: sourceRecordId,
sourceDate: sourceDroppableId,
destinationDate: destinationDroppableId,
destinationIndex,
+ selectedRecordIds: originalDragSelection,
+ }).catch((error) => {
+ logError(error);
+ enqueueErrorSnackBar({ message: t`Failed to move record` });
});
clearDragState();
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 3820cb37b1b..25819e8b80b 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
@@ -5,6 +5,7 @@ import { RecordCalendarCardCellEditModePortal } from '@/object-record/record-cal
import { RecordCalendarCardCellHoveredPortal } from '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal';
import { RecordCalendarCardBody } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody';
import { RecordCalendarCardHeader } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader';
+import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';
import { RECORD_CALENDAR_CARD_INPUT_ID_PREFIX } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardInputIdPrefix';
import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';
@@ -12,11 +13,15 @@ import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-recor
import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
+import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
+import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
@@ -33,11 +38,22 @@ const StyledRecordCardContainer = styled.div`
width: calc(100% - 2px);
`;
+const StyledCardContainer = styled.div<{ isPrimaryMultiDrag?: boolean }>`
+ position: relative;
+ transform: ${({ isPrimaryMultiDrag }) =>
+ isPrimaryMultiDrag ? 'scale(1.02)' : 'none'};
+ z-index: ${({ isPrimaryMultiDrag }) => (isPrimaryMultiDrag ? '10' : 'auto')};
+`;
+
type RecordCalendarCardProps = {
recordId: string;
+ isDragOverlay?: boolean;
};
-export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {
+export const RecordCalendarCard = ({
+ recordId,
+ isDragOverlay = false,
+}: RecordCalendarCardProps) => {
const { currentView } = useGetCurrentViewOnly();
const isCompactModeActive = currentView?.isCompact ?? false;
@@ -45,6 +61,26 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {
isDraggingRecordComponentState,
);
+ const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
+ isRecordIdPrimaryDragMultipleComponentFamilyState,
+ { recordId },
+ );
+
+ const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(
+ isRecordIdSecondaryDragMultipleComponentFamilyState,
+ { recordId },
+ );
+
+ const primaryDraggedRecordId = useAtomComponentStateValue(
+ primaryDraggedRecordIdComponentState,
+ );
+
+ const isDraggingThisCard =
+ !isDragOverlay &&
+ (isRecordIdPrimaryDragMultiple ||
+ isRecordIdSecondaryDragMultiple ||
+ primaryDraggedRecordId === recordId);
+
const { openRecordFromIndexView } = useOpenRecordFromIndexView();
const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =
@@ -104,22 +140,39 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {
>
<StyledContainer onContextMenu={handleContextMenuOpen}>
<StyledRecordCardContainer>
- <RecordCard
- data-selected={isRecordCalendarCardSelected}
- data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}
- onClick={isCompactModeActive ? handleCardClick : undefined}
+ <StyledCardContainer
+ isPrimaryMultiDrag={
+ isDragOverlay && isRecordIdPrimaryDragMultiple
+ }
>
- <RecordCalendarCardHeader recordId={recordId} />
- <AnimatedEaseInOut isOpen={!isCompactModeActive} initial={false}>
- <RecordCalendarCardBody
- recordId={recordId}
- isRecordReadOnly={false}
- />
- </AnimatedEaseInOut>
- </RecordCard>
+ {isDragOverlay && isRecordIdPrimaryDragMultiple && (
+ <RecordDragMultiDragStack />
+ )}
+ <RecordCard
+ data-selected={isRecordCalendarCardSelected}
+ data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}
+ onClick={isCompactModeActive ? handleCardClick : undefined}
+ isDragging={isDraggingThisCard}
+ >
+ <RecordCalendarCardHeader recordId={recordId} />
+ <AnimatedEaseInOut
+ isOpen={!isCompactModeActive}
+ initial={false}
+ >
+ <RecordCalendarCardBody
+ recordId={recordId}
+ isRecordReadOnly={false}
+ />
+ </AnimatedEaseInOut>
+ </RecordCard>
+ </StyledCardContainer>
</StyledRecordCardContainer>
- <RecordCalendarCardCellHoveredPortal recordId={recordId} />
- <RecordCalendarCardCellEditModePortal recordId={recordId} />
+ {!isDragOverlay && (
+ <>
+ <RecordCalendarCardCellHoveredPortal recordId={recordId} />
+ <RecordCalendarCardCellEditModePortal recordId={recordId} />
+ </>
+ )}
</StyledContainer>
</RecordFieldsScopeContextProvider>
</RecordCalendarCardComponentInstanceContext.Provider>
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx
new file mode 100644
index 00000000000..a5d480a5136
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx
@@ -0,0 +1,61 @@
+import { type Draggable } from '@dnd-kit/dom';
+import { isDefined } from 'twenty-shared/utils';
+
+import { RecordCalendarMonthContextProvider } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';
+import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';
+import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';
+import { useRecordCalendarMonthDaysRange } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange';
+import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';
+import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { RecordCalendarCardMultiDragPreview } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview';
+
+type RecordCalendarCardDragOverlayContentProps = {
+ source: Draggable | null;
+};
+export const RecordCalendarCardDragOverlayContent = ({
+ source,
+}: RecordCalendarCardDragOverlayContentProps) => {
+ const recordId = isDefined(source)
+ ? getRecordIdFromRecordCalendarCardDraggableId(String(source.id))
+ : '';
+
+ const recordCalendarSelectedDate = useAtomComponentStateValue(
+ recordCalendarSelectedDateComponentState,
+ );
+
+ const {
+ firstDayOfMonth,
+ lastDayOfMonth,
+ firstDayOfFirstWeek,
+ lastDayOfLastWeek,
+ weekDayLabels,
+ weekFirstDays,
+ weekStartsOnDayIndex,
+ } = useRecordCalendarMonthDaysRange(recordCalendarSelectedDate);
+
+ if (!isDefined(source)) {
+ return null;
+ }
+
+ return (
+ <RecordCalendarMonthContextProvider
+ value={{
+ firstDayOfMonth,
+ lastDayOfMonth,
+ firstDayOfFirstWeek,
+ lastDayOfLastWeek,
+ weekDayLabels,
+ weekFirstDays,
+ weekStartsOnDayIndex,
+ }}
+ >
+ <RecordCalendarCardComponentInstanceContext.Provider
+ value={{ instanceId: recordId }}
+ >
+ <RecordCalendarCard recordId={recordId} isDragOverlay />
+ <RecordCalendarCardMultiDragPreview recordId={recordId} />
+ </RecordCalendarCardComponentInstanceContext.Provider>
+ </RecordCalendarMonthContextProvider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx
new file mode 100644
index 00000000000..1e938848d3c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview.tsx
@@ -0,0 +1,20 @@
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
+import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
+
+export const RecordCalendarCardMultiDragPreview = ({
+ recordId,
+}: {
+ recordId: string;
+}) => {
+ const isRecordIdPrimaryDragMultiple = useAtomComponentFamilyStateValue(
+ isRecordIdPrimaryDragMultipleComponentFamilyState,
+ { recordId },
+ );
+
+ if (!isRecordIdPrimaryDragMultiple) {
+ return null;
+ }
+
+ return <RecordDragMultiDragCounterChip />;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.ts
new file mode 100644
index 00000000000..f0cc1407969
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.ts
@@ -0,0 +1,25 @@
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
+import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
+import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';
+import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';
+
+export const recordCalendarMonthSelectedRecordIdsComponentSelector =
+ createAtomComponentSelector<string[]>({
+ key: 'recordCalendarMonthSelectedRecordIdsComponentSelector',
+ componentInstanceContext: RecordCalendarComponentInstanceContext,
+ get:
+ ({ instanceId }) =>
+ ({ get }) => {
+ const allRecordIds = get(recordCalendarRecordIdsComponentState, {
+ instanceId,
+ });
+
+ return allRecordIds.filter(
+ (recordId) =>
+ get(isRecordCalendarCardSelectedComponentFamilyState, {
+ instanceId,
+ familyKey: recordId,
+ }) === true,
+ );
+ },
+ });
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
index 176227e520b..f42a08bae3a 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
@@ -1,7 +1,7 @@
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
+import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';
import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';
-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
export const recordCalendarSelectedRecordIdsComponentSelector =
createAtomComponentSelector<string[]>({
@@ -10,7 +10,7 @@ export const recordCalendarSelectedRecordIdsComponentSelector =
get:
({ instanceId }) =>
({ get }) => {
- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {
+ const allRecordIds = get(recordCalendarRecordIdsComponentState, {
instanceId,
});
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
index 979635bd72b..98f5ea0eda8 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
@@ -35,7 +35,7 @@ export const useRecordCalendarSelection = (recordCalendarId?: string) => {
getCommandMenuIdFromRecordIndexId(instanceIdFromProps),
);
- const resetRecordSelection = useCallback(() => {
+ const resetRecordCalendarSelection = useCallback(() => {
closeDropdown(dropdownId);
const recordIds = store.get(recordCalendarSelectedRecordIds);
@@ -52,6 +52,6 @@ export const useRecordCalendarSelection = (recordCalendarId?: string) => {
]);
return {
- resetRecordSelection,
+ resetRecordCalendarSelection,
};
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx
index 9c99a8bc3b6..67c9e0a9eff 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx
@@ -1,17 +1,24 @@
+import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';
import { useProcessRecordCalendarWeekEventDrop } from '@/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop';
import { type RecordCalendarWeekDndData } from '@/object-record/record-calendar/week/types/RecordCalendarWeekDndData';
import { resolveRecordCalendarWeekEventDrop } from '@/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop';
+import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
+import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
+import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
+import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';
+import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';
+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { DragDropProvider } from '@dnd-kit/react';
import { t } from '@lingui/core/macro';
+import { useStore } from 'jotai';
import { type ReactNode, type RefObject, useState } from 'react';
import type { Temporal } from 'temporal-polyfill';
import { isDefined } from 'twenty-shared/utils';
import { logError } from '~/utils/logError';
-import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';
-import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';
type DragStartPayload =
DragDropProviderDragStartEvent<RecordCalendarWeekDndData>;
@@ -33,8 +40,30 @@ export const RecordCalendarWeekDragDropContext = ({
useProcessRecordCalendarWeekEventDrop();
const { enqueueErrorSnackBar } = useSnackBar();
+ const store = useStore();
+ const { startRecordDrag } = useStartRecordDrag();
+ const { endRecordDrag } = useEndRecordDrag();
+
+ const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(
+ recordCalendarSelectedRecordIdsComponentSelector,
+ );
+
+ const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(
+ originalDragSelectionComponentState,
+ );
+
const handleDragStart = ({ operation }: DragStartPayload) => {
- const sourceElement = operation.source?.element;
+ const source = operation.source;
+ const sourceData = source?.data;
+
+ if (!isDefined(sourceData)) {
+ return;
+ }
+
+ const currentSelectedRecordIds = store.get(recordCalendarSelectedRecordIds);
+ startRecordDrag(sourceData.recordId, currentSelectedRecordIds);
+
+ const sourceElement = source?.element;
if (!isDefined(sourceElement)) {
setGrabOffsetY(0);
@@ -52,12 +81,14 @@ export const RecordCalendarWeekDragDropContext = ({
!isDefined(operation.source) ||
!isDefined(gridRef.current)
) {
+ endRecordDrag();
return;
}
const sourceData = operation.source.data;
if (sourceData.kind !== 'record-calendar-week-event') {
+ endRecordDrag();
return;
}
@@ -71,23 +102,30 @@ export const RecordCalendarWeekDragDropContext = ({
});
if (!isDefined(resolvedDrop)) {
+ endRecordDrag();
return;
}
const destinationDay = days[resolvedDrop.dayIndex];
if (!isDefined(destinationDay)) {
+ endRecordDrag();
return;
}
+ const originalDragSelection = store.get(originalDragSelectionCallbackState);
+
void processRecordCalendarWeekEventDrop({
destinationDay,
destinationMinutes: resolvedDrop.destinationMinutes,
recordId: sourceData.recordId,
+ selectedRecordIds: originalDragSelection,
}).catch((error) => {
logError(error);
enqueueErrorSnackBar({ message: t`Failed to move record` });
});
+
+ endRecordDrag();
};
return (
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts
index 4e250938d4c..a8d36bdeb30 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts
@@ -1,12 +1,15 @@
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';
import { getRecordCalendarWeekEventDropDateTime } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime';
+import { getRecordCalendarWeekEventDropShift } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift';
+import { getShiftedRecordCalendarWeekEventUpdateInput } from '@/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput';
+import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { useStore } from 'jotai';
import { useCallback } from 'react';
-import type { Temporal } from 'temporal-polyfill';
+import { type Temporal } from 'temporal-polyfill';
import { isDefined } from 'twenty-shared/utils';
import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -14,6 +17,7 @@ type ProcessRecordCalendarWeekEventDropArgs = {
destinationDay: Temporal.PlainDate;
destinationMinutes: number;
recordId: string;
+ selectedRecordIds: string[];
};
export const useProcessRecordCalendarWeekEventDrop = () => {
@@ -28,6 +32,7 @@ export const useProcessRecordCalendarWeekEventDrop = () => {
destinationDay,
destinationMinutes,
recordId,
+ selectedRecordIds,
}: ProcessRecordCalendarWeekEventDropArgs) => {
const calendarFieldMetadataItem = objectMetadataItem.fields.find(
(field) => field.id === currentView?.calendarFieldMetadataId,
@@ -46,10 +51,13 @@ export const useProcessRecordCalendarWeekEventDrop = () => {
return;
}
+ const primaryOriginalStart = record[calendarFieldMetadataItem.name];
+
+ // The primary dragged record lands exactly where it was dropped.
const shiftedDateTime = getRecordCalendarWeekEventDropDateTime({
destinationDay,
destinationMinutes,
- startDateTime: record[calendarFieldMetadataItem.name],
+ startDateTime: primaryOriginalStart,
endDateTime:
calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE_TIME
? record[calendarEndFieldMetadataItem.name]
@@ -72,6 +80,65 @@ export const useProcessRecordCalendarWeekEventDrop = () => {
}),
},
});
+
+ const dragOperationType = getDragOperationType({
+ draggedRecordId: recordId,
+ selectedRecordIds,
+ });
+
+ const recordIdsToShift =
+ dragOperationType === 'multi'
+ ? selectedRecordIds.filter((selectedId) => selectedId !== recordId)
+ : [];
+
+ // Measure how far the primary dragged record moved, then move every other
+ // selected record by that same amount.
+ const dropShift = getRecordCalendarWeekEventDropShift({
+ destinationDay,
+ destinationMinutes,
+ startDateTime: primaryOriginalStart,
+ timeZone: userTimezone,
+ });
+
+ if (!isDefined(dropShift)) {
+ return;
+ }
+
+ const { dayOffset, timeOfDayDeltaNanoseconds } = dropShift;
+
+ const calendarEndFieldName =
+ calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE_TIME
+ ? calendarEndFieldMetadataItem.name
+ : undefined;
+
+ for (const idToUpdate of recordIdsToShift) {
+ const recordToShift = store.get(
+ recordStoreFamilyState.atomFamily(idToUpdate),
+ );
+ if (!isDefined(recordToShift)) {
+ continue;
+ }
+
+ const updateOneRecordInput =
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: recordToShift,
+ calendarFieldName: calendarFieldMetadataItem.name,
+ calendarEndFieldName,
+ dayOffset,
+ timeOfDayDeltaNanoseconds,
+ timeZone: userTimezone,
+ });
+
+ if (!isDefined(updateOneRecordInput)) {
+ continue;
+ }
+
+ await updateOneRecord({
+ objectNameSingular: objectMetadataItem.nameSingular,
+ idToUpdate,
+ updateOneRecordInput,
+ });
+ }
},
[
currentView?.calendarEndFieldMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.ts
new file mode 100644
index 00000000000..e5646c1ee83
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.ts
@@ -0,0 +1,70 @@
+import { getRecordCalendarWeekEventDropShift } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift';
+import { Temporal } from 'temporal-polyfill';
+
+const timeZone = 'Europe/Paris';
+
+describe('getRecordCalendarWeekEventDropShift', () => {
+ it('computes the day offset and time-of-day delta', () => {
+ expect(
+ getRecordCalendarWeekEventDropShift({
+ destinationDay: Temporal.PlainDate.from('2026-07-09'),
+ destinationMinutes: 18 * 60 + 59,
+ startDateTime: '2026-07-08T15:59:00Z',
+ timeZone,
+ }),
+ ).toEqual({
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 3_600_000_000_000n,
+ });
+ });
+
+ it('returns a zero delta for a same-time drop when the start day springs forward', () => {
+ expect(
+ getRecordCalendarWeekEventDropShift({
+ destinationDay: Temporal.PlainDate.from('2026-03-30'),
+ destinationMinutes: 10 * 60,
+ startDateTime: '2026-03-29T08:00:00Z',
+ timeZone,
+ }),
+ ).toEqual({
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ });
+ });
+
+ it('returns a zero delta for a same-time drop when the start day falls back', () => {
+ expect(
+ getRecordCalendarWeekEventDropShift({
+ destinationDay: Temporal.PlainDate.from('2026-10-26'),
+ destinationMinutes: 10 * 60,
+ startDateTime: '2026-10-25T09:00:00Z',
+ timeZone,
+ }),
+ ).toEqual({
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ });
+ });
+
+ it('returns null when the start is not a string', () => {
+ expect(
+ getRecordCalendarWeekEventDropShift({
+ destinationDay: Temporal.PlainDate.from('2026-07-09'),
+ destinationMinutes: 600,
+ startDateTime: undefined,
+ timeZone,
+ }),
+ ).toBeNull();
+ });
+
+ it('returns null when the start is malformed', () => {
+ expect(
+ getRecordCalendarWeekEventDropShift({
+ destinationDay: Temporal.PlainDate.from('2026-07-09'),
+ destinationMinutes: 600,
+ startDateTime: 'not-a-date',
+ timeZone,
+ }),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.ts
new file mode 100644
index 00000000000..983c31b962f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.ts
@@ -0,0 +1,96 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getShiftedRecordCalendarWeekEventUpdateInput } from '@/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput';
+
+const timeZone = 'Europe/Paris';
+
+const buildRecord = (fields: Record<string, unknown>): ObjectRecord =>
+ ({
+ id: 'record-id',
+ __typename: 'Record',
+ ...fields,
+ }) as ObjectRecord;
+
+describe('getShiftedRecordCalendarWeekEventUpdateInput', () => {
+ it('moves the start by the day offset while keeping the local time', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({ startAt: '2026-07-08T15:59:00Z' }),
+ calendarFieldName: 'startAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ timeZone,
+ }),
+ ).toEqual({ startAt: '2026-07-09T15:59:00Z' });
+ });
+
+ it('applies the time-of-day delta on top of the day offset', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({ startAt: '2026-07-08T15:59:00Z' }),
+ calendarFieldName: 'startAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 3_600_000_000_000n,
+ timeZone,
+ }),
+ ).toEqual({ startAt: '2026-07-09T16:59:00Z' });
+ });
+
+ it('shifts the end and preserves the duration', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({
+ startAt: '2026-07-08T15:59:00Z',
+ endAt: '2026-07-10T18:59:00Z',
+ }),
+ calendarFieldName: 'startAt',
+ calendarEndFieldName: 'endAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ timeZone,
+ }),
+ ).toEqual({
+ startAt: '2026-07-09T15:59:00Z',
+ endAt: '2026-07-11T18:59:00Z',
+ });
+ });
+
+ it('omits the end when it precedes the start', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({
+ startAt: '2026-07-08T15:59:00Z',
+ endAt: '2026-07-07T18:59:00Z',
+ }),
+ calendarFieldName: 'startAt',
+ calendarEndFieldName: 'endAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ timeZone,
+ }),
+ ).toEqual({ startAt: '2026-07-09T15:59:00Z' });
+ });
+
+ it('returns null when the stored start is missing', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({}),
+ calendarFieldName: 'startAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ timeZone,
+ }),
+ ).toBeNull();
+ });
+
+ it('returns null when the stored start is malformed', () => {
+ expect(
+ getShiftedRecordCalendarWeekEventUpdateInput({
+ record: buildRecord({ startAt: 'not-a-date' }),
+ calendarFieldName: 'startAt',
+ dayOffset: 1,
+ timeOfDayDeltaNanoseconds: 0n,
+ timeZone,
+ }),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.ts
new file mode 100644
index 00000000000..51d9806f3b4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.ts
@@ -0,0 +1,57 @@
+// Time of day must be read from the wall clock (what a clock on the wall
+// shows), not from elapsed time since midnight. These two normally match,
+// but disagree on Daylight Saving Time transition days:
+//
+// - Spring forward: at 02:00 the clock jumps to 03:00, so that day has
+// only 23 hours. When the wall clock reads 10:00, only 9 real hours
+// have elapsed since midnight.
+// - Fall back: at 02:00 the clock jumps to 01:00, so that day has 25
+// hours. When the wall clock reads 10:00, 11 real hours have elapsed.
+//
+// The delta is applied to wall-clock plain times downstream, so measuring
+// it in elapsed time would shift the other selected records by an extra
+// hour on those days. Using toPlainTime() keeps this on the wall clock.
+
+import { Temporal } from 'temporal-polyfill';
+
+type GetRecordCalendarWeekEventDropShiftArgs = {
+ destinationDay: Temporal.PlainDate;
+ destinationMinutes: number;
+ startDateTime: unknown;
+ timeZone: string;
+};
+
+export const getRecordCalendarWeekEventDropShift = ({
+ destinationDay,
+ destinationMinutes,
+ startDateTime,
+ timeZone,
+}: GetRecordCalendarWeekEventDropShiftArgs) => {
+ if (typeof startDateTime !== 'string') {
+ return null;
+ }
+
+ try {
+ const startZoned =
+ Temporal.Instant.from(startDateTime).toZonedDateTimeISO(timeZone);
+
+ const dayOffset = startZoned.toPlainDate().until(destinationDay).days;
+
+ const destinationTimeOfDayNanoseconds = BigInt(
+ Math.round(destinationMinutes * 60 * 1_000_000_000),
+ );
+ const originalTimeOfDayNanoseconds = BigInt(
+ Temporal.PlainTime.from('00:00')
+ .until(startZoned.toPlainTime())
+ .total({ unit: 'nanoseconds' }),
+ );
+
+ return {
+ dayOffset,
+ timeOfDayDeltaNanoseconds:
+ destinationTimeOfDayNanoseconds - originalTimeOfDayNanoseconds,
+ };
+ } catch {
+ return null;
+ }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.ts
new file mode 100644
index 00000000000..553d4e4d0a8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.ts
@@ -0,0 +1,58 @@
+import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { Temporal } from 'temporal-polyfill';
+import { isDefined } from 'twenty-shared/utils';
+
+type GetShiftedRecordCalendarWeekEventUpdateInputArgs = {
+ record: ObjectRecord;
+ calendarFieldName: string;
+ calendarEndFieldName?: string;
+ dayOffset: number;
+ timeOfDayDeltaNanoseconds: bigint;
+ timeZone: string;
+};
+
+export const getShiftedRecordCalendarWeekEventUpdateInput = ({
+ record,
+ calendarFieldName,
+ calendarEndFieldName,
+ dayOffset,
+ timeOfDayDeltaNanoseconds,
+ timeZone,
+}: GetShiftedRecordCalendarWeekEventUpdateInputArgs): Partial<ObjectRecord> | null => {
+ const startDateTime = record[calendarFieldName];
+
+ try {
+ const originalStartInstant = Temporal.Instant.from(startDateTime);
+
+ const shiftedStartInstant = originalStartInstant
+ .toZonedDateTimeISO(timeZone)
+ .toPlainDateTime()
+ .add({
+ days: dayOffset,
+ nanoseconds: Number(timeOfDayDeltaNanoseconds),
+ })
+ .toZonedDateTime(timeZone)
+ .toInstant();
+
+ const endDateTime = isDefined(calendarEndFieldName)
+ ? record[calendarEndFieldName]
+ : undefined;
+
+ const shiftedEndDateTime = getShiftedRecordCalendarEndDateTime({
+ endDateTime,
+ originalStartInstant,
+ shiftedStartInstant,
+ });
+
+ return {
+ [calendarFieldName]: shiftedStartInstant.toString(),
+ ...(isDefined(calendarEndFieldName) &&
+ isDefined(shiftedEndDateTime) && {
+ [calendarEndFieldName]: shiftedEndDateTime,
+ }),
+ };
+ } catch {
+ return null;
+ }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
similarity index 93%
rename from packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx
rename to packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
index 7aea3c3cec3..347a5b8d2fe 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
@@ -10,7 +10,7 @@ const StyledNotificationCounterContainer = styled.div`
z-index: 1000;
`;
-export const RecordBoardCardMultiDragCounterChip = () => {
+export const RecordDragMultiDragCounterChip = () => {
const originalDragSelection = useAtomComponentStateValue(
originalDragSelectionComponentState,
);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragStack.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
similarity index 71%
rename from packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragStack.tsx
rename to packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
index e8c4502614f..91f9ac1a8fe 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragStack.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragStack.tsx
@@ -3,7 +3,9 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-const StyledRecordBoardCardStackCard = styled.div<{ offset: number }>`
+const MAX_STACK_CARDS = 5;
+
+const StyledRecordDragMultiDragStackCard = styled.div<{ offset: number }>`
background-color: ${themeCssVariables.accent.tertiary};
border: 1px solid ${themeCssVariables.border.color.medium};
border-radius: ${themeCssVariables.border.radius.sm};
@@ -15,22 +17,20 @@ const StyledRecordBoardCardStackCard = styled.div<{ offset: number }>`
z-index: ${({ offset }) => -offset};
`;
-export const RecordBoardCardMultiDragStack = () => {
+export const RecordDragMultiDragStack = () => {
const originalDragSelection = useAtomComponentStateValue(
originalDragSelectionComponentState,
);
- const selectedCount = originalDragSelection.length ?? 0;
-
- const shouldShow = selectedCount > 1;
+ const shouldShow = originalDragSelection.length > 1;
if (!shouldShow) {
return null;
}
return Array.from({
- length: Math.min(5, originalDragSelection.length - 1),
+ length: Math.min(MAX_STACK_CARDS, originalDragSelection.length - 1),
}).map((_, index) => (
- <StyledRecordBoardCardStackCard key={index} offset={index + 1} />
+ <StyledRecordDragMultiDragStackCard key={index} offset={index + 1} />
));
};
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 2fa5de26bdb..96c71d874c7 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
@@ -7,7 +7,8 @@ import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar
import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';
import { extractRecordPositions } from '@/object-record/record-drag/utils/extractRecordPositions';
-import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTime';
+import { getShiftedRecordCalendarDateTimeUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput';
+import { getShiftedRecordCalendarDateUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput';
import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { computeNewPositionOfDraggedRecord } from '@/object-record/utils/computeNewPositionOfDraggedRecord';
@@ -17,6 +18,7 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { Temporal } from 'temporal-polyfill';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';
export const useProcessCalendarCardDrop = () => {
const store = useStore();
@@ -40,21 +42,24 @@ export const useProcessCalendarCardDrop = () => {
sourceDate,
destinationDate,
destinationIndex,
+ selectedRecordIds,
}: {
recordId: string;
sourceDate: string;
destinationDate: string;
destinationIndex: number;
+ selectedRecordIds: string[];
}) => {
if (!currentView?.calendarFieldMetadataId) return;
+ const dragOperationType = getDragOperationType({
+ draggedRecordId: recordId,
+ selectedRecordIds,
+ });
+
const destinationPlainDate = Temporal.PlainDate.from(destinationDate);
const sourcePlainDate = Temporal.PlainDate.from(sourceDate);
- const record = store.get(recordStoreFamilyState.atomFamily(recordId));
-
- if (!record) return;
-
const calendarFieldMetadata = objectMetadataItem.fields.find(
(field) => field.id === currentView.calendarFieldMetadataId,
);
@@ -125,97 +130,77 @@ export const useProcessCalendarCardDrop = () => {
});
}
- const currentFieldValue = record[calendarFieldMetadata.name] as
- | string
- | undefined;
-
- if (calendarFieldMetadata.type === FieldMetadataType.DATE) {
- let shiftedStartDate = destinationPlainDate.toString();
- let shiftedEndDate: string | undefined;
-
- if (isDefined(currentFieldValue)) {
- try {
- const currentStartDate = Temporal.PlainDate.from(currentFieldValue);
- const dayOffset = sourcePlainDate.until(destinationPlainDate).days;
-
- shiftedStartDate = currentStartDate
- .add({ days: dayOffset })
- .toString();
-
- if (calendarEndFieldMetadata?.type === FieldMetadataType.DATE) {
- const currentEndFieldValue = record[
- calendarEndFieldMetadata.name
- ] as string | undefined;
-
- if (isDefined(currentEndFieldValue)) {
- const currentEndDate =
- Temporal.PlainDate.from(currentEndFieldValue);
-
- if (
- Temporal.PlainDate.compare(
- currentEndDate,
- currentStartDate,
- ) >= 0
- ) {
- shiftedEndDate = currentEndDate
- .add({ days: dayOffset })
- .toString();
- }
- }
- }
- } catch {
- shiftedStartDate = destinationPlainDate.toString();
- shiftedEndDate = undefined;
- }
+ const dayOffset = sourcePlainDate.until(destinationPlainDate).days;
+
+ const recordIdsToShift =
+ dragOperationType === 'single' ? [recordId] : selectedRecordIds;
+
+ for (const idToUpdate of recordIdsToShift) {
+ const recordToShift = store.get(
+ recordStoreFamilyState.atomFamily(idToUpdate),
+ );
+
+ if (!isDefined(recordToShift)) {
+ continue;
}
+ if (calendarFieldMetadata.type === FieldMetadataType.DATE) {
+ const calendarEndFieldName =
+ calendarEndFieldMetadata?.type === FieldMetadataType.DATE
+ ? calendarEndFieldMetadata.name
+ : undefined;
+
+ const updateOneRecordInput = getShiftedRecordCalendarDateUpdateInput({
+ record: recordToShift,
+ calendarFieldName: calendarFieldMetadata.name,
+ calendarEndFieldName,
+ dayOffset,
+ fallbackStartDate: destinationPlainDate.toString(),
+ });
+ if (!isDefined(updateOneRecordInput)) {
+ continue;
+ }
- await updateOneRecord({
- objectNameSingular: objectMetadataItem.nameSingular,
- idToUpdate: recordId,
- updateOneRecordInput: {
- [calendarFieldMetadata.name]: shiftedStartDate,
- ...(isDefined(calendarEndFieldMetadata) &&
- isDefined(shiftedEndDate) && {
- [calendarEndFieldMetadata.name]: shiftedEndDate,
- }),
- position: newPosition,
- },
- });
- } else if (calendarFieldMetadata.type === FieldMetadataType.DATE_TIME) {
- let shiftedDateTime = null;
-
- if (isDefined(currentFieldValue)) {
- shiftedDateTime = getShiftedRecordCalendarDateTime({
- sourceDay: sourcePlainDate,
- destinationDay: destinationPlainDate,
- startDateTime: currentFieldValue,
- endDateTime:
- calendarEndFieldMetadata?.type === FieldMetadataType.DATE_TIME
- ? record[calendarEndFieldMetadata.name]
- : undefined,
- timeZone: userTimezone,
+ await updateOneRecord({
+ objectNameSingular: objectMetadataItem.nameSingular,
+ idToUpdate,
+ updateOneRecordInput: {
+ ...updateOneRecordInput,
+ ...(idToUpdate === recordId && { position: newPosition }),
+ },
});
- }
+ } else {
+ const calendarEndFieldName =
+ calendarEndFieldMetadata?.type === FieldMetadataType.DATE_TIME
+ ? calendarEndFieldMetadata.name
+ : undefined;
- const shiftedStartDateTime =
- shiftedDateTime?.startDateTime ??
- destinationPlainDate
+ const fallbackStartDateTime = destinationPlainDate
.toZonedDateTime({ timeZone: userTimezone })
.toInstant()
.toString();
- await updateOneRecord({
- objectNameSingular: objectMetadataItem.nameSingular,
- idToUpdate: recordId,
- updateOneRecordInput: {
- [calendarFieldMetadata.name]: shiftedStartDateTime,
- ...(isDefined(calendarEndFieldMetadata) &&
- isDefined(shiftedDateTime?.endDateTime) && {
- [calendarEndFieldMetadata.name]: shiftedDateTime.endDateTime,
- }),
- position: newPosition,
- },
- });
+ const updateOneRecordInput =
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: recordToShift,
+ calendarFieldName: calendarFieldMetadata.name,
+ calendarEndFieldName,
+ dayOffset,
+ timeZone: userTimezone,
+ fallbackStartDateTime,
+ });
+ if (!isDefined(updateOneRecordInput)) {
+ continue;
+ }
+
+ await updateOneRecord({
+ objectNameSingular: objectMetadataItem.nameSingular,
+ idToUpdate,
+ updateOneRecordInput: {
+ ...updateOneRecordInput,
+ ...(idToUpdate === recordId && { position: newPosition }),
+ },
+ });
+ }
}
},
[
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts
new file mode 100644
index 00000000000..45cda8819d2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts
@@ -0,0 +1,85 @@
+import { getShiftedRecordCalendarDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDate';
+
+describe('getShiftedRecordCalendarDate', () => {
+ it('moves a dated event by the day offset and preserves duration', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 3,
+ startDate: '2026-07-08',
+ endDate: '2026-07-10',
+ }),
+ ).toEqual({
+ startDate: '2026-07-11',
+ endDate: '2026-07-13',
+ });
+ });
+
+ it('moves the start backwards for a negative offset', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: -2,
+ startDate: '2026-07-08',
+ endDate: '2026-07-10',
+ }),
+ ).toEqual({
+ startDate: '2026-07-06',
+ endDate: '2026-07-08',
+ });
+ });
+
+ it('shifts an end that is equal to the start', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 1,
+ startDate: '2026-07-08',
+ endDate: '2026-07-08',
+ }),
+ ).toEqual({
+ startDate: '2026-07-09',
+ endDate: '2026-07-09',
+ });
+ });
+
+ it('does not synthesize an end when it is malformed', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 1,
+ startDate: '2026-07-08',
+ endDate: 'not-a-date',
+ }),
+ ).toEqual({
+ startDate: '2026-07-09',
+ });
+ });
+
+ it('drops an end that precedes the start', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 1,
+ startDate: '2026-07-08',
+ endDate: '2026-07-05',
+ }),
+ ).toEqual({
+ startDate: '2026-07-09',
+ });
+ });
+
+ it('returns null for a missing start', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 1,
+ startDate: undefined,
+ }),
+ ).toBeNull();
+ });
+
+ it('returns null for a malformed start instead of throwing', () => {
+ expect(
+ getShiftedRecordCalendarDate({
+ dayOffset: 1,
+ startDate: 'not-a-date',
+ endDate: '2026-07-10',
+ }),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts
index 5304c2647af..7f4cdd7be26 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts
@@ -1,5 +1,4 @@
import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTime';
-import { Temporal } from 'temporal-polyfill';
const timeZone = 'Europe/Paris';
@@ -7,8 +6,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('moves a timed event by the rendered day offset and preserves duration', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-07-08'),
- destinationDay: Temporal.PlainDate.from('2026-07-11'),
+ dayOffset: 3,
startDateTime: '2026-07-08T15:59:00Z',
endDateTime: '2026-07-10T18:59:00Z',
timeZone,
@@ -22,8 +20,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('moves a continuation fragment by its visual anchor', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-07-10'),
- destinationDay: Temporal.PlainDate.from('2026-07-11'),
+ dayOffset: 1,
startDateTime: '2026-07-08T15:59:00Z',
endDateTime: '2026-07-10T18:59:00Z',
timeZone,
@@ -37,8 +34,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('lands on the requested local time and preserves duration across DST', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-03-28'),
- destinationDay: Temporal.PlainDate.from('2026-03-29'),
+ dayOffset: 1,
startDateTime: '2026-03-28T09:00:00Z',
endDateTime: '2026-03-28T11:00:00Z',
timeZone,
@@ -52,8 +48,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('preserves the later offset when the source start is a repeated DST time', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-10-25'),
- destinationDay: Temporal.PlainDate.from('2026-10-26'),
+ dayOffset: 1,
startDateTime: '2026-10-25T01:30:00Z',
endDateTime: '2026-10-25T02:30:00Z',
timeZone,
@@ -67,8 +62,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('keeps the local start time when a continuation moves across DST', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-03-29'),
- destinationDay: Temporal.PlainDate.from('2026-03-30'),
+ dayOffset: 1,
startDateTime: '2026-03-28T09:00:00Z',
endDateTime: '2026-03-30T10:00:00Z',
timeZone,
@@ -82,8 +76,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('does not synthesize an end when it is unusable', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-07-08'),
- destinationDay: Temporal.PlainDate.from('2026-07-09'),
+ dayOffset: 1,
startDateTime: '2026-07-08T15:59:00Z',
endDateTime: 'not-a-date',
timeZone,
@@ -96,8 +89,7 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('shifts an end that is equal to the start', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-07-08'),
- destinationDay: Temporal.PlainDate.from('2026-07-09'),
+ dayOffset: 1,
startDateTime: '2026-07-08T15:59:00Z',
endDateTime: '2026-07-08T15:59:00Z',
timeZone,
@@ -111,9 +103,8 @@ describe('getShiftedRecordCalendarDateTime', () => {
it('returns null for an unusable start', () => {
expect(
getShiftedRecordCalendarDateTime({
- sourceDay: Temporal.PlainDate.from('2026-07-08'),
- destinationDay: Temporal.PlainDate.from('2026-07-09'),
- startDateTime: 'not-a-date',
+ dayOffset: 1,
+ startDateTime: undefined,
timeZone,
}),
).toBeNull();
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts
new file mode 100644
index 00000000000..ee355d97ae9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts
@@ -0,0 +1,89 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getShiftedRecordCalendarDateTimeUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput';
+
+const timeZone = 'Europe/Paris';
+const fallbackStartDateTime = '2026-07-20T00:00:00Z';
+
+const buildRecord = (fields: Record<string, unknown>): ObjectRecord =>
+ ({
+ id: 'record-id',
+ __typename: 'Record',
+ ...fields,
+ }) as ObjectRecord;
+
+describe('getShiftedRecordCalendarDateTimeUpdateInput', () => {
+ it('shifts the start date-time by the day offset', () => {
+ expect(
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: buildRecord({ startAt: '2026-07-08T15:59:00Z' }),
+ calendarFieldName: 'startAt',
+ dayOffset: 3,
+ timeZone,
+ fallbackStartDateTime,
+ }),
+ ).toEqual({ startAt: '2026-07-11T15:59:00Z' });
+ });
+
+ it('shifts both the start and end date-times when an end field is given', () => {
+ expect(
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: buildRecord({
+ startAt: '2026-07-08T15:59:00Z',
+ endAt: '2026-07-10T18:59:00Z',
+ }),
+ calendarFieldName: 'startAt',
+ calendarEndFieldName: 'endAt',
+ dayOffset: 1,
+ timeZone,
+ fallbackStartDateTime,
+ }),
+ ).toEqual({
+ startAt: '2026-07-09T15:59:00Z',
+ endAt: '2026-07-11T18:59:00Z',
+ });
+ });
+
+ it('falls back to the destination date-time when the start is missing', () => {
+ expect(
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: buildRecord({}),
+ calendarFieldName: 'startAt',
+ dayOffset: 1,
+ timeZone,
+ fallbackStartDateTime,
+ }),
+ ).toEqual({ startAt: fallbackStartDateTime });
+ });
+
+ it('falls back without an end when the stored start is malformed', () => {
+ expect(
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: buildRecord({
+ startAt: 'not-a-date',
+ endAt: '2026-07-10T18:59:00Z',
+ }),
+ calendarFieldName: 'startAt',
+ calendarEndFieldName: 'endAt',
+ dayOffset: 1,
+ timeZone,
+ fallbackStartDateTime,
+ }),
+ ).toEqual({ startAt: fallbackStartDateTime });
+ });
+
+ it('omits the end when it precedes the start', () => {
+ expect(
+ getShiftedRecordCalendarDateTimeUpdateInput({
+ record: buildRecord({
+ startAt: '2026-07-08T15:59:00Z',
+ endAt: '2026-07-07T18:59:00Z',
+ }),
+ calendarFieldName: 'startAt',
+ calendarEndFieldName: 'endAt',
+ dayOffset: 1,
+ timeZone,
+ fallbackStartDateTime,
+ }),
+ ).toEqual({ startAt: '2026-07-09T15:59:00Z' });
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts
new file mode 100644
index 00000000000..691a75f7029
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts
@@ -0,0 +1,69 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getShiftedRecordCalendarDateUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput';
+
+const buildRecord = (fields: Record<string, unknown>): ObjectRecord =>
+ ({
+ id: 'record-id',
+ __typename: 'Record',
+ ...fields,
+ }) as ObjectRecord;
+
+describe('getShiftedRecordCalendarDateUpdateInput', () => {
+ it('shifts the start date by the day offset', () => {
+ expect(
+ getShiftedRecordCalendarDateUpdateInput({
+ record: buildRecord({ startDate: '2026-07-08' }),
+ calendarFieldName: 'startDate',
+ dayOffset: 3,
+ fallbackStartDate: '2026-07-20',
+ }),
+ ).toEqual({ startDate: '2026-07-11' });
+ });
+
+ it('shifts both the start and end dates when an end field is given', () => {
+ expect(
+ getShiftedRecordCalendarDateUpdateInput({
+ record: buildRecord({ startDate: '2026-07-08', endDate: '2026-07-10' }),
+ calendarFieldName: 'startDate',
+ calendarEndFieldName: 'endDate',
+ dayOffset: 1,
+ fallbackStartDate: '2026-07-20',
+ }),
+ ).toEqual({ startDate: '2026-07-09', endDate: '2026-07-11' });
+ });
+
+ it('falls back to the destination date when the start is missing', () => {
+ expect(
+ getShiftedRecordCalendarDateUpdateInput({
+ record: buildRecord({}),
+ calendarFieldName: 'startDate',
+ dayOffset: 1,
+ fallbackStartDate: '2026-07-20',
+ }),
+ ).toEqual({ startDate: '2026-07-20' });
+ });
+
+ it('falls back without an end when the stored start is malformed', () => {
+ expect(
+ getShiftedRecordCalendarDateUpdateInput({
+ record: buildRecord({ startDate: 'not-a-date', endDate: '2026-07-10' }),
+ calendarFieldName: 'startDate',
+ calendarEndFieldName: 'endDate',
+ dayOffset: 1,
+ fallbackStartDate: '2026-07-20',
+ }),
+ ).toEqual({ startDate: '2026-07-20' });
+ });
+
+ it('omits the end when it precedes the start', () => {
+ expect(
+ getShiftedRecordCalendarDateUpdateInput({
+ record: buildRecord({ startDate: '2026-07-08', endDate: '2026-07-05' }),
+ calendarFieldName: 'startDate',
+ calendarEndFieldName: 'endDate',
+ dayOffset: 1,
+ fallbackStartDate: '2026-07-20',
+ }),
+ ).toEqual({ startDate: '2026-07-09' });
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.ts
new file mode 100644
index 00000000000..a97ca5cd816
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.ts
@@ -0,0 +1,66 @@
+import { getShiftedRecordCalendarEndDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDate';
+import { Temporal } from 'temporal-polyfill';
+
+const originalStartDate = Temporal.PlainDate.from('2026-07-08');
+
+describe('getShiftedRecordCalendarEndDate', () => {
+ it('shifts an end that is after the start by the day offset', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: 1,
+ endDate: '2026-07-10',
+ originalStartDate,
+ }),
+ ).toBe('2026-07-11');
+ });
+
+ it('shifts an end that is equal to the start', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: 1,
+ endDate: '2026-07-08',
+ originalStartDate,
+ }),
+ ).toBe('2026-07-09');
+ });
+
+ it('moves the end backwards for a negative offset', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: -2,
+ endDate: '2026-07-10',
+ originalStartDate,
+ }),
+ ).toBe('2026-07-08');
+ });
+
+ it('returns undefined when the end precedes the start', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: 1,
+ endDate: '2026-07-05',
+ originalStartDate,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('returns undefined for a malformed end', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: 1,
+ endDate: 'not-a-date',
+ originalStartDate,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('returns undefined for a missing end', () => {
+ expect(
+ getShiftedRecordCalendarEndDate({
+ dayOffset: 1,
+ endDate: undefined,
+ originalStartDate,
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts
new file mode 100644
index 00000000000..82e633f72a1
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts
@@ -0,0 +1,43 @@
+import { getShiftedRecordCalendarEndDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDate';
+import { Temporal } from 'temporal-polyfill';
+
+type GetShiftedRecordCalendarDateArgs = {
+ dayOffset: number;
+ endDate?: unknown;
+ startDate?: unknown;
+};
+
+export type ShiftedRecordCalendarDate = {
+ endDate?: string;
+ startDate: string;
+};
+
+export const getShiftedRecordCalendarDate = ({
+ dayOffset,
+ endDate,
+ startDate,
+}: GetShiftedRecordCalendarDateArgs): ShiftedRecordCalendarDate | null => {
+ if (typeof startDate !== 'string') {
+ return null;
+ }
+
+ try {
+ const currentStartDate = Temporal.PlainDate.from(startDate);
+ const shiftedStartDate = currentStartDate.add({ days: dayOffset });
+
+ const shiftedEndDate = getShiftedRecordCalendarEndDate({
+ dayOffset,
+ endDate,
+ originalStartDate: currentStartDate,
+ });
+
+ return {
+ startDate: shiftedStartDate.toString(),
+ ...(shiftedEndDate !== undefined && {
+ endDate: shiftedEndDate,
+ }),
+ };
+ } catch {
+ return null;
+ }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts
index 1449ad4cad3..7c05467c96f 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts
@@ -2,9 +2,8 @@ import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag
import { Temporal } from 'temporal-polyfill';
type GetShiftedRecordCalendarDateTimeArgs = {
- destinationDay: Temporal.PlainDate;
+ dayOffset: number;
endDateTime?: unknown;
- sourceDay: Temporal.PlainDate;
startDateTime?: unknown;
timeZone: string;
};
@@ -15,9 +14,8 @@ export type ShiftedRecordCalendarDateTime = {
};
export const getShiftedRecordCalendarDateTime = ({
- destinationDay,
+ dayOffset,
endDateTime,
- sourceDay,
startDateTime,
timeZone,
}: GetShiftedRecordCalendarDateTimeArgs): ShiftedRecordCalendarDateTime | null => {
@@ -27,7 +25,6 @@ export const getShiftedRecordCalendarDateTime = ({
try {
const currentStartInstant = Temporal.Instant.from(startDateTime);
- const dayOffset = sourceDay.until(destinationDay).days;
const shiftedStartInstant = currentStartInstant
.toZonedDateTimeISO(timeZone)
.add({ days: dayOffset })
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts
new file mode 100644
index 00000000000..131b76f09ab
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts
@@ -0,0 +1,45 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTime';
+import { isDefined } from 'twenty-shared/utils';
+
+type GetShiftedRecordCalendarDateTimeUpdateInputArgs = {
+ record: ObjectRecord;
+ calendarFieldName: string;
+ calendarEndFieldName?: string;
+ dayOffset: number;
+ timeZone: string;
+ fallbackStartDateTime: string;
+};
+
+export const getShiftedRecordCalendarDateTimeUpdateInput = ({
+ record,
+ calendarFieldName,
+ calendarEndFieldName,
+ dayOffset,
+ timeZone,
+ fallbackStartDateTime,
+}: GetShiftedRecordCalendarDateTimeUpdateInputArgs): Partial<ObjectRecord> | null => {
+ const startDateTime = record[calendarFieldName] as string | undefined;
+
+ if (!isDefined(startDateTime)) {
+ return { [calendarFieldName]: fallbackStartDateTime };
+ }
+
+ const shiftedDateTime = getShiftedRecordCalendarDateTime({
+ dayOffset,
+ startDateTime,
+ endDateTime: isDefined(calendarEndFieldName)
+ ? record[calendarEndFieldName]
+ : undefined,
+ timeZone,
+ });
+
+ return {
+ [calendarFieldName]:
+ shiftedDateTime?.startDateTime ?? fallbackStartDateTime,
+ ...(isDefined(calendarEndFieldName) &&
+ isDefined(shiftedDateTime?.endDateTime) && {
+ [calendarEndFieldName]: shiftedDateTime.endDateTime,
+ }),
+ };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts
new file mode 100644
index 00000000000..b9bfe58ba0d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts
@@ -0,0 +1,41 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getShiftedRecordCalendarDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDate';
+import { isDefined } from 'twenty-shared/utils';
+
+type GetShiftedRecordCalendarDateUpdateInputArgs = {
+ record: ObjectRecord;
+ calendarFieldName: string;
+ calendarEndFieldName?: string;
+ dayOffset: number;
+ fallbackStartDate: string;
+};
+
+export const getShiftedRecordCalendarDateUpdateInput = ({
+ record,
+ calendarFieldName,
+ calendarEndFieldName,
+ dayOffset,
+ fallbackStartDate,
+}: GetShiftedRecordCalendarDateUpdateInputArgs): Partial<ObjectRecord> | null => {
+ const startDate = record[calendarFieldName] as string | undefined;
+
+ if (!isDefined(startDate)) {
+ return { [calendarFieldName]: fallbackStartDate };
+ }
+
+ const shiftedDate = getShiftedRecordCalendarDate({
+ dayOffset,
+ startDate,
+ endDate: isDefined(calendarEndFieldName)
+ ? record[calendarEndFieldName]
+ : undefined,
+ });
+
+ return {
+ [calendarFieldName]: shiftedDate?.startDate ?? fallbackStartDate,
+ ...(isDefined(calendarEndFieldName) &&
+ isDefined(shiftedDate?.endDate) && {
+ [calendarEndFieldName]: shiftedDate.endDate,
+ }),
+ };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.ts
new file mode 100644
index 00000000000..60f7b3c4963
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.ts
@@ -0,0 +1,29 @@
+import { Temporal } from 'temporal-polyfill';
+
+type GetShiftedRecordCalendarEndDateArgs = {
+ dayOffset: number;
+ endDate?: unknown;
+ originalStartDate: Temporal.PlainDate;
+};
+
+export const getShiftedRecordCalendarEndDate = ({
+ dayOffset,
+ endDate,
+ originalStartDate,
+}: GetShiftedRecordCalendarEndDateArgs): string | undefined => {
+ if (typeof endDate !== 'string') {
+ return undefined;
+ }
+
+ try {
+ const originalEndDate = Temporal.PlainDate.from(endDate);
+
+ if (Temporal.PlainDate.compare(originalEndDate, originalStartDate) < 0) {
+ return undefined;
+ }
+
+ return originalEndDate.add({ days: dayOffset }).toString();
+ } catch {
+ return undefined;
+ }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx
index 7bc05b97a8b..cc47610094b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragPreview.tsx
@@ -1,6 +1,6 @@
+import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { RecordTableRowMultiDragCounterChip } from '@/object-record/record-table/record-table-row/components/RecordTableRowMultiDragCounterChip';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
type RecordTableRowMultiDragPreviewProps = {
@@ -22,5 +22,5 @@ export const RecordTableRowMultiDragPreview = ({
return null;
}
- return <RecordTableRowMultiDragCounterChip />;
+ return <RecordDragMultiDragCounterChip />;
};