@rowsncolumns/spreadsheet-state 28.0.75 → 29.0.0

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

@@ -1,37 +1,44 @@
-import { selectionFromActiveCell } from "@rowsncolumns/utils";
 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";
-export const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeCitations, }) => {
+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 const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }) => {
     return (sheetId, activeCell, selections) => {
         const saveHistory = createHistory();
         // We need to track this for history. Precedent cells
         const recalcCells = new Map();
-        // Count
-        const finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        // Last selection
-        const selection = finalSelections[finalSelections.length - 1];
-        const count = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+        const selection = resolveShiftSelection(activeCell, selections);
+        const { startRowIndex: r1, endRowIndex: r2, startColumnIndex: c1, endColumnIndex: c2, } = selection.range;
+        const count = r2 - r1 + 1;
+        const band = shiftBand("down", selection.range);
+        const sheetName = getSheetName?.(sheetId) ?? "";
         enqueueStructureChange?.({
             kind: "insert-cells-shift-down",
             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,
         });
-        // Update sheets
+        // Update sheets — merges wholly inside the shifted columns ride down with their cells.
         onChangeSheets?.((prevSheets) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheets, (draft) => {
                 const sheet = draft.find((sheet) => sheet.sheetId === sheetId);
-                if (sheet) {
-                    for (let rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                        sheet.merges = moveMergedCells(sheet.merges, "row-insert", rowIndex);
-                    }
+                if (sheet?.merges) {
+                    sheet.merges = shiftMergesInBand(sheet.merges, "row", r1, count, true, c1, c2);
                 }
             });
             // Save history
@@ -40,27 +47,37 @@ export const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsReg
             });
             return nextState;
         });
+        // Tables whose columns the band covers entirely move with it (a partial cover was refused).
+        onChangeTables?.((prevTables) => {
+            const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
+                for (const table of draft) {
+                    if (table.sheetId !== sheetId ||
+                        !isRangeInsideBand(table.range, band)) {
+                        continue;
+                    }
+                    table.range.startRowIndex += count;
+                    table.range.endRowIndex += count;
+                }
+            });
+            saveHistory({ tables: { patches, inversePatches } });
+            return nextState;
+        });
         // Update citations - shift if in affected columns and after insertion row
         onChangeCitations?.((prevCitations) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCitations, (draft) => {
-                const affectedColStart = selection.range.startColumnIndex;
-                const affectedColEnd = selection.range.endColumnIndex;
-                const insertRowStart = selection.range.startRowIndex;
-                const shiftAmount = selection.range.endRowIndex - selection.range.startRowIndex + 1;
                 for (const citation of draft) {
                     // Skip citations on other sheets
                     if (citation.range.sheetId !== sheetId) {
                         continue;
                     }
                     // Check if citation overlaps with affected columns
-                    const citationColStart = citation.range.startColumnIndex;
-                    const citationColEnd = citation.range.endColumnIndex;
-                    const colsOverlap = !(citationColEnd < affectedColStart || citationColStart > affectedColEnd);
+                    const 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;
                         }
                     }
                 }
@@ -74,16 +91,31 @@ export const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsReg
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
                 const movedKeys = new Set();
