@rowsncolumns/spreadsheet-state 28.0.75 → 29.0.0

package/dist/cjs/interface/delete-cells-shift-left.js

@@ -1,62 +1,91 @@
-import { __read, __spreadArray, __values } from "tslib";
-import { selectionFromActiveCell } from "@rowsncolumns/utils";
+import { __assign, __read, __spreadArray, __values } from "tslib";
 import { produceWithPatches } from "immer";
 import { collectUniqueDependentsForRange, moveFormulaAtPosition, } from "../api/dependency";
-import { moveMergedCells } from "../api/merges";
+import { contractRangesInFormula } from "../api/formula";
+import { createSheetDraft } from "../api/immer-utils";
+import { shiftMergesInBand } from "../api/merges";
+import { isRangeInsideBand, isRangeInsideBlock, resolveShiftSelection, shiftBand, } from "../api/structural-guards";
+import { SheetCell } from "../sheet-cell";
+/**
+ * Delete cells ▸ Shift cells left (SHF-04) — the horizontal twin of `deleteCellsShiftUp`: only the
+ * selection's rows move, the selected block is removed and every cell to its right slides left by
+ * the block's width. A reference to a deleted cell becomes `#REF!`; one to a cell that slid left
+ * follows it; a range entirely inside the block's rows that the block partially covers contracts.
+ * Refusals (torn merge/table/array) are decided by the hook before this runs.
+ */
 export var deleteCellsShiftLeft = function (_a) {
-    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeCitations = _a.onChangeCitations;
+    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, getSheetName = _a.getSheetName, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeCitations = _a.onChangeCitations;
     return function (sheetId, activeCell, selections) {
+        var _a;
         var saveHistory = createHistory();
         var recalcCells = new Map();
-        // Calculate selection
-        var finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        var selection = finalSelections[finalSelections.length - 1];
-        var count = selection.range.endColumnIndex - selection.range.startColumnIndex + 1;
+        var selection = resolveShiftSelection(activeCell, selections);
+        var _b = selection.range, r1 = _b.startRowIndex, r2 = _b.endRowIndex, c1 = _b.startColumnIndex, c2 = _b.endColumnIndex;
+        var count = c2 - c1 + 1;
+        var band = shiftBand("left", selection.range);
+        var deletedRange = __assign({}, selection.range);
+        var sheetName = (_a = getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(sheetId)) !== null && _a !== void 0 ? _a : "";
         enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
             kind: "delete-cells-shift-left",
             sheetId: sheetId,
-            startRowIndex: selection.range.startRowIndex,
-            endRowIndex: selection.range.endRowIndex,
-            startColumnIndex: selection.range.startColumnIndex,
-            endColumnIndex: selection.range.endColumnIndex,
+            startRowIndex: r1,
+            endRowIndex: r2,
+            startColumnIndex: c1,
+            endColumnIndex: c2,
             columnCount: columnCount,
         });
-        // Update merges on sheet
+        // Update merges on sheet — merges wholly inside the deleted block go with it; merges wholly
+        // inside the shifted rows right of it ride left.
         onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
             var _a = __read(produceWithPatches(prevSheets, function (draft) {
                 var sheet = draft.find(function (s) { return s.sheetId === sheetId; });
                 if (sheet === null || sheet === void 0 ? void 0 : sheet.merges) {
-                    for (var columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        sheet.merges = moveMergedCells(sheet.merges, "column-remove", columnIndex);
-                    }
+                    sheet.merges = shiftMergesInBand(sheet.merges, "column", c1, count, false, r1, r2);
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ sheets: { patches: patches, inversePatches: inversePatches } });
             return nextState;
         });
