@rowsncolumns/spreadsheet 10.4.13 → 10.5.1

package/dist/esm/hooks/use-selection.js

@@ -1,4 +1,4 @@
-import { findLastContentfulCell, isNull } from "@rowsncolumns/grid";
+import { findLastContentfulCell, isCellWithinBounds, isNull, } from "@rowsncolumns/grid";
 import { cellToArea } from "@rowsncolumns/grid";
 import { getOwnerDocument, useIsomorphicLayoutEffect } from "@rowsncolumns/grid";
 import { Align, cellIdentifier, cellRangeToBounds, clampCellCoords, clampIndex, Direction, findNextCellInDataRegion, findNextCellWithinBounds, getBoundedCells, isAreasEqual, isEqualCells, MouseButtonCodes, newSelectionFromDrag, selectionSpansCells, } from "@rowsncolumns/grid";
@@ -157,6 +157,51 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
     useIsomorphicLayoutEffect(() => {
         activeCellRef.current = activeCell;
     }, [activeCell]);
+    /**
+     * The last active cell this hook itself emitted. When the `activeCell` prop
+     * moves without a grid gesture — undo/redo restoring the cursor, a host
+     * navigating — the arrow-key anchor (`selectionStart`/`selectionEnd`) must
+     * follow it, or the next arrow key moves from where the cursor was before
+     * (rowsncolumns/spreadsheet#1124). Cells the hook emitted itself are skipped:
+     * Cmd+click anchors at the range's `start`, not the top-left it emits, and
+     * Shift+Arrow never emits at all, so its fixed anchor survives.
+     */
+    const lastEmittedActiveCellRef = useRef(null);
+    const emitActiveCell = useCallback((sheetId, cell) => {
+        lastEmittedActiveCellRef.current = cell;
+        onChangeActiveCell?.(sheetId, cell);
+    }, [onChangeActiveCell]);
+    useIsomorphicLayoutEffect(() => {
+        if (!activeCell)
+            return;
+        const emitted = lastEmittedActiveCellRef.current;
+        if (emitted &&
+            emitted.rowIndex === activeCell.rowIndex &&
+            emitted.columnIndex === activeCell.columnIndex) {
+            return;
+        }
+        if (isSelecting.current || isFilling.current || isDragging.current)
+            return;
+        const range = selections[selections.length - 1]?.range;
+        if (range && isCellWithinBounds(activeCell, range)) {
+            // Keep the selection; anchor at the active cell and let the far corner
+            // be the moving end so Shift+Arrow extends from here.
+            selectionStart.current = activeCell;
+            selectionEnd.current = {
+                rowIndex: activeCell.rowIndex === range.startRowIndex
+                    ? range.endRowIndex
+                    : range.startRowIndex,
+                columnIndex: activeCell.columnIndex === range.startColumnIndex
+                    ? range.endColumnIndex
+                    : range.startColumnIndex,
+            };
+        }
+        else {
+            selectionStart.current = activeCell;
+            selectionEnd.current = activeCell;
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [sheetId, activeCell?.rowIndex, activeCell?.columnIndex]);
     useIsomorphicLayoutEffect(() => {
         mergedCellsRef.current = mergedCells;
     }, [mergedCells]);
@@ -269,7 +314,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         if (!range) {
             return;
         }
-        onChangeActiveCell?.(sheetId, {
+        emitActiveCell(sheetId, {
             rowIndex: range.startRowIndex,
             columnIndex: range.startColumnIndex,
         });
@@ -279,7 +324,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
     }, [
         sheetId,
         onChangeSelections,
-        onChangeActiveCell,
+        emitActiveCell,
         selectionFromStartEnd,
         isCellOutOfBounds,
         selectionPolicy,
@@ -305,7 +350,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
             columnIndex: bounds.startColumnIndex,
         };
         /* Keep track  of first cell that was selected by user */
-        onChangeActiveCell?.(sheetId, coords);
+        emitActiveCell(sheetId, coords);
         if (newSelectionMode === "clear") {
             clearSelections();
         }
@@ -321,7 +366,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         appendSelection,
         newSelectionMode,
         clearSelections,
-        onChangeActiveCell,
+        emitActiveCell,
         selectionFromStartEnd,
         isCellOutOfBounds,
     ]);
@@ -400,12 +445,12 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
     const handleSetActiveCell = useCallbackRef(useCallback((sheetId, coords, shouldScroll = true, align) => {
         selectionStart.current = coords;
         selectionEnd.current = coords;
-        onChangeActiveCell?.(sheetId, coords);
+        emitActiveCell(sheetId, coords);
         /* Scroll to the cell */
         if (shouldScroll && coords) {
             scrollToCell(coords, align);
         }
-    }, [onChangeActiveCell, scrollToCell]));
+    }, [emitActiveCell, scrollToCell]));
     /**
      * Navigate selection using keyboard
      * @param direction
@@ -1053,7 +1098,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
                     const newSelection = removeSelectionByIndex(cellIndex);
                     const nextActiveCell = getPossibleActiveCellFromSelections(newSelection);
                     if (nextActiveCell !== null) {
-                        onChangeActiveCell?.(sheetId, nextActiveCell);
+                        emitActiveCell(sheetId, nextActiveCell);
                     }
                     if (newSelection.length === 1 &&
                         cellEqualsSelection(nextActiveCell, newSelection)) {
@@ -1107,7 +1152,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         modifySelection,
         mouseDownInterceptor,
         newSelection,
-        onChangeActiveCell,
+        emitActiveCell,
         removeSelectionByIndex,
         selectionLeftBound,
         selectionTopBound,
@@ -1190,7 +1235,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
                     const direction = isShiftKey ? Direction.Up : Direction.Down;
                     const nextCell = findNextCellWithinBounds(activeCellBounds, range, direction);
                     if (nextCell) {
-                        onChangeActiveCell?.(sheetId, nextCell);
+                        emitActiveCell(sheetId, nextCell);
                         scrollToCell(nextCell);
                     }
                 }
@@ -1211,7 +1256,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
                     const direction = isShiftKey ? Direction.Left : Direction.Right;
                     const nextCell = findNextCellWithinBounds(activeCellBounds, range, direction);
                     if (nextCell) {
-                        onChangeActiveCell?.(sheetId, nextCell);
+                        emitActiveCell(sheetId, nextCell);
                         scrollToCell(nextCell);
                     }
                 }
@@ -1262,7 +1307,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         activeCell,
         selections,
         keyNavigate,
-        onChangeActiveCell,
+        emitActiveCell,
         pageDown,
         pageLeft,
         pageRight,
@@ -1419,7 +1464,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
             // The active cell normally anchors the surviving corner; if it fell in the cleared band,
             // move it to the remaining range's top-left so it never points at a deselected cell.
             if (!cellInRange(activeCell, shrink.remaining)) {
-                onChangeActiveCell?.(sheetId, {
+                emitActiveCell(sheetId, {
                     rowIndex: shrink.remaining.startRowIndex,
                     columnIndex: shrink.remaining.startColumnIndex,
                 });
@@ -1470,7 +1515,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         focus,
         handleFillMouseMove,
         onChangeSelections,
-        onChangeActiveCell,
+        emitActiveCell,
         onFill,
         onFillHandleRelease,
         onFillShrink,
@@ -1568,7 +1613,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
                 columnIndex: toSelection.range.startColumnIndex,
             };
             /* Pick the first cell as activee cell */
-            onChangeActiveCell?.(sheetId, coords);
+            emitActiveCell(sheetId, coords);
             /* Update selection start */
             selectionStart.current = coords;
             if (selectionSpansCells(toSelection?.range)) {
@@ -1604,7 +1649,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
                         onMoveSelection?.(sheetId, fromSelection, toSelection);
                         return;
                     }
-                    onChangeActiveCell?.(sheetId, {
+                    emitActiveCell(sheetId, {
                         rowIndex: fromSelection.range.startRowIndex,
                         columnIndex: fromSelection.range.startColumnIndex,
                     });
@@ -1642,7 +1687,7 @@ export const useSelection = ({ sheetId, activeCell, onChangeActiveCell, selectio
         getValue,
         handleSelectionMouseMove,
         focus,
-        onChangeActiveCell,
+        emitActiveCell,
         onChangeSelections,
     ]);
     /**

package/dist/esm/release-date.js

@@ -1,3 +1,3 @@
 export const releaseDate = 
 // @ts-ignore
-new Date("2026-10-08") ?? new Date("2025-06-18");
+new Date("2026-10-12") ?? new Date("2025-06-18");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/spreadsheet",
-  "version": "10.4.13",
+  "version": "10.5.1",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",