-                const totalRows = draft[sheetId]?.length ?? rowCount;
-                for (let rowIndex = totalRows; rowIndex > 0; rowIndex--) {
+                const totalRows = Math.max(draft[sheetId]?.length ?? 0, r2 + 1);
+                // Everything at or below the insertion row in the band's columns moves down by `count`.
+                const sourceRange = {
+                    startRowIndex: r1,
+                    endRowIndex: totalRows + count,
+                    startColumnIndex: c1,
+                    endColumnIndex: c2,
+                };
+                // Formulas that read a moving cell — captured before the graph goes stale.
+                const dependents = collectUniqueDependentsForRange({
+                    draft,
+                    sheetId,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: totalRows,
+                        startColumnIndex: c1,
+                        endColumnIndex: c2,
+                    },
+                    getDependents,
+                });
+                for (let rowIndex = totalRows; rowIndex >= r1; rowIndex--) {
                     // We have a for loop
                     // to cater for table expansion
                     // which will push multiple columns down
-                    for (let columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        const sourceRange = {
-                            ...selection.range,
-                            endRowIndex: selection.range.endRowIndex + count,
-                        };
+                    for (let columnIndex = c1; columnIndex <= c2; columnIndex++) {
                         // Process dependents
                         processSideEffectDependentCells({
                             draft,
@@ -94,6 +126,7 @@ export const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsReg
                             enqueueGraphOperation,
                             enqueueCalculation,
                             getDependents,
+                            getSheetName,
                             recalcCells,
                             rowDelta: count,
                             sourceRange,
@@ -104,26 +137,62 @@ export const insertCellsShiftDown = ({ rowCount, columnCount, locale, cellXfsReg
                             cellXfsRegistry,
                             sharedStringRegistry,
                         });
-                        // Skip unaffected cells
-                        if (rowIndex < selection.range.startRowIndex) {
-                            continue;
-                        }
                     }
                 }
+                // 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.
+                const sheetCell = new SheetCell();
+                for (const pos of dependents.values()) {
+                    if (pos.sheetId !== sheetId)
+                        continue;
+                    const currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                    const cellData = currentSheet[pos.rowIndex]?.values?.[pos.columnIndex];
+                    sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale, cellXfsRegistry, sharedStringRegistry });
+                    const formulaValue = sheetCell.formula;
+                    if (!formulaValue)
+                        continue;
+                    const 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();
+                    const movesWithBand = pos.rowIndex >= r1 && pos.columnIndex >= c1 && pos.columnIndex <= c2;
+                    const finalPosition = {
+                        sheetId,
+                        rowIndex: movesWithBand ? pos.rowIndex + count : pos.rowIndex,
+                        columnIndex: pos.columnIndex,
+                    };
+                    const enqueueOperation = sheetCell.ephemeral()
+                        ? enqueueCalculation
+                        : enqueueGraphOperation;
+                    enqueueOperation?.({ type: "add", position: finalPosition });
+                    enqueueCalculation?.({
+                        type: "dirty",
+                        position: finalPosition,
+                        force: true,
+                    });
+                    recalcCells.set(createSheetCellIdentifier(sheetId, finalPosition.rowIndex, finalPosition.columnIndex), finalPosition);
+                }
                 // Update values
-                for (let rowIndex = totalRows + count; rowIndex > selection.range.startRowIndex; rowIndex--) {
+                for (let rowIndex = totalRows + count; rowIndex > r1; rowIndex--) {
                     const currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (let columnIndex = selection.range.endColumnIndex; columnIndex >= selection.range.startColumnIndex; columnIndex--) {
+                    for (let columnIndex = c2; columnIndex >= c1; columnIndex--) {
                         const previousValue = currentSheet[rowIndex - count]?.values?.[columnIndex];
                         currentSheet[rowIndex].values[columnIndex] = previousValue;
                     }
                 }
-                // Update inserts cells
-                for (let 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 (let rowIndex = r1; rowIndex <= r2; rowIndex++) {
                     const currentSheet = createSheetDraft(draft, sheetId, rowIndex);
-                    for (let columnIndex = selection.range.endColumnIndex; columnIndex >= selection.range.startColumnIndex; columnIndex--) {
+                    for (let columnIndex = c2; columnIndex >= c1; columnIndex--) {
+                        const formatSource = r1 > 1
+                            ? currentSheet[r1 - 1]?.values?.[columnIndex]
+                            : currentSheet[rowIndex].values[columnIndex];
                         currentSheet[rowIndex].values[columnIndex] =
-                            cloneCellWithFormatting(currentSheet[rowIndex].values[columnIndex]);
+                            cloneCellWithFormatting(formatSource);
                     }
                 }
             });

package/dist/esm/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/esm/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/esm/interface/insert-cells-shift-right.js

@@ -1,39 +1,45 @@
-import { createArrayRange, selectionFromActiveCell } from "@rowsncolumns/utils";
+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";
-export const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeCitations, }) => {
+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 const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }) => {
     return (sheetId, activeCell, selections) => {
         const saveHistory = createHistory();
         // We need to track this for history. Precedent cells
         const recalcCells = new Map();
-        // Count
-        const finalSelections = selections.length
-            ? selections
-            : selectionFromActiveCell(activeCell);
-        // Last selection
-        const selection = finalSelections[finalSelections.length - 1];
-        const count = selection.range.endRowIndex - selection.range.startRowIndex + 1;
+        const selection = resolveShiftSelection(activeCell, selections);
+        const { startRowIndex: r1, endRowIndex: r2, startColumnIndex: c1, endColumnIndex: c2, } = selection.range;
+        const count = c2 - c1 + 1;
+        const band = shiftBand("right", selection.range);
+        const sheetName = getSheetName?.(sheetId) ?? "";
         enqueueStructureChange?.({
             kind: "insert-cells-shift-right",
             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,
         });
-        // Update sheets
+        // Update sheets — merges wholly inside the shifted rows ride right with their cells.
         onChangeSheets?.((prevSheets) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheets, (draft) => {
                 const sheet = draft.find((sheet) => sheet.sheetId === sheetId);
-                if (sheet) {
-                    for (let columnIndex = selection.range.startColumnIndex; columnIndex <= selection.range.endColumnIndex; columnIndex++) {
-                        if (sheet.merges) {
-                            sheet.merges = moveMergedCells(sheet.merges, "column-insert", columnIndex);
-                        }
-                    }
+                if (sheet?.merges) {
+                    sheet.merges = shiftMergesInBand(sheet.merges, "column", c1, count, true, r1, r2);
                 }
             });
             // Save history
@@ -42,30 +48,37 @@ export const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRe
             });
             return nextState;
         });
