@rowsncolumns/spreadsheet-state 28.0.75 → 29.0.0

package/dist/cjs/interface/insert-cells-shift-down.js

@@ -1,39 +1,47 @@
-import { __assign, __read, __spreadArray, __values } from "tslib";
-import { selectionFromActiveCell } from "@rowsncolumns/utils";
+import { __read, __spreadArray, __values } from "tslib";
 import { produceWithPatches } from "immer";
-import { processSideEffectDependentCells } from "../api/dependency";
+import { collectUniqueDependentsForRange, processSideEffectDependentCells, } from "../api/dependency";
+import { createSheetCellIdentifier, expandRangesInFormula } from "../api/formula";
 import { cloneCellWithFormatting, createSheetDraft } from "../api/immer-utils";
-import { moveMergedCells } from "../api/merges";
+import { shiftMergesInBand } from "../api/merges";
+import { isRangeInsideBand, resolveShiftSelection, shiftBand, } from "../api/structural-guards";
+import { SheetCell } from "../sheet-cell";
+/**
+ * Insert cells ▸ Shift cells down (SHF-01, SHF-06, SHF-07, SHF-08, FMT-03). Only the selection's
+ * columns move: every cell at or below the selection's first row slides down by the selection's
+ * height. References that target a shifted cell follow it; a range that lies entirely inside the
+ * shifted columns and straddles the insertion row grows by the inserted height (SHF-08); a wider
+ * range keeps its address (SHF-07). The vacated cells take the formatting of the cell above the
+ * insertion (FMT-03). Refusals (torn merge/table/array, off-sheet push) are decided by the hook via
+ * `getShiftCellsRefusal` before this runs.
+ */
 export var insertCellsShiftDown = function (_a) {
-    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeCitations = _a.onChangeCitations;
+    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, getSheetName = _a.getSheetName, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeCitations = _a.onChangeCitations;
     return function (sheetId, activeCell, selections) {
+        var _a;
         var saveHistory = createHistory();
         // We need to track this for history. Precedent cells
         var recalcCells = new Map();
-        // Count
-        var finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        // Last selection
-        var selection = finalSelections[finalSelections.length - 1];
-        var count = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+        var selection = resolveShiftSelection(activeCell, selections);
+        var _b = selection.range, r1 = _b.startRowIndex, r2 = _b.endRowIndex, c1 = _b.startColumnIndex, c2 = _b.endColumnIndex;
+        var count = r2 - r1 + 1;
+        var band = shiftBand("down", selection.range);
+        var sheetName = (_a = getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(sheetId)) !== null && _a !== void 0 ? _a : "";
         enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
             kind: "insert-cells-shift-down",
             sheetId: sheetId,
-            startRowIndex: selection.range.startRowIndex,
-            endRowIndex: selection.range.endRowIndex,
-            startColumnIndex: selection.range.startColumnIndex,
-            endColumnIndex: selection.range.endColumnIndex,
+            startRowIndex: r1,
+            endRowIndex: r2,
+            startColumnIndex: c1,
+            endColumnIndex: c2,
             rowCount: rowCount,
         });
