The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(front): resize record table columns in the right direction in RTL (#28378)
almoghazaz-celldad9adfd0af6
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler.tsxindex 7187acd60e0..2e182edbf6d 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler.tsx@@ -15,7 +15,7 @@ export const RecordBoardColumnResizeHandler = () => {return (<RecordColumnResizeHandleisResizing={isResizing}- position="right"+ position="end"onPointerDown={handleResizeStart}/>);diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useResizeBoardColumn.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useResizeBoardColumn.tsindex d411279ae66..0fabda6d593 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useResizeBoardColumn.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useResizeBoardColumn.ts@@ -1,9 +1,11 @@+import { useLingui } from '@lingui/react';import {type PointerEvent as ReactPointerEvent,useCallback,useContext,useState,} from 'react';+import { getLocaleTextDirection } from 'twenty-shared/translations';import { isDefined } from 'twenty-shared/utils';import { getUiZoom } from '@/ui/theme/utils/getUiZoom';@@ -11,6 +13,7 @@ import { getUiZoom } from '@/ui/theme/utils/getUiZoom';import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { clampRecordBoardColumnWidth } from '@/object-record/record-board/utils/clampRecordBoardColumnWidth';import { setRecordBoardColumnWidthCssVariable } from '@/object-record/record-board/utils/setRecordBoardColumnWidthCssVariable';+import { getRecordColumnResizeOffset } from '@/object-record/record-index/utils/getRecordColumnResizeOffset';import { recordIndexKanbanColumnWidthComponentState } from '@/object-record/record-index/states/recordIndexKanbanColumnWidthComponentState';import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';import { type PointerEventListener } from '@/ui/utilities/pointer-event/types/PointerEventListener';@@ -20,6 +23,8 @@ import { useUpdateViewKanbanColumnWidth } from '@/views/hooks/useUpdateViewKanbaexport const useResizeBoardColumn = () => {const { recordBoardId } = useContext(RecordBoardContext);+ const { i18n } = useLingui();+ const textDirection = getLocaleTextDirection(i18n.locale);const [recordIndexKanbanColumnWidth, setRecordIndexKanbanColumnWidth] =useAtomComponentState(recordIndexKanbanColumnWidthComponentState);@@ -70,7 +75,11 @@ export const useResizeBoardColumn = () => {recordBoardId,clampRecordBoardColumnWidth(recordIndexKanbanColumnWidth +- (x - initialPointerPositionX) / dragUiZoom,+ getRecordColumnResizeOffset({+ pointerDeltaX: x - initialPointerPositionX,+ uiZoom: dragUiZoom,+ textDirection,+ }),),);},@@ -80,6 +89,7 @@ export const useResizeBoardColumn = () => {recordBoardId,setDragSelectionStartEnabled,dragUiZoom,+ textDirection,],);@@ -95,7 +105,11 @@ export const useResizeBoardColumn = () => {const nextWidth = Math.round(clampRecordBoardColumnWidth(recordIndexKanbanColumnWidth +- (x - initialPointerPositionX) / dragUiZoom,+ getRecordColumnResizeOffset({+ pointerDeltaX: x - initialPointerPositionX,+ uiZoom: dragUiZoom,+ textDirection,+ }),),);@@ -111,6 +125,7 @@ export const useResizeBoardColumn = () => {updateViewKanbanColumnWidth,setDragSelectionStartEnabled,dragUiZoom,+ textDirection,],);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 6a891e4ecfb..fe30cef247f 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@@ -4,13 +4,14 @@ import { themeCssVariables } from 'twenty-ui/theme';const StyledRecordColumnResizeHandle = styled.div<{isResizing: boolean;- position: 'left' | 'right';+ position: 'start' | 'end';}>`bottom: 0;cursor: col-resize;- left: ${({ position }) => (position === 'left' ? '-1px' : 'auto')};+ inset-inline-end: ${({ position }) => (position === 'end' ? '-1px' : 'auto')};+ inset-inline-start: ${({ position }) =>+ position === 'start' ? '-1px' : 'auto'};position: absolute;- right: ${({ position }) => (position === 'right' ? '-1px' : 'auto')};top: 0;width: 10px;z-index: 1;@@ -20,9 +21,11 @@ const StyledRecordColumnResizeHandle = styled.div<{bottom: 0;content: '';display: ${({ isResizing }) => (isResizing ? 'block' : 'none')};- left: ${({ position }) => (position === 'left' ? '-1px' : 'auto')};+ inset-inline-end: ${({ position }) =>+ position === 'end' ? '-1px' : 'auto'};+ inset-inline-start: ${({ position }) =>+ position === 'start' ? '-1px' : 'auto'};position: absolute;- right: ${({ position }) => (position === 'right' ? '-1px' : 'auto')};top: 0;width: 2px;}@@ -30,7 +33,7 @@ const StyledRecordColumnResizeHandle = styled.div<{type RecordColumnResizeHandleProps = {isResizing: boolean;- position: 'left' | 'right';+ position: 'start' | 'end';onPointerDown: (event: ReactPointerEvent<HTMLDivElement>) => void;};diff --git a/packages/twenty-front/src/modules/object-record/record-index/utils/__tests__/getRecordColumnResizeOffset.test.ts b/packages/twenty-front/src/modules/object-record/record-index/utils/__tests__/getRecordColumnResizeOffset.test.tsnew file mode 100644index 00000000000..f8d0b091c2e--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-index/utils/__tests__/getRecordColumnResizeOffset.test.ts@@ -0,0 +1,43 @@+import { getRecordColumnResizeOffset } from '@/object-record/record-index/utils/getRecordColumnResizeOffset';++describe('getRecordColumnResizeOffset', () => {+ it('widens the column when the pointer moves right in LTR', () => {+ expect(+ getRecordColumnResizeOffset({+ pointerDeltaX: 80,+ uiZoom: 1,+ textDirection: 'ltr',+ }),+ ).toBe(80);+ });++ it('widens the column when the pointer moves left in RTL', () => {+ expect(+ getRecordColumnResizeOffset({+ pointerDeltaX: -80,+ uiZoom: 1,+ textDirection: 'rtl',+ }),+ ).toBe(80);+ });++ it('narrows the column when the pointer moves right in RTL', () => {+ expect(+ getRecordColumnResizeOffset({+ pointerDeltaX: 80,+ uiZoom: 1,+ textDirection: 'rtl',+ }),+ ).toBe(-80);+ });++ it('accounts for the UI zoom', () => {+ expect(+ getRecordColumnResizeOffset({+ pointerDeltaX: -80,+ uiZoom: 2,+ textDirection: 'rtl',+ }),+ ).toBe(40);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordColumnResizeOffset.ts b/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordColumnResizeOffset.tsnew file mode 100644index 00000000000..8ad5970c837--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordColumnResizeOffset.ts@@ -0,0 +1,15 @@+import { type TextDirection } from 'twenty-shared/translations';++type GetRecordColumnResizeOffsetParams = {+ pointerDeltaX: number;+ uiZoom: number;+ textDirection: TextDirection;+};++// Columns grow toward the inline end, which is leftward in RTL.+export const getRecordColumnResizeOffset = ({+ pointerDeltaX,+ uiZoom,+ textDirection,+}: GetRecordColumnResizeOffsetParams) =>+ ((textDirection === 'rtl' ? -1 : 1) * pointerDeltaX) / uiZoom;diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsxindex 674e7d19053..8c377ff017c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx@@ -110,7 +110,7 @@ export const RecordTableHeaderAddColumnButton = () => {><RecordTableHeaderResizeHandlerrecordFieldIndex={visibleRecordFields.length}- position="left"+ position="start"/><StyledDropdownContainer><DropdownRootdiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsxindex c42f7f57a40..23e51fe7875 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx@@ -101,7 +101,7 @@ export const RecordTableHeaderCell = ({{isRecordTableColumnResizable && (<RecordTableHeaderResizeHandlerrecordFieldIndex={recordFieldIndex}- position="left"+ position="start"/>)}<DragDropItemSortableHandle disabled={isRecordTableColumnHeadersReadOnly}>@@ -117,7 +117,7 @@ export const RecordTableHeaderCell = ({{isRecordTableColumnResizable && (<RecordTableHeaderResizeHandlerrecordFieldIndex={recordFieldIndex}- position="right"+ position="end"/>)}</RecordTableHeaderCellContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsxindex 0d89c834440..a524da1e16e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx@@ -115,7 +115,7 @@ export const RecordTableHeaderFirstCell = () => {)}{isRecordTableColumnResizable && (- <RecordTableHeaderResizeHandler recordFieldIndex={0} position="right" />+ <RecordTableHeaderResizeHandler recordFieldIndex={0} position="end" />)}</RecordTableHeaderCellContainer>);diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsxindex 338c2e7d24e..64793c1ed75 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx@@ -11,12 +11,12 @@ export const RecordTableHeaderResizeHandler = ({position,}: {recordFieldIndex: number;- position: 'left' | 'right';+ position: 'start' | 'end';}) => {const { visibleRecordFields } = useRecordTableContextOrThrow();const recordField: RecordField | undefined =- position === 'left'+ position === 'start'? visibleRecordFields[recordFieldIndex - 1]: visibleRecordFields[recordFieldIndex];diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.tsindex 02712792b54..09e37dc767c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts@@ -1,3 +1,4 @@+import { useLingui } from '@lingui/react';import { useUpdateRecordField } from '@/object-record/record-field/hooks/useUpdateRecordField';import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';import { getViewPersistTarget } from '@/object-record/record-table-widget/utils/getViewPersistTarget';@@ -15,6 +16,7 @@ import { resizedFieldMetadataIdComponentState } from '@/object-record/record-tabimport { resizeFieldOffsetComponentState } from '@/object-record/record-table/states/resizeFieldOffsetComponentState';import { useRecordTableFirstColumnWidthOverride } from '@/object-record/record-table/hooks/useRecordTableFirstColumnWidthOverride';import { computeLastRecordTableColumnWidth } from '@/object-record/record-table/utils/computeLastRecordTableColumnWidth';+import { getRecordColumnResizeOffset } from '@/object-record/record-index/utils/getRecordColumnResizeOffset';import { getRecordTableColumnFieldWidthCSSVariableName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthCSSVariableName';import { updateRecordTableCSSVariable } from '@/object-record/record-table/utils/updateRecordTableCSSVariable';import { getUiZoom } from '@/ui/theme/utils/getUiZoom';@@ -28,6 +30,7 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSeimport { useSaveRecordFields } from '@/views/hooks/useSaveRecordFields';import { useStore } from 'jotai';import { useCallback, useContext, useState } from 'react';+import { getLocaleTextDirection } from 'twenty-shared/translations';import {findById,findByProperty,@@ -37,6 +40,8 @@ import {export const useResizeTableHeader = () => {const { recordTableId, visibleRecordFields } = useRecordTableContextOrThrow();const recordTableWidgetContext = useContext(RecordTableWidgetContext);+ const { i18n } = useLingui();+ const textDirection = getLocaleTextDirection(i18n.locale);const resizeFieldOffset = useAtomComponentStateCallbackState(resizeFieldOffsetComponentState,@@ -99,7 +104,11 @@ export const useResizeTableHeader = () => {throwIfNotDefined(recordField, 'recordField');- const newResizeOffset = (x - initialPointerPositionX) / dragUiZoom;+ const newResizeOffset = getRecordColumnResizeOffset({+ pointerDeltaX: x - initialPointerPositionX,+ uiZoom: dragUiZoom,+ textDirection,+ });const newRecordFieldSizeWithOffset = recordField.size + newResizeOffset;@@ -146,10 +155,11 @@ export const useResizeTableHeader = () => {`${newGroupSectionLastColumnWidth}px`,);- setResizeFieldOffset((x - initialPointerPositionX) / dragUiZoom);+ setResizeFieldOffset(newResizeOffset);},[dragUiZoom,+ textDirection,initialPointerPositionX,recordField,recordTableId,