From b1b12388a3b463d0c34a54b96721a34b997f19fd Mon Sep 17 00:00:00 2001 From: Georg Schelkshorn Date: Thu, 23 Mar 2023 14:32:50 +0100 Subject: [PATCH 1/3] feat: take containers offset into account when positioning editor --- packages/grid/src/hooks/useEditable.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/grid/src/hooks/useEditable.tsx b/packages/grid/src/hooks/useEditable.tsx index 9445006..805ea23 100644 --- a/packages/grid/src/hooks/useEditable.tsx +++ b/packages/grid/src/hooks/useEditable.tsx @@ -527,7 +527,14 @@ const useEditable = ({ currentActiveCellRef.current = coords; /* Get offsets */ - const pos = gridRef.current.getCellOffsetFromCoords(coords); + const containerOffset = + gridRef.current.container?.getBoundingClientRect(); + const cellPos = gridRef.current.getCellOffsetFromCoords(coords); + const pos = { + ...cellPos, + x: (containerOffset?.x ?? 0) + (cellPos.x ?? 0), + y: (containerOffset?.y ?? 0) + (cellPos.y ?? 0), + }; const scrollPosition = gridRef.current.getScrollPosition(); const cellValue = getValueRef.current(coords); const value = initialValue || cellValue || ""; From a9a13bf7f64d218c13ffc8f59ea342309389da19 Mon Sep 17 00:00:00 2001 From: Georg Schelkshorn Date: Tue, 12 Nov 2024 09:32:17 +0100 Subject: [PATCH 2/3] Revert "feat: take containers offset into account when positioning editor" This reverts commit b1b12388a3b463d0c34a54b96721a34b997f19fd. --- packages/grid/src/hooks/useEditable.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/grid/src/hooks/useEditable.tsx b/packages/grid/src/hooks/useEditable.tsx index 805ea23..9445006 100644 --- a/packages/grid/src/hooks/useEditable.tsx +++ b/packages/grid/src/hooks/useEditable.tsx @@ -527,14 +527,7 @@ const useEditable = ({ currentActiveCellRef.current = coords; /* Get offsets */ - const containerOffset = - gridRef.current.container?.getBoundingClientRect(); - const cellPos = gridRef.current.getCellOffsetFromCoords(coords); - const pos = { - ...cellPos, - x: (containerOffset?.x ?? 0) + (cellPos.x ?? 0), - y: (containerOffset?.y ?? 0) + (cellPos.y ?? 0), - }; + const pos = gridRef.current.getCellOffsetFromCoords(coords); const scrollPosition = gridRef.current.getScrollPosition(); const cellValue = getValueRef.current(coords); const value = initialValue || cellValue || ""; From 2d35bb8e08bf11c883955675f7018cc877c01189 Mon Sep 17 00:00:00 2001 From: Georg Schelkshorn Date: Tue, 12 Nov 2024 09:41:57 +0100 Subject: [PATCH 3/3] remove unused inProgress prop from selectionRenderer call --- packages/grid/src/Grid.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/grid/src/Grid.tsx b/packages/grid/src/Grid.tsx index f5900b3..26606d9 100644 --- a/packages/grid/src/Grid.tsx +++ b/packages/grid/src/Grid.tsx @@ -2194,7 +2194,6 @@ const Grid: React.FC = memo( ? selectionStrokeWidth : 0, selection, - inProgress, }) ); } @@ -2217,7 +2216,6 @@ const Grid: React.FC = memo( ? selectionStrokeWidth : 0, selection, - inProgress, }) ); } @@ -2250,7 +2248,6 @@ const Grid: React.FC = memo( ? selectionStrokeWidth : 0, selection, - inProgress, }) ); } @@ -2264,7 +2261,6 @@ const Grid: React.FC = memo( width: selectionBounds.width, height: selectionBounds.height, selection, - inProgress, }) );