@rowsncolumns/spreadsheet-state 29.0.0 → 29.1.1

package/dist/cjs/interface/delete-table-row.js

@@ -1,7 +1,9 @@
 import { __assign, __read, __values } from "tslib";
 import { Direction } from "@rowsncolumns/common-types";
+import { getDeletableTableRowIndexes } from "@rowsncolumns/spreadsheet";
 import { getCellUserEnteredValue, getExtendedValueFormula } from "@rowsncolumns/utils";
 import { produceWithPatches } from "immer";
+import { shiftChartsOnTableEdit, tableBinding } from "../api/anchored-objects";
 import { collectUniqueDependentsForRange, moveFormulaAtPosition, } from "../api/dependency";
 import { contractRangesInFormula, createSheetCellIdentifier, } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
@@ -10,315 +12,399 @@ import { updateSheetRangeOnDelete } from "../api/range";
 import { moveFilterView } from "../api/selection";
 import { SheetCell } from "../sheet-cell";
 export var deleteTableRow = function (_a) {
-    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getSheetName = _a.getSheetName, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeDataValidations = _a.onChangeDataValidations, onChangeConditionalFormats = _a.onChangeConditionalFormats;
+    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getSheetName = _a.getSheetName, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeCharts = _a.onChangeCharts, onChangeDataValidations = _a.onChangeDataValidations, onChangeConditionalFormats = _a.onChangeConditionalFormats;
     return function (tableView, rowIndexes) {
+        var e_1, _a;
         var sheetId = tableView.sheetId;
-        rowIndexes = rowIndexes.sort(function (a, b) { return a - b; });
+        var _b = tableView.range, startColumnIndex = _b.startColumnIndex, endColumnIndex = _b.endColumnIndex;
+        // Excel's "Delete table rows" never removes the header row or the totals row: they are
+        // dropped from the request, and a request holding nothing else changes nothing.
+        rowIndexes = getDeletableTableRowIndexes(tableView, rowIndexes).sort(function (a, b) { return a - b; });
+        if (!rowIndexes.length) {
+            return;
+        }
+        // Excel never leaves a table without a data row: deleting every body row
+        // keeps ONE blank row — the lowest selected row is cleared in place while
+        // rows below it shift away.
+        var bodyStartRowIndex = tableView.range.startRowIndex + (tableView.headerRow !== false ? 1 : 0);
+        var bodyEndRowIndex = tableView.range.endRowIndex - (tableView.totalRow ? 1 : 0);
+        var blankRowIndex = rowIndexes.length > bodyEndRowIndex - bodyStartRowIndex
+            ? rowIndexes[0]
+            : undefined;
+        if (blankRowIndex !== undefined) {
+            rowIndexes = rowIndexes.slice(1);
+        }
         var saveHistory = createHistory();
-        var _a = rowIndexes, minRowIndex = _a[0], _b = rowIndexes.length - 1, maxRowIndex = _a[_b];
-        var count = rowIndexes.length;
-        var _c = tableView.range, startColumnIndex = _c.startColumnIndex, endColumnIndex = _c.endColumnIndex;
+        // We need to track this for history. Precedent cells
+        var recalcCells = new Map();
+        var clearBlankRow = function (draft) {
+            if (blankRowIndex === undefined)
+                return;
+            var currentSheet = createSheetDraft(draft, sheetId, blankRowIndex);
+            for (var columnIndex = startColumnIndex; columnIndex <= endColumnIndex; columnIndex++) {
+                currentSheet[blankRowIndex].values[columnIndex] = undefined;
+                enqueueCalculation === null || enqueueCalculation === void 0 ? void 0 : enqueueCalculation({
+                    type: "dirty",
+                    position: { sheetId: sheetId, rowIndex: blankRowIndex, columnIndex: columnIndex },
+                });
+                recalcCells.set(createSheetCellIdentifier(sheetId, blankRowIndex, columnIndex), { sheetId: sheetId, rowIndex: blankRowIndex, columnIndex: columnIndex });
+            }
+        };
+        if (!rowIndexes.length) {
+            // The only body row: nothing shifts, the row is just blanked.
+            onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
+                var _a = __read(produceWithPatches(prevSheetData, clearBlankRow), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                saveHistory({
+                    sheetData: { patches: patches, inversePatches: inversePatches },
+                    recalcCells: { undo: recalcCells, redo: recalcCells },
+                });
+                return nextState;
+            });
+            return;
+        }
         var isInsideColumnBand = function (range) {
             return range.startColumnIndex >= startColumnIndex &&
                 range.endColumnIndex <= endColumnIndex;
         };
-        enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
-            kind: "delete-table-row",
-            sheetId: sheetId,
-            index: minRowIndex,
-            count: count,
-            rowCount: rowCount,
-            startColumnIndex: tableView.range.startColumnIndex,
-            endColumnIndex: tableView.range.endColumnIndex,
-        });
-        // We need to track this for history. Precedent cells
-        var recalcCells = new Map();
-        // Update table position
-        onChangeTables === null || onChangeTables === void 0 ? void 0 : onChangeTables(function (prevTables) {
-            var _a = __read(produceWithPatches(prevTables, function (draft) {
-                var e_1, _a;
-                try {
-                    for (var draft_1 = __values(draft), draft_1_1 = draft_1.next(); !draft_1_1.done; draft_1_1 = draft_1.next()) {
-                        var table = draft_1_1.value;
-                        if (table.sheetId !== sheetId || !isInsideColumnBand(table.range)) {
-                            continue;
-                        }
-                        if (table.id === tableView.id) {
-                            table.range.endRowIndex -= count;
-                        }
-                        else if (maxRowIndex < table.range.startRowIndex) {
-                            moveFilterView(table, count, Direction.Up);
-                        }
-                    }
+        // A non-contiguous selection is not one block from its lowest row: each contiguous run of
+        // rows is one shift, and the runs go highest-first so the lower rows' indexes stay valid
+        // (the Rust engine deletes row by row the same way).
+        var runs = [];
+        try {
+            for (var rowIndexes_1 = __values(rowIndexes), rowIndexes_1_1 = rowIndexes_1.next(); !rowIndexes_1_1.done; rowIndexes_1_1 = rowIndexes_1.next()) {
+                var rowIndex = rowIndexes_1_1.value;
+                var run = runs[runs.length - 1];
+                if (run && run[1] + 1 === rowIndex) {
+                    run[1] = rowIndex;
                 }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (draft_1_1 && !draft_1_1.done && (_a = draft_1.return)) _a.call(draft_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
+                else {
+                    runs.push([rowIndex, rowIndex]);
                 }
-            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
-            // Save history
-            saveHistory({
-                tables: { patches: patches, inversePatches: inversePatches },
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (rowIndexes_1_1 && !rowIndexes_1_1.done && (_a = rowIndexes_1.return)) _a.call(rowIndexes_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        var binding = tableBinding(tableView);
+        var deleteRun = function (minRowIndex, maxRowIndex) {
+            var count = maxRowIndex - minRowIndex + 1;
+            enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
+                kind: "delete-table-row",
+                sheetId: sheetId,
+                index: minRowIndex,
+                count: count,
+                rowCount: rowCount,
+                startColumnIndex: tableView.range.startColumnIndex,
+                endColumnIndex: tableView.range.endColumnIndex,
             });
-            return nextState;
-        });
-        // Update data validations
-        onChangeDataValidations === null || onChangeDataValidations === void 0 ? void 0 : onChangeDataValidations(function (prevValidations) {
-            var _a = __read(produceWithPatches(prevValidations, function (draft) {
-                var _a, _b;
-                for (var idx = draft.length - 1; idx >= 0; idx--) {
-                    var rule = draft[idx];
-                    var ranges = (_b = (_a = rule.ranges) === null || _a === void 0 ? void 0 : _a.map(function (range) {
-                        return isInsideColumnBand(range)
-                            ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
-                            : range;
-                    }).filter(function (range) { return !!range; })) !== null && _b !== void 0 ? _b : [];
-                    if (ranges.length) {
-                        rule.ranges = ranges;
+            // Update table position
+            onChangeTables === null || onChangeTables === void 0 ? void 0 : onChangeTables(function (prevTables) {
+                var _a = __read(produceWithPatches(prevTables, function (draft) {
+                    var e_2, _a;
+                    try {
+                        for (var draft_1 = __values(draft), draft_1_1 = draft_1.next(); !draft_1_1.done; draft_1_1 = draft_1.next()) {
+                            var table = draft_1_1.value;
+                            if (table.sheetId !== sheetId || !isInsideColumnBand(table.range)) {
+                                continue;
+                            }
+                            if (table.id === tableView.id) {
+                                table.range.endRowIndex -= count;
+                            }
+                            else if (maxRowIndex < table.range.startRowIndex) {
+                                moveFilterView(table, count, Direction.Up);
+                            }
+                        }
                     }
-                    else {
-                        draft.splice(idx, 1);
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (draft_1_1 && !draft_1_1.done && (_a = draft_1.return)) _a.call(draft_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
                     }
-                }
-            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
-            saveHistory({
-                dataValidations: { patches: patches, inversePatches: inversePatches },
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                // Save history
+                saveHistory({
+                    tables: { patches: patches, inversePatches: inversePatches },
+                });
+                return nextState;
             });
-            return nextState;
-        });
-        // Update conditional formats
-        onChangeConditionalFormats === null || onChangeConditionalFormats === void 0 ? void 0 : onChangeConditionalFormats(function (prevConditionalFormats) {
-            var _a = __read(produceWithPatches(prevConditionalFormats, function (draft) {
-                var _a, _b;
-                for (var idx = draft.length - 1; idx >= 0; idx--) {
-                    var rule = draft[idx];
-                    var ranges = (_b = (_a = rule.ranges) === null || _a === void 0 ? void 0 : _a.map(function (range) {
-                        return isInsideColumnBand(range)
-                            ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
-                            : range;
-                    }).filter(function (range) { return !!range; })) !== null && _b !== void 0 ? _b : [];
-                    if (ranges.length) {
-                        rule.ranges = ranges;
-                    }
-                    else {
-                        draft.splice(idx, 1);
-                    }
-                }
-            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
-            saveHistory({
-                conditionalFormats: { patches: patches, inversePatches: inversePatches },
+            // Chart ranges inside the table's columns follow the shifted cells; a range bound to the table
+            // (a column's body, or header + body) shrinks with it.
+            onChangeCharts === null || onChangeCharts === void 0 ? void 0 : onChangeCharts(function (prevCharts) {
+                var _a = __read(produceWithPatches(prevCharts, function (draft) {
+                    shiftChartsOnTableEdit(draft, sheetId, binding, "row", "delete", minRowIndex, count);
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                saveHistory({ charts: { patches: patches, inversePatches: inversePatches } });
+                return nextState;
             });
-            return nextState;
-        });
-        // Update sheets
-        onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
-            var _a = __read(produceWithPatches(prevSheets, function (draft) {
-                var _a;
-                var sheet = draft.find(function (sheet) { return sheet.sheetId === sheetId; });
-                if (sheet) {
-                    if (sheet.rowMetadata) {
-                        sheet.rowMetadata.splice(minRowIndex, count);
-                    }
-                    if (sheet.basicFilter &&
-                        isInsideColumnBand(sheet.basicFilter.range)) {
-                        if (minRowIndex < sheet.basicFilter.range.startRowIndex) {
-                            moveFilterView(sheet.basicFilter, count, Direction.Up);
+            // Update data validations
+            onChangeDataValidations === null || onChangeDataValidations === void 0 ? void 0 : onChangeDataValidations(function (prevValidations) {
+                var _a = __read(produceWithPatches(prevValidations, function (draft) {
+                    var _a, _b;
+                    for (var idx = draft.length - 1; idx >= 0; idx--) {
+                        var rule = draft[idx];
+                        var ranges = (_b = (_a = rule.ranges) === null || _a === void 0 ? void 0 : _a.map(function (range) {
+                            return isInsideColumnBand(range)
+                                ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
+                                : range;
+                        }).filter(function (range) { return !!range; })) !== null && _b !== void 0 ? _b : [];
+                        if (ranges.length) {
+                            rule.ranges = ranges;
                         }
-                        if (minRowIndex > sheet.basicFilter.range.startRowIndex &&
-                            minRowIndex <= sheet.basicFilter.range.endRowIndex) {
-                            sheet.basicFilter.range.endRowIndex -= count;
+                        else {
+                            draft.splice(idx, 1);
                         }
                     }
-                    if (sheet.merges) {
-                        sheet.merges = moveMergedCells(sheet.merges, "row-remove", minRowIndex, count, function (area) {
-                            return (area.startColumnIndex >= tableView.range.startColumnIndex &&
-                                area.endColumnIndex <= tableView.range.endColumnIndex);
-                        });
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                saveHistory({
+                    dataValidations: { patches: patches, inversePatches: inversePatches },
+                });
+                return nextState;
+            });
+            // Update conditional formats
+            onChangeConditionalFormats === null || onChangeConditionalFormats === void 0 ? void 0 : onChangeConditionalFormats(function (prevConditionalFormats) {
+                var _a = __read(produceWithPatches(prevConditionalFormats, function (draft) {
+                    var _a, _b;
+                    for (var idx = draft.length - 1; idx >= 0; idx--) {
+                        var rule = draft[idx];
+                        var ranges = (_b = (_a = rule.ranges) === null || _a === void 0 ? void 0 : _a.map(function (range) {
+                            return isInsideColumnBand(range)
+                                ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
+                                : range;
+                        }).filter(function (range) { return !!range; })) !== null && _b !== void 0 ? _b : [];
+                        if (ranges.length) {
+                            rule.ranges = ranges;
+                        }
+                        else {
+                            draft.splice(idx, 1);
+                        }
                     }
-                    sheet.rowCount = Math.max(1, ((_a = sheet.rowCount) !== null && _a !== void 0 ? _a : rowCount) - count);
-                }
-            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
-            // Save history
-            saveHistory({
-                sheets: { patches: patches, inversePatches: inversePatches },
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                saveHistory({
+                    conditionalFormats: { patches: patches, inversePatches: inversePatches },
+                });
+                return nextState;
             });
-            return nextState;
-        });
-        // Sheet data
-        onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
-            var _a = __read(produceWithPatches(prevSheetData, function (draft) {
-                var e_2, _a, e_3, _b;
-                var _c, _d, _e, _f, _g, _h, _j, _k;
-                var movedKeys = new Set();
-                var totalRows = (_d = (_c = draft[sheetId]) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
-                var sourceRange = __assign(__assign({}, tableView.range), { startRowIndex: maxRowIndex + 1 });
-                /**
-                 * THREE-PASS FORMULA UPDATE STRATEGY FOR DELETION:
-                 *
-                 * PASS 1 (lines below): Contract ranges when deletion overlaps with them
-                 *   Example: Delete table row 5, =SUM(A1:A10) → =SUM(A1:A9)
-                 *   Uses dependency graph to find only formulas that reference the deletion range (efficient!)
-                 *
-                 * PASS 2 (after this loop): Shift references in formulas that DEPEND ON the moved cells
-                 *   Example: If A10 is moved to A9, formulas referencing A10 must update
-                 *   Uses dependency graph to find only affected formulas (efficient)
-                 *
-                 * PASS 3 (final loop): Shift references in formulas WITHIN the moved cells themselves
-                 *   Example: If A11 contains =A1+A2 and moves to A10, references stay the same
-                 *   But if it contains =A15, it needs adjustment based on sourceRange exclusion
-                 *
-                 * The 'movedKeys' Set ensures no formula is processed twice across passes 2 & 3.
-                 * Range contraction (Pass 1) doesn't interfere with reference shifting (Pass 2 & 3).
-                 */
-                // PASS 1: Contract ranges using dependency graph (OPTIMIZED!)
-                // Collect formulas that reference cells in the deletion range
-                var deletionRange = {
-                    startRowIndex: minRowIndex,
-                    endRowIndex: minRowIndex + count - 1,
-                    startColumnIndex: tableView.range.startColumnIndex,
-                    endColumnIndex: tableView.range.endColumnIndex,
-                };
-                var formulasToContract = collectUniqueDependentsForRange({
-                    draft: draft,
-                    sheetId: sheetId,
-                    sourceRange: deletionRange,
-                    getDependents: getDependents,
+            // Update sheets
+            onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
+                var _a = __read(produceWithPatches(prevSheets, function (draft) {
+                    var _a;
+                    var sheet = draft.find(function (sheet) { return sheet.sheetId === sheetId; });
+                    if (sheet) {
+                        if (sheet.rowMetadata) {
+                            sheet.rowMetadata.splice(minRowIndex, count);
+                        }
+                        if (sheet.basicFilter &&
+                            isInsideColumnBand(sheet.basicFilter.range)) {
+                            if (minRowIndex < sheet.basicFilter.range.startRowIndex) {
+                                moveFilterView(sheet.basicFilter, count, Direction.Up);
+                            }
+                            if (minRowIndex > sheet.basicFilter.range.startRowIndex &&
+                                minRowIndex <= sheet.basicFilter.range.endRowIndex) {
+                                sheet.basicFilter.range.endRowIndex -= count;
+                            }
+                        }
+                        if (sheet.merges) {
+                            sheet.merges = moveMergedCells(sheet.merges, "row-remove", minRowIndex, count, function (area) {
+                                return (area.startColumnIndex >= tableView.range.startColumnIndex &&
+                                    area.endColumnIndex <= tableView.range.endColumnIndex);
+                            });
+                        }
+                        sheet.rowCount = Math.max(1, ((_a = sheet.rowCount) !== null && _a !== void 0 ? _a : rowCount) - count);
+                    }
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                // Save history
+                saveHistory({
+                    sheets: { patches: patches, inversePatches: inversePatches },
                 });
-                var sheetCell = new SheetCell();
-                try {
-                    for (var _l = __values(formulasToContract.values()), _m = _l.next(); !_m.done; _m = _l.next()) {
-                        var pos = _m.value;
-                        var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
-                        var cellData = (_f = (_e = currentSheet[pos.rowIndex]) === null || _e === void 0 ? void 0 : _e.values) === null || _f === void 0 ? void 0 : _f[pos.columnIndex];
-                        if (!cellData)
-                            continue;
-                        // Check if cell has a formula
-                        sheetCell.assign(pos.sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale });
-                        var formulaValue = sheetCell.formula;
-                        if (formulaValue) {
-                            var activeSheetName = getSheetName(pos.sheetId);
-                            var contractedFormula = contractRangesInFormula(formulaValue, minRowIndex, count, "row", activeSheetName);
-                            // Update the formula if it changed
-                            if (contractedFormula && contractedFormula !== formulaValue) {
-                                // Preserve stale effective value until recalculation completes
-                                sheetCell.setFormulaValue(contractedFormula, false);
-                                currentSheet[pos.rowIndex].values[pos.columnIndex] =
-                                    sheetCell.getCellData();
-                                // Adjust row index for formulas below the deleted range
-                                // (they will shift up by `count` after the splice)
-                                var adjustedRowIndex = pos.sheetId === sheetId && pos.rowIndex > maxRowIndex
-                                    ? pos.rowIndex - count
-                                    : pos.rowIndex;
-                                enqueueCalculation === null || enqueueCalculation === void 0 ? void 0 : enqueueCalculation({
-                                    type: "add",
-                                    position: {
+                return nextState;
+            });
+            // Sheet data
+            onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
+                var _a = __read(produceWithPatches(prevSheetData, function (draft) {
+                    var e_3, _a, e_4, _b;
+                    var _c, _d, _e, _f, _g, _h, _j, _k;
+                    var movedKeys = new Set();
+                    var totalRows = (_d = (_c = draft[sheetId]) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
+                    // Every cell of the table's columns below the deleted run shifts up — through the
+                    // sheet's last used row, not just the table's — so formulas inside that band and
+                    // references into it re-anchor over the whole band (mirrors `insertTableRow`).
+                    var sourceRange = __assign(__assign({}, tableView.range), { startRowIndex: maxRowIndex + 1, endRowIndex: Math.max(tableView.range.endRowIndex, totalRows - 1) });
+                    /**
+                     * THREE-PASS FORMULA UPDATE STRATEGY FOR DELETION:
+                     *
+                     * PASS 1 (lines below): Contract ranges when deletion overlaps with them
+                     *   Example: Delete table row 5, =SUM(A1:A10) → =SUM(A1:A9)
+                     *   Uses dependency graph to find only formulas that reference the deletion range (efficient!)
+                     *
+                     * PASS 2 (after this loop): Shift references in formulas that DEPEND ON the moved cells
+                     *   Example: If A10 is moved to A9, formulas referencing A10 must update
+                     *   Uses dependency graph to find only affected formulas (efficient)
+                     *
+                     * PASS 3 (final loop): Shift references in formulas WITHIN the moved cells themselves
+                     *   Example: If A11 contains =A1+A2 and moves to A10, references stay the same
+                     *   But if it contains =A15, it needs adjustment based on sourceRange exclusion
+                     *
+                     * The 'movedKeys' Set ensures no formula is processed twice across passes 2 & 3.
+                     * Range contraction (Pass 1) doesn't interfere with reference shifting (Pass 2 & 3).
+                     */
+                    // PASS 1: Contract ranges using dependency graph (OPTIMIZED!)
+                    // Collect formulas that reference cells in the deletion range
+                    var deletionRange = {
+                        startRowIndex: minRowIndex,
+                        endRowIndex: minRowIndex + count - 1,
+                        startColumnIndex: tableView.range.startColumnIndex,
+                        endColumnIndex: tableView.range.endColumnIndex,
+                    };
+                    var formulasToContract = collectUniqueDependentsForRange({
+                        draft: draft,
+                        sheetId: sheetId,
+                        sourceRange: deletionRange,
+                        getDependents: getDependents,
+                    });
+                    var sheetCell = new SheetCell();
+                    try {
+                        for (var _l = __values(formulasToContract.values()), _m = _l.next(); !_m.done; _m = _l.next()) {
+                            var pos = _m.value;
+                            var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                            var cellData = (_f = (_e = currentSheet[pos.rowIndex]) === null || _e === void 0 ? void 0 : _e.values) === null || _f === void 0 ? void 0 : _f[pos.columnIndex];
+                            if (!cellData)
+                                continue;
+                            // Check if cell has a formula
+                            sheetCell.assign(pos.sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale });
+                            var formulaValue = sheetCell.formula;
+                            if (formulaValue) {
+                                var activeSheetName = getSheetName(pos.sheetId);
+                                var contractedFormula = contractRangesInFormula(formulaValue, minRowIndex, count, "row", activeSheetName);
+                                // Update the formula if it changed
+                                if (contractedFormula && contractedFormula !== formulaValue) {
+                                    // Preserve stale effective value until recalculation completes
+                                    sheetCell.setFormulaValue(contractedFormula, false);
+                                    currentSheet[pos.rowIndex].values[pos.columnIndex] =
+                                        sheetCell.getCellData();
+                                    // Adjust row index for formulas below the deleted range
+                                    // (they will shift up by `count` after the splice)
+                                    var adjustedRowIndex = pos.sheetId === sheetId && pos.rowIndex > maxRowIndex
+                                        ? pos.rowIndex - count
+                                        : pos.rowIndex;
+                                    enqueueCalculation === null || enqueueCalculation === void 0 ? void 0 : enqueueCalculation({
+                                        type: "add",
+                                        position: {
+                                            sheetId: pos.sheetId,
+                                            rowIndex: adjustedRowIndex,
+                                            columnIndex: pos.columnIndex,
+                                        },
+                                        force: true,
+                                    });
+                                    recalcCells.set(createSheetCellIdentifier(pos.sheetId, adjustedRowIndex, pos.columnIndex), {
                                         sheetId: pos.sheetId,
                                         rowIndex: adjustedRowIndex,
                                         columnIndex: pos.columnIndex,
-                                    },
-                                    force: true,
-                                });
-                                recalcCells.set(createSheetCellIdentifier(pos.sheetId, adjustedRowIndex, pos.columnIndex), {
-                                    sheetId: pos.sheetId,
-                                    rowIndex: adjustedRowIndex,
-                                    columnIndex: pos.columnIndex,
-                                    force: true,
-                                });
+                                        force: true,
+                                    });
+                                }
                             }
                         }
                     }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-                // PASS 2: Collect and process formulas that DEPEND ON the moved cells
-                var dependents = collectUniqueDependentsForRange({
-                    draft: draft,
-                    sheetId: sheetId,
-                    sourceRange: sourceRange,
-                    getDependents: getDependents,
-                });
-                try {
-                    for (var _o = __values(dependents.values()), _p = _o.next(); !_p.done; _p = _o.next()) {
-                        var pos = _p.value;
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: pos,
-                            activeSheetName: getSheetName(pos.sheetId),
-                            enqueueCalculation: enqueueCalculation,
-                            enqueueGraphOperation: enqueueGraphOperation,
-                            recalcCells: recalcCells,
-                            movedKeys: movedKeys,
-                            rowDelta: -count,
-                            columnDelta: 0,
-                            sourceRange: sourceRange,
-                            locale: locale,
-                            rowCount: rowCount,
-                            columnCount: columnCount,
-                            cellXfsRegistry: cellXfsRegistry,
-                            sharedStringRegistry: sharedStringRegistry,
-                        });
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
+                        }
+                        finally { if (e_3) throw e_3.error; }
                     }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
+                    // PASS 2: Collect and process formulas that DEPEND ON the moved cells
+                    var dependents = collectUniqueDependentsForRange({
+                        draft: draft,
+                        sheetId: sheetId,
+                        sourceRange: sourceRange,
+                        getDependents: getDependents,
+                    });
                     try {
-                        if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
+                        for (var _o = __values(dependents.values()), _p = _o.next(); !_p.done; _p = _o.next()) {
+                            var pos = _p.value;
+                            moveFormulaAtPosition({
+                                draft: draft,
+                                position: pos,
+                                activeSheetName: getSheetName(pos.sheetId),
+                                enqueueCalculation: enqueueCalculation,
+                                enqueueGraphOperation: enqueueGraphOperation,
+                                recalcCells: recalcCells,
+                                movedKeys: movedKeys,
+                                rowDelta: -count,
+                                columnDelta: 0,
+                                sourceRange: sourceRange,
+                                locale: locale,
+                                rowCount: rowCount,
+                                columnCount: columnCount,
+                                cellXfsRegistry: cellXfsRegistry,
+                                sharedStringRegistry: sharedStringRegistry,
+                            });
+                        }
                     }
-                    finally { if (e_3) throw e_3.error; }
-                }
-                // PASS 3: Process formulas WITHIN the moved cells themselves
-                for (var rowIndex = minRowIndex; rowIndex <= tableView.range.endRowIndex; rowIndex++) {
-                    var rowValues = (_h = (_g = draft[sheetId]) === null || _g === void 0 ? void 0 : _g[rowIndex]) === null || _h === void 0 ? void 0 : _h.values;
-                    if (!rowValues) {
-                        continue;
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
+                        }
+                        finally { if (e_4) throw e_4.error; }
                     }
-                    for (var columnIndex = tableView.range.startColumnIndex; columnIndex <= tableView.range.endColumnIndex; columnIndex++) {
-                        var cellData = rowValues === null || rowValues === void 0 ? void 0 : rowValues[columnIndex];
-                        var hasFormula = !!getExtendedValueFormula(getCellUserEnteredValue(cellData));
-                        if (!hasFormula) {
+                    // PASS 3: Process formulas WITHIN the moved cells themselves
+                    for (var rowIndex = minRowIndex; rowIndex <= sourceRange.endRowIndex; rowIndex++) {
+                        var rowValues = (_h = (_g = draft[sheetId]) === null || _g === void 0 ? void 0 : _g[rowIndex]) === null || _h === void 0 ? void 0 : _h.values;
+                        if (!rowValues) {
                             continue;
                         }
-                        moveFormulaAtPosition({
-                            draft: draft,
-                            position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
-                            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 columnIndex = tableView.range.startColumnIndex; columnIndex <= tableView.range.endColumnIndex; columnIndex++) {
+                            var cellData = rowValues === null || rowValues === void 0 ? void 0 : rowValues[columnIndex];
+                            var hasFormula = !!getExtendedValueFormula(getCellUserEnteredValue(cellData));
+                            if (!hasFormula) {
+                                continue;
+                            }
+                            moveFormulaAtPosition({
+                                draft: draft,
+                                position: { sheetId: sheetId, rowIndex: rowIndex, columnIndex: columnIndex },
+                                enqueueCalculation: enqueueCalculation,
+                                enqueueGraphOperation: enqueueGraphOperation,
+                                recalcCells: recalcCells,
+                                movedKeys: movedKeys,
+                                rowDelta: -count,
+                                columnDelta: 0,
+                                sourceRange: sourceRange,
+                                locale: locale,
+                                rowCount: rowCount,
+                                columnCount: columnCount,
+                                cellXfsRegistry: cellXfsRegistry,
+                                sharedStringRegistry: sharedStringRegistry,
+                            });
+                        }
                     }
-                }
-                // Shift values up inside the table range
-                for (var rowIndex = minRowIndex; rowIndex < totalRows; rowIndex++) {
-                    var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (var columnIndex = tableView.range.startColumnIndex; columnIndex <= tableView.range.endColumnIndex; columnIndex++) {
-                        currentSheet[rowIndex].values[columnIndex] =
-                            (_k = (_j = currentSheet[rowIndex + count]) === null || _j === void 0 ? void 0 : _j.values) === null || _k === void 0 ? void 0 : _k[columnIndex];
+                    clearBlankRow(draft);
+                    // Shift values up inside the table range
+                    for (var rowIndex = minRowIndex; rowIndex < totalRows; rowIndex++) {
+                        var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
+                        for (var columnIndex = tableView.range.startColumnIndex; columnIndex <= tableView.range.endColumnIndex; columnIndex++) {
+                            currentSheet[rowIndex].values[columnIndex] =
+                                (_k = (_j = currentSheet[rowIndex + count]) === null || _j === void 0 ? void 0 : _j.values) === null || _k === void 0 ? void 0 : _k[columnIndex];
+                        }
                     }
-                }
-            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
-            // Save history
-            saveHistory({
-                sheetData: { patches: patches, inversePatches: inversePatches },
-                recalcCells: { undo: recalcCells, redo: recalcCells },
+                }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+                // Save history
+                saveHistory({
+                    sheetData: { patches: patches, inversePatches: inversePatches },
+                    recalcCells: { undo: recalcCells, redo: recalcCells },
+                });
+                return nextState;
             });
-            return nextState;
-        });
+            binding = __assign(__assign({}, binding), { range: __assign(__assign({}, binding.range), { endRowIndex: binding.range.endRowIndex - count }), bodyEndRowIndex: binding.bodyEndRowIndex - count });
+        };
+        for (var idx = runs.length - 1; idx >= 0; idx--) {
+            deleteRun(runs[idx][0], runs[idx][1]);
+        }
     };
 };