@rowsncolumns/spreadsheet-state 29.1.15 → 29.1.17

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

@@ -4,6 +4,7 @@ import { produceWithPatches } from "immer";
 import { createSheetCellIdentifier } from "../api/formula";
 import { createSheetDraft } from "../api/immer-utils";
 import { SheetCell } from "../sheet-cell";
+import { releaseTableFilterRows } from "./remove-table";
 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") => {
@@ -14,13 +15,24 @@ 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.
+        // Delete / Clear over a selection that covers a whole table deletes the table (Excel's
+        // "select the table and press Delete"): the table, its filter and its style go with the
+        // cells, and the structured references into it error as they do for any deleted table
+        // (Convert to Range is the path that rewrites them to A1).
+        const removedTables = shouldClearContents
+            ? (tables ?? []).filter((table) => table.sheetId === sheetId &&
+                finalSelections.some((selection) => areaInsideArea(table.range, selection.range)))
+            : [];
+        const keptTables = removedTables.length
+            ? tables?.filter((table) => !removedTables.includes(table))
+            : tables;
+        // A table survives Delete / Clear over part of it (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,
+                tables: keptTables,
                 selections: finalSelections,
                 generatedNames,
             })
@@ -133,10 +145,16 @@ export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringReg
             });
             return nextState;
         });
