From 0e62b1cdf86d30e8e7aedc733d2f338f21b3b62b Mon Sep 17 00:00:00 2001
From: Jason Smith <jason@heyglide.com>
Date: Sat, 9 Apr 2022 18:23:30 -0700
Subject: [PATCH] Prevent editing error where selection can end up temporarily
 set to out of bounds locations

---
 packages/core/src/data-editor/data-editor.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/data-editor/data-editor.tsx b/packages/core/src/data-editor/data-editor.tsx
index db318315c..3a4cbbd0c 100644
--- a/packages/core/src/data-editor/data-editor.tsx
+++ b/packages/core/src/data-editor/data-editor.tsx
@@ -1695,15 +1695,15 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
                 const isEditingTrailingRow =
                     gridSelection.current.cell[1] === mangledRows - 1 && newValue !== undefined;
                 updateSelectedCell(
-                    gridSelection.current.cell[0] + movX,
-                    gridSelection.current.cell[1] + movY,
+                    clamp(gridSelection.current.cell[0] + movX, 0, mangledCols.length - 1),
+                    clamp(gridSelection.current.cell[1] + movY, 0, mangledRows - 1),
                     isEditingTrailingRow,
                     false
                 );
             }
             onFinishedEditing?.(newValue, movement);
         },
-        [overlay?.cell, focus, gridSelection, onFinishedEditing, mangledOnCellEdited, mangledRows, updateSelectedCell]
+        [overlay?.cell, focus, gridSelection, onFinishedEditing, mangledOnCellEdited, mangledRows, updateSelectedCell, mangledCols.length]
     );
 
     const overlayID = React.useMemo(() => {