@rowsncolumns/spreadsheet-state 28.0.76 → 29.1.0

package/dist/esm/interface/create-table.js

@@ -1,25 +1,101 @@
-import { areaIntersects, isAreasEqual, isCellWithinBounds, selectionFromActiveCell, } from "@rowsncolumns/utils";
+import { areaIntersects, isAreasEqual, isCellWithinBounds, selectionFromActiveCell, validateTableName, } from "@rowsncolumns/utils";
 import { uuid } from "@rowsncolumns/utils";
 import { produceWithPatches } from "immer";
-import { getGeneratedTableName } from "../generated-names";
-import { getNextTableColumnName } from "../helpers";
-import { addTableColumn, tableWouldOverlap } from "./table-utils";
-export const createTable = ({ locale, rowCount, columnCount, tables, basicFilter, theme: spreadsheetTheme, idCreationStrategy, enqueueCalculation, createHistory, onChangeSheets, onChangeTables, onChangeSheetData, getFormattedValue, getEffectiveValue, onRequestCalculate, getDependents, enqueueGraphOperation, getContentfulRangeAroundCell, generatedNames, }) => {
-    return (sheetId, activeCell, selections, tableSpec, theme, bandedRange) => {
+import { getTableRangeRefusal, shiftBand } from "../api/structural-guards";
+import { getNextTableTitle } from "../helpers";
+import { insertCellsShiftDown } from "./insert-cells-shift-down";
+import { addTableColumn, getTableHeaderNames } from "./table-utils";
+/**
+ * The data range a create-table targets: the spec's range, else the last selection, else the data
+ * region around the active cell (Ctrl+A's region), else the active cell. The hook's refusal guards
+ * and the create itself must agree on it, so both resolve it here.
+ */
+export const resolveCreateTableRange = ({ sheetId, activeCell, selections, tableSpec, getContentfulRangeAroundCell, }) => {
+    const lastSelection = selections?.[selections.length - 1];
+    return tableSpec?.range
+        ? tableSpec.range
+        : lastSelection
+            ? lastSelection.range
+            : getContentfulRangeAroundCell?.(sheetId, activeCell) ??
+                selectionFromActiveCell(activeCell)[0].range;
+};
+export const createTable = ({ locale, rowCount, columnCount, tables, namedRanges, basicFilter, cellXfsRegistry, sharedStringRegistry, theme: spreadsheetTheme, idCreationStrategy, enqueueCalculation, enqueueStructureChange, createHistory, onChangeSheets, onChangeTables, onChangeSheetData, onChangeCitations, onChangeCharts, getActiveCell, getSelections, getFormattedValue, getEffectiveValue, onRequestCalculate, getDependents, getSheetName, enqueueGraphOperation, getContentfulRangeAroundCell, generatedNames, }) => {
+    return (sheetId, activeCell, selections, tableSpec, theme, bandedRange, options) => {
         // Validate
         const lastSelection = selections?.[selections.length - 1];
-        const saveHistory = createHistory();
-        const range = tableSpec?.range
-            ? tableSpec.range
-            : lastSelection
-                ? lastSelection.range
-                : getContentfulRangeAroundCell?.(sheetId, activeCell) ??
-                    selectionFromActiveCell(activeCell)[0].range;
+        const dataRange = resolveCreateTableRange({
+            sheetId,
+            activeCell,
+            selections,
+            tableSpec,
+            getContentfulRangeAroundCell,
+        });
+        // Excel's "My table has headers" unchecked: a `Column1..N` header row is inserted ABOVE the
+        // data — the range's columns shift down one row (Insert Cells → Shift cells down) and the
+        // table covers header + data. The caller has already run the shift's refusal guard.
+        const hasHeaders = options?.hasHeaders !== false;
+        const range = hasHeaders
+            ? dataRange
+            : { ...dataRange, endRowIndex: dataRange.endRowIndex + 1 };
         // Refuse to create a table whose rectangle overlaps an existing one on the
-        // same sheet — Excel rejects such workbooks on open.
-        if (tableWouldOverlap({ sheetId, range }, tables)) {
+        // same sheet — Excel rejects such workbooks on open. With an inserted header
+        // row, tables wholly inside the shifted columns sit one row lower by then.
+        if (getTableRangeRefusal({
+            sheetId,
+            range,
+            tables,
+            insertedRows: hasHeaders
+                ? undefined
+                : {
+                    band: shiftBand("down", {
+                        ...dataRange,
+                        endRowIndex: dataRange.startRowIndex,
+                    }),
+                    count: 1,
+                },
+        })) {
+            return;
+        }
+        // A caller-supplied id must be free: pushing a second table under an existing id would leave
+        // two tables answering to it (the hook shows the reason; a generated id is fresh by construction).
+        if (tableSpec?.id !== undefined &&
+            tables?.some((table) => table.id === tableSpec.id)) {
+            return;
+        }
+        // A caller-supplied title must be a valid Excel table name no table or defined name holds
+        // (the hook shows the reason; the generated default is valid by construction).
+        if (tableSpec?.title !== undefined &&
+            validateTableName(tableSpec.title, tables?.map((table) => table.title), namedRanges?.map((namedRange) => namedRange.name))) {
             return;
         }
+        if (!hasHeaders) {
+            insertCellsShiftDown({
+                rowCount,
+                columnCount,
+                locale,
+                cellXfsRegistry,
+                sharedStringRegistry,
+                getActiveCell: getActiveCell ?? (() => activeCell),
+                getSelections: getSelections ?? (() => selections),
+                getDependents,
+                getSheetName,
+                createHistory,
+                enqueueGraphOperation,
+                enqueueCalculation,
+                enqueueStructureChange,
+                onChangeSheetData,
+                onChangeSheets,
+                onChangeCitations,
+                onChangeTables,
+                onChangeCharts,
+            })(sheetId, activeCell, [
+                { range: { ...dataRange, endRowIndex: dataRange.startRowIndex } },
+            ]);
+        }
+        const saveHistory = createHistory();
+        // The header names: the header cells' text (falling back to `ColumnN`), or `Column1..N` for
+        // an inserted header row — its cells are blank until `addTableColumn` writes them.
+        const headerCellText = hasHeaders ? getFormattedValue : () => undefined;
         // Crate a table
         onChangeTables?.((prevTables) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
@@ -27,20 +103,17 @@ export const createTable = ({ locale, rowCount, columnCount, tables, basicFilter
                     areaIntersects(table.range, lastSelection?.range)) &&
                     table.sheetId === sheetId);
                 if (tableIndex === -1) {
-                    const columns = [];
-                    for (let columnIndex = range.startColumnIndex; columnIndex <= range.endColumnIndex; columnIndex++) {
-                        const formattedValue = getFormattedValue(sheetId, range.startRowIndex, columnIndex);
-                        const columnName = getNextTableColumnName(columns, generatedNames);
-                        columns.push({
-                            name: formattedValue || columnName,
-                        });
-                    }
+                    // Excel: header names are unique (`Name`, `Name2`, …) and blanks take `ColumnN`.
+                    const columns = getTableHeaderNames({
+                        sheetId,
+                        range,
+                        getFormattedValue: headerCellText,
+                        generatedNames,
+                    }).map((name) => ({ name }));
                     draft.push({
                         id: tableSpec?.id ?? idCreationStrategy?.("table") ?? uuid(),
-                        range,
                         sheetId,
-                        title: tableSpec?.title ??
-                            getGeneratedTableName(draft.length + 1, generatedNames),
+                        title: tableSpec?.title ?? getNextTableTitle(draft, generatedNames),
                         columns,
                         filterSpecs: [],
                         headerRow: true,
@@ -50,6 +123,9 @@ export const createTable = ({ locale, rowCount, columnCount, tables, basicFilter
                         bandedRange,
                         theme: theme ?? "TableStyleLight1",
                         ...tableSpec,
+                        // The spec's range is the DATA range; the table also covers an inserted header row.
+                        range,
+                        ...(hasHeaders ? {} : { headerRow: true, columns }),
                     });
                 }
             });
@@ -71,7 +147,7 @@ export const createTable = ({ locale, rowCount, columnCount, tables, basicFilter
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
                 addTableColumn({
                     draft,
-                    getFormattedValue,
+                    getFormattedValue: headerCellText,
                     sheetId,
                     range,
                     locale,

package/dist/esm/interface/delete-cells-shift-left.d.ts

@@ -8,5 +8,5 @@ import type { UseOnDeleteCellsShiftLeftProps } from "../hooks/use-on-delete-cell
  * follows it; a range entirely inside the block's rows that the block partially covers contracts.
  * Refusals (torn merge/table/array) are decided by the hook before this runs.
  */
-export declare const deleteCellsShiftLeft: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }: UseOnDeleteCellsShiftLeftProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
+export declare const deleteCellsShiftLeft: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeCharts, }: UseOnDeleteCellsShiftLeftProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
 //# sourceMappingURL=delete-cells-shift-left.d.ts.map

package/dist/esm/interface/delete-cells-shift-left.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-cells-shift-left.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-left.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAI9F;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8RAkBvE,8BAA8B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEnC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAqRnD,CAAC"}
+{"version":3,"file":"delete-cells-shift-left.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-left.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAiBnC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAI9F;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8SAmBvE,8BAA8B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEnC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAySnD,CAAC"}

package/dist/esm/interface/delete-cells-shift-left.js

@@ -1,4 +1,5 @@
 import { produceWithPatches } from "immer";
+import { shiftChartsOnCellShift } from "../api/anchored-objects";
 import { collectUniqueDependentsForRange, moveFormulaAtPosition, } from "../api/dependency";
 import { contractRangesInFormula } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
@@ -12,7 +13,7 @@ import { SheetCell } from "../sheet-cell";
  * follows it; a range entirely inside the block's rows that the block partially covers contracts.
  * Refusals (torn merge/table/array) are decided by the hook before this runs.
  */
-export const deleteCellsShiftLeft = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }) => {
+export const deleteCellsShiftLeft = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeCharts, }) => {
     return (sheetId, activeCell, selections) => {
         const saveHistory = createHistory();
         const recalcCells = new Map();
@@ -90,6 +91,14 @@ export const deleteCellsShiftLeft = ({ rowCount, columnCount, locale, cellXfsReg
             saveHistory({ citations: { patches, inversePatches } });
             return nextState;
         });
+        // Chart ranges wholly inside the shifted rows contract/shift like references; one the block covers entirely is dropped (`#REF!`). The frame stays put.
+        onChangeCharts?.((prevCharts) => {
+            const [nextState, patches, inversePatches] = produceWithPatches(prevCharts, (draft) => {
+                shiftChartsOnCellShift(draft, sheetId, "column", "delete", c1, count, { startIndex: r1, endIndex: r2 });
+            });
+            saveHistory({ charts: { patches, inversePatches } });
+            return nextState;
+        });
         // Update sheet data
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {

package/dist/esm/interface/delete-cells-shift-up.d.ts

@@ -9,5 +9,5 @@ import type { UseOnDeleteCellsShiftUpProps } from "../hooks/use-on-delete-cells-
  * partially covers contracts by the overlap. Refusals (torn merge/table/array) are decided by the
  * hook via `getShiftCellsRefusal` before this runs.
  */
-export declare const deleteCellsShiftUp: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }: UseOnDeleteCellsShiftUpProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
+export declare const deleteCellsShiftUp: <T extends CellData, S extends Sheet>({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeCharts, }: UseOnDeleteCellsShiftUpProps<T, S>) => (sheetId: number, activeCell: CellInterface, selections: SelectionArea<SelectionAttributes>[]) => void;
 //# sourceMappingURL=delete-cells-shift-up.d.ts.map

package/dist/esm/interface/delete-cells-shift-up.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-cells-shift-up.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-up.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAI1F;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8RAkBrE,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEjC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAmQnD,CAAC"}
+{"version":3,"file":"delete-cells-shift-up.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells-shift-up.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAiBnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAI1F;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,8SAmBrE,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,MAEjC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAuRnD,CAAC"}

package/dist/esm/interface/delete-cells-shift-up.js

@@ -1,4 +1,5 @@
 import { produceWithPatches } from "immer";
+import { shiftChartsOnCellShift } from "../api/anchored-objects";
 import { collectUniqueDependentsForRange, moveFormulaAtPosition, } from "../api/dependency";
 import { contractRangesInFormula } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
@@ -13,7 +14,7 @@ import { SheetCell } from "../sheet-cell";
  * partially covers contracts by the overlap. Refusals (torn merge/table/array) are decided by the
  * hook via `getShiftCellsRefusal` before this runs.
  */
-export const deleteCellsShiftUp = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, }) => {
+export const deleteCellsShiftUp = ({ rowCount, columnCount, locale, cellXfsRegistry, sharedStringRegistry, getActiveCell, getSelections, getDependents, getSheetName, createHistory, enqueueGraphOperation, enqueueCalculation, enqueueStructureChange, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeCharts, }) => {
     return (sheetId, activeCell, selections) => {
         const saveHistory = createHistory();
         const recalcCells = new Map();
@@ -91,6 +92,14 @@ export const deleteCellsShiftUp = ({ rowCount, columnCount, locale, cellXfsRegis
             saveHistory({ citations: { patches, inversePatches } });
             return nextState;
         });
+        // Chart ranges wholly inside the shifted columns contract/shift like references; one the block covers entirely is dropped (`#REF!`). The frame stays put.
+        onChangeCharts?.((prevCharts) => {
+            const [nextState, patches, inversePatches] = produceWithPatches(prevCharts, (draft) => {
+                shiftChartsOnCellShift(draft, sheetId, "row", "delete", r1, count, { startIndex: c1, endIndex: c2 });
+            });
+            saveHistory({ charts: { patches, inversePatches } });
+            return nextState;
+        });
         // Update sheet data
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {

package/dist/esm/interface/delete-cells.d.ts

@@ -2,5 +2,5 @@ import type { CellInterface, SelectionArea } from "@rowsncolumns/common-types";
 import type { CellData, SelectionAttributes, Sheet } from "@rowsncolumns/spreadsheet";
 import type { UseOnDeleteProps } from "../hooks/use-on-delete";
 export type ClearType = "all" | "contents" | "formats";
-export declare const deleteCells: <T extends CellData, S extends Sheet>({ locale, rowCount, cellXfsRegistry, sharedStringRegistry, getDataValidationById, getDependents, getDataRowCount, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeActiveCell, enqueueCalculation, enqueueStructureChange, createHistory, isArrayFormula, getRowHeight, }: UseOnDeleteProps<T, S>) => (sheetId: number, cell: CellInterface, selections: SelectionArea<SelectionAttributes>[], clearType?: ClearType) => void;
+export declare const deleteCells: <T extends CellData, S extends Sheet>({ locale, rowCount, cellXfsRegistry, sharedStringRegistry, getDataValidationById, getDependents, getDataRowCount, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeActiveCell, enqueueCalculation, enqueueStructureChange, createHistory, isArrayFormula, getRowHeight, tables, generatedNames, }: UseOnDeleteProps<T, S>) => (sheetId: number, cell: CellInterface, selections: SelectionArea<SelectionAttributes>[], clearType?: ClearType) => void;
 //# sourceMappingURL=delete-cells.d.ts.map

package/dist/esm/interface/delete-cells.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-cells.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EACV,QAAQ,EAER,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAKnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAEvD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,wSAkB9D,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,MAErB,SAAS,MAAM,EACf,MAAM,aAAa,EACnB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,EAChD,YAAW,SAAsB,SAwPpC,CAAC"}
+{"version":3,"file":"delete-cells.d.ts","sourceRoot":"","sources":["../../../interface/delete-cells.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EACV,QAAQ,EAER,mBAAmB,EACnB,KAAK,EACN,MAAM,2BAA2B,CAAC;AAKnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK/D,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAEvD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,gUAoB9D,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,MAErB,SAAS,MAAM,EACf,MAAM,aAAa,EACnB,YAAY,aAAa,CAAC,mBAAmB,CAAC,EAAE,EAChD,YAAW,SAAsB,SA0RpC,CAAC"}

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

@@ -4,7 +4,8 @@ import { produceWithPatches } from "immer";
 import { createSheetCellIdentifier } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
 import { SheetCell } from "../sheet-cell";
-export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringRegistry, getDataValidationById, getDependents, getDataRowCount, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeActiveCell, enqueueCalculation, enqueueStructureChange, createHistory, isArrayFormula, getRowHeight, }) => {
+import { getTableHeaderRefills } from "./table-utils";
+export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringRegistry, getDataValidationById, getDependents, getDataRowCount, onChangeSheetData, onChangeSheets, onChangeTables, onChangeCitations, onChangeActiveCell, enqueueCalculation, enqueueStructureChange, createHistory, isArrayFormula, getRowHeight, tables, generatedNames, }) => {
     return (sheetId, cell, selections, clearType = "contents") => {
         const shouldClearContents = clearType === "contents" || clearType === "all";
         const shouldClearFormats = clearType === "formats" || clearType === "all";
@@ -13,6 +14,17 @@ export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringReg
             : selectionFromActiveCell(cell);
         const saveHistory = createHistory();
         const maxRowCount = getDataRowCount();
+        // A table survives Delete / Clear (Excel): only its cells empty out, and
+        // cleared header cells are re-named `ColumnN` so the header row and
+        // `columns[]` stay in step.
+        const headerRefills = shouldClearContents
+            ? getTableHeaderRefills({
+                sheetId,
+                tables,
+                selections: finalSelections,
+                generatedNames,
+            })
+            : [];
         // Bulk writes go through `onChangeSheetData` directly, so the
         // calculator's per-cell `invalidateCacheForCell` (which only fires on
         // recompute) never runs for the cleared positions. Invalidate the
@@ -96,6 +108,17 @@ export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringReg
                         }
                     }
                 }
+                for (const { rowIndex, columnIndex, name } of headerRefills) {
+                    const currentSheet = createSheetDraft(draft, sheetId, rowIndex);
+                    sheetCell.assign(sheetId, { rowIndex, columnIndex }, currentSheet[rowIndex].values?.[columnIndex], {
+                        locale,
+                        getDataValidationById,
+                        cellXfsRegistry,
+                        sharedStringRegistry,
+                    });
+                    sheetCell.setUserEnteredValue(name);
+                    currentSheet[rowIndex].values[columnIndex] = sheetCell.getCellData();
+                }
             });
             // Save history
             saveHistory({
@@ -110,20 +133,30 @@ export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringReg
             });
             return nextState;
         });
-        // Update tables
-        onChangeTables?.((prevTables) => {
-            const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
-                const tableIndex = draft.findIndex((table) => table.sheetId === sheetId &&
-                    selections.some((sel) => areaInsideArea(table.range, sel.range)));
-                if (tableIndex !== -1) {
-                    draft.splice(tableIndex, 1);
-                }
-            });
-            saveHistory({
-                tables: { patches, inversePatches },
+        // Rename the columns whose header cells were cleared
+        if (headerRefills.length) {
+            onChangeTables?.((prevTables) => {
+                const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
+                    for (const { tableId, dimensionIndex, name } of headerRefills) {
+                        const table = draft.find((table) => table.sheetId === sheetId && table.id === tableId);
+                        if (!table)
+                            continue;
+                        table.columns ??= [];
+                        const column = table.columns[dimensionIndex];
+                        if (column) {
+                            column.name = name;
+                        }
+                        else {
+                            table.columns[dimensionIndex] = { name };
+                        }
+                    }
+                });
+                saveHistory({
+                    tables: { patches, inversePatches },
+                });
+                return nextState;
             });
-            return nextState;
-        });
+        }
         // Update citations - remove citations that overlap with deleted cells
         onChangeCitations?.((prevCitations) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCitations, (draft) => {

package/dist/esm/interface/delete-column.d.ts

@@ -1,4 +1,4 @@
 import type { CellData, Sheet } from "@rowsncolumns/spreadsheet";
 import type { UseOnDeleteColumnProps } from "../hooks/use-on-delete-column";
-export declare const deleteColumn: <T extends CellData, S extends Sheet>({ 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, onChangeCharts, onChangeProtectedRanges, }: UseOnDeleteColumnProps<T, S>) => (sheetId: number, columnIndexes: number[]) => void;
+export declare const deleteColumn: <T extends CellData, S extends Sheet>({ 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, }: UseOnDeleteColumnProps<T, S>) => (sheetId: number, columnIndexes: number[]) => void;
 //# sourceMappingURL=delete-column.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"delete-column.d.ts","sourceRoot":"","sources":["../../../interface/delete-column.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAuBjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,0hBA+B/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,eAAe,MAAM,EAAE,SAscjD,CAAC"}
+{"version":3,"file":"delete-column.d.ts","sourceRoot":"","sources":["../../../interface/delete-column.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAuBjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,2iBAgC/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,eAAe,MAAM,EAAE,SAgdjD,CAAC"}

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

@@ -1,15 +1,14 @@
 import { Direction } from "@rowsncolumns/common-types";
 import { produceWithPatches } from "immer";
-import { shiftChartsOnStructuralChange, shiftEmbedsOnStructuralChange, shiftProtectedRangesOnStructuralChange, } from "../api/anchored-objects";
+import { shiftChartsOnStructuralChange, shiftEmbedsOnStructuralChange, shiftSlicersOnStructuralChange, shiftProtectedRangesOnStructuralChange, } from "../api/anchored-objects";
 import { shrinkMergesOnColumnDelete } from "../api/merges";
 import { updateNamedRangesOnStructuralChange, updatePrintSettingsOnStructuralChange, } from "../api/named-range-structural";
 import { shiftPivotsOnDelete } from "../api/pivot-range";
-import { updateSheetRangeOnDelete } from "../api/range";
 import { updateRangedRulesOnStructuralChange } from "../api/range-rule-helpers";
 import { moveFilterView } from "../api/selection";
 import { 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, onChangeCharts, onChangeProtectedRanges, }) => {
+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;
@@ -30,43 +29,33 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         const activeCell = getActiveCell();
         const selections = getSelections();
         const newColumnCount = Math.max(1, columnCount - count);
-        // NOTE: contiguity assumption — see delete-row.ts.
-        const inDeletedColumns = activeCell.columnIndex >= minColumnIndex &&
-            activeCell.columnIndex <= maxColumnIndex;
-        let nextActiveColumnIndex = activeCell.columnIndex;
-        if (inDeletedColumns) {
-            nextActiveColumnIndex = Math.max(1, minColumnIndex - 1);
-        }
-        else if (activeCell.columnIndex > maxColumnIndex) {
-            nextActiveColumnIndex = Math.max(1, activeCell.columnIndex - count);
-        }
-        if (nextActiveColumnIndex > newColumnCount) {
-            nextActiveColumnIndex = newColumnCount;
-        }
+        // Excel keeps the selection where it was (UI-02, column twin): after
+        // deleting columns C:D the selection still reads C:D — now over the
+        // columns that moved left — and the active cell sits in the first deleted
+        // column. Every coordinate loses the deleted columns that lie BEFORE it.
+        const deletedBefore = (columnIndex) => sortedColumnIndexes.filter((index) => index < columnIndex).length;
+        const clampColumn = (columnIndex) => Math.min(Math.max(1, columnIndex), newColumnCount);
+        const nextActiveColumnIndex = clampColumn(activeCell.columnIndex - deletedBefore(activeCell.columnIndex));
         const nextActiveCell = nextActiveColumnIndex === activeCell.columnIndex
             ? activeCell
             : { ...activeCell, columnIndex: nextActiveColumnIndex };
-        const fallbackSelectionColumnIndex = nextActiveCell.columnIndex;
         const nextSelections = selections.map((selection) => {
             if (!selection.range)
                 return selection;
-            const updatedRange = updateSheetRangeOnDelete({ ...selection.range, sheetId }, "column", minColumnIndex, count, sheetId);
-            if (updatedRange) {
-                return {
-                    ...selection,
-                    range: {
-                        ...selection.range,
-                        startColumnIndex: updatedRange.startColumnIndex,
-                        endColumnIndex: updatedRange.endColumnIndex,
-                    },
-                };
-            }
+            const { startColumnIndex, endColumnIndex } = selection.range;
+            const deletedWithin = sortedColumnIndexes.filter((index) => index >= startColumnIndex && index <= endColumnIndex).length;
+            const size = endColumnIndex - startColumnIndex + 1;
+            const nextStart = clampColumn(startColumnIndex - deletedBefore(startColumnIndex));
+            // A partially covered area shrinks by the columns it lost; an area
+            // deleted outright keeps its size (it now frames the columns that moved
+            // left).
+            const nextSize = deletedWithin < size ? size - deletedWithin : size;
             return {
                 ...selection,
                 range: {
                     ...selection.range,
-                    startColumnIndex: fallbackSelectionColumnIndex,
-                    endColumnIndex: fallbackSelectionColumnIndex,
+                    startColumnIndex: nextStart,
+                    endColumnIndex: clampColumn(nextStart + nextSize - 1),
                 },
             };
         });
@@ -184,6 +173,13 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
             saveHistory({ embeds: { patches, inversePatches } });
             return nextState;
         });
+        onChangeSlicers?.((prevSlicers) => {
+            const [nextState, patches, inversePatches] = produceWithPatches(prevSlicers, (draft) => {
+                shiftSlicersOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);
+            });
+            saveHistory({ slicers: { patches, inversePatches } });
+            return nextState;
+        });
         onChangeCharts?.((prevCharts) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevCharts, (draft) => {
                 shiftChartsOnStructuralChange(draft, sheetId, "column", "delete", minColumnIndex, count);

package/dist/esm/interface/delete-row.d.ts

@@ -1,4 +1,4 @@
 import type { CellData, Sheet } from "@rowsncolumns/spreadsheet";
 import { type UseOnDeleteRowProps } from "../hooks/use-on-delete-row";
-export declare const deleteRow: <T extends CellData, S extends Sheet>({ 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, onChangeCharts, onChangeProtectedRanges, }: UseOnDeleteRowProps<T, S>) => (sheetId: number, rowIndexes: number[]) => void;
+export declare const deleteRow: <T extends CellData, S extends Sheet>({ 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, }: UseOnDeleteRowProps<T, S>) => (sheetId: number, rowIndexes: number[]) => void;
 //# sourceMappingURL=delete-row.d.ts.map

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,EAAE,MAAM,2BAA2B,CAAC;AAuBjE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,0hBA+B5D,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,MAClB,SAAS,MAAM,EAAE,YAAY,MAAM,EAAE,SAmZ9C,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;AA0B5E,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,SA4jB9C,CAAC"}