@rowsncolumns/spreadsheet-state 29.1.4 → 29.1.6

package/dist/esm/api/immer-utils.js

@@ -59,6 +59,12 @@ export const cloneCellWithFormatting = (celLData) => {
  * first-specific-wins merging rule in `processPrecedentCell`.
  */
 const isGenericNumberFormatType = (type) => !type || type === "NUMBER" || type === "GENERAL";
+/**
+ * Whether a number format carries a real pattern — `General` (or a missing
+ * pattern) is "no format", the shape a plain typed number and an
+ * unformatted formula result have in Excel.
+ */
+const hasConcretePattern = (format) => !!format?.pattern && format.pattern !== "General";
 /**
  * Date-family types — when the derived (resolved) type is one of these
  * and the precedent's type is also in this set, we preserve the
@@ -472,6 +478,8 @@ resolvePrecedentNumberFormat) => {
     }
     // Priority
     // NUMBER -> PERCENTAGE -> CURRENCY
+    // Assigned inside `processPrecedentCell`; the cast keeps TypeScript from
+    // narrowing the declaration to `undefined` for the reads below.
     let numFormat = undefined;
     // Expected return type from function
     let expectedOutputType = undefined;
@@ -590,8 +598,13 @@ resolvePrecedentNumberFormat) => {
             // specific format is locked in we don't let a different specific
             // format override it (e.g. PERCENT then CURRENCY → keep PERCENT,
             // matching Excel; previously priority-based merging picked the
-            // higher-priority one regardless of position).
-            if (!numFormat || isGenericNumberFormatType(numFormat.type)) {
+            // higher-priority one regardless of position). Among generics, a
+            // pattern-less one (a General cell) never displaces an earlier one
+            // that carries a real pattern (`0.0`) — that pattern is the format
+            // Excel would inherit.
+            if (!numFormat ||
+                (isGenericNumberFormatType(numFormat.type) &&
+                    !(hasConcretePattern(numFormat) && !hasConcretePattern(curNumFormat)))) {
                 numFormat = curNumFormat;
             }
         }
@@ -621,9 +634,10 @@ resolvePrecedentNumberFormat) => {
     if (typeof calculatedValue === "number") {
         maxDecimals = Math.max(maxDecimals, calculatedDecimals ?? 0);
     }
-    if (!numFormat && maxDecimals > 0) {
-        numFormat = { type: "NUMBER" };
-    }
+    // A result with no formatted precedent is General, as in Excel: `=1/3`
+    // displays `0.333333333`, `=PI()` `3.141592654`. Decimals in the computed
+    // value are never a reason to manufacture a NUMBER pattern — a General
+    // result used to get `0.000` here and paint `0.333`.
     const applyDecimalHeuristic = (format) => {
         // `#` is the implicit integer pattern inferred from plain numeric cells,
         // but it suppresses zero. Formula results should still display a derived
@@ -650,24 +664,39 @@ resolvePrecedentNumberFormat) => {
                 };
             }
         }
-        // Original heuristic for NUMBER type
-        if (format?.type === "NUMBER" && maxDecimals > 0) {
-            const basePattern = format.pattern ?? "0";
+        // NUMBER decimals are only ever adjusted on a pattern a precedent
+        // actually carries (`0.0` → `0.00`). A NUMBER type without one — from
+        // General precedents, or from the AST reducing CURRENCY ÷ CURRENCY /
+        // DATE − DATE to a plain number — stays pattern-less and displays
+        // through General (`=D1/D2` → `1.5`, not `1.50`).
+        if (format?.type === "NUMBER" &&
+            hasConcretePattern(format) &&
+            maxDecimals > 0) {
             return {
                 ...format,
-                pattern: changeDecimals(basePattern, Math.min(maxDecimals, 3), false),
+                pattern: changeDecimals(format.pattern, Math.min(maxDecimals, 3), false),
             };
         }
         return format;
     };
     // Useful for Percentages
     // 20% x 50 => number
-    if (numFormat) {
-        // Does not support structured references as of now
-        const astDerivedNumberFormat = getNumberFormatFromFormulaAst(formula, numFormat, draft, tokenizer, sheetId, getSheetId, cellXfsRegistry, getDataValidationById, locale);
-        if (astDerivedNumberFormat) {
-            return applyDecimalHeuristic(astDerivedNumberFormat);
+    // The AST runs even when no precedent carried a format: it knows that
+    // `=NOW()-TODAY()` is a plain number where the function-return-type scan
+    // below would call it DATE_TIME. A General placeholder stands in for the
+    // missing precedent format and comes back as a pattern-less NUMBER for a
+    // General result. Does not support structured references as of now.
+    const astDerivedNumberFormat = getNumberFormatFromFormulaAst(formula, numFormat ?? { type: "NUMBER" }, draft, tokenizer, sheetId, getSheetId, cellXfsRegistry, getDataValidationById, locale);
+    if (astDerivedNumberFormat) {
+        if (!numFormat &&
+            astDerivedNumberFormat.type === "NUMBER" &&
+            !astDerivedNumberFormat.pattern) {
+            // The placeholder came back unchanged: a General result with no
+            // formatted precedent has no format at all (`=1/3`, `=B1` of a plain
+            // cell, `=NOW()-TODAY()`).
+            return undefined;
         }
+        return applyDecimalHeuristic(astDerivedNumberFormat);
     }
     // If we could not derive from function
     if (expectedOutputType === undefined) {

package/dist/esm/api/named-range-structural.d.ts

@@ -2,6 +2,21 @@ import type { NamedRange, SheetPrintSettings } from "@rowsncolumns/spreadsheet";
 import type { WritableDraft } from "immer";
 export type StructuralAxis = "row" | "column";
 export type StructuralOp = "insert" | "delete";
+/**
+ * The edited axis's extent, so a band can be recognised as UNBOUNDED on it:
+ * a whole-column name is modelled as `B1:B<rowCount>` and a whole-row name
+ * as `A1:<columnCount>1`, and Excel keeps `$B:$B` / `$1:$1` whole through
+ * every insert / delete on that axis.
+ */
+export type StructuralAxisBounds = {
+    /** The sheet's row / column count on the edited axis before the edit. */
+    length: number;
+    /**
+     * The hard cap the grid never grows past (`maxRowCount` / `maxColumnCount`);
+     * a band's end is clamped to it and a band pushed past it is `#REF!`.
+     */
+    max?: number;
+};
 /**
  * The `value` a defined name carries once every cell of its range has been
  * deleted. Excel keeps the name in the Name Manager as `=Sheet1!#REF!` and
@@ -22,8 +37,15 @@ export declare const isRefErrorNamedRange: (namedRange: Pick<NamedRange, "range"
  * - insert at the boundary directly below → unchanged;
  * - delete wholly above → shifts back; delete overlapping → shrinks by the
  *   deleted indices inside the band; delete covering the band → `null`.
+ *
+ * With `bounds`, a band that spans the whole axis (`1..length` — a
+ * whole-column `$B:$B` / whole-row `$1:$1` name) is unbounded on it: an
+ * insert anywhere keeps its start at 1 and stretches its end with the grid
+ * (Excel never turns `$B:$B` into `$B$2:$B$1001`), a delete only shrinks the
+ * end with the grid. Ends never pass `bounds.max`; a band whose start would
+ * is `null` (`#REF!`), like a cell reference pushed off the sheet.
  */
-export declare const shiftNamedBand: (start: number, end: number, op: StructuralOp, index: number, count: number) => [number, number] | null;
+export declare const shiftNamedBand: (start: number, end: number, op: StructuralOp, index: number, count: number, bounds?: StructuralAxisBounds) => [number, number] | null;
 export type NamedRangeStructuralUpdate<N extends NamedRange> = {
     /** Names whose range moved, grew, or shrank. */
     changed: N[];
@@ -41,13 +63,17 @@ export type NamedRangeStructuralUpdate<N extends NamedRange> = {
  * A name whose entire range is deleted is NOT dropped: it keeps its entry
  * with `range` cleared and `value: "#REF!"`, so `=SUM(Data)` evaluates to
  * `#REF!` like Excel rather than `#NAME?`.
+ *
+ * `bounds` (the edited sheet's row / column count on the edited axis) lets a
+ * whole-column / whole-row name keep its whole-axis geometry — see
+ * {@link shiftNamedBand}.
  */
-export declare const updateNamedRangesOnStructuralChange: (draft: WritableDraft<NamedRange>[], axis: StructuralAxis, op: StructuralOp, index: number, count: number, sheetId: number) => NamedRangeStructuralUpdate<WritableDraft<NamedRange>>;
+export declare const updateNamedRangesOnStructuralChange: (draft: WritableDraft<NamedRange>[], axis: StructuralAxis, op: StructuralOp, index: number, count: number, sheetId: number, bounds?: StructuralAxisBounds) => NamedRangeStructuralUpdate<WritableDraft<NamedRange>>;
 /**
  * Pure variant of {@link updateNamedRangesOnStructuralChange}: returns the
  * adjusted list (sharing untouched entries) plus the names that changed.
  */
-export declare const shiftNamedRangesOnStructuralChange: <N extends NamedRange>(namedRanges: readonly N[], axis: StructuralAxis, op: StructuralOp, index: number, count: number, sheetId: number) => {
+export declare const shiftNamedRangesOnStructuralChange: <N extends NamedRange>(namedRanges: readonly N[], axis: StructuralAxis, op: StructuralOp, index: number, count: number, sheetId: number, bounds?: StructuralAxisBounds) => {
     next: N[];
 } & NamedRangeStructuralUpdate<N>;
 /**

package/dist/esm/api/named-range-structural.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"named-range-structural.d.ts","sourceRoot":"","sources":["../../../api/named-range-structural.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAEV,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AAC9C,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE/C;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAE7C,eAAO,MAAM,oBAAoB,GAC/B,YAAY,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,YACmB,CAAC;AAErE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,KAAK,MAAM,EACX,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,KACZ,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAgBrB,CAAC;AAmBF,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,UAAU,IAAI;IAC7D,gDAAgD;IAChD,OAAO,EAAE,CAAC,EAAE,CAAC;IACb,gEAAgE;IAChE,UAAU,EAAE,CAAC,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mCAAmC,GAC9C,OAAO,aAAa,CAAC,UAAU,CAAC,EAAE,EAClC,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,SAAS,MAAM,KACd,0BAA0B,CAAC,aAAa,CAAC,UAAU,CAAC,CAmBtD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kCAAkC,GAAI,CAAC,SAAS,UAAU,EACrE,aAAa,SAAS,CAAC,EAAE,EACzB,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,SAAS,MAAM,KACd;IAAE,IAAI,EAAE,CAAC,EAAE,CAAA;CAAE,GAAG,0BAA0B,CAAC,CAAC,CAsB9C,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qCAAqC,GAChD,eAAe,aAAa,CAAC,kBAAkB,CAAC,EAChD,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,KACZ,OAiDF,CAAC"}
+{"version":3,"file":"named-range-structural.d.ts","sourceRoot":"","sources":["../../../api/named-range-structural.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAEV,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AAC9C,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAE7C,eAAO,MAAM,oBAAoB,GAC/B,YAAY,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,YACmB,CAAC;AAErE;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,KAAK,MAAM,EACX,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,SAAS,oBAAoB,KAC5B,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IA2BrB,CAAC;AA2BF,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,UAAU,IAAI;IAC7D,gDAAgD;IAChD,OAAO,EAAE,CAAC,EAAE,CAAC;IACb,gEAAgE;IAChE,UAAU,EAAE,CAAC,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mCAAmC,GAC9C,OAAO,aAAa,CAAC,UAAU,CAAC,EAAE,EAClC,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,SAAS,MAAM,EACf,SAAS,oBAAoB,KAC5B,0BAA0B,CAAC,aAAa,CAAC,UAAU,CAAC,CAmBtD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kCAAkC,GAAI,CAAC,SAAS,UAAU,EACrE,aAAa,SAAS,CAAC,EAAE,EACzB,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,SAAS,MAAM,EACf,SAAS,oBAAoB,KAC5B;IAAE,IAAI,EAAE,CAAC,EAAE,CAAA;CAAE,GAAG,0BAA0B,CAAC,CAAC,CAsB9C,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qCAAqC,GAChD,eAAe,aAAa,CAAC,kBAAkB,CAAC,EAChD,MAAM,cAAc,EACpB,IAAI,YAAY,EAChB,OAAO,MAAM,EACb,OAAO,MAAM,KACZ,OAiDF,CAAC"}

package/dist/esm/api/named-range-structural.js

@@ -18,20 +18,40 @@ export const isRefErrorNamedRange = (namedRange) => !namedRange.range && namedRa
  * - insert at the boundary directly below → unchanged;
  * - delete wholly above → shifts back; delete overlapping → shrinks by the
  *   deleted indices inside the band; delete covering the band → `null`.
+ *
+ * With `bounds`, a band that spans the whole axis (`1..length` — a
+ * whole-column `$B:$B` / whole-row `$1:$1` name) is unbounded on it: an
+ * insert anywhere keeps its start at 1 and stretches its end with the grid
+ * (Excel never turns `$B:$B` into `$B$2:$B$1001`), a delete only shrinks the
+ * end with the grid. Ends never pass `bounds.max`; a band whose start would
+ * is `null` (`#REF!`), like a cell reference pushed off the sheet.
  */
-export const shiftNamedBand = (start, end, op, index, count) => {
+export const shiftNamedBand = (start, end, op, index, count, bounds) => {
     if (count <= 0)
         return [start, end];
     const s = Math.max(1, start);
     const e = Math.max(s, end);
+    const max = bounds?.max ?? Number.POSITIVE_INFINITY;
+    const wholeAxis = bounds != null && s <= 1 && e >= bounds.length;
+    const deleteEnd = index + count - 1;
+    if (wholeAxis) {
+        if (op === "insert")
+            return [1, Math.min(e + count, max)];
+        if (index > e)
+            return [s, e];
+        const inside = Math.min(deleteEnd, e) - Math.max(index, 1) + 1;
+        return [1, Math.max(1, e - inside)];
+    }
     if (op === "insert") {
-        if (index <= s)
-            return [s + count, e + count];
+        if (index <= s) {
+            if (s + count > max)
+                return null;
+            return [s + count, Math.min(e + count, max)];
+        }
         if (index <= e)
-            return [s, e + count];
+            return [s, Math.min(e + count, max)];
         return [s, e];
     }
-    const deleteEnd = index + count - 1;
     if (deleteEnd < s)
         return [s - count, e - count];
     if (index > e)
@@ -42,11 +62,11 @@ export const shiftNamedBand = (start, end, op, index, count) => {
     const inside = Math.min(deleteEnd, e) - Math.max(index, s) + 1;
     return [s - before, e - before - inside];
 };
-const shiftGridRange = (range, axis, op, index, count) => {
+const shiftGridRange = (range, axis, op, index, count, bounds) => {
     const [startKey, endKey] = axis === "row"
         ? ["startRowIndex", "endRowIndex"]
         : ["startColumnIndex", "endColumnIndex"];
-    const next = shiftNamedBand(range[startKey], range[endKey], op, index, count);
+    const next = shiftNamedBand(range[startKey], range[endKey], op, index, count, bounds);
     if (!next)
         return null;
     if (next[0] === range[startKey] && next[1] === range[endKey])
@@ -64,8 +84,12 @@ const shiftGridRange = (range, axis, op, index, count) => {
  * A name whose entire range is deleted is NOT dropped: it keeps its entry
  * with `range` cleared and `value: "#REF!"`, so `=SUM(Data)` evaluates to
  * `#REF!` like Excel rather than `#NAME?`.
+ *
+ * `bounds` (the edited sheet's row / column count on the edited axis) lets a
+ * whole-column / whole-row name keep its whole-axis geometry — see
+ * {@link shiftNamedBand}.
  */
-export const updateNamedRangesOnStructuralChange = (draft, axis, op, index, count, sheetId) => {
+export const updateNamedRangesOnStructuralChange = (draft, axis, op, index, count, sheetId, bounds) => {
     const changed = [];
     const refErrored = [];
     if (count <= 0)
@@ -74,7 +98,7 @@ export const updateNamedRangesOnStructuralChange = (draft, axis, op, index, coun
         const range = namedRange.range;
         if (!range || range.sheetId !== sheetId)
             continue;
-        const next = shiftGridRange(range, axis, op, index, count);
+        const next = shiftGridRange(range, axis, op, index, count, bounds);
         if (next === range)
             continue;
         if (next === null) {
@@ -92,14 +116,14 @@ export const updateNamedRangesOnStructuralChange = (draft, axis, op, index, coun
  * Pure variant of {@link updateNamedRangesOnStructuralChange}: returns the
  * adjusted list (sharing untouched entries) plus the names that changed.
  */
-export const shiftNamedRangesOnStructuralChange = (namedRanges, axis, op, index, count, sheetId) => {
+export const shiftNamedRangesOnStructuralChange = (namedRanges, axis, op, index, count, sheetId, bounds) => {
     const changed = [];
     const refErrored = [];
     const next = namedRanges.map((namedRange) => {
         const range = namedRange.range;
         if (!range || range.sheetId !== sheetId || count <= 0)
             return namedRange;
-        const shifted = shiftGridRange(range, axis, op, index, count);
+        const shifted = shiftGridRange(range, axis, op, index, count, bounds);
         if (shifted === range)
             return namedRange;
         if (shifted === null) {

package/dist/esm/api/parse-html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-html.d.ts","sourceRoot":"","sources":["../../../api/parse-html.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EAGV,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EAGf,MAAM,2BAA2B,CAAC;AAkBnC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAgE1E,eAAO,MAAM,SAAS,GACpB,gBAAgB,MAAM,EACtB,gBAAgB,MAAM,GAAG,SAAS,EAClC,YAAY,aAAa,EACzB,SAAS,MAAM,EACf,qBAAqB,OAAO,EAC5B,qBAAqB,mBAAmB,CAAC,oBAAoB,CAAC,EAC9D,SAAS,MAAM,EACf,eAAe,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM;;;;;;EAoDxC,CAAC;AAyqBF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,MAAM,CAuBlE;AA2OD,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,uBAY5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,UAAU,MAAM,GAAG,SAAS,GAAG,IAAI,EACnC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,qBAAqB,mBAAmB,CAAC,oBAAoB,CAAC,wCA2B/D,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,MAAM,OAAO,kFA2CvD,CAAC"}
+{"version":3,"file":"parse-html.d.ts","sourceRoot":"","sources":["../../../api/parse-html.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EAGV,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EAGf,MAAM,2BAA2B,CAAC;AAqBnC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAgE1E,eAAO,MAAM,SAAS,GACpB,gBAAgB,MAAM,EACtB,gBAAgB,MAAM,GAAG,SAAS,EAClC,YAAY,aAAa,EACzB,SAAS,MAAM,EACf,qBAAqB,OAAO,EAC5B,qBAAqB,mBAAmB,CAAC,oBAAoB,CAAC,EAC9D,SAAS,MAAM,EACf,eAAe,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM;;;;;;EAuDxC,CAAC;AAmrBF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,MAAM,CAuBlE;AA2OD,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,uBAY5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,UAAU,MAAM,GAAG,SAAS,GAAG,IAAI,EACnC,SAAS,MAAM,EACf,YAAY,aAAa,EACzB,qBAAqB,mBAAmB,CAAC,oBAAoB,CAAC,wCA2B/D,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,MAAM,OAAO,kFA2CvD,CAAC"}

package/dist/esm/api/parse-html.js

@@ -1,5 +1,5 @@
 import { getImageDimensionsFromUrl } from "@rowsncolumns/toolkit";
-import { colorStringToHex, getExtendedValueBool, getExtendedValueError, getExtendedValueFormula, getExtendedValueNumber, getExtendedValueString, htmlElementToRichText, isNil, mountClipboardHtml, normalizeColor, pixelToPoint, pointToPixel, uuid, } from "@rowsncolumns/utils";
+import { colorStringToHex, getExtendedValueBool, getExtendedValueError, getExtendedValueFormula, getExtendedValueNumber, getExtendedValueString, htmlElementToRichText, isAFormula, isNil, isSafeHyperlinkUri, isSafeImageSrc, mountClipboardHtml, normalizeColor, pixelToPoint, pointToPixel, uuid, } from "@rowsncolumns/utils";
 import { defaultCellCoords, SheetCell } from "../sheet-cell";
 const BLOCK_TAGS = new Set([
     "p",
@@ -56,6 +56,9 @@ export const parseHtml = async (clipboardValue, plainTextValue, activeCell, shee
         rowStrings: [],
     };
     if (clipboardValue?.trim()) {
+        // A consumer's `sanitizeHtml` runs first and can only tighten the payload:
+        // `mountClipboardHtml` always applies the built-in sanitizer afterwards
+        // (scripts, handlers, frames, unsafe URLs) before anything reaches the DOM.
         const safeHtml = sanitizeHtml ? sanitizeHtml(clipboardValue) : clipboardValue;
         const { root, cleanup } = mountClipboardHtml(safeHtml);
         try {
@@ -471,7 +474,7 @@ const tryHandleImageElement = async (element, context) => {
         return false;
     }
     const imageUrl = image.getAttribute("src");
-    if (!imageUrl) {
+    if (!imageUrl || !isSafeImageSrc(imageUrl)) {
         return false;
     }
     const text = extractTextContent(element);
@@ -516,9 +519,13 @@ const applyGoogleSheetsValue = (element, sheetCell) => {
                 return true;
             }
         }
+        // `"1"` is the Google Sheets value type: 2 = string, 3 = number, 4 = boolean. A STRING
+        // cell whose text starts with `=` is text in the source sheet (its formula would ride
+        // `data-sheets-formula`), so it lands as quote-prefixed text rather than a formula.
+        const isStringType = parsed["1"] === 2;
         for (const candidate of candidates) {
             if (typeof candidate === "string" && candidate.length) {
-                sheetCell.setUserEnteredValue(candidate);
+                sheetCell.setUserEnteredValue(isStringType && isAFormula(candidate) ? `'${candidate}` : candidate);
                 return true;
             }
         }
@@ -558,7 +565,9 @@ const applyExcelValue = (element, sheetCell) => {
         sheetCell.setUserEnteredValue(excelValue === "1" || excelValue === "TRUE");
         return true;
     }
-    sheetCell.setUserEnteredValue(excelValue);
+    // A string-typed (`data-t="s"`) cell whose text starts with `=` is text in the source
+    // (a formula rides `data-formula`) — keep it text via the quote prefix.
+    sheetCell.setUserEnteredValue(excelType === "s" && isAFormula(excelValue) ? `'${excelValue}` : excelValue);
     return true;
 };
 const excelSerialToDate = (serial) => {
@@ -574,7 +583,7 @@ const excelSerialToDate = (serial) => {
 };
 const applyAnchorValue = (element, sheetCell) => {
     const href = element.getAttribute("href");
-    if (!href) {
+    if (!href || !isSafeHyperlinkUri(href)) {
         return false;
     }
     const title = extractTextContent(element) || href;

package/dist/esm/api/structural-formula-update.d.ts

@@ -14,11 +14,20 @@ export type StructuralFormulaUpdateParams<T extends CellData> = {
     sheetId: number;
     /**
      * For insert: the index at which rows/columns are being inserted.
-     * For delete: the smallest index in the (assumed contiguous) deleted range.
+     * For delete: the smallest deleted index.
      */
     referenceIndex: number;
     /** Number of rows/columns being inserted or deleted. */
     count: number;
+    /**
+     * Delete only: the exact deleted indexes (any order) when the selection is
+     * NOT one contiguous band — Ctrl-selected rows 2 and 4. Excel shifts every
+     * reference by the number of deleted lines BEFORE it and breaks references
+     * INTO a deleted line; treating the selection as the band 2:4 would break
+     * `=A3` and slide `=A4` onto the wrong cell. Defaults to the contiguous band
+     * `referenceIndex .. referenceIndex + count - 1`.
+     */
+    indexes?: number[];
     rowCount: number;
     columnCount: number;
     getDependents: ReturnType<typeof useCalculation>["getDependents"];
@@ -71,5 +80,15 @@ export type StructuralFormulaUpdateParams<T extends CellData> = {
  * and 3 don't double-process a cell.
  */
 export declare const updateFormulasForStructuralChange: <T extends CellData>(params: StructuralFormulaUpdateParams<T>) => void;
+/**
+ * The maximal contiguous runs of `indexes` (any order, duplicates ignored),
+ * ascending — the bands of a Ctrl-selected delete (rows 2 and 4 → two runs).
+ * Shared by `deleteRow` / `deleteColumn`, which apply every band-shaped update
+ * once per run.
+ */
+export declare const contiguousRuns: (indexes: number[]) => Array<{
+    start: number;
+    count: number;
+}>;
 export {};
 //# sourceMappingURL=structural-formula-update.d.ts.map

package/dist/esm/api/structural-formula-update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structural-formula-update.d.ts","sourceRoot":"","sources":["../../../api/structural-formula-update.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAK1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAarD,KAAK,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AACvC,KAAK,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,QAAQ,IAAI;IAC9D,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,YAAY,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,eAAe,CAAC,CAAC;IAClE;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,eAAe,CAAC,CAAC;IACnE;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAC/B,OAAO,cAAc,CACtB,CAAC,sBAAsB,CAAC,CAAC;IAC1B,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C,kBAAkB,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAC7E,qBAAqB,CAAC,EAAE,UAAU,CAChC,OAAO,cAAc,CACtB,CAAC,uBAAuB,CAAC,CAAC;IAE3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAE/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,iCAAiC,GAAI,CAAC,SAAS,QAAQ,EAClE,QAAQ,6BAA6B,CAAC,CAAC,CAAC,SA2WzC,CAAC"}
+{"version":3,"file":"structural-formula-update.d.ts","sourceRoot":"","sources":["../../../api/structural-formula-update.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAK1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAcrD,KAAK,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AACvC,KAAK,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,QAAQ,IAAI;IAC9D,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,YAAY,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,eAAe,CAAC,CAAC;IAClE;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,eAAe,CAAC,CAAC;IACnE;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAC/B,OAAO,cAAc,CACtB,CAAC,sBAAsB,CAAC,CAAC;IAC1B,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C,kBAAkB,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAC7E,qBAAqB,CAAC,EAAE,UAAU,CAChC,OAAO,cAAc,CACtB,CAAC,uBAAuB,CAAC,CAAC;IAE3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAE/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,iCAAiC,GAAI,CAAC,SAAS,QAAQ,EAClE,QAAQ,6BAA6B,CAAC,CAAC,CAAC,SAybzC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,SAAS,MAAM,EAAE,KAChB,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAYxC,CAAC"}