@rowsncolumns/spreadsheet-state 29.1.4 → 29.1.7

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

@@ -6,16 +6,21 @@ 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 const deleteColumn = ({ 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, onChangeSlicers, onChangeCharts, onChangeProtectedRanges, }) => {
     return (sheetId, columnIndexes) => {
         if (!columnIndexes.length)
             return;
-        const sortedColumnIndexes = [...columnIndexes].sort((a, b) => a - b);
+        const sortedColumnIndexes = [...new Set(columnIndexes)].sort((a, b) => a - b);
         const minColumnIndex = sortedColumnIndexes[0];
         const maxColumnIndex = sortedColumnIndexes[sortedColumnIndexes.length - 1];
         const 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`).
+        const runs = contiguousRuns(sortedColumnIndexes);
+        const runsDescending = [...runs].reverse();
+        const isDeleted = (columnIndex) => sortedColumnIndexes.includes(columnIndex);
         const saveHistory = createHistory();
         enqueueStructureChange?.({
             kind: "delete-column",
@@ -74,34 +79,37 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
                     }
                     if (minColumnIndex > endColumnIndex)
                         continue;
-                    if (minColumnIndex <= startColumnIndex &&
-                        maxColumnIndex >= endColumnIndex) {
+                    // The table's own columns that go — every one of them removes the table.
+                    const removedOffsets = [];
+                    for (let column = startColumnIndex; column <= endColumnIndex; column++) {
+                        if (isDeleted(column))
+                            removedOffsets.push(column - startColumnIndex);
+                    }
+                    if (removedOffsets.length === endColumnIndex - startColumnIndex + 1) {
                         draft.splice(idx, 1);
                         continue;
                     }
                     if (table.filterSpecs) {
                         for (const spec of table.filterSpecs) {
-                            if (spec.columnIndex >= minColumnIndex) {
-                                spec.columnIndex -= count;
-                            }
+                            spec.columnIndex -= deletedBefore(spec.columnIndex);
                         }
                     }
                     if (table.sortSpecs) {
                         for (const spec of table.sortSpecs) {
-                            if (spec.dimensionIndex >= minColumnIndex) {
-                                spec.dimensionIndex -= count;
-                            }
+                            spec.dimensionIndex -= deletedBefore(spec.dimensionIndex);
                         }
                     }
-                    const overlapStart = Math.max(minColumnIndex, startColumnIndex);
-                    const overlapEnd = Math.min(maxColumnIndex, endColumnIndex);
-                    const removed = overlapEnd - overlapStart + 1;
-                    table.columns?.splice(overlapStart - startColumnIndex, removed);
-                    table.range.startColumnIndex = Math.min(startColumnIndex, minColumnIndex);
+                    for (let i = removedOffsets.length - 1; i >= 0; i--) {
+                        table.columns?.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;
                 }
             });
             saveHistory({ tables: { patches, inversePatches } });
@@ -110,7 +118,9 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // Data validations
         onChangeDataValidations?.((prevValidations) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevValidations, (draft) => {
-                updateRangedRulesOnStructuralChange(draft, "delete", "column", minColumnIndex, count, sheetId, { getSheetName });
+                for (const run of runsDescending) {
+                    updateRangedRulesOnStructuralChange(draft, "delete", "column", run.start, run.count, sheetId, { getSheetName });
+                }
             });
             saveHistory({ dataValidations: { patches, inversePatches } });
             return nextState;
@@ -118,7 +128,9 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // Conditional formats
         onChangeConditionalFormats?.((prevConditionalFormats) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevConditionalFormats, (draft) => {
-                updateRangedRulesOnStructuralChange(draft, "delete", "column", minColumnIndex, count, sheetId, { getSheetName });
+                for (const run of runsDescending) {
+                    updateRangedRulesOnStructuralChange(draft, "delete", "column", run.start, run.count, sheetId, { getSheetName });
+                }
             });
             saveHistory({ conditionalFormats: { patches, inversePatches } });
             return nextState;
@@ -127,7 +139,9 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // deleted is kept as `#REF!` so its users evaluate `#REF!`, like Excel.
         onChangeNamedRanges?.((prevNamedRanges) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevNamedRanges, (draft) => {
-                updateNamedRangesOnStructuralChange(draft, "column", "delete", minColumnIndex, count, sheetId);
+                for (const run of runsDescending) {
+                    updateNamedRangesOnStructuralChange(draft, "column", "delete", run.start, run.count, sheetId, { length: columnCount });
+                }
             });
             saveHistory({ namedRanges: { patches, inversePatches } });
             return nextState;
@@ -135,7 +149,9 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // Shift pivot tables.
         onChangePivotTables?.((prevPivots) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevPivots, (draft) => {
-                shiftPivotsOnDelete(draft, sheetId, "column", minColumnIndex, count);
+                for (const run of runsDescending) {
+                    shiftPivotsOnDelete(draft, sheetId, "column", run.start, run.count);
+                }
             });
             saveHistory({ pivotTables: { patches, inversePatches } });
             return nextState;
@@ -144,24 +160,26 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         onChangeCitations?.((prevCitations) => {
             const updatedAt = new Date().toISOString();
             const [nextState, patches, inversePatches] = produceWithPatches(prevCitations, (draft) => {
-                const deleteEnd = minColumnIndex + count - 1;
-                for (let idx = draft.length - 1; idx >= 0; idx--) {
-                    const citation = draft[idx];
-                    if (citation.range.sheetId !== sheetId)
-                        continue;
-                    const citationStart = citation.range.startColumnIndex;
-                    const 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;
+                for (const run of runsDescending) {
+                    const deleteEnd = run.start + run.count - 1;
+                    for (let idx = draft.length - 1; idx >= 0; idx--) {
+                        const citation = draft[idx];
+                        if (citation.range.sheetId !== sheetId)
+                            continue;
+                        const citationStart = citation.range.startColumnIndex;
+                        const 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);
                     }
                 }
             });
@@ -174,28 +192,36 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // and are deliberately NOT touched here.
         onChangeEmbeds?.((prevEmbeds) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevEmbeds, (draft) => {
-                shiftEmbedsOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                for (const run of runsDescending) {
+                    shiftEmbedsOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                }
             });
             saveHistory({ embeds: { patches, inversePatches } });
             return nextState;
         });
         onChangeSlicers?.((prevSlicers) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSlicers, (draft) => {
-                shiftSlicersOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                for (const run of runsDescending) {
+                    shiftSlicersOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                }
             });
             saveHistory({ slicers: { patches, inversePatches } });
             return nextState;
         });
         onChangeCharts?.((prevCharts) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCharts, (draft) => {
-                shiftChartsOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                for (const run of runsDescending) {
+                    shiftChartsOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                }
             });
             saveHistory({ charts: { patches, inversePatches } });
             return nextState;
         });
         onChangeProtectedRanges?.((prevProtectedRanges) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevProtectedRanges, (draft) => {
-                shiftProtectedRangesOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+                for (const run of runsDescending) {
+                    shiftProtectedRangesOnStructuralChange(draft, sheetId, "column", "delete", run.start, run.count);
+                }
             });
             saveHistory({ protectedRanges: { patches, inversePatches } });
             return nextState;