-        // Rename the columns whose header cells were cleared
-        if (headerRefills.length) {
+        // Drop the tables the selection covered, and rename the columns whose header cells were cleared
+        if (headerRefills.length || removedTables.length) {
             onChangeTables?.((prevTables) => {
                 const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
+                    for (const removed of removedTables) {
+                        const tableIndex = draft.findIndex((table) => table.id == removed.id);
+                        if (tableIndex !== -1) {
+                            draft.splice(tableIndex, 1);
+                        }
+                    }
                     for (const { tableId, dimensionIndex, name } of headerRefills) {
                         const table = draft.find((table) => table.sheetId === sheetId && table.id === tableId);
                         if (!table)
@@ -156,6 +174,13 @@ export const deleteCells = ({ locale, rowCount, cellXfsRegistry, sharedStringReg
                 });
                 return nextState;
             });
+            releaseTableFilterRows({
+                tables: removedTables,
+                onChangeSheets,
+                saveHistory,
+                getDependents,
+                enqueueCalculation,
+            });
         }
         // Update citations - retire citations whose cited cells lose their contents.
         // Clearing formats only leaves the cited values in place, so the citations stay.

package/dist/esm/interface/remove-table.d.ts

@@ -1,4 +1,15 @@
 import type { CellData, Sheet, TableView } from "@rowsncolumns/spreadsheet";
 import type { UseOnTableProps } from "../hooks/use-on-table";
 export declare const removeTable: <T extends CellData, S extends Sheet>({ locale, cellXfsRegistry, sharedStringRegistry, getSheetName, onChangeTables, onChangeSheets, onChangeSheetData, createHistory, getDependents, getGraphNodes, getBandedCells, enqueueCalculation, enqueueGraphOperation, }: Pick<UseOnTableProps<T, S>, "locale" | "cellXfsRegistry" | "sharedStringRegistry" | "getSheetName" | "onChangeTables" | "onChangeSheets" | "onChangeSheetData" | "getDependents" | "getGraphNodes" | "getBandedCells" | "enqueueCalculation" | "enqueueGraphOperation" | "createHistory">) => (tableView: TableView) => void;
+/**
+ * A removed table's filter goes with it: the rows it hid become visible again, in the history step
+ * of the removal (`saveHistory`). Their values did not change, so only the formulas that read
+ * visibility — `SUBTOTAL(101…111)` / `AGGREGATE` over those rows — are stale; dirtying the
+ * un-hidden cells recalculates exactly those dependents. Shared by Convert to Range
+ * (`removeTable`) and Delete over a whole table (`deleteCells`).
+ */
+export declare const releaseTableFilterRows: <T extends CellData, S extends Sheet>({ tables, onChangeSheets, saveHistory, getDependents, enqueueCalculation, }: Pick<UseOnTableProps<T, S>, "onChangeSheets" | "getDependents" | "enqueueCalculation"> & {
+    tables: TableView[];
+    saveHistory: ReturnType<UseOnTableProps<T, S>["createHistory"]>;
+}) => void;
 //# sourceMappingURL=remove-table.d.ts.map

package/dist/esm/interface/remove-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-table.d.ts","sourceRoot":"","sources":["../../../interface/remove-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAK5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,6NAc9D,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,gBAAgB,GAChB,oBAAoB,GACpB,uBAAuB,GACvB,eAAe,CAClB,MACS,WAAW,SAAS,SAwH7B,CAAC"}
+{"version":3,"file":"remove-table.d.ts","sourceRoot":"","sources":["../../../interface/remove-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAK5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,6NAc9D,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,gBAAgB,GAChB,oBAAoB,GACpB,uBAAuB,GACvB,eAAe,CAClB,MACS,WAAW,SAAS,SA0E7B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,6EAMzE,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACrB,gBAAgB,GAAG,eAAe,GAAG,oBAAoB,CAC1D,GAAG;IACF,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;CACjE,SAoDA,CAAC"}

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

@@ -57,42 +57,58 @@ export const removeTable = ({ locale, cellXfsRegistry, sharedStringRegistry, get
             });
             return nextState;
         });
-        // The table's filter goes with it: rows it hid become visible again. Their values did not
-        // change, so only the formulas that read visibility — `SUBTOTAL(101…111)` / `AGGREGATE` over
-        // those rows — are stale; dirtying the un-hidden cells recalculates exactly those dependents
-        // (the rewritten structured references were re-entered above with `force`).
-        const unhiddenRecalcCells = new Map();
-        onChangeSheets((prevSheets) => {
-            const [nextState, patches, inversePatches] = produceWithPatches(prevSheets, (draft) => {
+        releaseTableFilterRows({
+            tables: [tableView],
+            onChangeSheets,
+            saveHistory,
+            getDependents,
+            enqueueCalculation,
+        });
+    };
+};
+/**
+ * A removed table's filter goes with it: the rows it hid become visible again, in the history step
+ * of the removal (`saveHistory`). Their values did not change, so only the formulas that read
+ * visibility — `SUBTOTAL(101…111)` / `AGGREGATE` over those rows — are stale; dirtying the
+ * un-hidden cells recalculates exactly those dependents. Shared by Convert to Range
+ * (`removeTable`) and Delete over a whole table (`deleteCells`).
+ */
+export const releaseTableFilterRows = ({ tables, onChangeSheets, saveHistory, getDependents, enqueueCalculation, }) => {
+    if (!tables.length)
+        return;
+    const unhiddenRecalcCells = new Map();
+    onChangeSheets((prevSheets) => {
+        const [nextState, patches, inversePatches] = produceWithPatches(prevSheets, (draft) => {
+            for (const tableView of tables) {
                 const sheet = draft.find((sheet) => sheet.sheetId === tableView.sheetId);
-                if (sheet && tableView) {
-                    if (!sheet.rowMetadata) {
-                        sheet.rowMetadata = [];
-                    }
-                    const { range } = tableView;
-                    for (let rowIndex = range.startRowIndex; rowIndex <= range.endRowIndex; rowIndex++) {
-                        if (sheet.rowMetadata[rowIndex]?.hiddenByFilter) {
-                            sheet.rowMetadata[rowIndex].hiddenByFilter = false;
-                            for (const [key, position] of markTableAsDirty(tableView.sheetId, { ...range, startRowIndex: rowIndex, endRowIndex: rowIndex }, getDependents, enqueueCalculation)) {
-                                unhiddenRecalcCells.set(key, position);
-                            }
+                if (!sheet)
+                    continue;
+                if (!sheet.rowMetadata) {
+                    sheet.rowMetadata = [];
+                }
+                const { range } = tableView;
+                for (let rowIndex = range.startRowIndex; rowIndex <= range.endRowIndex; rowIndex++) {
+                    if (sheet.rowMetadata[rowIndex]?.hiddenByFilter) {
+                        sheet.rowMetadata[rowIndex].hiddenByFilter = false;
+                        for (const [key, position] of markTableAsDirty(tableView.sheetId, { ...range, startRowIndex: rowIndex, endRowIndex: rowIndex }, getDependents, enqueueCalculation)) {
+                            unhiddenRecalcCells.set(key, position);
                         }
                     }
                 }
-            });
-            // Save to history
-            saveHistory({
-                sheets: { patches, inversePatches },
-                ...(unhiddenRecalcCells.size
-                    ? {
-                        recalcCells: {
-                            undo: unhiddenRecalcCells,
-                            redo: unhiddenRecalcCells,
-                        },
-                    }
-                    : {}),
-            });
-            return nextState;
+            }
         });
-    };
+        // Save to history
+        saveHistory({
+            sheets: { patches, inversePatches },
+            ...(unhiddenRecalcCells.size
+                ? {
+                    recalcCells: {
+                        undo: unhiddenRecalcCells,
+                        redo: unhiddenRecalcCells,
+                    },
+                }
+                : {}),
+        });
+        return nextState;
+    });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/spreadsheet-state",
-  "version": "29.1.15",
+  "version": "29.1.17",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -57,7 +57,7 @@
     "@rowsncolumns/calculator": ">=7.3.0",
     "@rowsncolumns/common-types": ">=5.2.33",
     "@rowsncolumns/dag": ">=7.2.30",
-    "@rowsncolumns/fast-formula-parser": "6.2.44",
+    "@rowsncolumns/fast-formula-parser": "6.2.45",
     "@rowsncolumns/grid": ">=13.2.33",
     "@rowsncolumns/icons": ">=7.2.32",
     "@rowsncolumns/pivot": ">=11.0.0",
@@ -72,18 +72,18 @@
     }
   },
   "devDependencies": {
-    "@rowsncolumns/calculator": ">=7.3.2",
+    "@rowsncolumns/calculator": ">=7.3.3",
     "@rowsncolumns/common-types": ">=5.3.2",
     "@rowsncolumns/dag": ">=7.2.31",
-    "@rowsncolumns/fast-formula-parser": ">=6.2.44",
-    "@rowsncolumns/grid": ">=13.2.38",
+    "@rowsncolumns/fast-formula-parser": ">=6.2.45",
+    "@rowsncolumns/grid": ">=13.2.39",
     "@rowsncolumns/icons": ">=7.2.33",
     "@rowsncolumns/spreadsheet": ">=10.5.11",
     "@rowsncolumns/ui": ">=16.1.0",
     "@rowsncolumns/utils": ">=9.5.6"
   },
   "dependencies": {
-    "@rowsncolumns/calculation-worker": ">=10.0.2",
+    "@rowsncolumns/calculation-worker": ">=10.0.3",
     "@rowsncolumns/date-parser": ">=13.0.4",
     "@rowsncolumns/functions": ">=15.1.0",
     "@rowsncolumns/toolkit": ">=24.5.15",