Skip to content

The open alternative to Salesforce, designed for AI.

Drag to select in the inbox (#27175)

Félix Malfait4e93c5213fcb
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
index 21da4ae2581..d58bd48b313 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
@@ -196,6 +196,8 @@ export const AiChatThreadListItem = ({
return (
<StyledThreadItem
$isSelected={isSelected}
+ data-selectable-id={thread.id}
+ data-select-disable={isRenaming || undefined}
onMouseDown={(event) => {
// Shift+click selects a range of chats, not the text in between
if (event.shiftKey && !isRenaming) {
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragSelect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragSelect.tsx
index 527fc1033bb..ebe2681d7ba 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardDragSelect.tsx
@@ -1,8 +1,6 @@
import { RECORD_BOARD_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-board/constants/RecordBoardClickOutsideListenerId';
-import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
+import { RecordSelectionDragSelect } from '@/object-record/record-selection/components/RecordSelectionDragSelect';
import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';
-import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
-import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass';
import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
import { type RefObject } from 'react';
@@ -28,15 +26,11 @@ export const RecordBoardDragSelect = ({
toggleClickOutside(true);
};
- const { setRecordAsSelected } = useRecordBoardSelection();
-
return (
- <DragSelect
+ <RecordSelectionDragSelect
selectableItemsContainerRef={boardRef}
- onDragSelectionEnd={handleDragSelectionEnd}
- onDragSelectionChange={setRecordAsSelected}
onDragSelectionStart={handleDragSelectionStart}
- selectionBoundaryClass={RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS}
+ onDragSelectionEnd={handleDragSelectionEnd}
/>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
index 9e220d22870..0a45c434191 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
@@ -1,11 +1,9 @@
import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';
import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';
-import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';
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 { useCallback } from 'react';
@@ -16,11 +14,6 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {
recordBoardId,
);
- const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(
- isRecordSelectedComponentFamilyState,
- recordBoardId,
- );
-
const selectedRecordIds = useAtomComponentSelectorCallbackState(
selectedRecordIdsComponentSelector,
recordBoardId,
@@ -33,20 +26,6 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {
getCommandMenuIdFromRecordIndexId(instanceIdFromProps),
);
- const setRecordAsSelected = useCallback(
- (recordId: string, isSelected: boolean) => {
- const atom = isRecordSelectedFamilyState(recordId);
- const isRecordCurrentlySelected = store.get(atom);
-
- if (isRecordCurrentlySelected === isSelected) {
- return;
- }
-
- store.set(atom, isSelected);
- },
- [isRecordSelectedFamilyState, store],
- );
-
const checkIfLastUnselectAndCloseDropdown = useCallback(() => {
const recordIds = store.get(selectedRecordIds);
@@ -56,7 +35,6 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {
}, [selectedRecordIds, store, closeDropdown, dropdownId]);
return {
- setRecordAsSelected,
checkIfLastUnselectAndCloseDropdown,
};
};
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx
new file mode 100644
index 00000000000..cb22007156b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionDragSelect.tsx
@@ -0,0 +1,74 @@
+import { useStore } from 'jotai';
+import { type RefObject, useCallback } from 'react';
+
+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
+import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
+import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass';
+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
+
+type RecordSelectionDragSelectProps = {
+ selectableItemsContainerRef: RefObject<HTMLElement | null>;
+ scrollWrapperComponentInstanceId?: string;
+ onDragSelectionStart?: () => void;
+ onDragSelectionEnd?: () => void;
+};
+
+export const RecordSelectionDragSelect = ({
+ selectableItemsContainerRef,
+ scrollWrapperComponentInstanceId,
+ onDragSelectionStart,
+ onDragSelectionEnd,
+}: RecordSelectionDragSelectProps) => {
+ const store = useStore();
+ const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(
+ isRecordSelectedComponentFamilyState,
+ );
+
+ const handleDragSelectionChange = useCallback(
+ (recordId: string, isSelected: boolean) => {
+ const isRecordSelectedAtom = isRecordSelectedFamilyState(recordId);
+
+ if (store.get(isRecordSelectedAtom) !== isSelected) {
+ store.set(isRecordSelectedAtom, isSelected);
+ }
+ },
+ [isRecordSelectedFamilyState, store],
+ );
+
+ const handleDragSelectionEnd = () => {
+ // A drag that ends on the record it started from also clicks it, which
+ // would open the record and drop the selection
+ const preventClick = (event: MouseEvent) => {
+ if (
+ !(event.target instanceof Node) ||
+ !selectableItemsContainerRef.current?.contains(event.target)
+ ) {
+ return;
+ }
+
+ event.preventDefault();
+ event.stopPropagation();
+ };
+
+ window.addEventListener('click', preventClick, {
+ capture: true,
+ once: true,
+ });
+ setTimeout(() =>
+ window.removeEventListener('click', preventClick, { capture: true }),
+ );
+
+ onDragSelectionEnd?.();
+ };
+
+ return (
+ <DragSelect
+ selectableItemsContainerRef={selectableItemsContainerRef}
+ scrollWrapperComponentInstanceId={scrollWrapperComponentInstanceId}
+ onDragSelectionStart={onDragSelectionStart}
+ onDragSelectionChange={handleDragSelectionChange}
+ onDragSelectionEnd={handleDragSelectionEnd}
+ selectionBoundaryClass={RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS}
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx
index ee574a259fb..b4bf8aab3fc 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx
@@ -13,12 +13,9 @@ import { RecordTableNoRecordGroupBody } from '@/object-record/record-table/recor
import { RecordTableRecordGroupsBody } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody';
import { RecordTableHeader } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';
-import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';
+import { RecordSelectionDragSelect } from '@/object-record/record-selection/components/RecordSelectionDragSelect';
import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';
import { isSomeCellInEditModeComponentSelector } from '@/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector';
-import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
-import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass';
-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';
import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -63,22 +60,10 @@ export const RecordTableContent = ({
handleDragSelectionEnd();
};
- const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(
- isRecordSelectedComponentFamilyState,
- recordTableId,
- );
+ const { visibleRecordFields } = useRecordTableContextOrThrow();
const store = useStore();
- const handleDragSelectionChange = useCallback(
- (rowId: string, selected: boolean) => {
- store.set(isRowSelectedFamilyState(rowId), selected);
- },
- [isRowSelectedFamilyState, store],
- );
-
- const { visibleRecordFields } = useRecordTableContextOrThrow();
-
const recordTableHoverPositionCallbackState =
useAtomComponentStateCallbackState(
recordTableHoverPositionComponentState,
@@ -164,12 +149,10 @@ export const RecordTableContent = ({
<RecordTableColumnWidthEffect />
<RecordTableWidthEffect />
</RecordTableStyleWrapper>
- <DragSelect
+ <RecordSelectionDragSelect
selectableItemsContainerRef={containerRef}
onDragSelectionStart={handleDragStart}
- onDragSelectionChange={handleDragSelectionChange}
onDragSelectionEnd={handleDragEnd}
- selectionBoundaryClass={RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS}
/>
</StyledTableContainer>
);
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
index 0d2d901cb82..c60892d460b 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
@@ -126,6 +126,9 @@ export const DragSelect = ({
newEndPoint.x = relativeX;
newEndPoint.y = relativeY;
+ let currentSelectionBox = selectionBox;
+ let isCurrentlySelecting = isSelecting;
+
if (!isDeeplyEqual(newEndPoint, endPoint)) {
setEndPoint(newEndPoint);
@@ -136,22 +139,23 @@ export const DragSelect = ({
height: Math.abs(newEndPoint.y - startPoint.y),
};
- if (isValidSelectionStart(newSelectionBox)) {
- if (!isSelecting) {
- setIsSelecting(true);
- onDragSelectionStart?.(event);
- }
- setSelectionBox(newSelectionBox);
- } else if (isSelecting) {
+ if (!isSelecting && isValidSelectionStart(newSelectionBox)) {
+ setIsSelecting(true);
+ onDragSelectionStart?.(event);
+ isCurrentlySelecting = true;
+ }
+
+ if (isCurrentlySelecting) {
setSelectionBox(newSelectionBox);
+ currentSelectionBox = newSelectionBox;
}
}
- if (isSelecting && isDefined(selectionBox)) {
+ if (isCurrentlySelecting) {
const scrollAwareBox = {
- ...selectionBox,
- top: selectionBox.top + window.scrollY,
- left: selectionBox.left + window.scrollX,
+ ...currentSelectionBox,
+ top: currentSelectionBox.top + window.scrollY,
+ left: currentSelectionBox.left + window.scrollX,
};
Array.from(
diff --git a/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx b/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx
index 8157f6c8373..dfa319ee97d 100644
--- a/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx
+++ b/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { type MouseEvent, useId } from 'react';
+import { type MouseEvent, useId, useRef } from 'react';
import { useParams } from 'react-router-dom';
import { AppPath } from 'twenty-shared/types';
import { isDefined, isValidUuid } from 'twenty-shared/utils';
@@ -23,6 +23,7 @@ import { useSwitchToNewAiChat } from '@/ai/hooks/useSwitchToNewAiChat';
import { agentChatThreadFilterStatusState } from '@/ai/states/agentChatThreadFilterStatusState';
import { agentChatVisibleThreadsSelector } from '@/ai/states/selectors/agentChatVisibleThreadsSelector';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
+import { RecordSelectionDragSelect } from '@/object-record/record-selection/components/RecordSelectionDragSelect';
import { RecordSelectionRecordIdsEffect } from '@/object-record/record-selection/components/RecordSelectionRecordIdsEffect';
import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';
import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';
@@ -51,6 +52,13 @@ const StyledListPane = styled.div<{ $isFullWidth: boolean }>`
min-width: 0;
`;
+const StyledThreadListContainer = styled.div`
+ display: flex;
+ flex: 1;
+ min-height: 0;
+ position: relative;
+`;
+
const StyledThreadList = styled.div`
display: flex;
flex: 1;
@@ -83,6 +91,7 @@ const AiChatInboxPageContent = () => {
selectedRecordIdsComponentSelector,
);
const { toggleRecordSelection } = useToggleRecordSelection();
+ const threadListContainerRef = useRef<HTMLDivElement>(null);
const { resetRecordSelection } = useResetRecordSelection();
// Rows hold a menu and a rename input, which a link cannot contain
@@ -162,29 +171,36 @@ const AiChatInboxPageContent = () => {
/>
}
>
- <StyledThreadList>
- {loading && threads.length === 0 ? (
- <SkeletonLoader />
- ) : threads.length === 0 ? (
- <EmptyState.Root>
- <AnimatedPlaceholder type="emptyInbox" />
- <EmptyState.Content>
- <EmptyState.Title>{t`No conversations`}</EmptyState.Title>
- <EmptyState.Description>
- {t`Conversations you can open will appear here.`}
- </EmptyState.Description>
- </EmptyState.Content>
- </EmptyState.Root>
- ) : (
- <AiChatThreadList
- threads={threads}
- surface={AI_CHAT_THREAD_ACTIONS_SURFACE.INBOX_PAGE}
- selectedThreadIds={highlightedThreadIds}
- onThreadClick={handleThreadClick}
+ <StyledThreadListContainer ref={threadListContainerRef}>
+ <StyledThreadList>
+ {loading && threads.length === 0 ? (
+ <SkeletonLoader />
+ ) : threads.length === 0 ? (
+ <EmptyState.Root>
+ <AnimatedPlaceholder type="emptyInbox" />
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No conversations`}</EmptyState.Title>
+ <EmptyState.Description>
+ {t`Conversations you can open will appear here.`}
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
+ ) : (
+ <AiChatThreadList
+ threads={threads}
+ surface={AI_CHAT_THREAD_ACTIONS_SURFACE.INBOX_PAGE}
+ selectedThreadIds={highlightedThreadIds}
+ onThreadClick={handleThreadClick}
+ />
+ )}
+ <AgentChatThreadsFetchMoreTrigger />
+ </StyledThreadList>
+ {!isMobile && (
+ <RecordSelectionDragSelect
+ selectableItemsContainerRef={threadListContainerRef}
/>
)}
- <AgentChatThreadsFetchMoreTrigger />
- </StyledThreadList>
+ </StyledThreadListContainer>
</PageCardLayout>
</StyledListPane>
)}