@@ -206,40 +232,41 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
                 const sheet = draft.find((sheet) => sheet.sheetId === sheetId);
                 if (!sheet)
                     return;
-                if (sheet.columnMetadata) {
-                    sheet.columnMetadata.splice(minColumnIndex, count);
-                }
-                if (sheet.basicFilter) {
-                    const { startColumnIndex, endColumnIndex } = sheet.basicFilter.range;
-                    if (minColumnIndex < startColumnIndex) {
-                        moveFilterView(sheet.basicFilter, count, Direction.Left);
+                for (const run of runsDescending) {
+                    if (sheet.columnMetadata) {
+                        sheet.columnMetadata.splice(run.start, run.count);
                     }
-                    if (minColumnIndex > startColumnIndex &&
-                        minColumnIndex <= endColumnIndex) {
-                        if (sheet.basicFilter.filterSpecs) {
-                            for (const spec of sheet.basicFilter.filterSpecs) {
-                                if (spec.columnIndex >= minColumnIndex) {
-                                    spec.columnIndex -= count;
+                    if (sheet.basicFilter) {
+                        const { startColumnIndex, endColumnIndex } = sheet.basicFilter.range;
+                        if (run.start < startColumnIndex) {
+                            moveFilterView(sheet.basicFilter, run.count, Direction.Left);
+                        }
+                        if (run.start > startColumnIndex && run.start <= endColumnIndex) {
+                            if (sheet.basicFilter.filterSpecs) {
+                                for (const spec of sheet.basicFilter.filterSpecs) {
+                                    if (spec.columnIndex >= run.start) {
+                                        spec.columnIndex -= run.count;
+                                    }
                                 }
                             }
-                        }
-                        if (sheet.basicFilter.sortSpecs) {
-                            for (const spec of sheet.basicFilter.sortSpecs) {
-                                if (spec.dimensionIndex >= minColumnIndex) {
-                                    spec.dimensionIndex -= count;
+                            if (sheet.basicFilter.sortSpecs) {
+                                for (const spec of sheet.basicFilter.sortSpecs) {
+                                    if (spec.dimensionIndex >= run.start) {
+                                        spec.dimensionIndex -= run.count;
+                                    }
                                 }
                             }
+                            const delta = Math.min(endColumnIndex - run.start + 1, run.count);
+                            sheet.basicFilter.range.endColumnIndex -= delta;
                         }
-                        const delta = Math.min(endColumnIndex - minColumnIndex + 1, count);
-                        sheet.basicFilter.range.endColumnIndex -= delta;
                     }
-                }
-                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);
+                    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);
+                    }
                 }
                 sheet.columnCount = Math.max(1, (sheet.columnCount ?? columnCount) - count);
                 // Frozen panes are positional: the split stays where it is, only
@@ -254,27 +281,30 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         });
         // Table columns spliced out above (and tables dropped whole): their
         // structured refs break to `#REF!`, computed from the PRE-edit definitions.
-        const removedTableParts = collectRemovedTableParts(tables, sheetId, "column", minColumnIndex, maxColumnIndex);
+        const removedTableParts = collectRemovedTableParts(tables, sheetId, "column", minColumnIndex, maxColumnIndex, sortedColumnIndexes);
         // Sheet data: three-pass formula update, then per-row column splice.
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
-                removeSpillsOfDeletedAnchors({
-                    draft,
-                    sheetId,
-                    axis: "column",
-                    minIndex: minColumnIndex,
-                    maxIndex: maxColumnIndex,
-                    getArrayRange,
-                    locale,
-                    cellXfsRegistry,
-                    sharedStringRegistry,
-                });
+                for (const run of runsDescending) {
+                    removeSpillsOfDeletedAnchors({
+                        draft,
+                        sheetId,
+                        axis: "column",
+                        minIndex: run.start,
+                        maxIndex: run.start + run.count - 1,
+                        getArrayRange,
+                        locale,
+                        cellXfsRegistry,
+                        sharedStringRegistry,
+                    });
+                }
                 breakStructuredRefsForRemovedTableParts({
                     draft,
                     sheetId,
                     axis: "column",
                     referenceIndex: minColumnIndex,
                     count,
+                    indexes: sortedColumnIndexes,
                     removed: removedTableParts,
                     getGraphNodes,
                     enqueueCalculation,
@@ -291,6 +321,7 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
                     sheetId,
                     referenceIndex: minColumnIndex,
                     count,
+                    indexes: sortedColumnIndexes,
                     rowCount,
                     columnCount,
                     getDependents,

package/dist/esm/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"}

package/dist/esm/interface/delete-row.js

@@ -6,7 +6,7 @@ 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, renameTableColumnsInFormulas, } from "../api/structural-table-refs";
 import { createSheetCellIdentifier } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
@@ -39,10 +39,17 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         if (!rowIndexes.length)
             return;
         // Don't mutate caller's array.
-        const sortedRowIndexes = [...rowIndexes].sort((a, b) => a - b);
+        const sortedRowIndexes = [...new Set(rowIndexes)].sort((a, b) => a - b);
         const minRowIndex = sortedRowIndexes[0];
         const maxRowIndex = sortedRowIndexes[sortedRowIndexes.length - 1];
         const count = sortedRowIndexes.length;
+        // A Ctrl-selected delete (rows 2 and 4) is several contiguous bands. Every
+        // band-shaped update below runs once per band, LAST band first, so each
+        // band's coordinates are still the original ones when its turn comes —
+        // Excel's result: a line loses exactly the deleted lines before it, and a
+        // reference into a deleted line breaks (#939 K-09).
+        const runs = contiguousRuns(sortedRowIndexes);
+        const runsDescending = [...runs].reverse();
         const saveHistory = createHistory();
         enqueueStructureChange?.({
             kind: "delete-row",
@@ -142,7 +149,9 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         // Data validations
         onChangeDataValidations?.((prevValidations) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevValidations, (draft) => {
-                updateRangedRulesOnStructuralChange(draft, "delete", "row", minRowIndex, count, sheetId, { getSheetName });
+                for (const run of runsDescending) {
+                    updateRangedRulesOnStructuralChange(draft, "delete", "row", run.start, run.count, sheetId, { getSheetName });
+                }
             });
             saveHistory({ dataValidations: { patches, inversePatches } });
             return nextState;
@@ -150,7 +159,9 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         // Conditional formats
         onChangeConditionalFormats?.((prevConditionalFormats) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevConditionalFormats, (draft) => {
-                updateRangedRulesOnStructuralChange(draft, "delete", "row", minRowIndex, count, sheetId, { getSheetName });
+                for (const run of runsDescending) {
+                    updateRangedRulesOnStructuralChange(draft, "delete", "row", run.start, run.count, sheetId, { getSheetName });
+                }
             });
             saveHistory({ conditionalFormats: { patches, inversePatches } });
             return nextState;
@@ -159,7 +170,9 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         // deleted is kept as `#REF!` so its users evaluate `#REF!`, like Excel.
         onChangeNamedRanges?.((prevNamedRanges) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevNamedRanges, (draft) => {
-                updateNamedRangesOnStructuralChange(draft, "row", "delete", minRowIndex, count, sheetId);
+                for (const run of runsDescending) {
+                    updateNamedRangesOnStructuralChange(draft, "row", "delete", run.start, run.count, sheetId, { length: rowCount });
+                }
             });
             saveHistory({ namedRanges: { patches, inversePatches } });
             return nextState;
@@ -168,7 +181,9 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         // the start of the deletion when its row falls inside the deletion.
         onChangePivotTables?.((prevPivots) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevPivots, (draft) => {
-                shiftPivotsOnDelete(draft, sheetId, "row", minRowIndex, count);
+                for (const run of runsDescending) {
+                    shiftPivotsOnDelete(draft, sheetId, "row", run.start, run.count);
+                }
             });
             saveHistory({ pivotTables: { patches, inversePatches } });
             return nextState;
@@ -178,24 +193,26 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         onChangeCitations?.((prevCitations) => {
             const updatedAt = new Date().toISOString();
             const [nextState, patches, inversePatches] = produceWithPatches(prevCitations, (draft) => {
-                const deleteEnd = minRowIndex + count - 1;
-                for (let idx = draft.length - 1; idx >= 0; idx--) {
-                    const citation = draft[idx];
-                    if (citation.range.sheetId !== sheetId)
-                        continue;
-                    const citationStart = citation.range.startRowIndex;
-                    const citationEnd = citation.range.endRowIndex;
-                    if (citationStart <= deleteEnd && citationEnd >= minRowIndex) {
-                        // Soft-delete: keep the record for provenance / undo, hide it from the UI
-                        if (citation.active !== false) {
-                            citation.active = false;
-                            citation.updated_at = updatedAt;
+                for (const run of runsDescending) {
+                    const deleteEnd = run.start + run.count - 1;
+                    for (let idx = draft.length - 1; idx >= 0; idx--) {
+                        const citation = draft[idx];
+                        if (citation.range.sheetId !== sheetId)
+                            continue;
+                        const citationStart = citation.range.startRowIndex;
+                        const citationEnd = citation.range.endRowIndex;
+                        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.startRowIndex -= run.count;
+                            citation.range.endRowIndex -= run.count;
+                            refreshCitationAnchor(citation);
                         }
-                    }
-                    else if (citationStart > deleteEnd) {
-                        citation.range.startRowIndex -= count;
-                        citation.range.endRowIndex -= count;
-                        refreshCitationAnchor(citation);
                     }
                 }
             });
@@ -208,28 +225,36 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         // and are deliberately NOT touched here.
         onChangeEmbeds?.((prevEmbeds) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevEmbeds, (draft) => {
-                shiftEmbedsOnStructuralChange(draft, sheetId, "row", "delete", minRowIndex, count);
+                for (const run of runsDescending) {
+                    shiftEmbedsOnStructuralChange(draft, sheetId, "row", "delete", run.start, run.count);
+                }
             });
             saveHistory({ embeds: { patches, inversePatches } });
             return nextState;
         });
         onChangeSlicers?.((prevSlicers) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSlicers, (draft) => {
-                shiftSlicersOnStructuralChange(draft, sheetId, "row", "delete", minRowIndex, count);
+                for (const run of runsDescending) {
+                    shiftSlicersOnStructuralChange(draft, sheetId, "row", "delete", run.start, run.count);
+                }
             });
             saveHistory({ slicers: { patches, inversePatches } });
             return nextState;
         });
         onChangeCharts?.((prevCharts) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCharts, (draft) => {
-                shiftChartsOnStructuralChange(draft, sheetId, "row", "delete", minRowIndex, count);
+                for (const run of runsDescending) {
+                    shiftChartsOnStructuralChange(draft, sheetId, "row", "delete", run.start, run.count);
+                }
             });
             saveHistory({ charts: { patches, inversePatches } });
             return nextState;
         });
         onChangeProtectedRanges?.((prevProtectedRanges) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevProtectedRanges, (draft) => {
-                shiftProtectedRangesOnStructuralChange(draft, sheetId, "row", "delete", minRowIndex, count);
+                for (const run of runsDescending) {
+                    shiftProtectedRangesOnStructuralChange(draft, sheetId, "row", "delete", run.start, run.count);
+                }
             });
             saveHistory({ protectedRanges: { patches, inversePatches } });
             return nextState;
@@ -240,30 +265,33 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
                 const sheet = draft.find((sheet) => sheet.sheetId === sheetId);
                 if (!sheet)
                     return;
-                if (sheet.rowMetadata) {
-                    sheet.rowMetadata.splice(minRowIndex, count);
-                }
-                if (sheet.basicFilter) {
-                    const { startRowIndex, endRowIndex } = sheet.basicFilter.range;
-                    if (minRowIndex < startRowIndex) {
-                        moveFilterView(sheet.basicFilter, count, Direction.Up);
+                for (const run of runsDescending) {
+                    const runEnd = run.start + run.count - 1;
+                    if (sheet.rowMetadata) {
+                        sheet.rowMetadata.splice(run.start, run.count);
+                    }
+                    if (sheet.basicFilter) {
+                        const { startRowIndex, endRowIndex } = sheet.basicFilter.range;
+                        if (run.start < startRowIndex) {
+                            moveFilterView(sheet.basicFilter, run.count, Direction.Up);
+                        }
+                        if (run.start > startRowIndex && run.start <= endRowIndex) {
+                            const delta = Math.min(endRowIndex - run.start + 1, run.count);
+                            sheet.basicFilter.range.endRowIndex -= delta;
+                        }
+                        if (sheet.basicFilter.range.startRowIndex >= run.start &&
+                            sheet.basicFilter.range.startRowIndex <= runEnd) {
+                            delete sheet.basicFilter;
+                        }
                     }
-                    if (minRowIndex > startRowIndex && minRowIndex <= endRowIndex) {
-                        const delta = Math.min(endRowIndex - minRowIndex + 1, count);
-                        sheet.basicFilter.range.endRowIndex -= delta;
+                    if (sheet.merges) {
+                        sheet.merges = shrinkMergesOnRowDelete(sheet.merges, run.start, run.count);
                     }
-                    if (sheet.basicFilter.range.startRowIndex >= minRowIndex &&
-                        sheet.basicFilter.range.startRowIndex <= maxRowIndex) {
-                        delete sheet.basicFilter;
+                    // `_xlnm.Print_Area` / `_xlnm.Print_Titles` follow the defined-name rule.
+                    if (sheet.printSettings) {
+                        updatePrintSettingsOnStructuralChange(sheet.printSettings, "row", "delete", run.start, run.count);
                     }
                 }
-                if (sheet.merges) {
-                    sheet.merges = shrinkMergesOnRowDelete(sheet.merges, minRowIndex, count);
-                }
-                // `_xlnm.Print_Area` / `_xlnm.Print_Titles` follow the defined-name rule.
-                if (sheet.printSettings) {
-                    updatePrintSettingsOnStructuralChange(sheet.printSettings, "row", "delete", minRowIndex, count);
-                }
                 sheet.rowCount = Math.max(1, (sheet.rowCount ?? rowCount) - count);
                 // Frozen panes are positional: the split stays where it is, only
                 // clamped so the freeze never exceeds the shrunk sheet.
@@ -276,29 +304,32 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
         });
         // Tables every row of which goes (dropped above): their structured refs
         // break to `#REF!`, computed from the PRE-edit definitions.
-        const removedTableParts = collectRemovedTableParts(tables, sheetId, "row", minRowIndex, maxRowIndex);
+        const removedTableParts = collectRemovedTableParts(tables, sheetId, "row", minRowIndex, maxRowIndex, sortedRowIndexes);
         // Sheet data: three-pass formula update, then splice the rows out.
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
                 // A dynamic array whose anchor row is deleted takes its spill with
                 // it — drop the projected cells before the rows close up.
-                removeSpillsOfDeletedAnchors({
-                    draft,
-                    sheetId,
-                    axis: "row",
-                    minIndex: minRowIndex,
-                    maxIndex: maxRowIndex,
-                    getArrayRange,
-                    locale,
-                    cellXfsRegistry,
-                    sharedStringRegistry,
-                });
+                for (const run of runsDescending) {
+                    removeSpillsOfDeletedAnchors({
+                        draft,
+                        sheetId,
+                        axis: "row",
+                        minIndex: run.start,
+                        maxIndex: run.start + run.count - 1,
+                        getArrayRange,
+                        locale,
+                        cellXfsRegistry,
+                        sharedStringRegistry,
+                    });
+                }
                 breakStructuredRefsForRemovedTableParts({
                     draft,
                     sheetId,
                     axis: "row",
                     referenceIndex: minRowIndex,
                     count,
+                    indexes: sortedRowIndexes,
                     removed: removedTableParts,
                     getGraphNodes,
                     enqueueCalculation,
@@ -315,6 +346,7 @@ export const deleteRow = ({ rowCount, columnCount, locale, cellXfsRegistry, shar
                     sheetId,
                     referenceIndex: minRowIndex,
                     count,
+                    indexes: sortedRowIndexes,
                     rowCount,
                     columnCount,
                     getDependents,

package/dist/esm/interface/duplicate-sheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"duplicate-sheet.d.ts","sourceRoot":"","sources":["../../../interface/duplicate-sheet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAc,MAAM,2BAA2B,CAAC;AAc7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,sPAejE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,MACvB,SAAS,MAAM,EAAE,0BAA0B,MAAM,uBAkT1D,CAAC"}
+{"version":3,"file":"duplicate-sheet.d.ts","sourceRoot":"","sources":["../../../interface/duplicate-sheet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAc,MAAM,2BAA2B,CAAC;AAe7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,sPAejE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,MACvB,SAAS,MAAM,EAAE,0BAA0B,MAAM,uBAkT1D,CAAC"}

package/dist/esm/interface/duplicate-sheet.js

@@ -1,4 +1,4 @@
-import { getCellUserEnteredValue, getExtendedValueFormula, getNextTableCopyName, uuid, } from "@rowsncolumns/utils";
+import { getCellUserEnteredValue, getExtendedValueFormula, getNextTableCopyName, uniqueSheetTitle, uuid, } from "@rowsncolumns/utils";
 import { castDraft, produceWithPatches } from "immer";
 import { retargetChartSpecRanges } from "../api/anchored-objects";
 import { renameTablesInFormula } from "../api/formula";
@@ -242,12 +242,7 @@ export const duplicateSheet = ({ locale, maxSheetCount, sheets, idCreationStrate
  * @returns
  */
 function generateUniqueSheetName(existingSheets, originalName, generatedNames) {
-    const baseName = getGeneratedSheetCopyName(originalName, generatedNames);
-    let newName = baseName;
-    let counter = 0;
-    while (existingSheets.includes(newName)) {
-        counter++;
-        newName = counter === 1 ? baseName : `${baseName} ${counter - 1}`;
-    }
-    return newName;
+    // `Copy of X`, then `Copy of X 1`, `Copy of X 2`, … — compared the way Excel compares worksheet
+    // names (case-insensitively), so a copy never lands on a title that differs only by case.
+    return uniqueSheetTitle(getGeneratedSheetCopyName(originalName, generatedNames), existingSheets);
 }

package/dist/esm/interface/insert-column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert-column.d.ts","sourceRoot":"","sources":["../../../interface/insert-column.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAqC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,ohBA+B/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,sBAAsB,MAAM,EAAE,mBAAc,SAqbtE,CAAC;AAMF,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qRAkBpE,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,QAAQ,GACR,aAAa,GACb,UAAU,GACV,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,gBAAgB,GAChB,oBAAoB,GACpB,wBAAwB,GACxB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,gBAAgB,CACnB,MAEG,WAAW,SAAS,EACpB,gBAAgB,MAAM,EACtB,WAAW,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,EAC3C,cAAS,SAwXZ,CAAC"}
+{"version":3,"file":"insert-column.d.ts","sourceRoot":"","sources":["../../../interface/insert-column.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAqC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,ohBA+B/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,sBAAsB,MAAM,EAAE,mBAAc,SAsbtE,CAAC;AAMF,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qRAkBpE,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,QAAQ,GACR,aAAa,GACb,UAAU,GACV,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,gBAAgB,GAChB,oBAAoB,GACpB,wBAAwB,GACxB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,gBAAgB,CACnB,MAEG,WAAW,SAAS,EACpB,gBAAgB,MAAM,EACtB,WAAW,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,EAC3C,cAAS,SAwXZ,CAAC"}