The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix column resize dragging the widget in layout edit mode (#25681)
Raphaël Bosia23c0f840b2a
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordColumnResizeHandle.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordColumnResizeHandle.tsxindex 8c32c25461d..f17dc01d637 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordColumnResizeHandle.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordColumnResizeHandle.tsx@@ -43,6 +43,7 @@ export const RecordColumnResizeHandle = ({className="cursor-col-resize"role="separator"aria-orientation="vertical"+ data-dnd-drag-disableisResizing={isResizing}position={position}onPointerDown={onPointerDown}diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/shouldPreventDragActivation.test.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/shouldPreventDragActivation.test.tsnew file mode 100644index 00000000000..ecc7bde3a26--- /dev/null+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/__tests__/shouldPreventDragActivation.test.ts@@ -0,0 +1,55 @@+import { shouldPreventDragActivation } from '@/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation';++const createPointerEvent = (target: Element) => ({ target });++describe('shouldPreventDragActivation', () => {+ it('should prevent activation when the target opts out of dragging', () => {+ const sourceElement = document.createElement('div');+ const resizeHandle = document.createElement('div');+ resizeHandle.setAttribute('data-dnd-drag-disable', '');+ sourceElement.appendChild(resizeHandle);++ expect(+ shouldPreventDragActivation(createPointerEvent(resizeHandle), {+ element: sourceElement,+ }),+ ).toBe(true);+ });++ it('should prevent activation when the target is inside an element that opts out of dragging', () => {+ const sourceElement = document.createElement('div');+ const optedOutContainer = document.createElement('div');+ optedOutContainer.setAttribute('data-dnd-drag-disable', '');+ const nestedTarget = document.createElement('span');+ optedOutContainer.appendChild(nestedTarget);+ sourceElement.appendChild(optedOutContainer);++ expect(+ shouldPreventDragActivation(createPointerEvent(nestedTarget), {+ element: sourceElement,+ }),+ ).toBe(true);+ });++ it('should not prevent activation when the target is the source element', () => {+ const sourceElement = document.createElement('div');++ expect(+ shouldPreventDragActivation(createPointerEvent(sourceElement), {+ element: sourceElement,+ }),+ ).toBe(false);+ });++ it('should not prevent activation for a plain descendant of the source element', () => {+ const sourceElement = document.createElement('div');+ const plainDescendant = document.createElement('span');+ sourceElement.appendChild(plainDescendant);++ expect(+ shouldPreventDragActivation(createPointerEvent(plainDescendant), {+ element: sourceElement,+ }),+ ).toBe(false);+ });+});diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.tsindex 6991b116950..e423f5a5ac3 100644--- a/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts+++ b/packages/twenty-front/src/modules/ui/utilities/drag-and-drop/utils/shouldPreventDragActivation.ts@@ -9,15 +9,18 @@ const NON_DRAGGABLE_TARGET_SELECTOR = ['textarea:not([disabled])','button:not([disabled])','[contenteditable]:not([contenteditable="false"])',+ '[data-dnd-drag-disable]',].join(', ');+type DragActivationEvent = Pick<PointerEvent, 'target'>;+type DragActivationSource = {element?: Element | null;handle?: Element | null;};export const shouldPreventDragActivation = (- event: PointerEvent,+ event: DragActivationEvent,source: DragActivationSource,): boolean => {const target = event.target;