The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move the calendar onto the shared record selection and drag provider (#27421)
Félix Malfait0a73a535d14e
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.tsxindex f9de664cebb..6b2687ad433 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@@ -3,14 +3,14 @@ import { styled } from '@linaria/react';import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';-import { RecordCalendarEscapeHotkeyEffect } from '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect';import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';import { RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-calendar/constants/RecordCalendarClickOutsideListenerId';import { RecordCalendarGrid } from '@/object-record/record-calendar/grid/components/RecordCalendarGrid';import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { useRecordCalendarSelection } from '@/object-record/record-calendar/states/selectors/useRecordCalendarSelection';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';+import { RecordSelectionEscapeHotkeyEffect } from '@/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { DIALOG_BACKDROP_CLICK_OUTSIDE_ID } from '@/ui/layout/dialog/constants/DialogBackdropClickOutsideId';import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constants/PageActionContainerClickOutsideId';import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@/ui/navigation/link/constants/LinkChipClickOutsideId';@@ -35,16 +35,15 @@ export const RecordCalendar = () => {RecordCalendarComponentInstanceContext,);- const { resetRecordCalendarSelection } =- useRecordCalendarSelection(recordCalendarId);+ const { resetRecordSelection } = useResetRecordSelection(recordCalendarId);const recordIndexCalendarLayout = useAtomComponentStateValue(recordIndexCalendarLayoutComponentState,);useEffect(() => {- resetRecordCalendarSelection();- }, [resetRecordCalendarSelection, recordIndexCalendarLayout]);+ resetRecordSelection();+ }, [resetRecordSelection, recordIndexCalendarLayout]);useListenClickOutside({excludedClickOutsideIds: [@@ -57,14 +56,12 @@ export const RecordCalendar = () => {],listenerId: RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID,refs: [],- callback: () => {- resetRecordCalendarSelection();- },+ callback: resetRecordSelection,});return (<StyledContainerContainer>- <RecordCalendarEscapeHotkeyEffect recordCalendarId={recordCalendarId} />+ <RecordSelectionEscapeHotkeyEffect /><RecordCalendarTopBar /><ScrollWrappercomponentInstanceId={`scroll-wrapper-record-calendar-${recordCalendarId}`}diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsxindex 933c9609bca..34690893197 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsx@@ -1,12 +1,16 @@-import { DragDropProvider, DragOverlay } from '@dnd-kit/react';+import { t } from '@lingui/core/macro';+import { useStore } from 'jotai';import type { ReactNode } from 'react';+import { Temporal } from 'temporal-polyfill';+import { useToast } from 'twenty-ui/components/feedback';-import { useRecordCalendarDndKit } from '@/object-record/record-calendar/hooks/useRecordCalendarDndKit';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';-import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';+import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';+import { RecordDragDropContextProvider } from '@/object-record/record-drag/components/RecordDragDropContextProvider';+import { useProcessCalendarCardDrop } from '@/object-record/record-drag/hooks/useProcessCalendarCardDrop';+import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';+import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';+import { logError } from '~/utils/logError';type RecordCalendarDragDropContextProps = {children: ReactNode;@@ -15,22 +19,43 @@ type RecordCalendarDragDropContextProps = {export const RecordCalendarDragDropContext = ({children,}: RecordCalendarDragDropContextProps) => {- const { contextValues, handlers } = useRecordCalendarDndKit();+ const store = useStore();++ const { userTimezone } = useUserTimezone();++ const { enqueueToast } = useToast();++ const calendarDayRecordIdsSelector =+ useAtomComponentFamilySelectorCallbackState(+ calendarDayRecordIdsComponentFamilySelector,+ );++ const { processCalendarCardDrop } = useProcessCalendarCardDrop();return (- <DragDropItemDndContext.Provider value={contextValues}>- <DragDropProvider<DragDropItemData>- sensors={DND_KIT_SENSORS}- plugins={DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION}- onDragStart={handlers.onDragStart}- onDragMove={handlers.onDragMove}- onDragEnd={handlers.onDragEnd}- >- {children}- <DragOverlay>- {(source) => <RecordCalendarCardDragOverlayContent source={source} />}- </DragOverlay>- </DragDropProvider>- </DragDropItemDndContext.Provider>+ <RecordDragDropContextProvider+ getDroppableItemCount={(droppableId) =>+ store.get(+ calendarDayRecordIdsSelector({+ day: Temporal.PlainDate.from(droppableId),+ timeZone: userTimezone,+ }),+ ).length+ }+ onRecordDrop={(result) => {+ void processCalendarCardDrop(result).catch((error) => {+ logError(error);+ enqueueToast({+ variant: 'error',+ children: t`Failed to move record`,+ });+ });+ }}+ renderDragOverlay={(source) => (+ <RecordCalendarCardDragOverlayContent source={source} />+ )}+ >+ {children}+ </RecordDragDropContextProvider>);};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.tsxdeleted file mode 100644index 5a42a30574f..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect.tsx+++ /dev/null@@ -1,44 +0,0 @@-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/RecordIndexCalendarDataLoaderEffect.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsxindex a85557035da..c65632eb694 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsx@@ -1,15 +1,13 @@-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { useRecordCalendarGroupByRecords } from '@/object-record/record-calendar/hooks/useRecordCalendarGroupByRecords';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { hasInitializedRecordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/hasInitializedRecordCalendarSelectedDateComponentState';-import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';-import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';import { useEffect } from 'react';export const RecordIndexCalendarDataLoaderEffect = () => {@@ -17,11 +15,6 @@ export const RecordIndexCalendarDataLoaderEffect = () => {RecordCalendarComponentInstanceContext,);- const selectedRecordIds = useAtomComponentSelectorValue(- recordCalendarSelectedRecordIdsComponentSelector,- recordCalendarId,- );-const recordCalendarSelectedDate = useAtomComponentStateValue(recordCalendarSelectedDateComponentState,recordCalendarId,@@ -29,13 +22,9 @@ export const RecordIndexCalendarDataLoaderEffect = () => {const { upsertRecordsInStore } = useUpsertRecordsInStore();- const setContextStoreTargetedRecordsRule = useSetAtomComponentState(- contextStoreTargetedRecordsRuleComponentState,- recordCalendarId,- );-- const setRecordCalendarRecordIds = useSetAtomComponentState(- recordCalendarRecordIdsComponentState,+ const setRecordIndexRecordIdsByGroup = useSetAtomComponentFamilyState(+ recordIndexRecordIdsByGroupComponentFamilyState,+ NO_RECORD_GROUP_FAMILY_KEY,recordCalendarId,);@@ -55,27 +44,13 @@ export const RecordIndexCalendarDataLoaderEffect = () => {upsertRecordsInStore({ partialRecords: records });const recordIds = records.map((record) => record.id);- setRecordCalendarRecordIds(recordIds);+ setRecordIndexRecordIdsByGroup(recordIds);}, [hasInitializedRecordCalendarSelectedDate,records,- setRecordCalendarRecordIds,+ setRecordIndexRecordIdsByGroup,upsertRecordsInStore,]);- useEffect(() => {- setContextStoreTargetedRecordsRule({- mode: 'selection',- selectedRecordIds,- });-- return () => {- setContextStoreTargetedRecordsRule({- mode: 'selection',- selectedRecordIds: [],- });- };- }, [selectedRecordIds, setContextStoreTargetedRecordsRule]);-return <></>;};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.tsxindex afa9f03e62b..6f69758dbe0 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@@ -22,8 +22,8 @@ jest.mock(}),);jest.mock(- '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect',- () => ({ RecordCalendarEscapeHotkeyEffect: () => null }),+ '@/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect',+ () => ({ RecordSelectionEscapeHotkeyEffect: () => null }),);jest.mock('@/object-record/record-calendar/components/RecordCalendarAddNew',@@ -89,10 +89,10 @@ jest.mock(}),);jest.mock(- '@/object-record/record-calendar/states/selectors/useRecordCalendarSelection',+ '@/object-record/record-selection/hooks/useResetRecordSelection',() => ({- useRecordCalendarSelection: jest.fn(() => ({- resetRecordCalendarSelection: jest.fn(),+ useResetRecordSelection: jest.fn(() => ({+ resetRecordSelection: jest.fn(),})),}),);diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.tsdeleted file mode 100644index fa2a4cf52a3..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts+++ /dev/null@@ -1,194 +0,0 @@-import { t } from '@lingui/core/macro';-import { useStore } from 'jotai';-import { useState } from 'react';-import { Temporal } from 'temporal-polyfill';-import { isDefined } from 'twenty-shared/utils';--import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';-import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';-import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';-import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';-import { useProcessCalendarCardDrop } from '@/object-record/record-drag/hooks/useProcessCalendarCardDrop';-import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';-import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';-import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';-import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';-import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';-import { type DragDropProviderDragMoveEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragMoveEvent';-import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';-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 { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useToast } from 'twenty-ui/components/feedback';-import { logError } from '~/utils/logError';--type DragStartPayload = DragDropProviderDragStartEvent<DragDropItemData>;-type DragMovePayload = DragDropProviderDragMoveEvent<DragDropItemData>;-type DragEndPayload = DragDropProviderDragEndEvent<DragDropItemData>;--export type RecordCalendarDndKitContextValues = {- activeDropTargetIndex: number | null;- activeDroppableId: string | null;-};--export const useRecordCalendarDndKit = (): {- contextValues: RecordCalendarDndKitContextValues;- handlers: {- onDragStart: (event: DragStartPayload) => void;- onDragMove: (event: DragMovePayload) => void;- onDragEnd: (event: DragEndPayload) => void;- };-} => {- const store = useStore();-- const { userTimezone } = useUserTimezone();-- const { enqueueToast } = useToast();-- const { startRecordDrag } = useStartRecordDrag();- const { endRecordDrag } = useEndRecordDrag();- const { processCalendarCardDrop } = useProcessCalendarCardDrop();-- const calendarDayRecordIdsSelector =- useAtomComponentFamilySelectorCallbackState(- calendarDayRecordIdsComponentFamilySelector,- );-- const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordCalendarSelectedRecordIdsComponentSelector,- );-- const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(- draggedRecordIdsComponentState,- );-- const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<- number | null- >(null);-- const [activeDroppableId, setActiveDroppableId] = useState<string | null>(- null,- );-- const getDroppableItemCount = (droppableId: string) =>- store.get(- calendarDayRecordIdsSelector({- day: Temporal.PlainDate.from(droppableId),- timeZone: userTimezone,- }),- ).length;-- const clearDragState = () => {- endRecordDrag();- setActiveDropTargetIndex(null);- setActiveDroppableId(null);- };-- const handleDragStart = (event: DragStartPayload) => {- const draggedId = event.operation.source?.id;-- if (!isDefined(draggedId)) {- return;- }-- const draggedRecordId = getRecordIdFromRecordCalendarCardDraggableId(- String(draggedId),- );-- const currentSelectedRecordIds = store.get(recordCalendarSelectedRecordIds);- startRecordDrag(draggedRecordId, currentSelectedRecordIds);- };-- const handleDragMove = (event: DragMovePayload) => {- const { target, position } = event.operation;-- const resolvedDrop = resolveDropFromPointer({- target,- pointer: position.current,- defaultOrientation: 'horizontal',- getDroppableItemCount,- });-- if (!isDefined(resolvedDrop)) {- setActiveDropTargetIndex(null);- setActiveDroppableId(null);- return;- }-- setActiveDropTargetIndex(resolvedDrop.dropTargetIndex);- setActiveDroppableId(resolvedDrop.droppableId);- };-- const handleDragEnd = (event: DragEndPayload) => {- const { source, target, position } = event.operation;-- if (event.canceled || !isDefined(source)) {- clearDragState();- return;- }-- const sourceRecordId = getRecordIdFromRecordCalendarCardDraggableId(- String(source.id),- );- const sourceDroppableId = (source.data as DragDropItemData).droppableId;- const sourceIndex = (source.data as DragDropItemData).index;-- const resolvedDrop = resolveDropFromPointer({- target,- pointer: position.current,- defaultOrientation: 'horizontal',- getDroppableItemCount,- });- if (!isDefined(resolvedDrop)) {- clearDragState();- return;- }-- const destinationDroppableId = resolvedDrop.droppableId;-- const destinationIndex = getDestinationIndex({- dropTargetIndex: resolvedDrop.dropTargetIndex,- sourceIndex,- sourceDroppableId,- destinationDroppableId,- });-- const isSameDay = sourceDroppableId === destinationDroppableId;-- if (isSameDay && destinationIndex === sourceIndex) {- clearDragState();- return;- }-- const draggedRecordIds = store.get(draggedRecordIdsCallbackState);-- void processCalendarCardDrop({- recordId: sourceRecordId,- sourceDate: sourceDroppableId,- destinationDate: destinationDroppableId,- destinationIndex,- draggedRecordIds,- }).catch((error) => {- logError(error);- enqueueToast({ variant: 'error', children: t`Failed to move record` });- });-- clearDragState();- };-- const contextValues: RecordCalendarDndKitContextValues = {- activeDropTargetIndex,- activeDroppableId,- };-- return {- contextValues,- handlers: {- onDragStart: handleDragStart,- onDragMove: handleDragMove,- onDragEnd: handleDragEnd,- },- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsxindex e533f741e2e..cf122f7b039 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@@ -1,18 +1,17 @@-import { useOpenCommandMenuDropdownAtCursor } from '@/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor';import { RecordCalendarCardCellEditModePortal } from '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal';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 { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';-import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';import { RecordCard } from '@/object-record/record-card/components/RecordCard';import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';-import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';@@ -67,14 +66,12 @@ export const RecordCalendarCard = ({const { openRecordFromIndexView } = useOpenRecordFromIndexView();- const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =- useAtomComponentFamilyState(- isRecordCalendarCardSelectedComponentFamilyState,- recordId,- );+ const isRecordSelected = useAtomComponentFamilyStateValue(+ isRecordSelectedComponentFamilyState,+ recordId,+ );- const { openCommandMenuDropdownAtCursor } =- useOpenCommandMenuDropdownAtCursor();+ const { openRecordContextMenu } = useOpenRecordContextMenu();const handleCardClick = () => {if (isDraggingRecord) {@@ -84,24 +81,20 @@ export const RecordCalendarCard = ({openRecordFromIndexView({ recordId });};- const handleContextMenuOpen = (event: React.MouseEvent) => {- if (openCommandMenuDropdownAtCursor(event)) {- setIsRecordCalendarCardSelected(true);- }- };-return (<RecordCalendarCardComponentInstanceContext.Providervalue={{instanceId: `${recordId}-${calendarDay}`,}}>- <StyledContainer onContextMenu={handleContextMenuOpen}>+ <StyledContainer+ onContextMenu={(event) => openRecordContextMenu({ event, recordId })}+ ><StyledRecordCardContainer><StyledCardContainer isPrimaryMultiDrag={isMultiDragOverlay}>{isMultiDragOverlay && <RecordDragMultiDragStack />}<RecordCard- data-selected={isRecordCalendarCardSelected}+ data-selected={isRecordSelected}data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}onClick={isCompactModeActive ? handleCardClick : undefined}isDragging={!isDragOverlay && isRecordIdSecondaryDragMultiple}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.tsxindex d75c11e87a8..9ae3468b7cd 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx@@ -3,8 +3,8 @@ import { isDefined } from 'twenty-shared/utils';import { RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardDragOverlayCalendarDay';import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';-import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';import { RecordDragMultiDragCounterChip } from '@/object-record/record-drag/components/RecordDragMultiDragCounterChip';+import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';type RecordCalendarCardDragOverlayContentProps = {source: Draggable | null;@@ -12,18 +12,16 @@ type RecordCalendarCardDragOverlayContentProps = {export const RecordCalendarCardDragOverlayContent = ({source,}: RecordCalendarCardDragOverlayContentProps) => {- const recordId = isDefined(source)- ? getRecordIdFromRecordCalendarCardDraggableId(String(source.id))- : '';+ const sourceData = source?.data as RecordDragData | undefined;- if (!isDefined(source)) {+ if (!isDefined(sourceData)) {return null;}return (<><RecordCalendarCard- recordId={recordId}+ recordId={sourceData.recordId}calendarDay={RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY}isDragOverlay/>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 7bf55e3385a..bbe24556bc8 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@@ -37,6 +37,7 @@ export const RecordCalendarCardDraggableContainer = ({group={calendarDay}type={RECORD_CALENDAR_CARD_DND_TYPE}accept={RECORD_CALENDAR_CARD_DND_TYPE}+ data={{ recordId }}collisionDetector={pointerIntersection}disabled={dragIsDisabled}fadeSourceWhileDraggingdiff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsxindex 948683ab091..ed1e366e729 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx@@ -4,6 +4,7 @@ import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendarimport { RecordCardHeaderContainer } from '@/object-record/record-card/components/RecordCardHeaderContainer';import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -12,7 +13,6 @@ import { styled } from '@linaria/react';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { isDefined } from 'twenty-shared/utils';import { Checkbox } from 'twenty-ui/primitives/input';-import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';import { themeCssVariables } from 'twenty-ui/theme';const StyledCheckboxContainer = styled.div`@@ -45,11 +45,10 @@ export const RecordCalendarCardHeader = ({isDraggingRecordComponentState,);- const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =- useAtomComponentFamilyState(- isRecordCalendarCardSelectedComponentFamilyState,- recordId,- );+ const [isRecordSelected, setIsRecordSelected] = useAtomComponentFamilyState(+ isRecordSelectedComponentFamilyState,+ recordId,+ );const handleChipClick = () => {if (isDraggingRecord) {@@ -94,10 +93,8 @@ export const RecordCalendarCardHeader = ({<StopPropagationContainer><Checkboxhoverable- checked={isRecordCalendarCardSelected}- onCheckedChange={(isChecked) => {- setIsRecordCalendarCardSelected(isChecked);- }}+ checked={isRecordSelected}+ onCheckedChange={setIsRecordSelected}variant="outline"/></StopPropagationContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsxindex 08fe1a80e7d..fa353653954 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx@@ -16,10 +16,6 @@ jest.mock(}),}),);-jest.mock(- '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState',- () => ({ useAtomComponentFamilyState: () => [false, jest.fn()] }),-);jest.mock('@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',() => ({ useAtomComponentStateValue: () => false }),diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.tsdeleted file mode 100644index 0cbd38beb7a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';--export const isRecordCalendarCardSelectedComponentFamilyState =- createAtomComponentFamilyState<boolean, string>({- key: 'isRecordCalendarCardSelectedComponentFamilyState',- defaultValue: false,- componentInstanceContext: RecordCalendarComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/__tests__/getRecordCalendarCardDraggableId.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/__tests__/getRecordCalendarCardDraggableId.test.tsindex 22defde0841..142653b247f 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/__tests__/getRecordCalendarCardDraggableId.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/__tests__/getRecordCalendarCardDraggableId.test.ts@@ -1,7 +1,4 @@-import {- getRecordCalendarCardDraggableId,- getRecordIdFromRecordCalendarCardDraggableId,-} from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';+import { getRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';describe('getRecordCalendarCardDraggableId', () => {it('creates a different draggable id for each rendered day', () => {@@ -15,28 +12,5 @@ describe('getRecordCalendarCardDraggableId', () => {});expect(firstDayDraggableId).not.toBe(secondDayDraggableId);- expect(- getRecordIdFromRecordCalendarCardDraggableId(firstDayDraggableId),- ).toBe('record-id');- expect(- getRecordIdFromRecordCalendarCardDraggableId(secondDayDraggableId),- ).toBe('record-id');- });-- it('preserves record ids containing separator characters', () => {- const draggableId = getRecordCalendarCardDraggableId({- calendarDay: '2026-07-08',- recordId: 'record:id/with special characters',- });-- expect(getRecordIdFromRecordCalendarCardDraggableId(draggableId)).toBe(- 'record:id/with special characters',- );- });-- it('accepts legacy draggable ids', () => {- expect(- getRecordIdFromRecordCalendarCardDraggableId('legacy-record-id'),- ).toBe('legacy-record-id');});});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId.tsindex 14839f45b95..ef272c01005 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId.ts@@ -8,29 +8,3 @@ export const getRecordCalendarCardDraggableId = ({recordId: string;}) =>`${RECORD_CALENDAR_CARD_DRAGGABLE_ID_PREFIX}${encodeURIComponent(recordId)}:${calendarDay}`;--export const getRecordIdFromRecordCalendarCardDraggableId = (- draggableId: string,-) => {- if (!draggableId.startsWith(RECORD_CALENDAR_CARD_DRAGGABLE_ID_PREFIX)) {- return draggableId;- }-- const encodedRecordIdAndCalendarDay = draggableId.slice(- RECORD_CALENDAR_CARD_DRAGGABLE_ID_PREFIX.length,- );- const calendarDaySeparatorIndex =- encodedRecordIdAndCalendarDay.lastIndexOf(':');-- if (calendarDaySeparatorIndex <= 0) {- return draggableId;- }-- try {- return decodeURIComponent(- encodedRecordIdAndCalendarDay.slice(0, calendarDaySeparatorIndex),- );- } catch {- return draggableId;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/recordCalendarRecordIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/recordCalendarRecordIdsComponentState.tsdeleted file mode 100644index 05e7e5cef0d..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/recordCalendarRecordIdsComponentState.ts+++ /dev/null@@ -1,10 +0,0 @@-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const recordCalendarRecordIdsComponentState = createAtomComponentState<- string[]->({- key: 'recordCalendarRecordIdsComponentState',- defaultValue: [],- componentInstanceContext: RecordCalendarComponentInstanceContext,-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.tsindex 66f2e0046fa..594bffc93a9 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.ts@@ -1,6 +1,7 @@-import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { createStore } from 'jotai';import { Temporal } from 'temporal-polyfill';@@ -55,7 +56,10 @@ describe('calendarDayRecordIdsComponentFamilySelector', () => {endAt: '2026-07-18',});store.set(- recordCalendarRecordIdsComponentState.atomFamily({ instanceId }),+ recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({+ instanceId,+ familyKey: NO_RECORD_GROUP_FAMILY_KEY,+ }),['record-id'],);@@ -78,7 +82,10 @@ describe('calendarDayRecordIdsComponentFamilySelector', () => {});}store.set(- recordCalendarRecordIdsComponentState.atomFamily({ instanceId }),+ recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({+ instanceId,+ familyKey: NO_RECORD_GROUP_FAMILY_KEY,+ }),records.map((record) => record.id),);diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.tsindex d3be5c827d3..6915b6e8900 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts@@ -2,8 +2,9 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetaimport { hasObjectMetadataItemPositionField } from '@/object-metadata/utils/hasObjectMetadataItemPositionField';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';import { isNonEmptyString } from '@sniptt/guards';@@ -49,9 +50,10 @@ export const calendarDayRecordIdsComponentFamilySelector =return [];}- const allRecordIds = get(recordCalendarRecordIdsComponentState, {- instanceId,- });+ const allRecordIds = get(+ recordIndexRecordIdsByGroupComponentFamilyState,+ { instanceId, familyKey: NO_RECORD_GROUP_FAMILY_KEY },+ );const recordIds = allRecordIds.filter((recordId) => {const record = get(recordStoreFamilyState, recordId);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.tsdeleted file mode 100644index f42a08bae3a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts+++ /dev/null@@ -1,25 +0,0 @@-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 recordCalendarSelectedRecordIdsComponentSelector =- createAtomComponentSelector<string[]>({- key: 'recordCalendarSelectedRecordIdsSelector',- componentInstanceContext: RecordCalendarComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordCalendarRecordIdsComponentState, {- instanceId,- });-- return allRecordIds.filter(- (recordId: string) =>- get(isRecordCalendarCardSelectedComponentFamilyState, {- instanceId,- familyKey: recordId,- }) === true,- );- },- });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.tsdeleted file mode 100644index 98f5ea0eda8..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts+++ /dev/null@@ -1,57 +0,0 @@-import { useCallback } from 'react';--import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useStore } from 'jotai';-import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { recordCalendarSelectedRecordIdsComponentSelector } from './recordCalendarSelectedRecordIdsComponentSelector';--export const useRecordCalendarSelection = (recordCalendarId?: string) => {- const instanceIdFromProps = useAvailableComponentInstanceIdOrThrow(- RecordCalendarComponentInstanceContext,- recordCalendarId,- );-- const isRecordCalendarCardSelectedFamilyState =- useAtomComponentFamilyStateCallbackState(- isRecordCalendarCardSelectedComponentFamilyState,- recordCalendarId,- );-- const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordCalendarSelectedRecordIdsComponentSelector,- recordCalendarId,- );-- const { closeDropdown } = useCloseDropdown();- const store = useStore();-- const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(- getCommandMenuIdFromRecordIndexId(instanceIdFromProps),- );-- const resetRecordCalendarSelection = useCallback(() => {- closeDropdown(dropdownId);-- const recordIds = store.get(recordCalendarSelectedRecordIds);-- for (const recordId of recordIds) {- store.set(isRecordCalendarCardSelectedFamilyState(recordId), false);- }- }, [- closeDropdown,- dropdownId,- recordCalendarSelectedRecordIds,- isRecordCalendarCardSelectedFamilyState,- store,- ]);-- return {- resetRecordCalendarSelection,- };-};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.tsindex 8803e5e2bf7..639298f1005 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@@ -5,6 +5,8 @@ import { useStore } from 'jotai';import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';+import { draggedRecordIdsComponentState } from '@/object-record/record-drag/states/draggedRecordIdsComponentState';+import { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';import { extractRecordPositions } from '@/object-record/record-drag/utils/extractRecordPositions';import { getShiftedRecordCalendarDateTimeUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput';@@ -13,6 +15,7 @@ import { recordStoreFamilyState } from '@/object-record/record-store/states/recoimport { computeNewPositionOfDraggedRecord } from '@/object-record/utils/computeNewPositionOfDraggedRecord';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { Temporal } from 'temporal-polyfill';import { FieldMetadataType } from 'twenty-shared/types';@@ -33,20 +36,20 @@ export const useProcessCalendarCardDrop = () => {calendarDayRecordIdsComponentFamilySelector,);+ const draggedRecordIdsCallbackState = useAtomComponentStateCallbackState(+ draggedRecordIdsComponentState,+ );+const processCalendarCardDrop = useCallback(async ({- recordId,- sourceDate,- destinationDate,+ draggedRecordId: recordId,+ sourceDroppableId: sourceDate,+ destinationDroppableId: destinationDate,destinationIndex,- draggedRecordIds,- }: {- recordId: string;- sourceDate: string;- destinationDate: string;- destinationIndex: number;- draggedRecordIds: string[];- }) => {+ }: RecordDragDropResult) => {+ // Read before any await: the drag provider clears it once this call returns+ const draggedRecordIds = store.get(draggedRecordIdsCallbackState);+if (!recordIndexCalendarFieldMetadataId) return;const destinationPlainDate = Temporal.PlainDate.from(destinationDate);@@ -164,6 +167,7 @@ export const useProcessCalendarCardDrop = () => {objectMetadataItem.nameSingular,objectMetadataItem.fields,calendarDayRecordIdsSelector,+ draggedRecordIdsCallbackState,userTimezone,updateOneRecord,],