@rowsncolumns/spreadsheet-state 29.1.3 → 29.1.6

package/dist/cjs/interface/delete-column.js

@@ -7,17 +7,24 @@ import { updateNamedRangesOnStructuralChange, updatePrintSettingsOnStructuralCha
 import { shiftPivotsOnDelete } from "../api/pivot-range";
 import { updateRangedRulesOnStructuralChange } from "../api/range-rule-helpers";
 import { moveFilterView } from "../api/selection";
-import { updateFormulasForStructuralChange } from "../api/structural-formula-update";
+import { contiguousRuns, updateFormulasForStructuralChange, } from "../api/structural-formula-update";
 import { breakStructuredRefsForRemovedTableParts, collectRemovedTableParts, removeSpillsOfDeletedAnchors, } from "../api/structural-table-refs";
 export var deleteColumn = function (_a) {
     var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getSheetName = _a.getSheetName, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, getGraphNodes = _a.getGraphNodes, getGraphNodesInSheet = _a.getGraphNodesInSheet, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeActiveCell = _a.onChangeActiveCell, onChangeSelections = _a.onChangeSelections, onChangeConditionalFormats = _a.onChangeConditionalFormats, onChangeDataValidations = _a.onChangeDataValidations, onChangeCitations = _a.onChangeCitations, onChangePivotTables = _a.onChangePivotTables, tables = _a.tables, getArrayRange = _a.getArrayRange, onChangeNamedRanges = _a.onChangeNamedRanges, onChangeEmbeds = _a.onChangeEmbeds, onChangeSlicers = _a.onChangeSlicers, onChangeCharts = _a.onChangeCharts, onChangeProtectedRanges = _a.onChangeProtectedRanges;
     return function (sheetId, columnIndexes) {
         if (!columnIndexes.length)
             return;
-        var sortedColumnIndexes = __spreadArray([], __read(columnIndexes), false).sort(function (a, b) { return a - b; });
+        var sortedColumnIndexes = __spreadArray([], __read(new Set(columnIndexes)), false).sort(function (a, b) { return a - b; });
         var minColumnIndex = sortedColumnIndexes[0];
         var maxColumnIndex = sortedColumnIndexes[sortedColumnIndexes.length - 1];
         var count = sortedColumnIndexes.length;
+        // A Ctrl-selected delete (columns B and D) is several contiguous bands;
+        // band-shaped updates run once per band, LAST band first (see `deleteRow`).
+        var runs = contiguousRuns(sortedColumnIndexes);
+        var runsDescending = __spreadArray([], __read(runs), false).reverse();
+        var isDeleted = function (columnIndex) {
+            return sortedColumnIndexes.includes(columnIndex);
+        };
         var saveHistory = createHistory();
         enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
             kind: "delete-column",
@@ -75,8 +82,13 @@ export var deleteColumn = function (_a) {
                     }
                     if (minColumnIndex > endColumnIndex)
                         continue;
-                    if (minColumnIndex <= startColumnIndex &&
-                        maxColumnIndex >= endColumnIndex) {
+                    // The table's own columns that go — every one of them removes the table.
+                    var removedOffsets = [];
+                    for (var column = startColumnIndex; column <= endColumnIndex; column++) {
+                        if (isDeleted(column))
+                            removedOffsets.push(column - startColumnIndex);
+                    }
+                    if (removedOffsets.length === endColumnIndex - startColumnIndex + 1) {
                         draft.splice(idx, 1);
                         continue;
                     }
@@ -84,9 +96,7 @@ export var deleteColumn = function (_a) {
                         try {
                             for (var _e = (e_1 = void 0, __values(table.filterSpecs)), _f = _e.next(); !_f.done; _f = _e.next()) {
                                 var spec = _f.value;
-                                if (spec.columnIndex >= minColumnIndex) {
-                                    spec.columnIndex -= count;
-                                }
+                                spec.columnIndex -= deletedBefore(spec.columnIndex);
                             }
                         }
                         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -101,9 +111,7 @@ export var deleteColumn = function (_a) {
                         try {
                             for (var _g = (e_2 = void 0, __values(table.sortSpecs)), _h = _g.next(); !_h.done; _h = _g.next()) {
                                 var spec = _h.value;
-                                if (spec.dimensionIndex >= minColumnIndex) {
-                                    spec.dimensionIndex -= count;
-                                }
+                                spec.dimensionIndex -= deletedBefore(spec.dimensionIndex);
                             }
                         }
                         catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -114,15 +122,17 @@ export var deleteColumn = function (_a) {
                             finally { if (e_2) throw e_2.error; }
                         }
                     }
-                    var overlapStart = Math.max(minColumnIndex, startColumnIndex);
-                    var overlapEnd = Math.min(maxColumnIndex, endColumnIndex);
-                    var removed = overlapEnd - overlapStart + 1;
-                    (_c = table.columns) === null || _c === void 0 ? void 0 : _c.splice(overlapStart - startColumnIndex, removed);
-                    table.range.startColumnIndex = Math.min(startColumnIndex, minColumnIndex);
+                    for (var i = removedOffsets.length - 1; i >= 0; i--) {
+                        (_c = table.columns) === null || _c === void 0 ? void 0 : _c.splice(removedOffsets[i], 1);
+                    }
+                    // The table moves left by the columns deleted before it (a deleted
+                    // leading column is one of its own, so it counts as removed, not moved).
+                    table.range.startColumnIndex =
+                        startColumnIndex - deletedBefore(startColumnIndex);
                     table.range.endColumnIndex =
                         table.range.startColumnIndex +
                             (endColumnIndex - startColumnIndex) -
-                            removed;
+                            removedOffsets.length;
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ tables: { patches: patches, inversePatches: inversePatches } });
@@ -131,7 +141,20 @@ export var deleteColumn = function (_a) {
         // Data validations
         onChangeDataValidations === null || onChangeDataValidations === void 0 ? void 0 : onChangeDataValidations(function (prevValidations) {
             var _a = __read(produceWithPatches(prevValidations, function (draft) {
-                updateRangedRulesOnStructuralChange(draft, "delete", "column", minColumnIndex, count, sheetId, { getSheetName: getSheetName });
+                var e_3, _a;
+                try {
+                    for (var runsDescending_1 = __values(runsDescending), runsDescending_1_1 = runsDescending_1.next(); !runsDescending_1_1.done; runsDescending_1_1 = runsDescending_1.next()) {
+                        var run = runsDescending_1_1.value;
+                        updateRangedRulesOnStructuralChange(draft, "delete", "column", run.start, run.count, sheetId, { getSheetName: getSheetName });
+                    }
+                }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_1_1 && !runsDescending_1_1.done && (_a = runsDescending_1.return)) _a.call(runsDescending_1);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ dataValidations: { patches: patches, inversePatches: inversePatches } });
             return nextState;
@@ -139,7 +162,20 @@ export var deleteColumn = function (_a) {
         // Conditional formats
         onChangeConditionalFormats === null || onChangeConditionalFormats === void 0 ? void 0 : onChangeConditionalFormats(function (prevConditionalFormats) {
             var _a = __read(produceWithPatches(prevConditionalFormats, function (draft) {
-                updateRangedRulesOnStructuralChange(draft, "delete", "column", minColumnIndex, count, sheetId, { getSheetName: getSheetName });
+                var e_4, _a;
+                try {
+                    for (var runsDescending_2 = __values(runsDescending), runsDescending_2_1 = runsDescending_2.next(); !runsDescending_2_1.done; runsDescending_2_1 = runsDescending_2.next()) {
+                        var run = runsDescending_2_1.value;
+                        updateRangedRulesOnStructuralChange(draft, "delete", "column", run.start, run.count, sheetId, { getSheetName: getSheetName });
+                    }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_2_1 && !runsDescending_2_1.done && (_a = runsDescending_2.return)) _a.call(runsDescending_2);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ conditionalFormats: { patches: patches, inversePatches: inversePatches } });
             return nextState;
@@ -148,7 +184,20 @@ export var deleteColumn = function (_a) {
         // deleted is kept as `#REF!` so its users evaluate `#REF!`, like Excel.
         onChangeNamedRanges === null || onChangeNamedRanges === void 0 ? void 0 : onChangeNamedRanges(function (prevNamedRanges) {
             var _a = __read(produceWithPatches(prevNamedRanges, function (draft) {
-                updateNamedRangesOnStructuralChange(draft, "column", "delete", minColumnIndex, count, sheetId);
+                var e_5, _a;
+                try {
+                    for (var runsDescending_3 = __values(runsDescending), runsDescending_3_1 = runsDescending_3.next(); !runsDescending_3_1.done; runsDescending_3_1 = runsDescending_3.next()) {
+                        var run = runsDescending_3_1.value;
+                        updateNamedRangesOnStructuralChange(draft, "column", "delete", run.start, run.count, sheetId, { length: columnCount });
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_3_1 && !runsDescending_3_1.done && (_a = runsDescending_3.return)) _a.call(runsDescending_3);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ namedRanges: { patches: patches, inversePatches: inversePatches } });
             return nextState;
@@ -156,7 +205,20 @@ export var deleteColumn = function (_a) {
         // Shift pivot tables.
         onChangePivotTables === null || onChangePivotTables === void 0 ? void 0 : onChangePivotTables(function (prevPivots) {
             var _a = __read(produceWithPatches(prevPivots, function (draft) {
-                shiftPivotsOnDelete(draft, sheetId, "column", minColumnIndex, count);
+                var e_6, _a;
+                try {
+                    for (var runsDescending_4 = __values(runsDescending), runsDescending_4_1 = runsDescending_4.next(); !runsDescending_4_1.done; runsDescending_4_1 = runsDescending_4.next()) {
+                        var run = runsDescending_4_1.value;
+                        shiftPivotsOnDelete(draft, sheetId, "column", run.start, run.count);
+                    }
+                }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_4_1 && !runsDescending_4_1.done && (_a = runsDescending_4.return)) _a.call(runsDescending_4);
+                    }
+                    finally { if (e_6) throw e_6.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ pivotTables: { patches: patches, inversePatches: inversePatches } });
             return nextState;
@@ -165,25 +227,38 @@ export var deleteColumn = function (_a) {
         onChangeCitations === null || onChangeCitations === void 0 ? void 0 : onChangeCitations(function (prevCitations) {
             var updatedAt = new Date().toISOString();
             var _a = __read(produceWithPatches(prevCitations, function (draft) {
-                var deleteEnd = minColumnIndex + count - 1;
-                for (var idx = draft.length - 1; idx >= 0; idx--) {
-                    var citation = draft[idx];
-                    if (citation.range.sheetId !== sheetId)
-                        continue;
-                    var citationStart = citation.range.startColumnIndex;
-                    var citationEnd = citation.range.endColumnIndex;
-                    if (citationStart <= deleteEnd && citationEnd >= minColumnIndex) {
-                        // Soft-delete: keep the record for provenance / undo, hide it from the UI
-                        if (citation.active !== false) {
-                            citation.active = false;
-                            citation.updated_at = updatedAt;
+                var e_7, _a;
+                try {
+                    for (var runsDescending_5 = __values(runsDescending), runsDescending_5_1 = runsDescending_5.next(); !runsDescending_5_1.done; runsDescending_5_1 = runsDescending_5.next()) {
+                        var run = runsDescending_5_1.value;
+                        var deleteEnd = run.start + run.count - 1;
+                        for (var idx = draft.length - 1; idx >= 0; idx--) {
+                            var citation = draft[idx];
+                            if (citation.range.sheetId !== sheetId)
+                                continue;
+                            var citationStart = citation.range.startColumnIndex;
+                            var citationEnd = citation.range.endColumnIndex;
+                            if (citationStart <= deleteEnd && citationEnd >= run.start) {
+                                // Soft-delete: keep the record for provenance / undo, hide it from the UI
+                                if (citation.active !== false) {
+                                    citation.active = false;
+                                    citation.updated_at = updatedAt;
+                                }
+                            }
+                            else if (citationStart > deleteEnd) {
+                                citation.range.startColumnIndex -= run.count;
+                                citation.range.endColumnIndex -= run.count;
+                                refreshCitationAnchor(citation);
+                            }
                         }
                     }
-                    else if (citationStart > deleteEnd) {
-                        citation.range.startColumnIndex -= count;
-                        citation.range.endColumnIndex -= count;
-                        refreshCitationAnchor(citation);
+                }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_5_1 && !runsDescending_5_1.done && (_a = runsDescending_5.return)) _a.call(runsDescending_5);
                     }
+                    finally { if (e_7) throw e_7.error; }
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ citations: { patches: patches, inversePatches: inversePatches } });
@@ -195,28 +270,80 @@ export var deleteColumn = function (_a) {
         // and are deliberately NOT touched here.
         onChangeEmbeds === null || onChangeEmbeds === void 0 ? void 0 : onChangeEmbeds(function (prevEmbeds) {
             var _a = __read(produceWithPatches(prevEmbeds, function (draft) {
-                shiftEmbedsOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                var e_8, _a;
+                try {
+                    for (var runsDescending_6 = __values(runsDescending), runsDescending_6_1 = runsDescending_6.next(); !runsDescending_6_1.done; runsDescending_6_1 = runsDescending_6.next()) {
+                        var run = runsDescending_6_1.value;
+                        shiftEmbedsOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                    }
+                }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_6_1 && !runsDescending_6_1.done && (_a = runsDescending_6.return)) _a.call(runsDescending_6);
+                    }
+                    finally { if (e_8) throw e_8.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ embeds: { patches: patches, inversePatches: inversePatches } });
             return nextState;
         });
         onChangeSlicers === null || onChangeSlicers === void 0 ? void 0 : onChangeSlicers(function (prevSlicers) {
             var _a = __read(produceWithPatches(prevSlicers, function (draft) {
-                shiftSlicersOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                var e_9, _a;
+                try {
+                    for (var runsDescending_7 = __values(runsDescending), runsDescending_7_1 = runsDescending_7.next(); !runsDescending_7_1.done; runsDescending_7_1 = runsDescending_7.next()) {
+                        var run = runsDescending_7_1.value;
+                        shiftSlicersOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                    }
+                }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_7_1 && !runsDescending_7_1.done && (_a = runsDescending_7.return)) _a.call(runsDescending_7);
+                    }
+                    finally { if (e_9) throw e_9.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ slicers: { patches: patches, inversePatches: inversePatches } });
             return nextState;
         });
         onChangeCharts === null || onChangeCharts === void 0 ? void 0 : onChangeCharts(function (prevCharts) {
             var _a = __read(produceWithPatches(prevCharts, function (draft) {
-                shiftChartsOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                var e_10, _a;
+                try {
+                    for (var runsDescending_8 = __values(runsDescending), runsDescending_8_1 = runsDescending_8.next(); !runsDescending_8_1.done; runsDescending_8_1 = runsDescending_8.next()) {
+                        var run = runsDescending_8_1.value;
+                        shiftChartsOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                    }
+                }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_8_1 && !runsDescending_8_1.done && (_a = runsDescending_8.return)) _a.call(runsDescending_8);
+                    }
+                    finally { if (e_10) throw e_10.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ charts: { patches: patches, inversePatches: inversePatches } });
             return nextState;
         });
         onChangeProtectedRanges === null || onChangeProtectedRanges === void 0 ? void 0 : onChangeProtectedRanges(function (prevProtectedRanges) {
             var _a = __read(produceWithPatches(prevProtectedRanges, function (draft) {
-                shiftProtectedRangesOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                var e_11, _a;
+                try {
+                    for (var runsDescending_9 = __values(runsDescending), runsDescending_9_1 = runsDescending_9.next(); !runsDescending_9_1.done; runsDescending_9_1 = runsDescending_9.next()) {
+                        var run = runsDescending_9_1.value;
+                        shiftProtectedRangesOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                    }
+                }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_9_1 && !runsDescending_9_1.done && (_a = runsDescending_9.return)) _a.call(runsDescending_9);
+                    }
+                    finally { if (e_11) throw e_11.error; }
+                }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({ protectedRanges: { patches: patches, inversePatches: inversePatches } });
             return nextState;
@@ -224,67 +351,78 @@ export var deleteColumn = function (_a) {
         // Sheet metadata
         onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
             var _a = __read(produceWithPatches(prevSheets, function (draft) {
-                var e_3, _a, e_4, _b;
-                var _c;
+                var e_12, _a, e_13, _b, e_14, _c;
+                var _d;
                 var sheet = draft.find(function (sheet) { return sheet.sheetId === sheetId; });
                 if (!sheet)
                     return;
-                if (sheet.columnMetadata) {
-                    sheet.columnMetadata.splice(minColumnIndex, count);
-                }
-                if (sheet.basicFilter) {
-                    var _d = sheet.basicFilter.range, startColumnIndex = _d.startColumnIndex, endColumnIndex = _d.endColumnIndex;
-                    if (minColumnIndex < startColumnIndex) {
-                        moveFilterView(sheet.basicFilter, count, Direction.Left);
-                    }
-                    if (minColumnIndex > startColumnIndex &&
-                        minColumnIndex <= endColumnIndex) {
-                        if (sheet.basicFilter.filterSpecs) {
-                            try {
-                                for (var _e = __values(sheet.basicFilter.filterSpecs), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                    var spec = _f.value;
-                                    if (spec.columnIndex >= minColumnIndex) {
-                                        spec.columnIndex -= count;
-                                    }
-                                }
-                            }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                            finally {
-                                try {
-                                    if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
-                                }
-                                finally { if (e_3) throw e_3.error; }
-                            }
+                try {
+                    for (var runsDescending_10 = __values(runsDescending), runsDescending_10_1 = runsDescending_10.next(); !runsDescending_10_1.done; runsDescending_10_1 = runsDescending_10.next()) {
+                        var run = runsDescending_10_1.value;
+                        if (sheet.columnMetadata) {
+                            sheet.columnMetadata.splice(run.start, run.count);
                         }
-                        if (sheet.basicFilter.sortSpecs) {
-                            try {
-                                for (var _g = __values(sheet.basicFilter.sortSpecs), _h = _g.next(); !_h.done; _h = _g.next()) {
-                                    var spec = _h.value;
-                                    if (spec.dimensionIndex >= minColumnIndex) {
-                                        spec.dimensionIndex -= count;
+                        if (sheet.basicFilter) {
+                            var _e = sheet.basicFilter.range, startColumnIndex = _e.startColumnIndex, endColumnIndex = _e.endColumnIndex;
+                            if (run.start < startColumnIndex) {
+                                moveFilterView(sheet.basicFilter, run.count, Direction.Left);
+                            }
+                            if (run.start > startColumnIndex && run.start <= endColumnIndex) {
+                                if (sheet.basicFilter.filterSpecs) {
+                                    try {
+                                        for (var _f = (e_13 = void 0, __values(sheet.basicFilter.filterSpecs)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                                            var spec = _g.value;
+                                            if (spec.columnIndex >= run.start) {
+                                                spec.columnIndex -= run.count;
+                                            }
+                                        }
+                                    }
+                                    catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                                    finally {
+                                        try {
+                                            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+                                        }
+                                        finally { if (e_13) throw e_13.error; }
                                     }
                                 }
-                            }
-                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                            finally {
-                                try {
-                                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                                if (sheet.basicFilter.sortSpecs) {
+                                    try {
+                                        for (var _h = (e_14 = void 0, __values(sheet.basicFilter.sortSpecs)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                                            var spec = _j.value;
+                                            if (spec.dimensionIndex >= run.start) {
+                                                spec.dimensionIndex -= run.count;
+                                            }
+                                        }
+                                    }
+                                    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                                    finally {
+                                        try {
+                                            if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                                        }
+                                        finally { if (e_14) throw e_14.error; }
+                                    }
                                 }
-                                finally { if (e_4) throw e_4.error; }
+                                var delta = Math.min(endColumnIndex - run.start + 1, run.count);
+                                sheet.basicFilter.range.endColumnIndex -= delta;
                             }
                         }
-                        var delta = Math.min(endColumnIndex - minColumnIndex + 1, count);
-                        sheet.basicFilter.range.endColumnIndex -= delta;
+                        if (sheet.merges) {
+                            sheet.merges = shrinkMergesOnColumnDelete(sheet.merges, run.start, run.count);
+                        }
+                        // `_xlnm.Print_Area` / `_xlnm.Print_Titles` follow the defined-name rule.
+                        if (sheet.printSettings) {
+                            updatePrintSettingsOnStructuralChange(sheet.printSettings, "column", "delete", run.start, run.count);
+                        }
                     }
                 }
-                if (sheet.merges) {
-                    sheet.merges = shrinkMergesOnColumnDelete(sheet.merges, minColumnIndex, count);
-                }
-                // `_xlnm.Print_Area` / `_xlnm.Print_Titles` follow the defined-name rule.
-                if (sheet.printSettings) {
-                    updatePrintSettingsOnStructuralChange(sheet.printSettings, "column", "delete", minColumnIndex, count);
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_10_1 && !runsDescending_10_1.done && (_a = runsDescending_10.return)) _a.call(runsDescending_10);
+                    }
+                    finally { if (e_12) throw e_12.error; }
                 }
-                sheet.columnCount = Math.max(1, ((_c = sheet.columnCount) !== null && _c !== void 0 ? _c : columnCount) - count);
+                sheet.columnCount = Math.max(1, ((_d = sheet.columnCount) !== null && _d !== void 0 ? _d : columnCount) - count);
                 // Frozen panes are positional: the split stays where it is, only
                 // clamped so the freeze never exceeds the shrunk sheet.
                 if (sheet.frozenColumnCount &&
@@ -297,27 +435,41 @@ export var deleteColumn = function (_a) {
         });
         // Table columns spliced out above (and tables dropped whole): their
         // structured refs break to `#REF!`, computed from the PRE-edit definitions.
-        var removedTableParts = collectRemovedTableParts(tables, sheetId, "column", minColumnIndex, maxColumnIndex);
+        var removedTableParts = collectRemovedTableParts(tables, sheetId, "column", minColumnIndex, maxColumnIndex, sortedColumnIndexes);
         // Sheet data: three-pass formula update, then per-row column splice.
         onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
             var _a = __read(produceWithPatches(prevSheetData, function (draft) {
-                removeSpillsOfDeletedAnchors({
-                    draft: draft,
-                    sheetId: sheetId,
-                    axis: "column",
-                    minIndex: minColumnIndex,
-                    maxIndex: maxColumnIndex,
-                    getArrayRange: getArrayRange,
-                    locale: locale,
-                    cellXfsRegistry: cellXfsRegistry,
-                    sharedStringRegistry: sharedStringRegistry,
-                });
+                var e_15, _a;
+                try {
+                    for (var runsDescending_11 = __values(runsDescending), runsDescending_11_1 = runsDescending_11.next(); !runsDescending_11_1.done; runsDescending_11_1 = runsDescending_11.next()) {
+                        var run = runsDescending_11_1.value;
+                        removeSpillsOfDeletedAnchors({
+                            draft: draft,
+                            sheetId: sheetId,
+                            axis: "column",
+                            minIndex: run.start,
+                            maxIndex: run.start + run.count - 1,
+                            getArrayRange: getArrayRange,
+                            locale: locale,
+                            cellXfsRegistry: cellXfsRegistry,
+                            sharedStringRegistry: sharedStringRegistry,
+                        });
+                    }
+                }
+                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                finally {
+                    try {
+                        if (runsDescending_11_1 && !runsDescending_11_1.done && (_a = runsDescending_11.return)) _a.call(runsDescending_11);
+                    }
+                    finally { if (e_15) throw e_15.error; }
+                }
                 breakStructuredRefsForRemovedTableParts({
                     draft: draft,
                     sheetId: sheetId,
                     axis: "column",
                     referenceIndex: minColumnIndex,
                     count: count,
+                    indexes: sortedColumnIndexes,
                     removed: removedTableParts,
                     getGraphNodes: getGraphNodes,
                     enqueueCalculation: enqueueCalculation,
@@ -334,6 +486,7 @@ export var deleteColumn = function (_a) {
                     sheetId: sheetId,
                     referenceIndex: minColumnIndex,
                     count: count,
+                    indexes: sortedColumnIndexes,
                     rowCount: rowCount,
                     columnCount: columnCount,
                     getDependents: getDependents,

package/dist/cjs/interface/delete-row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-row.d.ts","sourceRoot":"","sources":["../../../interface/delete-row.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAa,MAAM,2BAA2B,CAAC;AA2B5E,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAiCtE,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,2iBAgC5D,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,MAClB,SAAS,MAAM,EAAE,YAAY,MAAM,EAAE,SAkkB9C,CAAC"}
+{"version":3,"file":"delete-row.d.ts","sourceRoot":"","sources":["../../../interface/delete-row.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAa,MAAM,2BAA2B,CAAC;AA8B5E,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAiCtE,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,2iBAgC5D,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,MAClB,SAAS,MAAM,EAAE,YAAY,MAAM,EAAE,SAomB9C,CAAC"}