@rowsncolumns/spreadsheet-state 29.1.4 → 29.1.7

package/dist/esm/api/structural-formula-update.js

@@ -32,12 +32,77 @@ import { createSheetDraft } from "./immer-utils";
  * and 3 don't double-process a cell.
  */
 export const updateFormulasForStructuralChange = (params) => {
-    const { draft, axis, op, sheetId, referenceIndex, count, rowCount, columnCount, getDependents, getGraphNodes, getGraphNodesInSheet, getSheetName, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, } = params;
+    const { draft, axis, op, sheetId, referenceIndex, count, indexes, rowCount, columnCount, getDependents, getGraphNodes, getGraphNodesInSheet, getSheetName, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, } = params;
     if (count <= 0)
         return;
     const isRow = axis === "row";
     const isInsert = op === "insert";
     const delta = isInsert ? count : -count;
+    // The deleted bands, as contiguous runs. A contiguous delete (or an insert)
+    // is the single run at `referenceIndex`; a Ctrl-selected delete has one run
+    // per island. Rewrites apply the runs from the LAST to the first: a run's
+    // references then sit in their original coordinates when its turn comes
+    // (only lines beyond it have moved, and they stay beyond it).
+    const runs = !isInsert && indexes?.length
+        ? contiguousRuns(indexes)
+        : [{ start: referenceIndex, count }];
+    const runsDescending = [...runs].sort((a, b) => b.start - a.start);
+    const deletedIndexes = new Set();
+    for (const run of runs) {
+        for (let i = 0; i < run.count; i++)
+            deletedIndexes.add(run.start + i);
+    }
+    const sortedDeleted = [...deletedIndexes].sort((a, b) => a - b);
+    /** Where a line at `index` on the edited sheet ends up after the splice. */
+    const finalIndex = (index) => {
+        if (isInsert)
+            return index >= referenceIndex ? index + count : index;
+        let before = 0;
+        for (const deleted of sortedDeleted) {
+            if (deleted >= index)
+                break;
+            before++;
+        }
+        return index - before;
+    };
+    const finalPosition = (pos) => pos.sheetId !== sheetId
+        ? pos
+        : isRow
+            ? { ...pos, rowIndex: finalIndex(pos.rowIndex) }
+            : { ...pos, columnIndex: finalIndex(pos.columnIndex) };
+    const bandRange = (start, size) => isRow
+        ? {
+            startRowIndex: start,
+            endRowIndex: start + size - 1,
+            startColumnIndex: 1,
+            endColumnIndex: columnCount,
+        }
+        : {
+            startRowIndex: 1,
+            endRowIndex: rowCount,
+            startColumnIndex: start,
+            endColumnIndex: start + size - 1,
+        };
+    const tailRange = (from) => isRow
+        ? {
+            startRowIndex: from,
+            endRowIndex: rowCount,
+            startColumnIndex: 1,
+            endColumnIndex: columnCount,
+        }
+        : {
+            startRowIndex: 1,
+            endRowIndex: rowCount,
+            startColumnIndex: from,
+            endColumnIndex: columnCount,
+        };
+    // One reference shift per run, last run first (see `runs`).
+    const steps = runsDescending.map((run) => ({
+        rowDelta: isRow ? (isInsert ? run.count : -run.count) : 0,
+        columnDelta: isRow ? 0 : isInsert ? run.count : -run.count,
+        sourceRange: tailRange(isInsert ? run.start : run.start + run.count),
+        deletedRange: isInsert ? undefined : bandRange(run.start, run.count),
+    }));
     // The set of cells that ARE moving (Pass 3 target region). For both
     // insert and delete, this is everything from the reference index along
     // the affected axis; the splice happens after the formula updates.
@@ -72,32 +137,29 @@ export const updateFormulasForStructuralChange = (params) => {
         };
     // Pass 2's source range — the cells that will move under the splice.
     // For insert this is everything at-or-after the insertion point; for
-    // delete this is everything strictly after the deleted block.
-    const pass2SourceRange = isRow
-        ? {
-            startRowIndex: isInsert ? referenceIndex : referenceIndex + count,
-            endRowIndex: rowCount,
-            startColumnIndex: 1,
-            endColumnIndex: columnCount,
-        }
-        : {
-            startRowIndex: 1,
-            endRowIndex: rowCount,
-            startColumnIndex: isInsert ? referenceIndex : referenceIndex + count,
-            endColumnIndex: columnCount,
-        };
+    // delete this is everything strictly after the FIRST deleted band (a line
+    // between two bands of a Ctrl-selected delete moves too — by the bands
+    // before it — so its dependents must be collected).
+    const pass2SourceRange = tailRange(isInsert ? referenceIndex : runs[0].start + runs[0].count);
     // The cells a delete removes: any reference into them (that Pass 1 did not
     // already contract) is broken to `#REF!` instead of sliding onto the cell
     // that moves into its place.
     const deletedRange = isInsert ? undefined : pass1Range;
     const editedSheetName = getSheetName(sheetId);
     // ---- PASS 1 ----
-    const pass1Formulas = collectUniqueDependentsForRange({
-        draft,
-        sheetId,
-        sourceRange: pass1Range,
-        getDependents,
-    });
+    // Dependents of every deleted band (the single band for an insert).
+    const pass1Formulas = new Map();
+    for (const run of runs) {
+        for (const [key, pos] of collectUniqueDependentsForRange({
+            draft,
+            sheetId,
+            sourceRange: isInsert ? pass1Range : bandRange(run.start, run.count),
+            getDependents,
+        })) {
+            if (!pass1Formulas.has(key))
+                pass1Formulas.set(key, pos);
+        }
+    }
     if (pass1Formulas.size > 0) {
         const sheetCell = new SheetCell();
         for (const pos of pass1Formulas.values()) {
@@ -115,34 +177,28 @@ export const updateFormulasForStructuralChange = (params) => {
             const rangeOptions = {
                 includeUnqualifiedReferences: pos.sheetId === sheetId,
             };
-            const updatedFormula = isInsert
-                ? expandRangesInFormula(formulaValue, referenceIndex, count, axis, editedSheetName, rangeOptions)
-                : contractRangesInFormula(formulaValue, referenceIndex, count, axis, editedSheetName, rangeOptions);
+            let updatedFormula = formulaValue;
+            if (isInsert) {
+                updatedFormula = expandRangesInFormula(formulaValue, referenceIndex, count, axis, editedSheetName, rangeOptions);
+            }
+            else {
+                // Contract for each deleted band, last band first: a range spanning
+                // rows 2 and 4 loses row 4 (`A1:A5` → `A1:A4`), then row 2 (→ `A1:A3`).
+                for (const run of runsDescending) {
+                    if (!updatedFormula)
+                        break;
+                    updatedFormula = contractRangesInFormula(updatedFormula, run.start, run.count, axis, editedSheetName, rangeOptions);
+                }
+            }
             if (!updatedFormula || updatedFormula === formulaValue)
                 continue;
             sheetCell.setFormulaValue(updatedFormula, false);
             currentSheet[pos.rowIndex].values[pos.columnIndex] =
                 sheetCell.getCellData();
             // Adjust the recalc position for cells that themselves shift in
-            // the splice that follows. For insert: cells AT or after the
-            // reference shift by +count along the axis. For delete: cells
-            // STRICTLY after the deleted block shift by -count.
-            const adjustedRowIndex = isRow
-                ? pos.sheetId === sheetId &&
-                    (isInsert
-                        ? pos.rowIndex >= referenceIndex
-                        : pos.rowIndex >= referenceIndex + count)
-                    ? pos.rowIndex + delta
-                    : pos.rowIndex
-                : pos.rowIndex;
-            const adjustedColumnIndex = !isRow
-                ? pos.sheetId === sheetId &&
-                    (isInsert
-                        ? pos.columnIndex >= referenceIndex
-                        : pos.columnIndex >= referenceIndex + count)
-                    ? pos.columnIndex + delta
-                    : pos.columnIndex
-                : pos.columnIndex;
+            // the splice that follows: a cell on the edited sheet loses the deleted
+            // lines before it (or gains the inserted ones at or before it).
+            const { rowIndex: adjustedRowIndex, columnIndex: adjustedColumnIndex } = finalPosition(pos);
             enqueueCalculation?.({
                 type: "add",
                 position: {
@@ -184,6 +240,7 @@ export const updateFormulasForStructuralChange = (params) => {
                 columnDelta,
                 sourceRange: pass2SourceRange,
                 deletedRange,
+                steps,
                 locale,
                 rowCount,
                 columnCount,
@@ -204,6 +261,8 @@ export const updateFormulasForStructuralChange = (params) => {
             columnDelta,
             sourceRange: pass2SourceRange,
             deletedRange,
+            steps,
+            destinationPosition: finalPosition(pos),
             locale,
             rowCount,
             columnCount,
@@ -227,6 +286,7 @@ export const updateFormulasForStructuralChange = (params) => {
             columnDelta,
             sourceRange: pass2SourceRange,
             deletedRange,
+            steps,
             locale,
             rowCount,
             columnCount,
@@ -271,6 +331,12 @@ export const updateFormulasForStructuralChange = (params) => {
                 columnDelta,
                 sourceRange: pass2SourceRange,
                 deletedRange,
+                steps,
+                destinationPosition: finalPosition({
+                    sheetId,
+                    rowIndex: pos.rowIndex,
+                    columnIndex: pos.columnIndex,
+                }),
                 locale,
                 rowCount,
                 columnCount,
@@ -309,6 +375,8 @@ export const updateFormulasForStructuralChange = (params) => {
                     columnDelta,
                     sourceRange: pass2SourceRange,
                     deletedRange,
+                    steps,
+                    destinationPosition: finalPosition({ sheetId, rowIndex, columnIndex }),
                     locale,
                     rowCount,
                     columnCount,
@@ -319,7 +387,27 @@ export const updateFormulasForStructuralChange = (params) => {
         }
     }
 };
-const shiftExternalDependentFormulaReferences = ({ draft, position, editedSheetName, enqueueCalculation, enqueueGraphOperation, recalcCells, movedKeys, rowDelta, columnDelta, sourceRange, deletedRange, locale, rowCount, columnCount, cellXfsRegistry, sharedStringRegistry, }) => {
+/**
+ * The maximal contiguous runs of `indexes` (any order, duplicates ignored),
+ * ascending — the bands of a Ctrl-selected delete (rows 2 and 4 → two runs).
+ * Shared by `deleteRow` / `deleteColumn`, which apply every band-shaped update
+ * once per run.
+ */
+export const contiguousRuns = (indexes) => {
+    const sorted = [...new Set(indexes)].sort((a, b) => a - b);
+    const runs = [];
+    for (const index of sorted) {
+        const last = runs[runs.length - 1];
+        if (last && last.start + last.count === index) {
+            last.count++;
+        }
+        else {
+            runs.push({ start: index, count: 1 });
+        }
+    }
+    return runs;
+};
+const shiftExternalDependentFormulaReferences = ({ draft, position, editedSheetName, enqueueCalculation, enqueueGraphOperation, recalcCells, movedKeys, rowDelta, columnDelta, sourceRange, deletedRange, steps, locale, rowCount, columnCount, cellXfsRegistry, sharedStringRegistry, }) => {
     const sheetCell = new SheetCell();
     const currentSheet = createSheetDraft(draft, position.sheetId, position.rowIndex);
     const cellData = currentSheet[position.rowIndex]?.values?.[position.columnIndex];
@@ -329,17 +417,25 @@ const shiftExternalDependentFormulaReferences = ({ draft, position, editedSheetN
     }
     movedKeys.add(sheetCell.key);
     const previousFormula = sheetCell.formula;
-    const updatedFormula = formulaToRelativeReference(previousFormula, { rowIndex: position.rowIndex, columnIndex: position.columnIndex }, {
-        rowIndex: position.rowIndex + rowDelta,
-        columnIndex: position.columnIndex + columnDelta,
-    }, editedSheetName, {
-        exclusionRange: sourceRange,
-        deletedRange,
-        rowCount,
-        columnCount,
-        referenceSheetName: editedSheetName,
-        includeUnqualifiedReferences: false,
-    });
+    const moves = steps ?? [
+        { rowDelta, columnDelta, sourceRange, deletedRange },
+    ];
+    let updatedFormula = previousFormula;
+    for (const move of moves) {
+        if (!updatedFormula)
+            break;
+        updatedFormula = formulaToRelativeReference(updatedFormula, { rowIndex: position.rowIndex, columnIndex: position.columnIndex }, {
+            rowIndex: position.rowIndex + move.rowDelta,
+            columnIndex: position.columnIndex + move.columnDelta,
+        }, editedSheetName, {
+            exclusionRange: move.sourceRange,
+            deletedRange: move.deletedRange,
+            rowCount,
+            columnCount,
+            referenceSheetName: editedSheetName,
+            includeUnqualifiedReferences: false,
+        });
+    }
     if (!updatedFormula || updatedFormula === previousFormula) {
         return;
     }

package/dist/esm/api/structural-guards.d.ts

@@ -132,4 +132,15 @@ export declare const getInsertLinesRefusal: <T extends CellData>({ axis, referen
     rows: SheetData<T>[number] | undefined;
     limit: number | undefined;
 }) => StructuralRefusal | undefined;
+/**
+ * Excel's sort rule for merged cells: a sort may only reorder rows whose merge layout is identical —
+ * every merge touching the sorted range must lie wholly inside it, span a single row, and every row of
+ * the range must carry the same column spans. Otherwise the anchor values would move with their rows
+ * while the merge outlines stayed behind (stale merge geometry), so the sort is refused with Excel's
+ * "To do this, all the merged cells need to be the same size." Merges outside the range are untouched.
+ */
+export declare const getSortMergeRefusal: ({ range, merges, }: {
+    range: GridRange;
+    merges: readonly GridRange[] | null | undefined;
+}) => StructuralRefusal | undefined;
 //# sourceMappingURL=structural-guards.d.ts.map

package/dist/esm/api/structural-guards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structural-guards.d.ts","sourceRoot":"","sources":["../../../api/structural-guards.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structural-guards.d.ts","sourceRoot":"","sources":["../../../api/structural-guards.ts"],"names":[],"mappings":"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"}

package/dist/esm/api/structural-guards.js

@@ -269,3 +269,34 @@ export const getInsertLinesRefusal = ({ axis, referenceIndex, count, rows, limit
         ? structuralRefusal("off-sheet-push")
         : undefined;
 };
+/**
+ * Excel's sort rule for merged cells: a sort may only reorder rows whose merge layout is identical —
+ * every merge touching the sorted range must lie wholly inside it, span a single row, and every row of
+ * the range must carry the same column spans. Otherwise the anchor values would move with their rows
+ * while the merge outlines stayed behind (stale merge geometry), so the sort is refused with Excel's
+ * "To do this, all the merged cells need to be the same size." Merges outside the range are untouched.
+ */
+export const getSortMergeRefusal = ({ range, merges, }) => {
+    if (!merges?.length)
+        return undefined;
+    const touching = merges.filter((merge) => rangesIntersect(merge, range));
+    if (!touching.length)
+        return undefined;
+    const spansByRow = new Map();
+    for (const merge of touching) {
+        if (!rangeContains(range, merge) ||
+            merge.startRowIndex !== merge.endRowIndex) {
+            return structuralRefusal("sort-merged-cells");
+        }
+        const spans = spansByRow.get(merge.startRowIndex) ?? [];
+        spans.push(`${merge.startColumnIndex}:${merge.endColumnIndex}`);
+        spansByRow.set(merge.startRowIndex, spans);
+    }
+    const layoutOf = (rowIndex) => (spansByRow.get(rowIndex) ?? []).slice().sort().join(",");
+    const first = layoutOf(range.startRowIndex);
+    for (let r = range.startRowIndex + 1; r <= range.endRowIndex; r++) {
+        if (layoutOf(r) !== first)
+            return structuralRefusal("sort-merged-cells");
+    }
+    return undefined;
+};

package/dist/esm/api/structural-table-refs.d.ts

@@ -34,7 +34,14 @@ export type RemovedTableParts = {
  * `[minIndex, maxIndex]` on `sheetId`. Mirrors the table updates those
  * interfaces apply to `tables`.
  */
-export declare const collectRemovedTableParts: (tables: TableView[] | undefined, sheetId: number, axis: StructuralAxis, minIndex: number, maxIndex: number) => RemovedTableParts;
+export declare const collectRemovedTableParts: (tables: TableView[] | undefined, sheetId: number, axis: StructuralAxis, minIndex: number, maxIndex: number, 
+/**
+ * The exact deleted indexes when the selection is not one contiguous band
+ * (Ctrl-selected rows 2 and 4): a table is removed only when EVERY one of
+ * its lines is deleted, and only the deleted columns are spliced out.
+ * Defaults to the band `[minIndex, maxIndex]`.
+ */
+indexes?: number[]) => RemovedTableParts;
 export type BreakStructuredRefsParams<T extends CellData> = {
     draft: Draft<SheetData<T>>;
     /** The edited sheet. */
@@ -43,6 +50,12 @@ export type BreakStructuredRefsParams<T extends CellData> = {
     /** Smallest deleted index and the number of deleted rows/columns. */
     referenceIndex: number;
     count: number;
+    /**
+     * The exact deleted indexes of a non-contiguous delete (see
+     * `collectRemovedTableParts`); a formula cell then closes up by the deleted
+     * lines BEFORE it rather than by `count`.
+     */
+    indexes?: number[];
     removed: RemovedTableParts;
     getGraphNodes?: ReturnType<typeof useCalculation>["getGraphNodes"];
     enqueueCalculation?: ReturnType<typeof useCalculation>["enqueueCalculation"];
@@ -59,7 +72,7 @@ export type BreakStructuredRefsParams<T extends CellData> = {
  * formula's pre-edit position. Formula cells come from the dependency graph
  * when it is available (cost O(formula cells)); without one the draft is swept.
  */
-export declare const breakStructuredRefsForRemovedTableParts: <T extends CellData>({ draft, sheetId, axis, referenceIndex, count, removed, getGraphNodes, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, }: BreakStructuredRefsParams<T>) => void;
+export declare const breakStructuredRefsForRemovedTableParts: <T extends CellData>({ draft, sheetId, axis, referenceIndex, count, indexes, removed, getGraphNodes, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, }: BreakStructuredRefsParams<T>) => void;
 export type RewriteFormulasParams<T extends CellData> = Pick<BreakStructuredRefsParams<T>, "draft" | "getGraphNodes" | "enqueueCalculation" | "enqueueGraphOperation" | "recalcCells" | "locale" | "cellXfsRegistry" | "sharedStringRegistry">;
 /**
  * Column `oldName` of `table` was renamed `newName` (a header-cell edit):

package/dist/esm/api/structural-table-refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structural-table-refs.d.ts","sourceRoot":"","sources":["../../../api/structural-table-refs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structural-table-refs.d.ts","sourceRoot":"","sources":["../../../api/structural-table-refs.ts"],"names":[],"mappings":"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"}

package/dist/esm/api/structural-table-refs.js

@@ -11,33 +11,51 @@ import { createSheetDraft } from "./immer-utils";
  * `[minIndex, maxIndex]` on `sheetId`. Mirrors the table updates those
  * interfaces apply to `tables`.
  */
-export const collectRemovedTableParts = (tables, sheetId, axis, minIndex, maxIndex) => {
+export const collectRemovedTableParts = (tables, sheetId, axis, minIndex, maxIndex, 
+/**
+ * The exact deleted indexes when the selection is not one contiguous band
+ * (Ctrl-selected rows 2 and 4): a table is removed only when EVERY one of
+ * its lines is deleted, and only the deleted columns are spliced out.
+ * Defaults to the band `[minIndex, maxIndex]`.
+ */
+indexes) => {
     const removed = { tables: [], columns: [] };
+    const deleted = new Set(indexes ?? []);
+    const isDeleted = (index) => indexes ? deleted.has(index) : index >= minIndex && index <= maxIndex;
     for (const table of tables ?? []) {
         if (table.sheetId !== sheetId || !table.title)
             continue;
         if (axis === "row") {
             const { startRowIndex, endRowIndex } = table.range;
-            if (minIndex <= startRowIndex && maxIndex >= endRowIndex) {
-                removed.tables.push(table.title);
+            let every = true;
+            for (let row = startRowIndex; row <= endRowIndex; row++) {
+                if (!isDeleted(row)) {
+                    every = false;
+                    break;
+                }
             }
+            if (every)
+                removed.tables.push(table.title);
             continue;
         }
         const { startColumnIndex, endColumnIndex } = table.range;
         if (maxIndex < startColumnIndex || minIndex > endColumnIndex)
             continue;
-        if (minIndex <= startColumnIndex && maxIndex >= endColumnIndex) {
-            removed.tables.push(table.title);
-            continue;
-        }
-        const overlapStart = Math.max(minIndex, startColumnIndex);
-        const overlapEnd = Math.min(maxIndex, endColumnIndex);
         const names = [];
-        for (let column = overlapStart; column <= overlapEnd; column++) {
+        let every = true;
+        for (let column = startColumnIndex; column <= endColumnIndex; column++) {
+            if (!isDeleted(column)) {
+                every = false;
+                continue;
+            }
             const name = table.columns?.[column - startColumnIndex]?.name;
             if (name)
                 names.push(name);
         }
+        if (every) {
+            removed.tables.push(table.title);
+            continue;
+        }
         if (names.length) {
             removed.columns.push({
                 table: table.title,
@@ -61,12 +79,24 @@ const isWithinRange = (range, rowIndex, columnIndex) => rowIndex >= range.startR
  * formula's pre-edit position. Formula cells come from the dependency graph
  * when it is available (cost O(formula cells)); without one the draft is swept.
  */
-export const breakStructuredRefsForRemovedTableParts = ({ draft, sheetId, axis, referenceIndex, count, removed, getGraphNodes, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, }) => {
+export const breakStructuredRefsForRemovedTableParts = ({ draft, sheetId, axis, referenceIndex, count, indexes, removed, getGraphNodes, enqueueCalculation, enqueueGraphOperation, recalcCells, locale, cellXfsRegistry, sharedStringRegistry, }) => {
     if (isEmptyRemoval(removed))
         return;
     const sheetCell = new SheetCell();
     const isRow = axis === "row";
-    const afterBand = referenceIndex + count;
+    const sortedDeleted = indexes
+        ? [...new Set(indexes)].sort((a, b) => a - b)
+        : Array.from({ length: count }, (_, i) => referenceIndex + i);
+    /** How many deleted lines lie strictly before `index`. */
+    const deletedBefore = (index) => {
+        let before = 0;
+        for (const deleted of sortedDeleted) {
+            if (deleted >= index)
+                break;
+            before++;
+        }
+        return before;
+    };
     for (const pos of collectFormulaPositions(draft, getGraphNodes)) {
         const currentSheet = createSheetDraft(draft, pos.sheetId, pos.rowIndex);
         const cellData = currentSheet[pos.rowIndex]?.values?.[pos.columnIndex];
@@ -91,14 +121,15 @@ export const breakStructuredRefsForRemovedTableParts = ({ draft, sheetId, axis,
         sheetCell.setFormulaValue(updated, false);
         currentSheet[pos.rowIndex].values[pos.columnIndex] =
             sheetCell.getCellData();
-        // Where the cell ends up after the splice that follows (cells strictly
-        // after the deleted band on the edited sheet close up by `count`).
-        const shifts = pos.sheetId === sheetId &&
-            (isRow ? pos.rowIndex : pos.columnIndex) >= afterBand;
+        // Where the cell ends up after the splice that follows (a cell on the
+        // edited sheet closes up by the deleted lines before it).
+        const shift = pos.sheetId === sheetId
+            ? deletedBefore(isRow ? pos.rowIndex : pos.columnIndex)
+            : 0;
         const nextPosition = {
             sheetId: pos.sheetId,
-            rowIndex: pos.rowIndex - (shifts && isRow ? count : 0),
-            columnIndex: pos.columnIndex - (shifts && !isRow ? count : 0),
+            rowIndex: pos.rowIndex - (isRow ? shift : 0),
+            columnIndex: pos.columnIndex - (isRow ? 0 : shift),
         };
         const enqueueOperation = sheetCell.ephemeral()
             ? enqueueCalculation

package/dist/esm/commands.d.ts

@@ -1,4 +1,4 @@
-import type { CellData, CellInterface, Citation, Color, Direction, GridRange, SelectionArea, SheetRange, SortOrder } from "@rowsncolumns/common-types";
+import type { CellData, CellInterface, Citation, Color, Direction, ExtendedValue, GridRange, SelectionArea, SheetRange, SortOrder } from "@rowsncolumns/common-types";
 import type { AXIS, BandedDefinition, BandedRange, BorderLocation, BorderStyle, CellFormat, ColorFilterCriteria, ConditionalFormatRule, ConditionType, ConditionValue, DataValidationRuleRecord, EmbeddedChart, EmbeddedObject, FillModifier, FillSeriesSpec, FilterView, IconFilterCriteria, NamedRange, PivotTable, ProtectedRange, SelectionAttributes, Sheet, Slicer, SortSpecs, SpreadsheetTheme, CalculatedColumnPreviousCell, TableAutoExpansionWrites, TableTheme, TableView, TextFormatRun, BooleanCondition, FilterConditionJoin, CustomTableStyle } from "@rowsncolumns/spreadsheet";
 import type { AutoFillType } from "./api/fill";
 import type { ChangeBatchOptions } from "./interface/change-batch";
@@ -62,10 +62,18 @@ export type Command = {
     target: CellInterface;
     /** Source top-left of the copied range — relative formula refs shift by (target − source). */
     source: CellInterface;
-    /** The copied rectangle, row-major. Each cell carries its user-entered value (formula text or a
-     *  literal, as a string) plus optional format and optional hyperlink target (a pasted link
+    /** The copied rectangle, row-major. Each cell carries its user-entered value (typed in `ue`,
+     *  as a string in `value`) plus optional format and optional hyperlink target (a pasted link
      *  stays clickable); `null` = a blank cell within the copied range. */
     cells: ({
+        /** The source cell's TYPED user-entered value (`{ sv }` / `{ nv }` / `{ bv }` / `{ fv }` /
+         *  `{ ev }`, the `CellData.ue` shape). The engine lands it with that type — a text `0123`,
+         *  `1/2`, `TRUE`, `1e3` or `=x` stays text, a number stays a number, a formula relocates
+         *  like `value` — as Excel keeps each copied cell's stored type on copy / cut / paste-values.
+         *  Absent → the engine infers `value` as if typed. */
+        ue?: ExtendedValue | null;
+        /** `ue` as a string (formula text or the literal) — the inference fallback for an engine
+         *  build predating `ue`. */
         value: string | null;
         format?: CellFormat | null;
         hyperlink?: string | null;
@@ -396,6 +404,12 @@ export type Command = {
 } | {
     command: "sort-range";
     sheetId: number;
+    /**
+     * The cursor at sort time. Excel / Sheets key a one-click range sort on the
+     * column the active cell is in; absent (or outside the range's columns) the
+     * range's leftmost column keys the sort.
+     */
+    activeCell?: CellInterface;
     selections: SelectionArea<SelectionAttributes>[];
     sortOrder: SortOrder;
 } | {