+        // Tables: one wholly inside the deleted block is deleted with it; one wholly inside the
+        // shifted rows right of the block rides left. A partial cover was refused by the hook.
+        onChangeTables === null || onChangeTables === void 0 ? void 0 : onChangeTables(function (prevTables) {
+            var _a = __read(produceWithPatches(prevTables, function (draft) {
+                for (var idx = draft.length - 1; idx >= 0; idx--) {
+                    var table = draft[idx];
+                    if (table.sheetId !== sheetId)
+                        continue;
+                    if (isRangeInsideBlock(deletedRange, table.range)) {
+                        draft.splice(idx, 1);
+                        continue;
+                    }
+                    if (isRangeInsideBand(table.range, band) &&
+                        table.range.startColumnIndex > c2) {
+                        table.range.startColumnIndex -= count;
+                        table.range.endColumnIndex -= count;
+                    }
+                }
+            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+            saveHistory({ tables: { patches: patches, inversePatches: inversePatches } });
+            return nextState;
+        });
         // Update citations - delete if overlapping, shift back if after
         onChangeCitations === null || onChangeCitations === void 0 ? void 0 : onChangeCitations(function (prevCitations) {
             var _a = __read(produceWithPatches(prevCitations, function (draft) {
-                var deleteRowStart = selection.range.startRowIndex;
-                var deleteRowEnd = selection.range.endRowIndex;
-                var deleteColStart = selection.range.startColumnIndex;
-                var deleteColEnd = selection.range.endColumnIndex;
-                var shiftAmount = deleteColEnd - deleteColStart + 1;
                 for (var idx = draft.length - 1; idx >= 0; idx--) {
                     var citation = draft[idx];
                     if (citation.range.sheetId !== sheetId)
                         continue;
-                    var rowsOverlap = !(citation.range.endRowIndex < deleteRowStart || citation.range.startRowIndex > deleteRowEnd);
+                    var rowsOverlap = !(citation.range.endRowIndex < r1 ||
+                        citation.range.startRowIndex > r2);
                     if (rowsOverlap) {
-                        var colsOverlap = !(citation.range.endColumnIndex < deleteColStart || citation.range.startColumnIndex > deleteColEnd);
+                        var colsOverlap = !(citation.range.endColumnIndex < c1 ||
+                            citation.range.startColumnIndex > c2);
                         if (colsOverlap) {
                             draft.splice(idx, 1);
                         }
-                        else if (citation.range.startColumnIndex > deleteColEnd) {
-                            citation.range.startColumnIndex -= shiftAmount;
-                            citation.range.endColumnIndex -= shiftAmount;
+                        else if (citation.range.startColumnIndex > c2) {
+                            citation.range.startColumnIndex -= count;
+                            citation.range.endColumnIndex -= count;
                         }
                     }
                 }
@@ -68,79 +97,128 @@ export var deleteCellsShiftLeft = function (_a) {
         onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
             var _a = __read(produceWithPatches(prevSheetData, function (draft) {
                 var e_1, _a;
-                var _b, _c, _d, _e, _f, _g, _h, _j;
+                var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
                 var movedKeys = new Set();
-                // Build a broad source range across the selection rows, clamped per row by helper
-                var sourceRange = {
-                    startRowIndex: selection.range.startRowIndex,
-                    endRowIndex: selection.range.endRowIndex,
-                    startColumnIndex: selection.range.startColumnIndex,
-                    endColumnIndex: columnCount,
+                var totalColumns = Math.max(columnCount, c2 + 1);
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    totalColumns = Math.max(totalColumns, (_e = (_d = (_c = (_b = draft[sheetId]) === null || _b === void 0 ? void 0 : _b[rowIndex]) === null || _c === void 0 ? void 0 : _c.values) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0);
+                }
+                // The cells that actually move: everything RIGHT of the deleted block in its rows.
+                var movingRange = {
+                    startRowIndex: r1,
+                    endRowIndex: r2,
+                    startColumnIndex: c2 + 1,
+                    endColumnIndex: totalColumns,
                 };
-                // Collect unique dependents only once
+                // Dependents of the deleted block AND of the moving cells, each processed once.
                 var dependents = collectUniqueDependentsForRange({
                     draft: draft,
                     sheetId: sheetId,
-                    sourceRange: sourceRange,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: r2,
+                        startColumnIndex: c1,
+                        endColumnIndex: totalColumns,
+                    },
                     getDependents: getDependents,
                 });
+                var sheetCell = new SheetCell();
+                var contractAt = function (pos) {
+                    var _a, _b;
+                    if (pos.sheetId !== sheetId)
+                        return;
+                    var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                    var cellData = (_b = (_a = currentSheet[pos.rowIndex]) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b[pos.columnIndex];
+                    sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale, cellXfsRegistry: cellXfsRegistry, sharedStringRegistry: sharedStringRegistry });
+                    var formulaValue = sheetCell.formula;
+                    if (!formulaValue)
+                        return;
+                    var contracted = contractRangesInFormula(formulaValue, c1, count, "column", sheetName, { bandSpan: { startIndex: r1, endIndex: r2 } });
+                    if (!contracted || contracted === formulaValue)
+                        return;
+                    sheetCell.setFormulaValue(contracted, false);
+                    currentSheet[pos.rowIndex].values[pos.columnIndex] =
+                        sheetCell.getCellData();
+                };
+                var rebaseAt = function (pos) {
+                    var insideBlock = pos.sheetId === sheetId &&
+                        pos.rowIndex >= r1 &&
+                        pos.rowIndex <= r2 &&
+                        pos.columnIndex >= c1 &&
+                        pos.columnIndex <= c2;
+                    if (insideBlock)
+                        return;
+                    var moves = pos.sheetId === sheetId &&
+                        pos.columnIndex > c2 &&
+                        pos.rowIndex >= r1 &&
+                        pos.rowIndex <= r2;
+                    contractAt(pos);
+                    moveFormulaAtPosition({
+                        draft: draft,
+                        position: pos,
+                        activeSheetName: getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(pos.sheetId),
+                        enqueueCalculation: enqueueCalculation,
+                        enqueueGraphOperation: enqueueGraphOperation,
+                        recalcCells: recalcCells,
+                        movedKeys: movedKeys,
+                        rowDelta: 0,
+                        columnDelta: -count,
+                        destinationPosition: {
+                            rowIndex: pos.rowIndex,
+                            columnIndex: moves ? pos.columnIndex - count : pos.columnIndex,
+                        },
+                        sourceRange: movingRange,
+                        deletedRange: deletedRange,
+                        locale: locale,
+                        rowCount: rowCount,
+                        columnCount: columnCount,
+                        cellXfsRegistry: cellXfsRegistry,
+                        sharedStringRegistry: sharedStringRegistry,
+                    });
+                };
                 try {
-                    // Move each dependent exactly once (shift left by count)
-                    for (var _k = __values(dependents.values()), _l = _k.next(); !_l.done; _l = _k.next()) {
-                        var pos = _l.value;
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: pos,
-                            enqueueCalculation: enqueueCalculation,
-                            enqueueGraphOperation: enqueueGraphOperation,
-                            recalcCells: recalcCells,
-                            movedKeys: movedKeys,
-                            rowDelta: 0,
-                            columnDelta: -count,
-                            sourceRange: sourceRange,
-                            locale: locale,
-                            rowCount: rowCount,
-                            columnCount: columnCount,
-                            cellXfsRegistry: cellXfsRegistry,
-                            sharedStringRegistry: sharedStringRegistry,
-                        });
+                    for (var _s = __values(dependents.values()), _t = _s.next(); !_t.done; _t = _s.next()) {
+                        var pos = _t.value;
+                        rebaseAt(pos);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+                        if (_t && !_t.done && (_a = _s.return)) _a.call(_s);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
-                // Also adjust formulas that live within the selection band itself
-                for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                    var dataColumnCount = (_e = (_d = (_c = (_b = draft[sheetId]) === null || _b === void 0 ? void 0 : _b[rowIndex]) === null || _c === void 0 ? void 0 : _c.values) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
-                    var startCol = Math.min(Math.max(selection.range.startColumnIndex, 1), dataColumnCount);
-                    for (var columnIndex = startCol; columnIndex < dataColumnCount; columnIndex++) {
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
-                            enqueueCalculation: enqueueCalculation,
-                            enqueueGraphOperation: enqueueGraphOperation,
-                            recalcCells: recalcCells,
-                            movedKeys: movedKeys,
-                            rowDelta: 0,
-                            columnDelta: -count,
-                            sourceRange: sourceRange,
+                // Formulas inside the deleted block leave the graph with their cells.
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    for (var columnIndex = c1; columnIndex <= c2; columnIndex++) {
+                        var cellData = (_h = (_g = (_f = draft[sheetId]) === null || _f === void 0 ? void 0 : _f[rowIndex]) === null || _g === void 0 ? void 0 : _g.values) === null || _h === void 0 ? void 0 : _h[columnIndex];
+                        sheetCell.assign(sheetId, { rowIndex: rowIndex, columnIndex: columnIndex }, cellData, {
                             locale: locale,
-                            rowCount: rowCount,
-                            columnCount: columnCount,
-                            cellXfsRegistry: cellXfsRegistry,
-                            sharedStringRegistry: sharedStringRegistry,
                         });
+                        if (!sheetCell.isFormula())
+                            continue;
+                        var enqueueOperation = sheetCell.ephemeral()
+                            ? enqueueCalculation
+                            : enqueueGraphOperation;
+                        enqueueOperation === null || enqueueOperation === void 0 ? void 0 : enqueueOperation({
+                            type: "remove",
+                            position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
+                        });
+                    }
+                }
+                // Re-base the moving formulas themselves
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    var dataColumnCount = (_m = (_l = (_k = (_j = draft[sheetId]) === null || _j === void 0 ? void 0 : _j[rowIndex]) === null || _k === void 0 ? void 0 : _k.values) === null || _l === void 0 ? void 0 : _l.length) !== null && _m !== void 0 ? _m : 0;
+                    for (var columnIndex = c2 + 1; columnIndex < dataColumnCount; columnIndex++) {
+                        rebaseAt({ sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex });
                     }
                 }
                 // Finally delete the selected cells by splicing from right to left
-                for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                    for (var columnIndex = selection.range.endColumnIndex; columnIndex >= selection.range.startColumnIndex; columnIndex--) {
-                        if ((_g = (_f = draft[sheetId]) === null || _f === void 0 ? void 0 : _f[rowIndex]) === null || _g === void 0 ? void 0 : _g.values) {
-                            (_j = (_h = draft[sheetId][rowIndex]) === null || _h === void 0 ? void 0 : _h.values) === null || _j === void 0 ? void 0 : _j.splice(columnIndex, 1);
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    for (var columnIndex = c2; columnIndex >= c1; columnIndex--) {
+                        if ((_p = (_o = draft[sheetId]) === null || _o === void 0 ? void 0 : _o[rowIndex]) === null || _p === void 0 ? void 0 : _p.values) {
+                            (_r = (_q = draft[sheetId][rowIndex]) === null || _q === void 0 ? void 0 : _q.values) === null || _r === void 0 ? void 0 : _r.splice(columnIndex, 1);
                         }
                     }
                 }

package/dist/cjs/interface/delete-cells-shift-up.d.ts

@@ -1,5 +1,13 @@
 import type { CellInterface, SelectionArea } from "@rowsncolumns/common-types";
 import type { CellData, SelectionAttributes, Sheet } from "@rowsncolumns/spreadsheet";
 import type { UseOnDeleteCellsShiftUpProps } from "../hooks/use-on-delete-cells-shift-up";
-export declare const deleteCellsShiftUp: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeCitations, }: UseOnDeleteCellsShiftUpProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
+/**
+ * Delete cells ▸ Shift cells up (SHF-03, SHF-09). Only the selection's columns move: the selected
+ * block is removed and every cell below it slides up by the block's height. A reference to a
+ * deleted cell (or to a range the block covers entirely) becomes `#REF!` (SHF-09); a reference to a
+ * cell that slid up follows it (SHF-03); a range entirely inside the block's columns that the block
+ * partially covers contracts by the overlap. Refusals (torn merge/table/array) are decided by the
+ * hook via `getShiftCellsRefusal` before this runs.
+ */
+export declare const deleteCellsShiftUp: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }: UseOnDeleteCellsShiftUpProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
 //# sourceMappingURL=delete-cells-shift-up.d.ts.map

package/dist/cjs/interface/delete-cells-shift-up.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-cells-shift-up.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-up.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AASnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAG1F,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,gQAgBrE,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEjC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAuKnD,CAAC"}
+{"version":3,"file":"delete-cells-shift-up.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-up.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAI1F;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8RAkBrE,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEjC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAmQnD,CAAC"}

package/dist/cjs/interface/delete-cells-shift-up.js

@@ -1,62 +1,92 @@
-import { __read, __spreadArray, __values } from "tslib";
-import { selectionFromActiveCell } from "@rowsncolumns/utils";
+import { __assign, __read, __spreadArray, __values } from "tslib";
 import { produceWithPatches } from "immer";
 import { collectUniqueDependentsForRange, moveFormulaAtPosition, } from "../api/dependency";
+import { contractRangesInFormula } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
-import { moveMergedCells } from "../api/merges";
+import { shiftMergesInBand } from "../api/merges";
+import { isRangeInsideBand, isRangeInsideBlock, resolveShiftSelection, shiftBand, } from "../api/structural-guards";
+import { SheetCell } from "../sheet-cell";
+/**
+ * Delete cells ▸ Shift cells up (SHF-03, SHF-09). Only the selection's columns move: the selected
+ * block is removed and every cell below it slides up by the block's height. A reference to a
+ * deleted cell (or to a range the block covers entirely) becomes `#REF!` (SHF-09); a reference to a
+ * cell that slid up follows it (SHF-03); a range entirely inside the block's columns that the block
+ * partially covers contracts by the overlap. Refusals (torn merge/table/array) are decided by the
+ * hook via `getShiftCellsRefusal` before this runs.
+ */
 export var deleteCellsShiftUp = function (_a) {
-    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeCitations = _a.onChangeCitations;
+    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, getSheetName = _a.getSheetName, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeCitations = _a.onChangeCitations;
     return function (sheetId, activeCell, selections) {
+        var _a;
         var saveHistory = createHistory();
         var recalcCells = new Map();
-        var finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        var selection = finalSelections[finalSelections.length - 1];
-        var count = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+        var selection = resolveShiftSelection(activeCell, selections);
+        var _b = selection.range, r1 = _b.startRowIndex, r2 = _b.endRowIndex, c1 = _b.startColumnIndex, c2 = _b.endColumnIndex;
+        var count = r2 - r1 + 1;
+        var band = shiftBand("up", selection.range);
+        var deletedRange = __assign({}, selection.range);
+        var sheetName = (_a = getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(sheetId)) !== null && _a !== void 0 ? _a : "";
         enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
             kind: "delete-cells-shift-up",
             sheetId: sheetId,
-            startRowIndex: selection.range.startRowIndex,
-            endRowIndex: selection.range.endRowIndex,
-            startColumnIndex: selection.range.startColumnIndex,
-            endColumnIndex: selection.range.endColumnIndex,
+            startRowIndex: r1,
+            endRowIndex: r2,
+            startColumnIndex: c1,
+            endColumnIndex: c2,
             rowCount: rowCount,
         });
-        // Update merges on sheet rows
+        // Update merges on sheet rows — merges wholly inside the deleted block go with it; merges
+        // wholly inside the shifted columns below it ride up.
         onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
             var _a = __read(produceWithPatches(prevSheets, function (draft) {
                 var sheet = draft.find(function (s) { return s.sheetId === sheetId; });
                 if (sheet === null || sheet === void 0 ? void 0 : sheet.merges) {
-                    for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                        sheet.merges = moveMergedCells(sheet.merges, "row-remove", rowIndex);
-                    }
+                    sheet.merges = shiftMergesInBand(sheet.merges, "row", r1, count, false, c1, c2);
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ sheets: { patches: patches, inversePatches: inversePatches } });
             return nextState;
         });
+        // Tables: one wholly inside the deleted block is deleted with it (TBL-06); one wholly inside
+        // the shifted columns below the block rides up. A partial cover was refused by the hook.
+        onChangeTables === null || onChangeTables === void 0 ? void 0 : onChangeTables(function (prevTables) {
+            var _a = __read(produceWithPatches(prevTables, function (draft) {
+                for (var idx = draft.length - 1; idx >= 0; idx--) {
+                    var table = draft[idx];
+                    if (table.sheetId !== sheetId)
+                        continue;
+                    if (isRangeInsideBlock(deletedRange, table.range)) {
+                        draft.splice(idx, 1);
+                        continue;
+                    }
+                    if (isRangeInsideBand(table.range, band) &&
+                        table.range.startRowIndex > r2) {
+                        table.range.startRowIndex -= count;
+                        table.range.endRowIndex -= count;
+                    }
+                }
+            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+            saveHistory({ tables: { patches: patches, inversePatches: inversePatches } });
+            return nextState;
+        });
         // Update citations - delete if overlapping, shift back if after
         onChangeCitations === null || onChangeCitations === void 0 ? void 0 : onChangeCitations(function (prevCitations) {
             var _a = __read(produceWithPatches(prevCitations, function (draft) {
-                var deleteRowStart = selection.range.startRowIndex;
-                var deleteRowEnd = selection.range.endRowIndex;
-                var deleteColStart = selection.range.startColumnIndex;
-                var deleteColEnd = selection.range.endColumnIndex;
-                var shiftAmount = deleteRowEnd - deleteRowStart + 1;
                 for (var idx = draft.length - 1; idx >= 0; idx--) {
                     var citation = draft[idx];
                     if (citation.range.sheetId !== sheetId)
                         continue;
-                    var colsOverlap = !(citation.range.endColumnIndex < deleteColStart || citation.range.startColumnIndex > deleteColEnd);
+                    var colsOverlap = !(citation.range.endColumnIndex < c1 ||
+                        citation.range.startColumnIndex > c2);
                     if (colsOverlap) {
-                        var rowsOverlap = !(citation.range.endRowIndex < deleteRowStart || citation.range.startRowIndex > deleteRowEnd);
+                        var rowsOverlap = !(citation.range.endRowIndex < r1 ||
+                            citation.range.startRowIndex > r2);
                         if (rowsOverlap) {
                             draft.splice(idx, 1);
                         }
-                        else if (citation.range.startRowIndex > deleteRowEnd) {
-                            citation.range.startRowIndex -= shiftAmount;
-                            citation.range.endRowIndex -= shiftAmount;
+                        else if (citation.range.startRowIndex > r2) {
+                            citation.range.startRowIndex -= count;
+                            citation.range.endRowIndex -= count;
                         }
                     }
                 }
@@ -68,72 +98,124 @@ export var deleteCellsShiftUp = function (_a) {
         onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
             var _a = __read(produceWithPatches(prevSheetData, function (draft) {
                 var e_1, _a;
-                var _b, _c, _d, _e;
+                var _b, _c, _d, _e, _f, _g, _h;
                 var movedKeys = new Set();
                 var totalRows = (_c = (_b = draft[sheetId]) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
-                // Collect unique dependents across the vertical band
-                var sourceRange = {
-                    startRowIndex: selection.range.startRowIndex,
-                    endRowIndex: totalRows,
-                    startColumnIndex: selection.range.startColumnIndex,
-                    endColumnIndex: selection.range.endColumnIndex,
+                // The cells that actually move: everything BELOW the deleted block in its columns.
+                var movingRange = {
+                    startRowIndex: r2 + 1,
+                    endRowIndex: Math.max(totalRows, r2 + 1),
+                    startColumnIndex: c1,
+                    endColumnIndex: c2,
                 };
+                // Dependents of the deleted block AND of the moving cells, each processed once.
                 var dependents = collectUniqueDependentsForRange({
                     draft: draft,
                     sheetId: sheetId,
-                    sourceRange: sourceRange,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: Math.max(totalRows, r2),
+                        startColumnIndex: c1,
+                        endColumnIndex: c2,
+                    },
                     getDependents: getDependents,
                 });
+                // Contract ranges the block partially covers, then re-base: a range wholly inside the
+                // block is left to `moveFormulaAtPosition`, which turns it into `#REF!`.
+                var sheetCell = new SheetCell();
+                var contractAt = function (pos) {
+                    var _a, _b;
+                    if (pos.sheetId !== sheetId)
+                        return;
+                    var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                    var cellData = (_b = (_a = currentSheet[pos.rowIndex]) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b[pos.columnIndex];
+                    sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale, cellXfsRegistry: cellXfsRegistry, sharedStringRegistry: sharedStringRegistry });
+                    var formulaValue = sheetCell.formula;
+                    if (!formulaValue)
+                        return;
+                    var contracted = contractRangesInFormula(formulaValue, r1, count, "row", sheetName, { bandSpan: { startIndex: c1, endIndex: c2 } });
+                    if (!contracted || contracted === formulaValue)
+                        return;
+                    sheetCell.setFormulaValue(contracted, false);
+                    currentSheet[pos.rowIndex].values[pos.columnIndex] =
+                        sheetCell.getCellData();
+                };
+                var rebaseAt = function (pos) {
+                    var insideBlock = pos.sheetId === sheetId &&
+                        pos.rowIndex >= r1 &&
+                        pos.rowIndex <= r2 &&
+                        pos.columnIndex >= c1 &&
+                        pos.columnIndex <= c2;
+                    if (insideBlock)
+                        return;
+                    var moves = pos.sheetId === sheetId &&
+                        pos.rowIndex > r2 &&
+                        pos.columnIndex >= c1 &&
+                        pos.columnIndex <= c2;
+                    contractAt(pos);
+                    moveFormulaAtPosition({
+                        draft: draft,
+                        position: pos,
+                        activeSheetName: getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(pos.sheetId),
+                        enqueueCalculation: enqueueCalculation,
+                        enqueueGraphOperation: enqueueGraphOperation,
+                        recalcCells: recalcCells,
+                        movedKeys: movedKeys,
+                        rowDelta: -count,
+                        columnDelta: 0,
+                        destinationPosition: {
+                            rowIndex: moves ? pos.rowIndex - count : pos.rowIndex,
+                            columnIndex: pos.columnIndex,
+                        },
+                        sourceRange: movingRange,
+                        deletedRange: deletedRange,
+                        locale: locale,
+                        rowCount: rowCount,
+                        columnCount: columnCount,
+                        cellXfsRegistry: cellXfsRegistry,
+                        sharedStringRegistry: sharedStringRegistry,
+                    });
+                };
                 try {
-                    for (var _f = __values(dependents.values()), _g = _f.next(); !_g.done; _g = _f.next()) {
-                        var pos = _g.value;
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: pos,
-                            enqueueCalculation: enqueueCalculation,
-                            enqueueGraphOperation: enqueueGraphOperation,
-                            recalcCells: recalcCells,
-                            movedKeys: movedKeys,
-                            rowDelta: -count,
-                            columnDelta: 0,
-                            sourceRange: sourceRange,
-                            locale: locale,
-                            rowCount: rowCount,
-                            columnCount: columnCount,
-                            cellXfsRegistry: cellXfsRegistry,
-                            sharedStringRegistry: sharedStringRegistry,
-                        });
+                    for (var _j = __values(dependents.values()), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        var pos = _k.value;
+                        rebaseAt(pos);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+                        if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
-                // Adjust formulas in the band and shift values up
-                for (var rowIndex = selection.range.startRowIndex; rowIndex < totalRows; rowIndex++) {
-                    var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (var columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
-                            enqueueCalculation: enqueueCalculation,
-                            enqueueGraphOperation: enqueueGraphOperation,
-                            recalcCells: recalcCells,
-                            movedKeys: movedKeys,
-                            rowDelta: -count,
-                            columnDelta: 0,
-                            sourceRange: sourceRange,
+                // Formulas inside the deleted block leave the graph with their cells.
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    for (var columnIndex = c1; columnIndex <= c2; columnIndex++) {
+                        var cellData = (_f = (_e = (_d = draft[sheetId]) === null || _d === void 0 ? void 0 : _d[rowIndex]) === null || _e === void 0 ? void 0 : _e.values) === null || _f === void 0 ? void 0 : _f[columnIndex];
+                        sheetCell.assign(sheetId, { rowIndex: rowIndex, columnIndex: columnIndex }, cellData, {
                             locale: locale,
-                            rowCount: rowCount,
-                            columnCount: columnCount,
-                            cellXfsRegistry: cellXfsRegistry,
-                            sharedStringRegistry: sharedStringRegistry,
                         });
+                        if (!sheetCell.isFormula())
+                            continue;
+                        var enqueueOperation = sheetCell.ephemeral()
+                            ? enqueueCalculation
+                            : enqueueGraphOperation;
+                        enqueueOperation === null || enqueueOperation === void 0 ? void 0 : enqueueOperation({
+                            type: "remove",
+                            position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
+                        });
+                    }
+                }
+                // Re-base the moving formulas themselves, then shift values up
+                for (var rowIndex = r1; rowIndex < totalRows; rowIndex++) {
+                    var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
+                    for (var columnIndex = c1; columnIndex <= c2; columnIndex++) {
+                        if (rowIndex > r2) {
+                            rebaseAt({ sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex });
+                        }
                         currentSheet[rowIndex].values[columnIndex] =
-                            (_e = (_d = currentSheet[rowIndex + count]) === null || _d === void 0 ? void 0 : _d.values) === null || _e === void 0 ? void 0 : _e[columnIndex];
+                            (_h = (_g = currentSheet[rowIndex + count]) === null || _g === void 0 ? void 0 : _g.values) === null || _h === void 0 ? void 0 : _h[columnIndex];
                     }
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];

package/dist/cjs/interface/delete-column.d.ts

@@ -1,4 +1,4 @@
 import type { CellData, Sheet } from "@rowsncolumns/spreadsheet";
 import type { UseOnDeleteColumnProps } from "../hooks/use-on-delete-column";
-export declare const deleteColumn: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getSheetName, getActiveCell, getSelections, getDependents, getGraphNodes, getGraphNodesInSheet, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeActiveCell, onChangeSelections, onChangeConditionalFormats, onChangeDataValidations, onChangeCitations, onChangePivotTables, }: UseOnDeleteColumnProps<T, S>) => (sheetId: number, columnIndexes: number[]) => void;
+export declare const deleteColumn: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getSheetName, getActiveCell, getSelections, getDependents, getGraphNodes, getGraphNodesInSheet, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeActiveCell, onChangeSelections, onChangeConditionalFormats, onChangeDataValidations, onChangeCitations, onChangePivotTables, tables, getArrayRange, onChangeNamedRanges, onChangeEmbeds, onChangeCharts, onChangeProtectedRanges, }: UseOnDeleteColumnProps<T, S>) => (sheetId: number, columnIndexes: number[]) => void;
 //# sourceMappingURL=delete-column.d.ts.map