-        // Update sheets
+        // Update sheets — merges wholly inside the shifted columns ride down with their cells.
         onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
             var _a = __read(produceWithPatches(prevSheets, function (draft) {
                 var sheet = draft.find(function (sheet) { return sheet.sheetId === sheetId; });
-                if (sheet) {
-                    for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                        sheet.merges = moveMergedCells(sheet.merges, "row-insert", rowIndex);
-                    }
+                if (sheet === null || sheet === void 0 ? void 0 : sheet.merges) {
+                    sheet.merges = shiftMergesInBand(sheet.merges, "row", r1, count, true, c1, c2);
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             // Save history
@@ -42,40 +50,61 @@ export var insertCellsShiftDown = function (_a) {
             });
             return nextState;
         });
+        // Tables whose columns the band covers entirely move with it (a partial cover was refused).
+        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 ||
+                            !isRangeInsideBand(table.range, band)) {
+                            continue;
+                        }
+                        table.range.startRowIndex += count;
+                        table.range.endRowIndex += count;
+                    }
+                }
+                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; }
+                }
+            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+            saveHistory({ tables: { patches: patches, inversePatches: inversePatches } });
+            return nextState;
+        });
         // Update citations - shift if in affected columns and after insertion row
         onChangeCitations === null || onChangeCitations === void 0 ? void 0 : onChangeCitations(function (prevCitations) {
             var _a = __read(produceWithPatches(prevCitations, function (draft) {
-                var e_1, _a;
-                var affectedColStart = selection.range.startColumnIndex;
-                var affectedColEnd = selection.range.endColumnIndex;
-                var insertRowStart = selection.range.startRowIndex;
-                var shiftAmount = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+                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 citation = draft_1_1.value;
+                    for (var draft_2 = __values(draft), draft_2_1 = draft_2.next(); !draft_2_1.done; draft_2_1 = draft_2.next()) {
+                        var citation = draft_2_1.value;
                         // Skip citations on other sheets
                         if (citation.range.sheetId !== sheetId) {
                             continue;
                         }
                         // Check if citation overlaps with affected columns
-                        var citationColStart = citation.range.startColumnIndex;
-                        var citationColEnd = citation.range.endColumnIndex;
-                        var colsOverlap = !(citationColEnd < affectedColStart || citationColStart > affectedColEnd);
+                        var colsOverlap = !(citation.range.endColumnIndex < c1 ||
+                            citation.range.startColumnIndex > c2);
                         if (colsOverlap) {
                             // If citation starts at or after the insertion row, shift it down
-                            if (citation.range.startRowIndex >= insertRowStart) {
-                                citation.range.startRowIndex += shiftAmount;
-                                citation.range.endRowIndex += shiftAmount;
+                            if (citation.range.startRowIndex >= r1) {
+                                citation.range.startRowIndex += count;
+                                citation.range.endRowIndex += count;
                             }
                         }
                     }
                 }
-                catch (e_1_1) { e_1 = { error: e_1_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);
+                        if (draft_2_1 && !draft_2_1.done && (_a = draft_2.return)) _a.call(draft_2);
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({
@@ -86,15 +115,34 @@ export var insertCellsShiftDown = function (_a) {
         // Sheet data
         onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
             var _a = __read(produceWithPatches(prevSheetData, function (draft) {
-                var _a, _b, _c, _d;
+                var e_3, _a;
+                var _b, _c, _d, _e, _f, _g, _h, _j;
                 var movedKeys = new Set();
-                var totalRows = (_b = (_a = draft[sheetId]) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : rowCount;
-                for (var rowIndex = totalRows; rowIndex > 0; rowIndex--) {
+                var totalRows = Math.max((_c = (_b = draft[sheetId]) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, r2 + 1);
+                // Everything at or below the insertion row in the band's columns moves down by `count`.
+                var sourceRange = {
+                    startRowIndex: r1,
+                    endRowIndex: totalRows + count,
+                    startColumnIndex: c1,
+                    endColumnIndex: c2,
+                };
+                // Formulas that read a moving cell — captured before the graph goes stale.
+                var dependents = collectUniqueDependentsForRange({
+                    draft: draft,
+                    sheetId: sheetId,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: totalRows,
+                        startColumnIndex: c1,
+                        endColumnIndex: c2,
+                    },
+                    getDependents: getDependents,
+                });
+                for (var rowIndex = totalRows; rowIndex >= r1; rowIndex--) {
                     // We have a for loop
                     // to cater for table expansion
                     // which will push multiple columns down
-                    for (var columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        var sourceRange = __assign(__assign({}, selection.range), { endRowIndex: selection.range.endRowIndex + count });
+                    for (var columnIndex = c1; columnIndex <= c2; columnIndex++) {
                         // Process dependents
                         processSideEffectDependentCells({
                             draft: draft,
@@ -105,6 +153,7 @@ export var insertCellsShiftDown = function (_a) {
                             enqueueGraphOperation: enqueueGraphOperation,
                             enqueueCalculation: enqueueCalculation,
                             getDependents: getDependents,
+                            getSheetName: getSheetName,
                             recalcCells: recalcCells,
                             rowDelta: count,
                             sourceRange: sourceRange,
@@ -115,26 +164,72 @@ export var insertCellsShiftDown = function (_a) {
                             cellXfsRegistry: cellXfsRegistry,
                             sharedStringRegistry: sharedStringRegistry,
                         });
-                        // Skip unaffected cells
-                        if (rowIndex < selection.range.startRowIndex) {
+                    }
+                }
+                // SHF-08: a range living entirely inside the band's columns that straddles the insertion
+                // row grows by the inserted height (Excel's "insert inside a range expands it"). Runs on
+                // the pre-shift positions; the value shift below carries in-band dependents down.
+                var sheetCell = new SheetCell();
+                try {
+                    for (var _k = __values(dependents.values()), _l = _k.next(); !_l.done; _l = _k.next()) {
+                        var pos = _l.value;
+                        if (pos.sheetId !== sheetId)
                             continue;
-                        }
+                        var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                        var cellData = (_e = (_d = currentSheet[pos.rowIndex]) === null || _d === void 0 ? void 0 : _d.values) === null || _e === void 0 ? void 0 : _e[pos.columnIndex];
+                        sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale, cellXfsRegistry: cellXfsRegistry, sharedStringRegistry: sharedStringRegistry });
+                        var formulaValue = sheetCell.formula;
+                        if (!formulaValue)
+                            continue;
+                        var expanded = expandRangesInFormula(formulaValue, r1, count, "row", sheetName, { bandSpan: { startIndex: c1, endIndex: c2 } });
+                        if (!expanded || expanded === formulaValue)
+                            continue;
+                        sheetCell.setFormulaValue(expanded, false);
+                        currentSheet[pos.rowIndex].values[pos.columnIndex] =
+                            sheetCell.getCellData();
+                        var movesWithBand = pos.rowIndex >= r1 && pos.columnIndex >= c1 && pos.columnIndex <= c2;
+                        var finalPosition = {
+                            sheetId: sheetId,
+                            rowIndex: movesWithBand ? pos.rowIndex + count : pos.rowIndex,
+                            columnIndex: pos.columnIndex,
+                        };
+                        var enqueueOperation = sheetCell.ephemeral()
+                            ? enqueueCalculation
+                            : enqueueGraphOperation;
+                        enqueueOperation === null || enqueueOperation === void 0 ? void 0 : enqueueOperation({ type: "add", position: finalPosition });
+                        enqueueCalculation === null || enqueueCalculation === void 0 ? void 0 : enqueueCalculation({
+                            type: "dirty",
+                            position: finalPosition,
+                            force: true,
+                        });
+                        recalcCells.set(createSheetCellIdentifier(sheetId, finalPosition.rowIndex, finalPosition.columnIndex), finalPosition);
+                    }
+                }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                finally {
+                    try {
+                        if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
                     }
+                    finally { if (e_3) throw e_3.error; }
                 }
                 // Update values
-                for (var rowIndex = totalRows + count; rowIndex > selection.range.startRowIndex; rowIndex--) {
+                for (var rowIndex = totalRows + count; rowIndex > r1; rowIndex--) {
                     var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (var columnIndex = selection.range.endColumnIndex; columnIndex >= selection.range.startColumnIndex; columnIndex--) {
-                        var previousValue = (_d = (_c = currentSheet[rowIndex - count]) === null || _c === void 0 ? void 0 : _c.values) === null || _d === void 0 ? void 0 : _d[columnIndex];
+                    for (var columnIndex = c2; columnIndex >= c1; columnIndex--) {
+                        var previousValue = (_g = (_f = currentSheet[rowIndex - count]) === null || _f === void 0 ? void 0 : _f.values) === null || _g === void 0 ? void 0 : _g[columnIndex];
                         currentSheet[rowIndex].values[columnIndex] = previousValue;
                     }
                 }
-                // Update inserts cells
-                for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
+                // FMT-03: the inserted cells take the formatting of the cell directly ABOVE the
+                // insertion; at row 1 there is none, so they keep the displaced cell's formatting.
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
                     var currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (var columnIndex = selection.range.endColumnIndex; columnIndex >= selection.range.startColumnIndex; columnIndex--) {
+                    for (var columnIndex = c2; columnIndex >= c1; columnIndex--) {
+                        var formatSource = r1 > 1
+                            ? (_j = (_h = currentSheet[r1 - 1]) === null || _h === void 0 ? void 0 : _h.values) === null || _j === void 0 ? void 0 : _j[columnIndex]
+                            : currentSheet[rowIndex].values[columnIndex];
                         currentSheet[rowIndex].values[columnIndex] =
-                            cloneCellWithFormatting(currentSheet[rowIndex].values[columnIndex]);
+                            cloneCellWithFormatting(formatSource);
                     }
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];

package/dist/cjs/interface/insert-cells-shift-right.d.ts

@@ -1,5 +1,14 @@
 import type { CellData, CellInterface, SelectionArea } from "@rowsncolumns/common-types";
 import type { SelectionAttributes, Sheet } from "@rowsncolumns/spreadsheet";
 import type { UseOnInsertCellsShiftRight } from "../hooks/use-on-insert-cells-shift-right";
-export declare const insertCellsShiftRight: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeCitations, }: UseOnInsertCellsShiftRight<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
+/**
+ * Insert cells ▸ Shift cells right (SHF-02, FMT-04) — the horizontal twin of
+ * `insertCellsShiftDown`: only the selection's rows move, every cell at or right of the selection's
+ * first column slides right by the selection's width. References follow shifted cells; a range
+ * entirely inside the shifted rows that straddles the insertion column widens (SHF-08 analog);
+ * the vacated cells take the formatting of the cell to the LEFT of the insertion (FMT-04). Refusals
+ * (torn merge/table/array, a non-blank cell pushed past `columnCount` — SHF-10) are decided by the
+ * hook before this runs.
+ */
+export declare const insertCellsShiftRight: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }: UseOnInsertCellsShiftRight<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
 //# sourceMappingURL=insert-cells-shift-right.d.ts.map

package/dist/cjs/interface/insert-cells-shift-right.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert-cells-shift-right.d.ts","sourceRoot":"","sources":["../../../interface/insert-cells-shift-right.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAM5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAG3F,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,gQAgBxE,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC,MAE/B,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SA2LnD,CAAC"}
+{"version":3,"file":"insert-cells-shift-right.d.ts","sourceRoot":"","sources":["../../../interface/insert-cells-shift-right.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAgB5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAI3F;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8RAkBxE,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC,MAE/B,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAqQnD,CAAC"}

package/dist/cjs/interface/insert-cells-shift-right.js

@@ -1,41 +1,48 @@
-import { __assign, __read, __spreadArray, __values } from "tslib";
-import { createArrayRange, selectionFromActiveCell } from "@rowsncolumns/utils";
+import { __read, __spreadArray, __values } from "tslib";
+import { createArrayRange } from "@rowsncolumns/utils";
 import { produceWithPatches } from "immer";
-import { processSideEffectDependentCells } from "../api/dependency";
-import { cloneCellWithFormatting } from "../api/immer-utils";
-import { moveMergedCells } from "../api/merges";
+import { collectUniqueDependentsForRange, processSideEffectDependentCells, } from "../api/dependency";
+import { createSheetCellIdentifier, expandRangesInFormula } from "../api/formula";
+import { cloneCellWithFormatting, createSheetDraft } from "../api/immer-utils";
+import { shiftMergesInBand } from "../api/merges";
+import { isRangeInsideBand, resolveShiftSelection, shiftBand, } from "../api/structural-guards";
+import { SheetCell } from "../sheet-cell";
+/**
+ * Insert cells ▸ Shift cells right (SHF-02, FMT-04) — the horizontal twin of
+ * `insertCellsShiftDown`: only the selection's rows move, every cell at or right of the selection's
+ * first column slides right by the selection's width. References follow shifted cells; a range
+ * entirely inside the shifted rows that straddles the insertion column widens (SHF-08 analog);
+ * the vacated cells take the formatting of the cell to the LEFT of the insertion (FMT-04). Refusals
+ * (torn merge/table/array, a non-blank cell pushed past `columnCount` — SHF-10) are decided by the
+ * hook before this runs.
+ */
 export var insertCellsShiftRight = function (_a) {
-    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeCitations = _a.onChangeCitations;
+    var rowCount = _a.rowCount, columnCount = _a.columnCount, locale = _a.locale, cellXfsRegistry = _a.cellXfsRegistry, sharedStringRegistry = _a.sharedStringRegistry, getActiveCell = _a.getActiveCell, getSelections = _a.getSelections, getDependents = _a.getDependents, getSheetName = _a.getSheetName, createHistory = _a.createHistory, enqueueGraphOperation = _a.enqueueGraphOperation, enqueueCalculation = _a.enqueueCalculation, enqueueStructureChange = _a.enqueueStructureChange, onChangeSheetData = _a.onChangeSheetData, onChangeSheets = _a.onChangeSheets, onChangeTables = _a.onChangeTables, onChangeCitations = _a.onChangeCitations;
     return function (sheetId, activeCell, selections) {
+        var _a;
         var saveHistory = createHistory();
         // We need to track this for history. Precedent cells
         var recalcCells = new Map();
-        // Count
-        var finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        // Last selection
-        var selection = finalSelections[finalSelections.length - 1];
-        var count = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+        var selection = resolveShiftSelection(activeCell, selections);
+        var _b = selection.range, r1 = _b.startRowIndex, r2 = _b.endRowIndex, c1 = _b.startColumnIndex, c2 = _b.endColumnIndex;
+        var count = c2 - c1 + 1;
+        var band = shiftBand("right", selection.range);
+        var sheetName = (_a = getSheetName === null || getSheetName === void 0 ? void 0 : getSheetName(sheetId)) !== null && _a !== void 0 ? _a : "";
         enqueueStructureChange === null || enqueueStructureChange === void 0 ? void 0 : enqueueStructureChange({
             kind: "insert-cells-shift-right",
             sheetId: sheetId,
-            startRowIndex: selection.range.startRowIndex,
-            endRowIndex: selection.range.endRowIndex,
-            startColumnIndex: selection.range.startColumnIndex,
-            endColumnIndex: selection.range.endColumnIndex,
+            startRowIndex: r1,
+            endRowIndex: r2,
+            startColumnIndex: c1,
+            endColumnIndex: c2,
             columnCount: columnCount,
         });
-        // Update sheets
+        // Update sheets — merges wholly inside the shifted rows ride right with their cells.
         onChangeSheets === null || onChangeSheets === void 0 ? void 0 : onChangeSheets(function (prevSheets) {
             var _a = __read(produceWithPatches(prevSheets, function (draft) {
                 var sheet = draft.find(function (sheet) { return sheet.sheetId === sheetId; });
-                if (sheet) {
-                    for (var columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        if (sheet.merges) {
-                            sheet.merges = moveMergedCells(sheet.merges, "column-insert", columnIndex);
-                        }
-                    }
+                if (sheet === null || sheet === void 0 ? void 0 : sheet.merges) {
+                    sheet.merges = shiftMergesInBand(sheet.merges, "column", c1, count, true, r1, r2);
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             // Save history
@@ -44,43 +51,61 @@ export var insertCellsShiftRight = function (_a) {
             });
             return nextState;
         });
+        // Tables whose rows the band covers entirely move with it (a partial cover was refused).
+        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 ||
+                            !isRangeInsideBand(table.range, band)) {
+                            continue;
+                        }
+                        table.range.startColumnIndex += count;
+                        table.range.endColumnIndex += count;
+                    }
+                }
+                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; }
+                }
+            }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
+            saveHistory({ tables: { patches: patches, inversePatches: inversePatches } });
+            return nextState;
+        });
         // Update citations - shift if in affected rows and after insertion column
         onChangeCitations === null || onChangeCitations === void 0 ? void 0 : onChangeCitations(function (prevCitations) {
             var _a = __read(produceWithPatches(prevCitations, function (draft) {
-                var e_1, _a;
-                var affectedRowStart = selection.range.startRowIndex;
-                var affectedRowEnd = selection.range.endRowIndex;
-                var insertColumnStart = selection.range.startColumnIndex;
-                var shiftAmount = selection.range.endColumnIndex -
-                    selection.range.startColumnIndex +
-                    1;
+                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 citation = draft_1_1.value;
+                    for (var draft_2 = __values(draft), draft_2_1 = draft_2.next(); !draft_2_1.done; draft_2_1 = draft_2.next()) {
+                        var citation = draft_2_1.value;
                         // Skip citations on other sheets
                         if (citation.range.sheetId !== sheetId) {
                             continue;
                         }
                         // Check if citation overlaps with affected rows
-                        var citationRowStart = citation.range.startRowIndex;
-                        var citationRowEnd = citation.range.endRowIndex;
-                        var rowsOverlap = !(citationRowEnd < affectedRowStart ||
-                            citationRowStart > affectedRowEnd);
+                        var rowsOverlap = !(citation.range.endRowIndex < r1 ||
+                            citation.range.startRowIndex > r2);
                         if (rowsOverlap) {
                             // If citation starts at or after the insertion column, shift it right
-                            if (citation.range.startColumnIndex >= insertColumnStart) {
-                                citation.range.startColumnIndex += shiftAmount;
-                                citation.range.endColumnIndex += shiftAmount;
+                            if (citation.range.startColumnIndex >= c1) {
+                                citation.range.startColumnIndex += count;
+                                citation.range.endColumnIndex += count;
                             }
                         }
                     }
                 }
-                catch (e_1_1) { e_1 = { error: e_1_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);
+                        if (draft_2_1 && !draft_2_1.done && (_a = draft_2.return)) _a.call(draft_2);
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];
             saveHistory({
@@ -91,12 +116,34 @@ export var insertCellsShiftRight = function (_a) {
         // Sheet data
         onChangeSheetData === null || onChangeSheetData === void 0 ? void 0 : onChangeSheetData(function (prevSheetData) {
             var _a = __read(produceWithPatches(prevSheetData, function (draft) {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var e_3, _a;
+                var _b, _c, _d, _e, _f, _g, _h, _j;
                 var movedKeys = new Set();
-                for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                    var totalColumns = (_d = (_c = (_b = (_a = draft[sheetId]) === null || _a === void 0 ? void 0 : _a[rowIndex]) === null || _b === void 0 ? void 0 : _b.values) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : columnCount;
-                    for (var columnIndex = 1; columnIndex < totalColumns; columnIndex++) {
-                        var sourceRange = __assign(__assign({}, selection.range), { endColumnIndex: totalColumns });
+                var totalColumns = Math.max(columnCount, c2 + 1);
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    totalColumns = Math.max(totalColumns, (_e = (_d = (_c = (_b = draft[sheetId]) === null || _b === void 0 ? void 0 : _b[rowIndex]) === null || _c === void 0 ? void 0 : _c.values) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0);
+                }
+                // Everything at or right of the insertion column in the band's rows moves by `count`.
+                var sourceRange = {
+                    startRowIndex: r1,
+                    endRowIndex: r2,
+                    startColumnIndex: c1,
+                    endColumnIndex: totalColumns + count,
+                };
+                // Formulas that read a moving cell — captured before the graph goes stale.
+                var dependents = collectUniqueDependentsForRange({
+                    draft: draft,
+                    sheetId: sheetId,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: r2,
+                        startColumnIndex: c1,
+                        endColumnIndex: totalColumns,
+                    },
+                    getDependents: getDependents,
+                });
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    for (var columnIndex = totalColumns; columnIndex >= c1; columnIndex--) {
                         // Process dependents
                         processSideEffectDependentCells({
                             draft: draft,
@@ -107,6 +154,7 @@ export var insertCellsShiftRight = function (_a) {
                             enqueueGraphOperation: enqueueGraphOperation,
                             enqueueCalculation: enqueueCalculation,
                             getDependents: getDependents,
+                            getSheetName: getSheetName,
                             recalcCells: recalcCells,
                             rowDelta: 0,
                             sourceRange: sourceRange,
@@ -119,18 +167,66 @@ export var insertCellsShiftRight = function (_a) {
                         });
                     }
                 }
-                var _loop_1 = function (rowIndex) {
-                    // Delete column
-                    if ((_f = (_e = draft[sheetId]) === null || _e === void 0 ? void 0 : _e[rowIndex]) === null || _f === void 0 ? void 0 : _f.values) {
-                        (_h = (_g = draft[sheetId][rowIndex]) === null || _g === void 0 ? void 0 : _g.values) === null || _h === void 0 ? void 0 : _h.splice.apply(_h, __spreadArray([selection.range.startColumnIndex,
-                            0], __read(createArrayRange(selection.range.startColumnIndex, selection.range.endColumnIndex).map(function (columnIndex) {
-                            var _a, _b;
-                            return cloneCellWithFormatting((_b = (_a = draft[sheetId][rowIndex]) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b[columnIndex]);
-                        })), false));
+                // SHF-08 analog: a range living entirely inside the band's rows that straddles the
+                // insertion column widens by the inserted width. Runs on the pre-shift positions; the
+                // splice below carries in-band dependents right.
+                var sheetCell = new SheetCell();
+                try {
+                    for (var _k = __values(dependents.values()), _l = _k.next(); !_l.done; _l = _k.next()) {
+                        var pos = _l.value;
+                        if (pos.sheetId !== sheetId)
+                            continue;
+                        var currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                        var cellData = (_g = (_f = currentSheet[pos.rowIndex]) === null || _f === void 0 ? void 0 : _f.values) === null || _g === void 0 ? void 0 : _g[pos.columnIndex];
+                        sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale: locale, cellXfsRegistry: cellXfsRegistry, sharedStringRegistry: sharedStringRegistry });
+                        var formulaValue = sheetCell.formula;
+                        if (!formulaValue)
+                            continue;
+                        var expanded = expandRangesInFormula(formulaValue, c1, count, "column", sheetName, { bandSpan: { startIndex: r1, endIndex: r2 } });
+                        if (!expanded || expanded === formulaValue)
+                            continue;
+                        sheetCell.setFormulaValue(expanded, false);
+                        currentSheet[pos.rowIndex].values[pos.columnIndex] =
+                            sheetCell.getCellData();
+                        var movesWithBand = pos.columnIndex >= c1 && pos.rowIndex >= r1 && pos.rowIndex <= r2;
+                        var finalPosition = {
+                            sheetId: sheetId,
+                            rowIndex: pos.rowIndex,
+                            columnIndex: movesWithBand
+                                ? pos.columnIndex + count
+                                : pos.columnIndex,
+                        };
+                        var enqueueOperation = sheetCell.ephemeral()
+                            ? enqueueCalculation
+                            : enqueueGraphOperation;
+                        enqueueOperation === null || enqueueOperation === void 0 ? void 0 : enqueueOperation({ type: "add", position: finalPosition });
+                        enqueueCalculation === null || enqueueCalculation === void 0 ? void 0 : enqueueCalculation({
+                            type: "dirty",
+                            position: finalPosition,
+                            force: true,
+                        });
+                        recalcCells.set(createSheetCellIdentifier(sheetId, finalPosition.rowIndex, finalPosition.columnIndex), finalPosition);
                     }
+                }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                finally {
+                    try {
+                        if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                }
+                var _loop_1 = function (rowIndex) {
+                    var values = (_j = (_h = draft[sheetId]) === null || _h === void 0 ? void 0 : _h[rowIndex]) === null || _j === void 0 ? void 0 : _j.values;
+                    if (!values)
+                        return "continue";
+                    values.splice.apply(values, __spreadArray([c1,
+                        0], __read(createArrayRange(c1, c2).map(function (columnIndex) {
+                        return cloneCellWithFormatting(c1 > 1 ? values[c1 - 1] : values[columnIndex]);
+                    })), false));
                 };
-                // Delete column
-                for (var rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
+                // Splice the inserted cells in. FMT-04: they take the formatting of the cell directly
+                // LEFT of the insertion; at column 1 there is none, so they keep the displaced cell's.
+                for (var rowIndex = r1; rowIndex <= r2; rowIndex++) {
                     _loop_1(rowIndex);
                 }
             }), 3), nextState = _a[0], patches = _a[1], inversePatches = _a[2];

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

@@ -2,6 +2,6 @@ import { Direction } from "@rowsncolumns/common-types";
 import type { CellData, Sheet, TableView } from "@rowsncolumns/spreadsheet";
 import type { UseOnInsertColumnProps } from "../hooks/use-on-insert-column";
 import type { UseOnTableProps } from "../hooks/use-on-table";
-export declare const insertColumn: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, tables, cellXfsRegistry, sharedStringRegistry, getSheetName, getDependents, getGraphNodes, getGraphNodesInSheet, getActiveCell, getSelections, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeDataValidations, onChangeConditionalFormats, onChangeCitations, onChangePivotTables, generatedNames, }: UseOnInsertColumnProps<T, S>) => (sheetId: number, referenceColumnIndex: number, numColumns?: number) => void;
+export declare const insertColumn: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, maxColumnCount, tables, cellXfsRegistry, sharedStringRegistry, getSheetName, getDependents, getGraphNodes, getGraphNodesInSheet, getActiveCell, getSelections, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeDataValidations, onChangeConditionalFormats, onChangeCitations, onChangePivotTables, onChangeNamedRanges, onChangeEmbeds, onChangeCharts, onChangeProtectedRanges, generatedNames, }: UseOnInsertColumnProps<T, S>) => (sheetId: number, referenceColumnIndex: number, numColumns?: number) => void;
 export declare const insertTableColumn: <T extends CellData, S extends Sheet>({ tables, columnCount, rowCount, locale, cellXfsRegistry, sharedStringRegistry, getSheetName, createHistory, onChangeTables, onChangeSheets, onChangeSheetData, enqueueCalculation, enqueueStructureChange, enqueueGraphOperation, getDependents, generatedNames, }: Pick<UseOnTableProps<T, S>, "tables" | "columnCount" | "rowCount" | "locale" | "cellXfsRegistry" | "sharedStringRegistry" | "createHistory" | "onChangeTables" | "onChangeSheets" | "onChangeSheetData" | "enqueueCalculation" | "enqueueStructureChange" | "enqueueGraphOperation" | "getDependents" | "getSheetName" | "generatedNames">) => (tableView: TableView, dimensionIndex: number, direction: Direction.Left | Direction.Right) => void;
 //# sourceMappingURL=insert-column.d.ts.map

package/dist/cjs/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;AAoB5E,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,qaAyB/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,sBAAsB,MAAM,EAAE,mBAAc,SA0TtE,CAAC;AAMF,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qQAiBpE,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,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,SA2V9C,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;AAkC5E,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,mgBA8B/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,sBAAsB,MAAM,EAAE,mBAAc,SAoatE,CAAC;AAMF,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qQAiBpE,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,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,SA2V9C,CAAC"}