+        // Tables whose rows the band covers entirely move with it (a partial cover was refused).
+        onChangeTables?.((prevTables) => {
+            const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
+                for (const table of draft) {
+                    if (table.sheetId !== sheetId ||
+                        !isRangeInsideBand(table.range, band)) {
+                        continue;
+                    }
+                    table.range.startColumnIndex += count;
+                    table.range.endColumnIndex += count;
+                }
+            });
+            saveHistory({ tables: { patches, inversePatches } });
+            return nextState;
+        });
         // Update citations - shift if in affected rows and after insertion column
         onChangeCitations?.((prevCitations) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCitations, (draft) => {
-                const affectedRowStart = selection.range.startRowIndex;
-                const affectedRowEnd = selection.range.endRowIndex;
-                const insertColumnStart = selection.range.startColumnIndex;
-                const shiftAmount = selection.range.endColumnIndex -
-                    selection.range.startColumnIndex +
-                    1;
                 for (const citation of draft) {
                     // Skip citations on other sheets
                     if (citation.range.sheetId !== sheetId) {
                         continue;
                     }
                     // Check if citation overlaps with affected rows
-                    const citationRowStart = citation.range.startRowIndex;
-                    const citationRowEnd = citation.range.endRowIndex;
-                    const rowsOverlap = !(citationRowEnd < affectedRowStart ||
-                        citationRowStart > affectedRowEnd);
+                    const 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;
                         }
                     }
                 }
@@ -79,13 +92,31 @@ export const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRe
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
                 const movedKeys = new Set();
