@rowsncolumns/spreadsheet-state 28.0.67 → 28.0.69

package/dist/esm/hooks/use-on-copy.js

@@ -2,6 +2,7 @@ import { areaInsideArea, cellIdentifier, } from "@rowsncolumns/grid";
 import { getBandedCells, getStringifiedColor, } from "@rowsncolumns/spreadsheet";
 import { cellToAddress, getStyleId, getCellUserEnteredValue, getExtendedValueFormula, isNil, iterateCellsInRange, } from "@rowsncolumns/utils";
 import { useCallback, useMemo } from "react";
+import { useShowError } from "../atoms/error-state.atom";
 import { isStyleReference } from "../sheet-cell";
 const escapeHtmlAttribute = (value) => value
     .replace(/&/g, "&")
@@ -9,6 +10,46 @@ const escapeHtmlAttribute = (value) => value
     .replace(/'/g, "'")
     .replace(/</g, "&lt;")
     .replace(/>/g, "&gt;");
+const MULTIPLE_SELECTIONS_ERROR = "This action won't work on multiple selections.";
+/**
+ * Excel/Sheets copy a multi-area selection only when every area spans the same
+ * rows (areas sit side by side, left to right) or the same columns (areas stack,
+ * top to bottom). Returns the row and column indexes of the merged rectangle, or
+ * undefined for any other shape.
+ */
+export const getCopiedRowsAndColumns = (copiedSelections) => {
+    const ranges = copiedSelections.map(({ range }) => range);
+    const [first] = ranges;
+    if (!first) {
+        return [[], []];
+    }
+    const sameRows = ranges.every((range) => range.startRowIndex === first.startRowIndex &&
+        range.endRowIndex === first.endRowIndex);
+    const sameColumns = ranges.every((range) => range.startColumnIndex === first.startColumnIndex &&
+        range.endColumnIndex === first.endColumnIndex);
+    if (!sameRows && !sameColumns) {
+        return undefined;
+    }
+    const rowRanges = sameRows
+        ? [first]
+        : [...ranges].sort((a, b) => a.startRowIndex - b.startRowIndex);
+    const columnRanges = sameColumns
+        ? [first]
+        : [...ranges].sort((a, b) => a.startColumnIndex - b.startColumnIndex);
+    const rows = [];
+    for (const { startRowIndex, endRowIndex } of rowRanges) {
+        for (let rowIndex = startRowIndex; rowIndex <= endRowIndex; rowIndex++) {
+            rows.push(rowIndex);
+        }
+    }
+    const columns = [];
+    for (const { startColumnIndex, endColumnIndex } of columnRanges) {
+        for (let columnIndex = startColumnIndex; columnIndex <= endColumnIndex; columnIndex++) {
+            columns.push(columnIndex);
+        }
+    }
+    return [rows, columns];
+};
 /**
  * Called when user copies a selection from sheet
  * 1. User can copy from any cell
@@ -19,7 +60,18 @@ const escapeHtmlAttribute = (value) => value
 export const useOnCopy = ({ theme, merges, tables: sheetTables, bandedRanges, getFormattedValue, getCellData, getColumnWidth, getRowHeight, cellXfs, sharedStrings, getEffectiveFormat, isHiddenRow, isColumnHidden, }) => {
     // Merge cell map
     const mergedCellMap = useMergedCellMap(merges);
-    return useCallback((e, sheetId, copiedSelections) => {
+    const showError = useShowError();
+    return useCallback((e, sheetId, copiedSelections, isCutOperation) => {
+        // Excel refuses to cut a multi-area selection, and only copies one whose
+        // areas share the same rows or the same columns.
+        const rowsAndColumns = isCutOperation && copiedSelections.length > 1
+            ? undefined
+            : getCopiedRowsAndColumns(copiedSelections);
+        if (!rowsAndColumns) {
+            showError({ message: MULTIPLE_SELECTIONS_ERROR });
+            return false;
+        }
+        const [rows, columns] = rowsAndColumns;
         const isRowHidden = isHiddenRow ?? (() => false);
         const isColHidden = isColumnHidden ?? (() => false);
         // Table styling (header fill, banded row/column fills, table borders)
@@ -70,15 +122,12 @@ export const useOnCopy = ({ theme, merges, tables: sheetTables, bandedRanges, ge
             }
         };
         let colGroups = `<colgroup>`;
-        copiedSelections.forEach(({ range }) => {
-            const { startColumnIndex, endColumnIndex } = range;
-            for (let columnIndex = startColumnIndex; columnIndex <= endColumnIndex; columnIndex++) {
-                if (isColHidden(sheetId, columnIndex))
-                    continue;
-                const cellWidth = getColumnWidth(sheetId, columnIndex);
-                colGroups += `<col width="${cellWidth}" />`;
-            }
-        });
+        for (const columnIndex of columns) {
+            if (isColHidden(sheetId, columnIndex))
+                continue;
+            const cellWidth = getColumnWidth(sheetId, columnIndex);
+            colGroups += `<col width="${cellWidth}" />`;
+        }
         colGroups += `</colgroup>`;
         let htmlString = `<html xmlns:v="urn:schemas-microsoft-com:vml"
         xmlns:o="urn:schemas-microsoft-com:office:office"
@@ -90,9 +139,9 @@ export const useOnCopy = ({ theme, merges, tables: sheetTables, bandedRanges, ge
             </style>
             <style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><body>
           <table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none">${colGroups}<tbody>`;
-        for (const { range } of copiedSelections) {
-            const { startRowIndex, startColumnIndex, endColumnIndex, endRowIndex } = range;
-            /* Check if user is copying a table */
+        /* Check if user is copying a table */
+        if (copiedSelections.length === 1) {
+            const { range } = copiedSelections[0];
             const table = sheetTables?.find((table) => areaInsideArea(table.range, range) && table.sheetId === sheetId);
             if (table) {
                 // We need to set a rowDelta and colDelta
@@ -105,147 +154,147 @@ export const useOnCopy = ({ theme, merges, tables: sheetTables, bandedRanges, ge
                     colDelta,
                 });
             }
-            /* Iterate over all cells */
-            for (let rowIndex = startRowIndex; rowIndex <= endRowIndex; rowIndex++) {
-                if (isRowHidden(sheetId, rowIndex)) {
+        }
+        /* Iterate over all cells */
+        for (const rowIndex of rows) {
+            if (isRowHidden(sheetId, rowIndex)) {
+                continue;
+            }
+            const rowHeight = getRowHeight(sheetId, rowIndex);
+            htmlString += `<tr style="height:${rowHeight}px">`;
+            const csvRow = [];
+            const jsonRow = [];
+            for (const columnIndex of columns) {
+                if (isColHidden(sheetId, columnIndex)) {
                     continue;
                 }
-                const rowHeight = getRowHeight(sheetId, rowIndex);
-                htmlString += `<tr style="height:${rowHeight}px">`;
-                const csvRow = [];
-                const jsonRow = [];
-                for (let columnIndex = startColumnIndex; columnIndex <= endColumnIndex; columnIndex++) {
-                    if (isColHidden(sheetId, columnIndex)) {
-                        continue;
-                    }
-                    const mergedCellInfo = mergedCellMap.get(cellIdentifier(rowIndex, columnIndex));
-                    const isMasterCell = mergedCellInfo ? mergedCellInfo[0] : true;
-                    if (!isMasterCell) {
-                        jsonRow.push({
-                            data: undefined,
-                        });
-                        continue;
-                    }
-                    const [rowspan, colspan] = mergedCellInfo
-                        ? mergedCellInfo[1]
-                        : [1, 1];
-                    const formattedValue = getFormattedValue(sheetId, rowIndex, columnIndex) ?? "";
-                    const cellData = getCellData(sheetId, rowIndex, columnIndex);
-                    let normalizedCellData = cellData;
-                    if (cellData && typeof cellData === "object") {
-                        normalizedCellData = { ...cellData };
-                        if (!isNil(normalizedCellData.ss)) {
-                            normalizedCellData.ss = collectSharedString(String(normalizedCellData.ss));
-                        }
-                        collectCellXfs(normalizedCellData.uf);
-                        collectCellXfs(normalizedCellData.ef);
-                    }
-                    const formula = getExtendedValueFormula(getCellUserEnteredValue(cellData));
-                    const origin = cellToAddress({ rowIndex, columnIndex }) ??
-                        `${rowIndex}:${columnIndex}`;
-                    const formulaAttr = formula
-                        ? ` data-sheets-formula="${escapeHtmlAttribute(formula)}" data-formula="${escapeHtmlAttribute(formula)}" data-sheets-formula-origin="${escapeHtmlAttribute(origin)}" data-formula-origin="${escapeHtmlAttribute(origin)}"`
-                        : "";
-                    const effectiveFormat = getEffectiveFormat?.(sheetId, rowIndex, columnIndex);
-                    const bandedFormat = bandedCells?.get(cellIdentifier(rowIndex, columnIndex));
-                    const numberFormatType = effectiveFormat?.numberFormat?.type;
-                    const numberFormatPattern = effectiveFormat?.numberFormat?.pattern;
-                    const numberFormatAttr = numberFormatType
-                        ? ` data-sheets-numberformat-type="${escapeHtmlAttribute(numberFormatType)}"${numberFormatPattern
-                            ? ` data-sheets-numberformat-pattern="${escapeHtmlAttribute(numberFormatPattern)}"`
-                            : ""}`
-                        : "";
-                    // Alignment is encoded as data attributes so paste doesn't have
-                    // to trust `getComputedStyle().textAlign`, which fabricates a
-                    // CSS-spec default of `"start"` even when the value was never set.
-                    const horizontalAlignment = effectiveFormat?.horizontalAlignment;
-                    const verticalAlignment = effectiveFormat?.verticalAlignment;
-                    const alignmentAttr = `${horizontalAlignment
-                        ? ` data-sheets-horizontal-alignment="${escapeHtmlAttribute(horizontalAlignment)}"`
-                        : ""}${verticalAlignment
-                        ? ` data-sheets-vertical-alignment="${escapeHtmlAttribute(verticalAlignment)}"`
-                        : ""}`;
-                    // Csv
-                    csvRow.push(formattedValue);
-                    // Style
-                    const isItalic = effectiveFormat?.textFormat?.italic;
-                    const isBold = effectiveFormat?.textFormat?.bold;
-                    const isUnderline = effectiveFormat?.textFormat?.underline;
-                    const isStrikeThrough = effectiveFormat?.textFormat?.strikethrough;
-                    const baselineOffset = effectiveFormat?.textFormat?.baselineOffset;
-                    // Cell-level formatting wins over the banded (table style) layer,
-                    // matching the canvas grid's merge order.
-                    const cellBorders = effectiveFormat?.borders ?? bandedFormat?.borders;
-                    const borderTop = cellBorders?.top;
-                    const borderBottom = cellBorders?.bottom;
-                    const borderLeft = cellBorders?.left;
-                    const borderRight = cellBorders?.right;
-                    const textDecoration = `${isUnderline ? "underline" : ""} ${isStrikeThrough ? "line-through" : ""}`.trim();
-                    const wordWrap = effectiveFormat?.wrapStrategy === "wrap";
-                    const style = theme
-                        ? {
-                            "background-color": getStringifiedColor(effectiveFormat?.backgroundColor ??
-                                bandedFormat?.backgroundColor, theme),
-                            color: getStringifiedColor(effectiveFormat?.textFormat?.color ??
-                                bandedFormat?.textFormat?.color, theme),
-                            padding: "2px 3px 2px 3px",
-                            overflow: "hidden",
-                            "font-weight": isBold ? "700" : "normal",
-                            "font-family": effectiveFormat?.textFormat?.fontFamily,
-                            "font-style": isItalic ? "italic" : "normal",
-                            "text-decoration": textDecoration
-                                ? textDecoration
-                                : undefined,
-                            "font-size": `${effectiveFormat?.textFormat?.fontSize ?? 10}pt`,
-                            "text-align": effectiveFormat?.horizontalAlignment,
-                            "vertical-align": effectiveFormat?.verticalAlignment,
-                            "border-top": borderTop
-                                ? `${borderTop.width}px solid ${getStringifiedColor(borderTop.color, theme)}`
-                                : undefined,
-                            "border-left": borderLeft
-                                ? `${borderLeft.width}px solid ${getStringifiedColor(borderLeft.color, theme)}`
-                                : undefined,
-                            "border-right": borderRight
-                                ? `${borderRight.width}px solid ${getStringifiedColor(borderRight.color, theme)}`
-                                : undefined,
-                            "border-bottom": borderBottom
-                                ? `${borderBottom.width}px solid ${getStringifiedColor(borderBottom.color, theme)}`
-                                : undefined,
-                            "text-wrap": wordWrap ? "wrap" : undefined,
-                        }
-                        : {};
-                    // html
-                    const innerHtml = baselineOffset === "superscript"
-                        ? `<sup>${formattedValue}</sup>`
-                        : baselineOffset === "subscript"
-                            ? `<sub>${formattedValue}</sub>`
-                            : formattedValue;
-                    htmlString +=
-                        `<td${formulaAttr}${numberFormatAttr}${alignmentAttr} ${rowspan > 1 ? `rowspan="${rowspan}"` : ""} ${colspan > 1 ? `colspan="${colspan}"` : ""} style='${Object.entries(style)
-                            .filter(([_, v]) => !isNil(v))
-                            .map(([k, v]) => `${k}:${v}`)
-                            .join(";")}'>` +
-                            innerHtml +
-                            "</td>";
-                    // json
+                const mergedCellInfo = mergedCellMap.get(cellIdentifier(rowIndex, columnIndex));
+                const isMasterCell = mergedCellInfo ? mergedCellInfo[0] : true;
+                if (!isMasterCell) {
                     jsonRow.push({
-                        data: normalizedCellData,
-                        sourceCell: { rowIndex, columnIndex },
-                        rowspan,
-                        colspan,
+                        data: undefined,
                     });
+                    continue;
                 }
-                /* Join with ',' for csv */
-                csv.push(csvRow.join(","));
-                // Plain text
-                plainText.push(csvRow.join("\t"));
+                const [rowspan, colspan] = mergedCellInfo
+                    ? mergedCellInfo[1]
+                    : [1, 1];
+                const formattedValue = getFormattedValue(sheetId, rowIndex, columnIndex) ?? "";
+                const cellData = getCellData(sheetId, rowIndex, columnIndex);
+                let normalizedCellData = cellData;
+                if (cellData && typeof cellData === "object") {
+                    normalizedCellData = { ...cellData };
+                    if (!isNil(normalizedCellData.ss)) {
+                        normalizedCellData.ss = collectSharedString(String(normalizedCellData.ss));
+                    }
+                    collectCellXfs(normalizedCellData.uf);
+                    collectCellXfs(normalizedCellData.ef);
+                }
+                const formula = getExtendedValueFormula(getCellUserEnteredValue(cellData));
+                const origin = cellToAddress({ rowIndex, columnIndex }) ??
+                    `${rowIndex}:${columnIndex}`;
+                const formulaAttr = formula
+                    ? ` data-sheets-formula="${escapeHtmlAttribute(formula)}" data-formula="${escapeHtmlAttribute(formula)}" data-sheets-formula-origin="${escapeHtmlAttribute(origin)}" data-formula-origin="${escapeHtmlAttribute(origin)}"`
+                    : "";
+                const effectiveFormat = getEffectiveFormat?.(sheetId, rowIndex, columnIndex);
+                const bandedFormat = bandedCells?.get(cellIdentifier(rowIndex, columnIndex));
+                const numberFormatType = effectiveFormat?.numberFormat?.type;
+                const numberFormatPattern = effectiveFormat?.numberFormat?.pattern;
+                const numberFormatAttr = numberFormatType
+                    ? ` data-sheets-numberformat-type="${escapeHtmlAttribute(numberFormatType)}"${numberFormatPattern
+                        ? ` data-sheets-numberformat-pattern="${escapeHtmlAttribute(numberFormatPattern)}"`
+                        : ""}`
+                    : "";
+                // Alignment is encoded as data attributes so paste doesn't have
+                // to trust `getComputedStyle().textAlign`, which fabricates a
+                // CSS-spec default of `"start"` even when the value was never set.
+                const horizontalAlignment = effectiveFormat?.horizontalAlignment;
+                const verticalAlignment = effectiveFormat?.verticalAlignment;
+                const alignmentAttr = `${horizontalAlignment
+                    ? ` data-sheets-horizontal-alignment="${escapeHtmlAttribute(horizontalAlignment)}"`
+                    : ""}${verticalAlignment
+                    ? ` data-sheets-vertical-alignment="${escapeHtmlAttribute(verticalAlignment)}"`
+                    : ""}`;
+                // Csv
+                csvRow.push(formattedValue);
+                // Style
+                const isItalic = effectiveFormat?.textFormat?.italic;
+                const isBold = effectiveFormat?.textFormat?.bold;
+                const isUnderline = effectiveFormat?.textFormat?.underline;
+                const isStrikeThrough = effectiveFormat?.textFormat?.strikethrough;
+                const baselineOffset = effectiveFormat?.textFormat?.baselineOffset;
+                // Cell-level formatting wins over the banded (table style) layer,
+                // matching the canvas grid's merge order.
+                const cellBorders = effectiveFormat?.borders ?? bandedFormat?.borders;
+                const borderTop = cellBorders?.top;
+                const borderBottom = cellBorders?.bottom;
+                const borderLeft = cellBorders?.left;
+                const borderRight = cellBorders?.right;
+                const textDecoration = `${isUnderline ? "underline" : ""} ${isStrikeThrough ? "line-through" : ""}`.trim();
+                const wordWrap = effectiveFormat?.wrapStrategy === "wrap";
+                const style = theme
+                    ? {
+                        "background-color": getStringifiedColor(effectiveFormat?.backgroundColor ??
+                            bandedFormat?.backgroundColor, theme),
+                        color: getStringifiedColor(effectiveFormat?.textFormat?.color ??
+                            bandedFormat?.textFormat?.color, theme),
+                        padding: "2px 3px 2px 3px",
+                        overflow: "hidden",
+                        "font-weight": isBold ? "700" : "normal",
+                        "font-family": effectiveFormat?.textFormat?.fontFamily,
+                        "font-style": isItalic ? "italic" : "normal",
+                        "text-decoration": textDecoration
+                            ? textDecoration
+                            : undefined,
+                        "font-size": `${effectiveFormat?.textFormat?.fontSize ?? 10}pt`,
+                        "text-align": effectiveFormat?.horizontalAlignment,
+                        "vertical-align": effectiveFormat?.verticalAlignment,
+                        "border-top": borderTop
+                            ? `${borderTop.width}px solid ${getStringifiedColor(borderTop.color, theme)}`
+                            : undefined,
+                        "border-left": borderLeft
+                            ? `${borderLeft.width}px solid ${getStringifiedColor(borderLeft.color, theme)}`
+                            : undefined,
+                        "border-right": borderRight
+                            ? `${borderRight.width}px solid ${getStringifiedColor(borderRight.color, theme)}`
+                            : undefined,
+                        "border-bottom": borderBottom
+                            ? `${borderBottom.width}px solid ${getStringifiedColor(borderBottom.color, theme)}`
+                            : undefined,
+                        "text-wrap": wordWrap ? "wrap" : undefined,
+                    }
+                    : {};
                 // html
-                htmlString += "</tr>";
+                const innerHtml = baselineOffset === "superscript"
+                    ? `<sup>${formattedValue}</sup>`
+                    : baselineOffset === "subscript"
+                        ? `<sub>${formattedValue}</sub>`
+                        : formattedValue;
+                htmlString +=
+                    `<td${formulaAttr}${numberFormatAttr}${alignmentAttr} ${rowspan > 1 ? `rowspan="${rowspan}"` : ""} ${colspan > 1 ? `colspan="${colspan}"` : ""} style='${Object.entries(style)
+                        .filter(([_, v]) => !isNil(v))
+                        .map(([k, v]) => `${k}:${v}`)
+                        .join(";")}'>` +
+                        innerHtml +
+                        "</td>";
                 // json
-                json.push(jsonRow);
+                jsonRow.push({
+                    data: normalizedCellData,
+                    sourceCell: { rowIndex, columnIndex },
+                    rowspan,
+                    colspan,
+                });
             }
-            htmlString += "<tbody></table></body></html>";
+            /* Join with ',' for csv */
+            csv.push(csvRow.join(","));
+            // Plain text
+            plainText.push(csvRow.join("\t"));
+            // html
+            htmlString += "</tr>";
+            // json
+            json.push(jsonRow);
         }
+        htmlString += "<tbody></table></body></html>";
         const csvStr = csv.join("\n");
         const plainTextStr = plainText.join("\n");
         if (copiedSharedStrings.size) {
@@ -259,7 +308,9 @@ export const useOnCopy = ({ theme, merges, tables: sheetTables, bandedRanges, ge
         e?.clipboardData?.setData("text/plain", plainTextStr);
         e?.clipboardData?.setData("text/csv", csvStr);
         e?.clipboardData?.setData("application/json", JSON.stringify(copiedSchema));
+        return true;
     }, [
+        showError,
         theme,
         sheetTables,
         bandedRanges,

package/dist/esm/hooks/use-on-rename-sheet.js

@@ -1,14 +1,14 @@
 import { produceWithPatches } from "immer";
 import { useCallback } from "react";
 import { updateFormulaSheetReferences } from "../api/rename-sheet";
-import { truncateSheetTitle } from "../helpers/sheet-title";
+import { isValidSheetTitle, truncateSheetTitle } from "../helpers/sheet-title";
 import { useCanEditSheet, useCanEditWorkbook } from "./use-can-edit-cellrange";
 export const useOnRenameSheet = ({ locale, onChangeSheetData, onChangeSheets, onChangeActiveCell, getActiveCell, getGraphNodes, getPrecedents, createHistory, onCommand, }) => {
     const canEditSheet = useCanEditSheet();
     const canEditWorkbook = useCanEditWorkbook();
     return useCallback((sheetId, name, oldName) => {
         // Worksheet names cannot be empty or whitespace-only
-        if (name.trim().length === 0) {
+        if (!isValidSheetTitle(name)) {
             console.debug("Sheet name cannot be empty.");
             return;
         }

package/dist/esm/hooks/use-spreadsheet-state.d.ts

@@ -525,7 +525,7 @@ export declare const useSpreadsheetState: <T extends CellData = CellData, S exte
     onInsertTableRow: (tableView: TableView, relativeRowIndex?: number, rowData?: Record<string, string | undefined | null>[]) => void;
     onDeleteTableColumn: (tableView: TableView, dimensionIndex: number) => void;
     onDeleteTableRow: (tableView: TableView, rowIndexes: number[]) => void;
-    onCopy: (e: ClipboardEvent | undefined, sheetId: number, copiedSelections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[]) => void;
+    onCopy: (e: ClipboardEvent | undefined, sheetId: number, copiedSelections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[], isCutOperation?: boolean) => boolean;
     onPaste: (e: ClipboardEvent | undefined, sourceSheetId: number | undefined, destinationSheetId: number, copiedSelections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[] | undefined, activeCell: import("@rowsncolumns/grid").CellInterface, selections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[] | undefined, finalSelections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[] | undefined, isCutOperation: boolean) => Promise<void>;
     onCreateBasicFilter: (sheetId: number, activeCell: import("@rowsncolumns/grid").CellInterface, selections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[], basicFilterSpec?: Partial<import("@rowsncolumns/spreadsheet").FilterView>) => void;
     onCreateTable: (sheetId: number, activeCell: import("@rowsncolumns/grid").CellInterface, selections: import("@rowsncolumns/grid").SelectionArea<SelectionAttributes>[], tableSpec?: Partial<TableView>, theme?: import("@rowsncolumns/spreadsheet").TableTheme, bandedRange?: BandedDefinition) => void;

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;AASjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qbAyB/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,eAAe,MAAM,EAAE,SA8TjD,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;AASjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,qbAyB/D,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,MACrB,SAAS,MAAM,EAAE,eAAe,MAAM,EAAE,SAuUjD,CAAC"}

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

@@ -71,33 +71,45 @@ export const deleteColumn = ({ rowCount, columnCount, locale, cellXfsRegistry, s
         // and table-column splice for partially-overlapped tables.
         onChangeTables?.((prevTables) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
-                for (const table of draft) {
+                for (let idx = draft.length - 1; idx >= 0; idx--) {
+                    const table = draft[idx];
                     if (table.sheetId !== sheetId)
                         continue;
-                    if (minColumnIndex < table.range.startColumnIndex) {
+                    const { startColumnIndex, endColumnIndex } = table.range;
+                    if (maxColumnIndex < startColumnIndex) {
                         moveFilterView(table, count, Direction.Left);
+                        continue;
                     }
-                    if (minColumnIndex >= table.range.startColumnIndex &&
-                        minColumnIndex <= table.range.endColumnIndex) {
-                        if (table.filterSpecs) {
-                            for (const spec of table.filterSpecs) {
-                                if (spec.columnIndex >= minColumnIndex) {
-                                    spec.columnIndex -= count;
-                                }
+                    if (minColumnIndex > endColumnIndex)
+                        continue;
+                    if (minColumnIndex <= startColumnIndex &&
+                        maxColumnIndex >= endColumnIndex) {
+                        draft.splice(idx, 1);
+                        continue;
+                    }
+                    if (table.filterSpecs) {
+                        for (const spec of table.filterSpecs) {
+                            if (spec.columnIndex >= minColumnIndex) {
+                                spec.columnIndex -= count;
                             }
                         }
-                        if (table.sortSpecs) {
-                            for (const spec of table.sortSpecs) {
-                                if (spec.dimensionIndex >= minColumnIndex) {
-                                    spec.dimensionIndex -= count;
-                                }
+                    }
+                    if (table.sortSpecs) {
+                        for (const spec of table.sortSpecs) {
+                            if (spec.dimensionIndex >= minColumnIndex) {
+                                spec.dimensionIndex -= count;
                             }
                         }
-                        const columnArrayIndex = minColumnIndex - table.range.startColumnIndex;
-                        table.columns?.splice(columnArrayIndex, count);
-                        const delta = Math.min(table.range.endColumnIndex - minColumnIndex + 1, count);
-                        table.range.endColumnIndex -= delta;
                     }
+                    const overlapStart = Math.max(minColumnIndex, startColumnIndex);
+                    const overlapEnd = Math.min(maxColumnIndex, endColumnIndex);
+                    const removed = overlapEnd - overlapStart + 1;
+                    table.columns?.splice(overlapStart - startColumnIndex, removed);
+                    table.range.startColumnIndex = Math.min(startColumnIndex, minColumnIndex);
+                    table.range.endColumnIndex =
+                        table.range.startColumnIndex +
+                            (endColumnIndex - startColumnIndex) -
+                            removed;
                 }
             });
             saveHistory({ tables: { patches, inversePatches } });

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

@@ -1 +1 @@
-{"version":3,"file":"delete-table-column.d.ts","sourceRoot":"","sources":["../../../interface/delete-table-column.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAY5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,6OAepE,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,aAAa,GACb,UAAU,GACV,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,cAAc,GACd,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,oBAAoB,GACpB,wBAAwB,GACxB,uBAAuB,GACvB,eAAe,CAClB,MACS,WAAW,SAAS,EAAE,gBAAgB,MAAM,SA4VrD,CAAC"}
+{"version":3,"file":"delete-table-column.d.ts","sourceRoot":"","sources":["../../../interface/delete-table-column.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAY5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,6OAepE,IAAI,CACL,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EACnB,aAAa,GACb,UAAU,GACV,QAAQ,GACR,iBAAiB,GACjB,sBAAsB,GACtB,cAAc,GACd,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,GACnB,oBAAoB,GACpB,wBAAwB,GACxB,uBAAuB,GACvB,eAAe,CAClB,MACS,WAAW,SAAS,EAAE,gBAAgB,MAAM,SA8VrD,CAAC"}

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

@@ -121,9 +121,12 @@ export const deleteTableColumn = ({ columnCount, rowCount, locale, cellXfsRegist
         // Sheet data
         onChangeSheetData?.((prevSheetData) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
+                // The moved region is every cell after the deleted column within the table's rows,
+                // including any table to the right that sits inside that row band.
                 const sourceRange = {
                     ...range,
                     startColumnIndex: referenceColumnIndex + count,
+                    endColumnIndex: Number.MAX_SAFE_INTEGER,
                 };
                 const movedKeys = new Set();
                 /**
@@ -233,8 +236,7 @@ export const deleteTableColumn = ({ columnCount, rowCount, locale, cellXfsRegist
                         continue;
                     }
                     const startCol = Math.min(Math.max(range.startColumnIndex, 1), dataColumnCount);
-                    const endCol = Math.min(range.endColumnIndex, dataColumnCount);
-                    for (let columnIndex = startCol; columnIndex < endCol; columnIndex++) {
+                    for (let columnIndex = startCol; columnIndex < dataColumnCount; columnIndex++) {
                         const cellData = rowValues?.[columnIndex];
                         const hasFormula = !!getExtendedValueFormula(getCellUserEnteredValue(cellData));
                         if (!hasFormula) {

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

@@ -1 +1 @@
-{"version":3,"file":"delete-table-row.d.ts","sourceRoot":"","sources":["../../../interface/delete-table-row.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAgB5E,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,kSAiBjE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,MACvB,WAAW,SAAS,EAAE,YAAY,MAAM,EAAE,SAyXnD,CAAC"}
+{"version":3,"file":"delete-table-row.d.ts","sourceRoot":"","sources":["../../../interface/delete-table-row.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAgB5E,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,KAAK,EAAE,kSAiBjE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,MACvB,WAAW,SAAS,EAAE,YAAY,MAAM,EAAE,SAoYnD,CAAC"}

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

@@ -15,6 +15,9 @@ export const deleteTableRow = ({ rowCount, columnCount, locale, cellXfsRegistry,
         const saveHistory = createHistory();
         const { 0: minRowIndex, [rowIndexes.length - 1]: maxRowIndex } = rowIndexes;
         const count = rowIndexes.length;
+        const { startColumnIndex, endColumnIndex } = tableView.range;
+        const isInsideColumnBand = (range) => range.startColumnIndex >= startColumnIndex &&
+            range.endColumnIndex <= endColumnIndex;
         enqueueStructureChange?.({
             kind: "delete-table-row",
             sheetId,
@@ -30,14 +33,15 @@ export const deleteTableRow = ({ rowCount, columnCount, locale, cellXfsRegistry,
         onChangeTables?.((prevTables) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
                 for (const table of draft) {
-                    const startRowIndex = table.range.startRowIndex;
-                    const endRowIndex = table.range.endRowIndex;
-                    if (minRowIndex < startRowIndex) {
-                        moveFilterView(table, count, Direction.Up);
+                    if (table.sheetId !== sheetId || !isInsideColumnBand(table.range)) {
+                        continue;
                     }
-                    if (minRowIndex >= startRowIndex && minRowIndex <= endRowIndex) {
+                    if (table.id === tableView.id) {
                         table.range.endRowIndex -= count;
                     }
+                    else if (maxRowIndex < table.range.startRowIndex) {
+                        moveFilterView(table, count, Direction.Up);
+                    }
                 }
             });
             // Save history
@@ -52,7 +56,9 @@ export const deleteTableRow = ({ rowCount, columnCount, locale, cellXfsRegistry,
                 for (let idx = draft.length - 1; idx >= 0; idx--) {
                     const rule = draft[idx];
                     const ranges = rule.ranges
-                        ?.map((range) => updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId))
+                        ?.map((range) => isInsideColumnBand(range)
+                        ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
+                        : range)
                         .filter((range) => !!range) ?? [];
                     if (ranges.length) {
                         rule.ranges = ranges;
@@ -73,7 +79,9 @@ export const deleteTableRow = ({ rowCount, columnCount, locale, cellXfsRegistry,
                 for (let idx = draft.length - 1; idx >= 0; idx--) {
                     const rule = draft[idx];
                     const ranges = rule.ranges
-                        ?.map((range) => updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId))
+                        ?.map((range) => isInsideColumnBand(range)
+                        ? updateSheetRangeOnDelete(range, "row", minRowIndex, count, sheetId)
+                        : range)
                         .filter((range) => !!range) ?? [];
                     if (ranges.length) {
                         rule.ranges = ranges;
@@ -96,7 +104,8 @@ export const deleteTableRow = ({ rowCount, columnCount, locale, cellXfsRegistry,
                     if (sheet.rowMetadata) {
                         sheet.rowMetadata.splice(minRowIndex, count);
                     }
-                    if (sheet.basicFilter) {
+                    if (sheet.basicFilter &&
+                        isInsideColumnBand(sheet.basicFilter.range)) {
                         if (minRowIndex < sheet.basicFilter.range.startRowIndex) {
                             moveFilterView(sheet.basicFilter, count, Direction.Up);
                         }

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,SA4V9C,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;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"}

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

@@ -259,7 +259,7 @@ export const insertTableColumn = ({ tables, columnCount, rowCount, locale, cellX
         onChangeTables?.((prevTables) => {
             const [nextState, patches, inversePatches] = produceWithPatches(prevTables, (draft) => {
                 for (const table of draft) {
-                    if (referenceColumnIndex < table.range.startColumnIndex &&
+                    if (referenceColumnIndex <= table.range.startColumnIndex &&
                         table.range.startRowIndex >= tableView.range.startRowIndex &&
                         table.range.endRowIndex <= tableView.range.endRowIndex &&
                         table.id !== tableView.id) {
@@ -342,9 +342,12 @@ export const insertTableColumn = ({ tables, columnCount, rowCount, locale, cellX
             const [nextState, patches, inversePatches] = produceWithPatches(prevSheetData, (draft) => {
                 const { range } = tableView;
                 const headerRow = tableView.headerRow ?? true;
+                // The moved region is every cell at/after the insertion point within the table's
+                // rows, including any table to the right that sits inside that row band.
                 const sourceRange = {
                     ...range,
                     startColumnIndex: referenceColumnIndex,
+                    endColumnIndex: Number.MAX_SAFE_INTEGER,
                 };
                 const movedKeys = new Set();
                 // PASS 1
@@ -427,8 +430,7 @@ export const insertTableColumn = ({ tables, columnCount, rowCount, locale, cellX
                 for (let rowIndex = range.startRowIndex; rowIndex <= range.endRowIndex; rowIndex++) {
                     const dataColumnCount = draft[sheetId]?.[rowIndex]?.values?.length ?? 0;
                     const startCol = Math.min(Math.max(referenceColumnIndex, 1), dataColumnCount);
-                    const endCol = Math.min(range.endColumnIndex + numColumns, dataColumnCount);
-                    for (let columnIndex = startCol; columnIndex < endCol; columnIndex++) {
+                    for (let columnIndex = startCol; columnIndex < dataColumnCount; columnIndex++) {
                         moveFormulaAtPosition({
                             draft,
                             position: { sheetId, rowIndex, columnIndex },