-                for (let rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                    const totalColumns = draft[sheetId]?.[rowIndex]?.values?.length ?? columnCount;
-                    for (let columnIndex = 1; columnIndex < totalColumns; columnIndex++) {
-                        const sourceRange = {
-                            ...selection.range,
-                            endColumnIndex: totalColumns,
-                        };
+                let totalColumns = Math.max(columnCount, c2 + 1);
+                for (let rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    totalColumns = Math.max(totalColumns, draft[sheetId]?.[rowIndex]?.values?.length ?? 0);
+                }
+                // Everything at or right of the insertion column in the band's rows moves by `count`.
+                const sourceRange = {
+                    startRowIndex: r1,
+                    endRowIndex: r2,
+                    startColumnIndex: c1,
+                    endColumnIndex: totalColumns + count,
+                };
+                // Formulas that read a moving cell — captured before the graph goes stale.
+                const dependents = collectUniqueDependentsForRange({
+                    draft,
+                    sheetId,
+                    sourceRange: {
+                        startRowIndex: r1,
+                        endRowIndex: r2,
+                        startColumnIndex: c1,
+                        endColumnIndex: totalColumns,
+                    },
+                    getDependents,
+                });
+                for (let rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    for (let columnIndex = totalColumns; columnIndex >= c1; columnIndex--) {
                         // Process dependents
                         processSideEffectDependentCells({
                             draft,
@@ -96,6 +127,7 @@ export const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRe
                             enqueueGraphOperation,
                             enqueueCalculation,
                             getDependents,
+                            getSheetName,
                             recalcCells,
                             rowDelta: 0,
                             sourceRange,
@@ -108,14 +140,51 @@ export const insertCellsShiftRight = ({ rowCount, columnCount, locale, cellXfsRe
                         });
                     }
                 }
-                // Delete column
-                for (let rowIndex = selection.range.startRowIndex; rowIndex <= selection.range.endRowIndex; rowIndex++) {
-                    // Delete column
-                    if (draft[sheetId]?.[rowIndex]?.values) {
-                        draft[sheetId][rowIndex]?.values?.splice(selection.range.startColumnIndex, 0, ...createArrayRange(selection.range.startColumnIndex, selection.range.endColumnIndex).map((columnIndex) => {
-                            return cloneCellWithFormatting(draft[sheetId][rowIndex]?.values?.[columnIndex]);
-                        }));
-                    }
+                // 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.
+                const sheetCell = new SheetCell();
+                for (const pos of dependents.values()) {
+                    if (pos.sheetId !== sheetId)
+                        continue;
+                    const currentSheet = createSheetDraft(draft, sheetId, pos.rowIndex);
+                    const cellData = currentSheet[pos.rowIndex]?.values?.[pos.columnIndex];
+                    sheetCell.assign(sheetId, { rowIndex: pos.rowIndex, columnIndex: pos.columnIndex }, cellData, { locale, cellXfsRegistry, sharedStringRegistry });
+                    const formulaValue = sheetCell.formula;
+                    if (!formulaValue)
+                        continue;
+                    const 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();
+                    const movesWithBand = pos.columnIndex >= c1 && pos.rowIndex >= r1 && pos.rowIndex <= r2;
+                    const finalPosition = {
+                        sheetId,
+                        rowIndex: pos.rowIndex,
+                        columnIndex: movesWithBand
+                            ? pos.columnIndex + count
+                            : pos.columnIndex,
+                    };
+                    const enqueueOperation = sheetCell.ephemeral()
+                        ? enqueueCalculation
+                        : enqueueGraphOperation;
+                    enqueueOperation?.({ type: "add", position: finalPosition });
+                    enqueueCalculation?.({
+                        type: "dirty",
+                        position: finalPosition,
+                        force: true,
+                    });
+                    recalcCells.set(createSheetCellIdentifier(sheetId, finalPosition.rowIndex, finalPosition.columnIndex), finalPosition);
+                }
+                // 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 (let rowIndex = r1; rowIndex <= r2; rowIndex++) {
+                    const values = draft[sheetId]?.[rowIndex]?.values;
+                    if (!values)
+                        continue;
+                    values.splice(c1, 0, ...createArrayRange(c1, c2).map((columnIndex) => cloneCellWithFormatting(c1 > 1 ? values[c1 - 1] : values[columnIndex])));
                 }
             });
             // Save history

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