@rowsncolumns/spreadsheet 10.6.4 → 10.7.0

package/dist/cjs/components/cell/cell-background.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CellBackground = exports.AUTOMATIC_PATTERN_COLOR = void 0;
+exports.CellBackground = exports.getPathGradientRegions = exports.AUTOMATIC_PATTERN_COLOR = void 0;
 var tslib_1 = require("tslib");
 var utils_1 = require("@rowsncolumns/utils");
 var react_1 = tslib_1.__importDefault(require("react"));
@@ -8,35 +8,132 @@ var react_konva_1 = require("react-konva");
 var fill_patterns_1 = require("../../api/fill-patterns");
 /** Excel's Automatic pattern colour: a pattern with no colour of its own. */
 exports.AUTOMATIC_PATTERN_COLOR = "#000000";
-// Build a CanvasGradient matching the OOXML <gradientFill> spec.
-// linear: `degree` rotates the axis (0 = left→right, 90 = top→bottom,
-//   180 = right→left, 270 = bottom→top). Excel's axis runs through the
-//   cell's centroid at the given angle and the gradient spans the full
-//   cell along it.
-// path: rectangular radial — `left`/`right`/`top`/`bottom` (each 0..1)
-//   describe the inset of the inner stop's "core" rectangle. We
-//   approximate as a single radial gradient anchored at that core's
-//   center, with radius = distance to the farthest corner.
+/**
+ * Excel's path gradient over the rectangle `[x0, y0]–[x1, y1]`: the core
+ * rectangle (inner stop colour) and four trapezoids cut along the
+ * core-to-corner diagonals, each a linear gradient from the core edge out
+ * to its cell edge — together, concentric rectangles of colour.
+ */
+var getPathGradientRegions = function (gradient, x0, y0, x1, y1) {
+    var _a, _b, _c, _d;
+    var width = x1 - x0;
+    var height = y1 - y0;
+    var cl = x0 + ((_a = gradient.left) !== null && _a !== void 0 ? _a : 0) * width;
+    var cr = x1 - ((_b = gradient.right) !== null && _b !== void 0 ? _b : 0) * width;
+    var ct = y0 + ((_c = gradient.top) !== null && _c !== void 0 ? _c : 0) * height;
+    var cb = y1 - ((_d = gradient.bottom) !== null && _d !== void 0 ? _d : 0) * height;
+    var coreLeft = Math.min(cl, cr);
+    var coreRight = Math.max(cl, cr);
+    var coreTop = Math.min(ct, cb);
+    var coreBottom = Math.max(ct, cb);
+    return {
+        core: [coreLeft, coreTop, coreRight, coreBottom],
+        regions: [
+            {
+                points: [
+                    [x0, y0],
+                    [x1, y0],
+                    [coreRight, coreTop],
+                    [coreLeft, coreTop],
+                ],
+                axis: [coreLeft, coreTop, coreLeft, y0],
+            },
+            {
+                points: [
+                    [x1, y0],
+                    [x1, y1],
+                    [coreRight, coreBottom],
+                    [coreRight, coreTop],
+                ],
+                axis: [coreRight, coreTop, x1, coreTop],
+            },
+            {
+                points: [
+                    [x1, y1],
+                    [x0, y1],
+                    [coreLeft, coreBottom],
+                    [coreRight, coreBottom],
+                ],
+                axis: [coreLeft, coreBottom, coreLeft, y1],
+            },
+            {
+                points: [
+                    [x0, y1],
+                    [x0, y0],
+                    [coreLeft, coreTop],
+                    [coreLeft, coreBottom],
+                ],
+                axis: [coreLeft, coreTop, x0, coreTop],
+            },
+        ],
+    };
+};
+exports.getPathGradientRegions = getPathGradientRegions;
+var addStops = function (canvasGrad, gradient) {
+    var e_1, _a;
+    try {
+        for (var _b = tslib_1.__values(gradient.stops), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var stop_1 = _c.value;
+            // Clamp position to [0,1] — Canvas API rejects out-of-range values.
+            var pos = Math.max(0, Math.min(1, stop_1.position));
+            try {
+                canvasGrad.addColorStop(pos, stop_1.color);
+            }
+            catch (_d) {
+                // Invalid color string — skip rather than blow up the render.
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+};
+var paintPathGradient = function (context, native, gradient, rect) {
+    var e_2, _a;
+    var _b = exports.getPathGradientRegions.apply(void 0, tslib_1.__spreadArray([gradient], tslib_1.__read(rect), false)), core = _b.core, regions = _b.regions;
+    var sorted = tslib_1.__spreadArray([], tslib_1.__read(gradient.stops), false).sort(function (a, b) { return a.position - b.position; });
+    context.setAttr("fillStyle", sorted[0].color);
+    context.fillRect(core[0], core[1], core[2] - core[0], core[3] - core[1]);
+    try {
+        for (var regions_1 = tslib_1.__values(regions), regions_1_1 = regions_1.next(); !regions_1_1.done; regions_1_1 = regions_1.next()) {
+            var region = regions_1_1.value;
+            var _c = tslib_1.__read(region.axis, 4), ax0 = _c[0], ay0 = _c[1], ax1 = _c[2], ay1 = _c[3];
+            if (ax0 === ax1 && ay0 === ay1)
+                continue;
+            var canvasGrad = native.createLinearGradient(ax0, ay0, ax1, ay1);
+            addStops(canvasGrad, gradient);
+            context.beginPath();
+            region.points.forEach(function (_a, index) {
+                var _b = tslib_1.__read(_a, 2), px = _b[0], py = _b[1];
+                return index ? context.lineTo(px, py) : context.moveTo(px, py);
+            });
+            context.closePath();
+            context.setAttr("fillStyle", canvasGrad);
+            context.fill();
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (regions_1_1 && !regions_1_1.done && (_a = regions_1.return)) _a.call(regions_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+};
 var buildCanvasGradient = function (native, gradient, width, height) {
-    var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f, _g, _h;
-    if (!((_c = gradient.stops) === null || _c === void 0 ? void 0 : _c.length))
+    var e_3, _a;
+    var _b, _c;
+    if (!((_b = gradient.stops) === null || _b === void 0 ? void 0 : _b.length))
         return null;
     var canvasGrad;
-    if (gradient.type === "path") {
-        var left = (_d = gradient.left) !== null && _d !== void 0 ? _d : 0;
-        var right = (_e = gradient.right) !== null && _e !== void 0 ? _e : 0;
-        var top_1 = (_f = gradient.top) !== null && _f !== void 0 ? _f : 0;
-        var bottom = (_g = gradient.bottom) !== null && _g !== void 0 ? _g : 0;
-        var cx = ((left + (1 - right)) / 2) * width;
-        var cy = ((top_1 + (1 - bottom)) / 2) * height;
-        var farthestCorner = Math.max(Math.hypot(cx, cy), Math.hypot(width - cx, cy), Math.hypot(cx, height - cy), Math.hypot(width - cx, height - cy));
-        canvasGrad = native.createRadialGradient(cx, cy, 0, cx, cy, farthestCorner || 1);
-    }
-    else {
+    {
         // Linear. Map degrees → axis vector. Excel: degree=0 runs the
         // gradient from LEFT to RIGHT. degree increases clockwise.
-        var deg = ((((_h = gradient.degree) !== null && _h !== void 0 ? _h : 0) % 360) + 360) % 360;
+        var deg = ((((_c = gradient.degree) !== null && _c !== void 0 ? _c : 0) % 360) + 360) % 360;
         var rad = (deg * Math.PI) / 180;
         // Project the axis through the rect's center; the start/end points
         // are where that axis exits the bounding box (handled by computing
@@ -55,7 +152,7 @@ var buildCanvasGradient = function (native, gradient, width, height) {
         var maxProj = -Infinity;
         try {
             for (var corners_1 = tslib_1.__values(corners), corners_1_1 = corners_1.next(); !corners_1_1.done; corners_1_1 = corners_1.next()) {
-                var _j = tslib_1.__read(corners_1_1.value, 2), px = _j[0], py = _j[1];
+                var _d = tslib_1.__read(corners_1_1.value, 2), px = _d[0], py = _d[1];
                 var proj = (px - cx) * dx + (py - cy) * dy;
                 if (proj < minProj)
                     minProj = proj;
@@ -63,12 +160,12 @@ var buildCanvasGradient = function (native, gradient, width, height) {
                     maxProj = proj;
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (corners_1_1 && !corners_1_1.done && (_a = corners_1.return)) _a.call(corners_1);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         var x0 = cx + dx * minProj;
         var y0 = cy + dy * minProj;
@@ -76,26 +173,7 @@ var buildCanvasGradient = function (native, gradient, width, height) {
         var y1 = cy + dy * maxProj;
         canvasGrad = native.createLinearGradient(x0, y0, x1, y1);
     }
-    try {
-        for (var _k = tslib_1.__values(gradient.stops), _l = _k.next(); !_l.done; _l = _k.next()) {
-            var stop_1 = _l.value;
-            // Clamp position to [0,1] — Canvas API rejects out-of-range values.
-            var pos = Math.max(0, Math.min(1, stop_1.position));
-            try {
-                canvasGrad.addColorStop(pos, stop_1.color);
-            }
-            catch (_m) {
-                // Invalid color string — skip rather than blow up the render.
-            }
-        }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (_l && !_l.done && (_b = _k.return)) _b.call(_k);
-        }
-        finally { if (e_2) throw e_2.error; }
-    }
+    addStops(canvasGrad, gradient);
     return canvasGrad;
 };
 var CellBackground = function (_a) {
@@ -124,7 +202,14 @@ var CellBackground = function (_a) {
         var useTile = fillPattern && fillPattern !== "solid" && fillPattern !== "none";
         var useGradient = !!gradient && ((_c = (_b = gradient.stops) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0;
         var native = context._context;
-        if (useGradient && native) {
+        var fillRectArea = (isMergedCell || !showFaintBorder) && showGridLines
+            ? [1, 1, shape.width(), shape.height()]
+            : [0, 0, shape.width() + 1, shape.height() + 1];
+        var usePathGradient = useGradient && native && gradient.type === "path";
+        if (usePathGradient) {
+            paintPathGradient(context, native, gradient, fillRectArea);
+        }
+        else if (useGradient && native) {
             var canvasGrad = buildCanvasGradient(native, gradient, shape.width(), shape.height());
             if (canvasGrad) {
                 context.setAttr("fillStyle", canvasGrad);
@@ -149,11 +234,13 @@ var CellBackground = function (_a) {
         else {
             context.setAttr("fillStyle", finalBackgroundColor);
         }
-        if ((isMergedCell || !showFaintBorder) && showGridLines) {
-            context.fillRect(1, 1, shape.width() - 1, shape.height() - 1);
-        }
-        else {
-            context.fillRect(0, 0, shape.width() + 1, shape.height() + 1);
+        if (!usePathGradient) {
+            if ((isMergedCell || !showFaintBorder) && showGridLines) {
+                context.fillRect(1, 1, shape.width() - 1, shape.height() - 1);
+            }
+            else {
+                context.fillRect(0, 0, shape.width() + 1, shape.height() + 1);
+            }
         }
         if (showFaintBorder) {
             var lightColor = (0, utils_1.lightenColor)(-0.1, backgroundColor);

package/dist/cjs/components/cell/cell-text-runs.d.ts

@@ -46,6 +46,13 @@ export type CellTextRunsProps = {
     wrap: boolean;
     /** Theme — used to resolve segment `color` objects to CSS strings. */
     theme: SpreadsheetTheme;
+    /**
+     * Multiplier for run font sizes given in points (zoom × shrink-to-fit),
+     * so a run's own size follows the cell's.
+     */
+    fontScale?: number;
+    /** Konva rotation (degrees, clockwise) of the whole block — rotated text. */
+    rotation?: number;
 };
 export type Resolved = {
     bold: boolean;
@@ -64,7 +71,7 @@ export type Resolved = {
  * merged style carries a `baselineOffset` (own or inherited from the
  * base) the sup/sub font scale is applied here, exactly once.
  */
-export declare const resolveSegmentStyle: (seg: RichTextSegment, base: Resolved, theme: SpreadsheetTheme) => Resolved;
+export declare const resolveSegmentStyle: (seg: RichTextSegment, base: Resolved, theme: SpreadsheetTheme, fontScale?: number) => Resolved;
 /** A segment paired with its fully-resolved paint style. */
 export type ResolvedSegment = {
     seg: RichTextSegment;
@@ -83,10 +90,10 @@ export declare const computeLineMetrics: (resolvedLines: ResolvedSegment[][], ba
 };
 /**
  * Vertical draw position (textBaseline="top") for one segment within
- * its line box. Normal runs share the line's alphabetic baseline
- * (smaller runs shift down), superscript hugs the line top, subscript
- * hugs the line bottom. All three reduce to `lineTop` when the run's
- * size equals the line's. Exported for unit tests.
+ * its line box. Every run shares the line's alphabetic baseline (smaller
+ * runs shift down); superscript / subscript runs then move that baseline
+ * up / down by Excel's shift ({@link getScriptBaselineShift}). Exported
+ * for unit tests.
  */
 export declare const computeSegmentTop: (lineTop: number, lineFontSize: number, segFontSize: number, baselineOffset: "superscript" | "subscript" | undefined) => number;
 /**

package/dist/cjs/components/cell/cell-text-runs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-text-runs.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-text-runs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAsB,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,8DAA8D;IAC9D,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IACjD,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,EAAE,OAAO,CAAC;IACd,sEAAsE;IACtE,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;CAC9C,CAAC;AAkCF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,eAAe,EACpB,MAAM,QAAQ,EACd,OAAO,gBAAgB,KACtB,QA0BF,CAAC;AAKF,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,eAAe,CAAC;IACrB,CAAC,EAAE,QAAQ,CAAC;CACb,CAAC;AAYF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,eAAe,eAAe,EAAE,EAAE,EAClC,MAAM,QAAQ,EACd,WAAW,CAAC,CAAC,EAAE,QAAQ,KAAK,MAAM,KACjC;IAAE,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CASvE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,gBAAgB,aAAa,GAAG,WAAW,GAAG,SAAS,KACtD,MAMF,CAAC;AAoHF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,oCAAsB,iBAAiB,uBA2P9D,CAAC"}
+{"version":3,"file":"cell-text-runs.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-text-runs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAsB,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,8DAA8D;IAC9D,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IACjD,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,EAAE,OAAO,CAAC;IACd,sEAAsE;IACtE,KAAK,EAAE,gBAAgB,CAAC;IACxB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;CAC9C,CAAC;AAkCF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,eAAe,EACpB,MAAM,QAAQ,EACd,OAAO,gBAAgB,EACvB,kBAAa,KACZ,QAwBF,CAAC;AAKF,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,eAAe,CAAC;IACrB,CAAC,EAAE,QAAQ,CAAC;CACb,CAAC;AAYF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,eAAe,eAAe,EAAE,EAAE,EAClC,MAAM,QAAQ,EACd,WAAW,CAAC,CAAC,EAAE,QAAQ,KAAK,MAAM,KACjC;IAAE,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CASvE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,gBAAgB,aAAa,GAAG,WAAW,GAAG,SAAS,KACtD,MAGmD,CAAC;AAoHvD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,oCAAsB,iBAAiB,uBAgQ9D,CAAC"}

package/dist/cjs/components/cell/cell-text-runs.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
 var react_konva_1 = require("react-konva");
 var themes_1 = require("../../themes");
+var alignment_1 = require("./alignment");
 var line_height_1 = require("./line-height");
 var rich_text_1 = require("./rich-text");
 var BASELINE_OFFSET_FONT_SCALE = 0.58;
@@ -45,13 +46,12 @@ var buildFontString = function (r) {
  * merged style carries a `baselineOffset` (own or inherited from the
  * base) the sup/sub font scale is applied here, exactly once.
  */
-var resolveSegmentStyle = function (seg, base, theme) {
+var resolveSegmentStyle = function (seg, base, theme, fontScale) {
     var _a, _b, _c, _d, _e, _f;
+    if (fontScale === void 0) { fontScale = 1; }
     var f = seg.format;
     var baselineOffset = (_a = f.baselineOffset) !== null && _a !== void 0 ? _a : base.baselineOffset;
-    var fontSize = typeof f.fontSize === "number"
-        ? (f.fontSize / pointFromPx(base.fontSize)) * base.fontSize
-        : base.fontSize;
+    var fontSize = typeof f.fontSize === "number" ? f.fontSize * PT_TO_PX * fontScale : base.fontSize;
     return {
         bold: (_b = f.bold) !== null && _b !== void 0 ? _b : base.bold,
         italic: (_c = f.italic) !== null && _c !== void 0 ? _c : base.italic,
@@ -72,8 +72,8 @@ var resolveSegmentStyle = function (seg, base, theme) {
     };
 };
 exports.resolveSegmentStyle = resolveSegmentStyle;
-/** Inverse of pointToPixel — used only when computing a per-segment scale. */
-var pointFromPx = function (px) { return px / 1.3333; };
+/** CSS pixels per point (96 / 72), as `pointToPixel`. */
+var PT_TO_PX = 96 / 72;
 /**
  * Fraction of the em box above the alphabetic baseline for typical
  * Latin fonts. Used to baseline-align mixed-size runs on one line:
@@ -108,18 +108,15 @@ var computeLineMetrics = function (resolvedLines, base, advanceOf) {
 exports.computeLineMetrics = computeLineMetrics;
 /**
  * Vertical draw position (textBaseline="top") for one segment within
- * its line box. Normal runs share the line's alphabetic baseline
- * (smaller runs shift down), superscript hugs the line top, subscript
- * hugs the line bottom. All three reduce to `lineTop` when the run's
- * size equals the line's. Exported for unit tests.
+ * its line box. Every run shares the line's alphabetic baseline (smaller
+ * runs shift down); superscript / subscript runs then move that baseline
+ * up / down by Excel's shift ({@link getScriptBaselineShift}). Exported
+ * for unit tests.
  */
 var computeSegmentTop = function (lineTop, lineFontSize, segFontSize, baselineOffset) {
-    if (baselineOffset === "superscript")
-        return lineTop;
-    if (baselineOffset === "subscript") {
-        return lineTop + (lineFontSize - segFontSize);
-    }
-    return lineTop + (lineFontSize - segFontSize) * ALPHABETIC_BASELINE_RATIO;
+    return lineTop +
+        (lineFontSize - segFontSize) * ALPHABETIC_BASELINE_RATIO +
+        (0, alignment_1.getScriptBaselineShift)(baselineOffset, lineFontSize);
 };
 exports.computeSegmentTop = computeSegmentTop;
 /**
@@ -256,7 +253,7 @@ var atomsToSegments = function (atoms) {
  *  - Mention runs render as their inline label only (no chrome).
  */
 exports.CellTextRuns = react_1.default.memo(function (props) {
-    var x = props.x, y = props.y, width = props.width, height = props.height, padding = props.padding, value = props.value, runs = props.runs, baseColor = props.baseColor, baseFontFamily = props.baseFontFamily, baseFontSize = props.baseFontSize, baseBold = props.baseBold, baseItalic = props.baseItalic, baseUnderline = props.baseUnderline, baseStrikethrough = props.baseStrikethrough, baseBaselineOffset = props.baseBaselineOffset, horizontalAlign = props.horizontalAlign, verticalAlign = props.verticalAlign, lineHeight = props.lineHeight, lineHeightMode = props.lineHeightMode, scale = props.scale, wrap = props.wrap, theme = props.theme;
+    var x = props.x, y = props.y, width = props.width, height = props.height, padding = props.padding, value = props.value, runs = props.runs, baseColor = props.baseColor, baseFontFamily = props.baseFontFamily, baseFontSize = props.baseFontSize, baseBold = props.baseBold, baseItalic = props.baseItalic, baseUnderline = props.baseUnderline, baseStrikethrough = props.baseStrikethrough, baseBaselineOffset = props.baseBaselineOffset, horizontalAlign = props.horizontalAlign, verticalAlign = props.verticalAlign, lineHeight = props.lineHeight, lineHeightMode = props.lineHeightMode, scale = props.scale, wrap = props.wrap, theme = props.theme, _a = props.fontScale, fontScale = _a === void 0 ? 1 : _a, rotation = props.rotation;
     var sceneFunc = (0, react_1.useCallback)(function (context, _shape) {
         var e_3, _a, e_4, _b, e_5, _c, e_6, _d, e_7, _e;
         var baseResolved = {
@@ -281,7 +278,7 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         // it walks; the per-segment paint loop below sets it again per
         // segment so the mutation here is safe.
         var measureAtom = function (atom) {
-            var r = (0, exports.resolveSegmentStyle)({ text: atom.text, format: atom.format }, baseResolved, theme);
+            var r = (0, exports.resolveSegmentStyle)({ text: atom.text, format: atom.format }, baseResolved, theme, fontScale);
             context.setAttr("font", buildFontString(r));
             return context.measureText(atom.text).width;
         };
@@ -365,7 +362,7 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         var resolvedLines = lines.map(function (lineSegments) {
             return lineSegments.map(function (seg) { return ({
                 seg: seg,
-                r: (0, exports.resolveSegmentStyle)(seg, baseResolved, theme),
+                r: (0, exports.resolveSegmentStyle)(seg, baseResolved, theme, fontScale),
             }); });
         });
         var _h = (0, exports.computeLineMetrics)(resolvedLines, baseResolved, function (r) {
@@ -476,7 +473,8 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         height,
         padding,
         theme,
+        fontScale,
     ]);
-    return (react_1.default.createElement(react_konva_1.Shape, { x: x, y: y, width: width, height: height, sceneFunc: sceneFunc, listening: false, perfectDrawEnabled: false }));
+    return (react_1.default.createElement(react_konva_1.Shape, { x: x, y: y, width: width, height: height, rotation: rotation, sceneFunc: sceneFunc, listening: false, perfectDrawEnabled: false }));
 });
 exports.CellTextRuns.displayName = "CellTextRuns";

package/dist/cjs/components/cell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/cell/index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAsDjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAO3C,eAAO,MAAM,IAAI,oCAAgB,SAAS,uBA6hCxC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/cell/index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAoDjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAO3C,eAAO,MAAM,IAAI,oCAAgB,SAAS,uBA0hCxC,CAAC"}

package/dist/cjs/components/cell/index.js

@@ -11,13 +11,14 @@ var cf_icons_1 = require("../../api/cf-icons");
 var config_1 = require("../../config");
 var helpers_1 = require("../../helpers");
 var themes_1 = require("../../themes");
+var sparkline_math_1 = require("../cell-structured/sparkline-math");
 var cell_arrow_1 = require("../cell-arrow");
 var cell_calculated_1 = require("../cell-calculated");
 var cell_checkbox_1 = require("../cell-checkbox");
-var cell_error_1 = require("../cell-error");
 var cell_expand_1 = require("../cell-expand");
 var cell_filter_1 = require("../cell-filter");
 var cell_group_1 = require("../cell-group");
+var cell_indicator_1 = require("../cell-indicator");
 var alignment_1 = require("./alignment");
 var cell_text_runs_1 = require("./cell-text-runs");
 var helpers_2 = require("./helpers");
@@ -28,9 +29,9 @@ var LOADING_VALUE = "Loading...";
 // CSS-equivalent scale for sup/sub baseline offset (matches browser default).
 var BASELINE_OFFSET_FONT_SCALE = 0.58;
 exports.Cell = (0, react_1.memo)(function (props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    var x = props.x, y = props.y, width = props.width, height = props.height, value = props.value, _m = props.padding, padding = _m === void 0 ? grid_1.CELL_TEXT_PADDING : _m, _o = props.scale, scale = _o === void 0 ? 1 : _o, _p = props.lineHeight, lineHeight = _p === void 0 ? 1.2 : _p, _q = props.lineHeightMode, lineHeightMode = _q === void 0 ? "fontMetrics" : _q, imageUrl = props.imageUrl, cellFormat = props.cellFormat, chipBackgroundColor = props.chipBackgroundColor, defaultColor = props.defaultColor, defaultBackgroundColor = props.defaultBackgroundColor, sheetId = props.sheetId, rowIndex = props.rowIndex, columnIndex = props.columnIndex, onRequestEdit = props.onRequestEdit, onArrowClick = props.onArrowClick, isChecked = props.isChecked, isInvalid = props.isInvalid, isError = props.isError, showCheckbox = props.showCheckbox, showArrow = props.showArrow, showFilter = props.showFilter, showChip = props.showChip, showNote = props.showNote, showComment = props.showComment, isFilterActive = props.isFilterActive, filterIconColor = props.filterIconColor, onFilterClick = props.onFilterClick, onCheckboxClick = props.onCheckboxClick, enableOverflow = props.enableOverflow, cellWidth = props.cellWidth, _textWidth = props.textWidth, theme = props.theme, showCalculatedColumnIcon = props.showCalculatedColumnIcon, isCalculatedColumn = props.isCalculatedColumn, expandable = props.expandable, expanded = props.expanded, columnSpans = props.columnSpans, overflowRight = props.overflowRight, overflowLeft = props.overflowLeft, _r = props.centerOnSpan, centerOnSpan = _r === void 0 ? false : _r, _s = props.arrowOutside, arrowOutside = _s === void 0 ? false : _s, showGridLines = props.showGridLines, structuredValue = props.structuredValue, sparklineGroupAxis = props.sparklineGroupAxis, defaultFontSizePoint = props.defaultFontSizePoint, sortOrder = props.sortOrder, textFormatRuns = props.textFormatRuns, numberFormatLayout = props.numberFormatLayout, StructuredResult = props.StructuredResult, _t = props.readonly, readonly = _t === void 0 ? false : _t, onExpandCollapse = props.onExpandCollapse, getDefaultHorizontalAlignment = props.getDefaultHorizontalAlignment;
-    var _u = cellFormat !== null && cellFormat !== void 0 ? cellFormat : {}, textFormat = _u.textFormat, wrapStrategy = _u.wrapStrategy;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var x = props.x, y = props.y, width = props.width, height = props.height, value = props.value, _r = props.padding, padding = _r === void 0 ? grid_1.CELL_TEXT_PADDING : _r, _s = props.scale, scale = _s === void 0 ? 1 : _s, _t = props.lineHeight, lineHeight = _t === void 0 ? 1.2 : _t, _u = props.lineHeightMode, lineHeightMode = _u === void 0 ? "fontMetrics" : _u, imageUrl = props.imageUrl, cellFormat = props.cellFormat, chipBackgroundColor = props.chipBackgroundColor, defaultColor = props.defaultColor, defaultBackgroundColor = props.defaultBackgroundColor, sheetId = props.sheetId, rowIndex = props.rowIndex, columnIndex = props.columnIndex, onRequestEdit = props.onRequestEdit, onArrowClick = props.onArrowClick, isChecked = props.isChecked, showErrorIndicator = props.showErrorIndicator, circleInvalid = props.circleInvalid, showCheckbox = props.showCheckbox, showArrow = props.showArrow, showFilter = props.showFilter, showChip = props.showChip, showNote = props.showNote, showComment = props.showComment, isFilterActive = props.isFilterActive, filterIconColor = props.filterIconColor, onFilterClick = props.onFilterClick, onCheckboxClick = props.onCheckboxClick, enableOverflow = props.enableOverflow, cellWidth = props.cellWidth, _textWidth = props.textWidth, theme = props.theme, showCalculatedColumnIcon = props.showCalculatedColumnIcon, isCalculatedColumn = props.isCalculatedColumn, expandable = props.expandable, expanded = props.expanded, columnSpans = props.columnSpans, overflowRight = props.overflowRight, overflowLeft = props.overflowLeft, _v = props.centerOnSpan, centerOnSpan = _v === void 0 ? false : _v, _w = props.arrowOutside, arrowOutside = _w === void 0 ? false : _w, showGridLines = props.showGridLines, structuredValue = props.structuredValue, sparklineGroupAxis = props.sparklineGroupAxis, defaultFontSizePoint = props.defaultFontSizePoint, sortOrder = props.sortOrder, textFormatRuns = props.textFormatRuns, numberFormatLayout = props.numberFormatLayout, StructuredResult = props.StructuredResult, _x = props.readonly, readonly = _x === void 0 ? false : _x, onExpandCollapse = props.onExpandCollapse, getDefaultHorizontalAlignment = props.getDefaultHorizontalAlignment;
+    var _y = cellFormat !== null && cellFormat !== void 0 ? cellFormat : {}, textFormat = _y.textFormat, wrapStrategy = _y.wrapStrategy;
     // openpyxl's `relativeIndent` is an additive delta on top of `indent`.
     var indent = ((_a = cellFormat === null || cellFormat === void 0 ? void 0 : cellFormat.indent) !== null && _a !== void 0 ? _a : 0) + ((_b = cellFormat === null || cellFormat === void 0 ? void 0 : cellFormat.relativeIndent) !== null && _b !== void 0 ? _b : 0);
     var conditionalIcon = (_c = cellFormat === null || cellFormat === void 0 ? void 0 : cellFormat.conditionalIcon) !== null && _c !== void 0 ? _c : null;
@@ -56,7 +57,7 @@ exports.Cell = (0, react_1.memo)(function (props) {
     var canvasTextAlign = (0, alignment_1.resolveCanvasTextAlign)(horizontalAlignment);
     var isFillAlignment = horizontalAlignment === "fill";
     // Text format
-    var _v = textFormat !== null && textFormat !== void 0 ? textFormat : {}, colorObject = _v.color, bold = _v.bold, italic = _v.italic, strikethrough = _v.strikethrough, underline = _v.underline, underlineStyle = _v.underlineStyle, baselineOffset = _v.baselineOffset;
+    var _z = textFormat !== null && textFormat !== void 0 ? textFormat : {}, colorObject = _z.color, bold = _z.bold, italic = _z.italic, strikethrough = _z.strikethrough, underline = _z.underline, underlineStyle = _z.underlineStyle, baselineOffset = _z.baselineOffset;
     var fontSizePt = (_f = textFormat === null || textFormat === void 0 ? void 0 : textFormat.fontSize) !== null && _f !== void 0 ? _f : defaultFontSizePoint;
     // Fall back to the theme's body font so the painter agrees with the
     // sizer (AutoSizerCanvas measures with theme.primaryFontFamily).
@@ -77,11 +78,9 @@ exports.Cell = (0, react_1.memo)(function (props) {
     var fontSize = baselineOffset
         ? baseFontSize * BASELINE_OFFSET_FONT_SCALE
         : baseFontSize;
-    var effectiveVerticalAlignment = baselineOffset === "superscript"
-        ? "top"
-        : baselineOffset === "subscript"
-            ? "bottom"
-            : verticalAlignment;
+    // Superscript / subscript keep the cell's alignment and move the
+    // baseline instead (`scriptOffsetY` below), as Excel does.
+    var effectiveVerticalAlignment = verticalAlignment;
     var textStyle = "".concat(bold ? "bold" : "normal", " ").concat(italic ? "italic" : "normal");
     var showText = !(0, utils_1.isNil)(structuredValue) ? false : !(0, utils_1.isNil)(value);
     // Overflow line
@@ -116,8 +115,6 @@ exports.Cell = (0, react_1.memo)(function (props) {
             finally { if (e_1) throw e_1.error; }
         }
     }, [defaultBackgroundColor, columnSpans, theme, columnIndex, scale]);
-    // Show error tag
-    var showError = isError || isInvalid;
     // Calculated
     var isCalculatedCell = showCalculatedColumnIcon && isCalculatedColumn;
     // Alignment
@@ -316,11 +313,19 @@ exports.Cell = (0, react_1.memo)(function (props) {
     // own styling instead of being flattened; plain no-run cells with
     // a cell-level baselineOffset keep the single-style approximation
     // below (scaled font + top/bottom alignment).
+    // Shrink-to-fit and rotated cells keep their runs: the run painter takes
+    // the shrink factor and the rotated layout (stacked text stays plain).
     var useRichTextRunPath = !showChip &&
-        !shrinkEnabled &&
         !isStackedVertical &&
-        !hasNumericRotation &&
         (0, rich_text_1.hasRenderableRuns)(textFormatRuns !== null && textFormatRuns !== void 0 ? textFormatRuns : undefined);
+    var shrinkFactor = fontSize > 0 ? effectiveFontSize / fontSize : 1;
+    var scriptOffsetY = (0, alignment_1.getScriptTextOffsetY)({
+        baselineOffset: baselineOffset,
+        verticalAlign: effectiveVerticalAlignment,
+        baseFontSize: baseFontSize * shrinkFactor,
+        scriptFontSize: effectiveFontSize,
+        lineHeight: textLineHeight,
+    });
     // Double / accounting underlines on a single unrotated line (the default
     // Text path); wrapped, rotated or rich-text cells keep Konva's single line.
     var paintStyledUnderline = hasStyledUnderline &&
@@ -605,30 +610,30 @@ exports.Cell = (0, react_1.memo)(function (props) {
         // lines, and `textFormatRuns` indices reference the raw
         // string. `normalizeDisplayText` is bypassed because the
         // renderer handles multi-line layout itself.
-        react_1.default.createElement(cell_text_runs_1.CellTextRuns, { x: textLeftPadding, y: textNode.y, width: finalTextWidth, height: textNode.height, padding: padding, value: displayValue !== null && displayValue !== void 0 ? displayValue : "", runs: textFormatRuns !== null && textFormatRuns !== void 0 ? textFormatRuns : [], baseColor: color !== null && color !== void 0 ? color : defaultColor, baseFontFamily: fontFamily, 
+        react_1.default.createElement(cell_text_runs_1.CellTextRuns, { x: (_j = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.x) !== null && _j !== void 0 ? _j : textLeftPadding, y: (_k = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.y) !== null && _k !== void 0 ? _k : textNode.y, width: (_l = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.width) !== null && _l !== void 0 ? _l : finalTextWidth, height: rotatedLayout ? approxTextHeight : textNode.height, rotation: rotatedLayout ? rotationDegrees : undefined, fontScale: scale * shrinkFactor, padding: padding, value: displayValue !== null && displayValue !== void 0 ? displayValue : "", runs: textFormatRuns !== null && textFormatRuns !== void 0 ? textFormatRuns : [], baseColor: color !== null && color !== void 0 ? color : defaultColor, baseFontFamily: fontFamily, 
             // UN-scaled size on purpose: when the cell carries a
             // baselineOffset the segment resolver applies the
             // sup/sub font scale itself (exactly once). Shrink-to-
             // fit never reaches this path, so `baseFontSize` equals
             // `effectiveFontSize` for every other cell.
-            baseFontSize: baseFontSize, baseBold: !!bold, baseItalic: !!italic, baseUnderline: !!underline, baseStrikethrough: !!strikethrough, baseBaselineOffset: baselineOffset !== null && baselineOffset !== void 0 ? baselineOffset : undefined, horizontalAlign: canvasTextAlign, verticalAlign: effectiveVerticalAlignment, lineHeight: lineHeight, lineHeightMode: lineHeightMode, scale: scale, wrap: shouldWrap, theme: theme })) : paintDistributed ? (react_1.default.createElement(react_konva_1.Shape, { x: textLeftPadding, y: textNode.y, width: finalTextWidth, height: textNode.height, sceneFunc: distributedSceneFunc, listening: false, perfectDrawEnabled: false })) : paintNumberFormatLayout ? (react_1.default.createElement(react_konva_1.Shape, { x: textLeftPadding, y: textNode.y, width: finalTextWidth, height: textNode.height, sceneFunc: numberFormatSceneFunc, listening: false, perfectDrawEnabled: false })) : (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(react_konva_1.Text, { x: (_j = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.x) !== null && _j !== void 0 ? _j : textLeftPadding, y: (_k = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.y) !== null && _k !== void 0 ? _k : textNode.y, offsetX: rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.offsetX, offsetY: rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.offsetY, height: rotatedLayout ? approxTextHeight : textNode.height, width: (_l = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.width) !== null && _l !== void 0 ? _l : finalTextWidth, text: displayValue, fill: color !== null && color !== void 0 ? color : defaultColor, verticalAlign: rotatedLayout ? "top" : effectiveVerticalAlignment, align: rotatedLayout ? "left" : canvasTextAlign, fontFamily: fontFamily, fontStyle: textStyle, fontSize: effectiveFontSize, textDecoration: paintStyledUnderline ? textDecorationFor(false) : textDecoration, padding: padding, wrap: textWrapStrategy, lineHeight: textLineHeight, rotation: rotationDegrees, direction: textDirection, hitStrokeWidth: 0, perfectDrawEnabled: false }),
+            baseFontSize: baseFontSize * shrinkFactor, baseBold: !!bold, baseItalic: !!italic, baseUnderline: !!underline, baseStrikethrough: !!strikethrough, baseBaselineOffset: baselineOffset !== null && baselineOffset !== void 0 ? baselineOffset : undefined, horizontalAlign: rotatedLayout ? "left" : canvasTextAlign, verticalAlign: rotatedLayout ? "top" : effectiveVerticalAlignment, lineHeight: lineHeight, lineHeightMode: lineHeightMode, scale: scale, wrap: shouldWrap && !rotatedLayout, theme: theme })) : paintDistributed ? (react_1.default.createElement(react_konva_1.Shape, { x: textLeftPadding, y: textNode.y, width: finalTextWidth, height: textNode.height, sceneFunc: distributedSceneFunc, listening: false, perfectDrawEnabled: false })) : paintNumberFormatLayout ? (react_1.default.createElement(react_konva_1.Shape, { x: textLeftPadding, y: textNode.y, width: finalTextWidth, height: textNode.height, sceneFunc: numberFormatSceneFunc, listening: false, perfectDrawEnabled: false })) : (react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement(react_konva_1.Text, { x: (_m = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.x) !== null && _m !== void 0 ? _m : textLeftPadding, y: (_o = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.y) !== null && _o !== void 0 ? _o : textNode.y, offsetX: rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.offsetX, offsetY: ((_p = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.offsetY) !== null && _p !== void 0 ? _p : 0) + scriptOffsetY, height: rotatedLayout ? approxTextHeight : textNode.height, width: (_q = rotatedLayout === null || rotatedLayout === void 0 ? void 0 : rotatedLayout.width) !== null && _q !== void 0 ? _q : finalTextWidth, text: displayValue, fill: color !== null && color !== void 0 ? color : defaultColor, verticalAlign: rotatedLayout ? "top" : effectiveVerticalAlignment, align: rotatedLayout ? "left" : canvasTextAlign, fontFamily: fontFamily, fontStyle: textStyle, fontSize: effectiveFontSize, textDecoration: paintStyledUnderline ? textDecorationFor(false) : textDecoration, padding: padding, wrap: textWrapStrategy, lineHeight: textLineHeight, rotation: rotationDegrees, direction: textDirection, hitStrokeWidth: 0, perfectDrawEnabled: false }),
             paintStyledUnderline ? (react_1.default.createElement(react_konva_1.Shape, { sceneFunc: underlineSceneFunc, listening: false, perfectDrawEnabled: false })) : null)))) : imageUrl ? (react_1.default.createElement(grid_1.Image, { x: x, y: y, spacing: 1, width: width, height: height, url: imageUrl, perfectDrawEnabled: false, horizontalAlignment: canvasTextAlign === "justify" ? "left" : canvasTextAlign, verticalAlignment: verticalAlignment })) : null,
         showFilter ? (react_1.default.createElement(cell_filter_1.CellFilter, { scale: scale, isActive: isFilterActive, onClick: readonly ? undefined : onFilterClick, rowIndex: props.rowIndex, columnIndex: props.columnIndex, x: x, y: y, height: height, width: width, filterIconColor: filterIconColor, verticalAlignment: verticalAlignment, backgroundColor: defaultBackgroundColor, sortOrder: sortOrder })) : showArrow && !readonly ? (react_1.default.createElement(cell_arrow_1.CellArrow, { scale: scale, onClick: onArrowClick !== null && onArrowClick !== void 0 ? onArrowClick : onRequestEdit, rowIndex: rowIndex, columnIndex: columnIndex, x: arrowOutside ? x + (config_1.ARROW_DOWN_WIDTH + 4) * scale : x, y: y, height: height, width: width, verticalAlignment: verticalAlignment })) : null,
         expandable ? (react_1.default.createElement(cell_group_1.CellGroup, { scale: scale, onClick: function (cell) {
                 onExpandCollapse === null || onExpandCollapse === void 0 ? void 0 : onExpandCollapse(cell, !expanded);
             }, rowIndex: rowIndex, columnIndex: columnIndex, x: x + indentSpacing, y: y, height: height, width: width, verticalAlignment: verticalAlignment, expanded: expanded, theme: theme })) : null,
         showCalculatedColumnIcon && isCalculatedColumn ? (react_1.default.createElement(cell_calculated_1.CellCalculated, { x: x, y: y, scale: scale, width: width, height: height, verticalAlignment: verticalAlignment, color: color })) : null,
-        showError ? (react_1.default.createElement(cell_error_1.CellError, { color: isError ? config_1.ERROR_COLOR : config_1.INVALID_COLOR, x: x + width - cell_error_1.ERROR_TAG_WIDTH * scale, y: y + 1, scale: scale })) : null,
-        showNote ? (react_1.default.createElement(cell_error_1.CellError, { color: config_1.NOTE_COLOR, x: x + width - cell_error_1.ERROR_TAG_WIDTH * scale, y: y + 1, scale: scale })) : null,
-        showComment ? (react_1.default.createElement(cell_error_1.CellError, { color: config_1.COMMENT_COLOR, x: x + width - cell_error_1.ERROR_TAG_WIDTH * scale, y: y + 1, scale: scale })) : null,
+        react_1.default.createElement(cell_indicator_1.CellIndicators, { x: x, y: y, width: width, height: height, scale: scale, showNote: showNote, showComment: showComment, showErrorIndicator: showErrorIndicator, circleInvalid: circleInvalid }),
         structuredValue ? (react_1.default.createElement(StructuredResult, { x: x, y: y, width: width, height: height, 
             // Text props
             textX: textLeftPadding, textY: y + cellSpacingY, textWidth: finalTextWidth, textFill: color !== null && color !== void 0 ? color : defaultColor, textVerticalAlign: verticalAlignment, textAlign: canvasTextAlign, textFontFamily: fontFamily, textFontStyle: textStyle, textFontSize: fontSize, textDecoration: textDecoration, textPadding: padding, textWrap: textWrapStrategy, textLineHeight: lineHeight, 
             // / Text props
             color: defaultBackgroundColor
                 ? (0, utils_1.getContrastColor)((0, themes_1.getStringifiedColor)(defaultBackgroundColor, theme), (0, themes_1.getStringifiedColor)({ theme: 1 }, theme), (0, themes_1.getStringifiedColor)({ theme: 1, tint: 1 }, theme))
-                : undefined, structuredValue: structuredValue, sparklineGroupAxis: sparklineGroupAxis })) : null,
+                : undefined, structuredValue: structuredValue, sparklineGroupAxis: sparklineGroupAxis, sparklineDefaultColors: structuredValue.kind === "sparkline"
+                ? (0, sparkline_math_1.resolveDefaultSparklineColors)(function (c) { return (0, themes_1.getStringifiedColor)(c, theme); })
+                : undefined })) : null,
         showExpand ? (react_1.default.createElement(cell_expand_1.CellExpand, { scale: scale, onClick: onRequestEdit, rowIndex: rowIndex, columnIndex: columnIndex, x: x, y: y, height: height, width: width, verticalAlignment: verticalAlignment, horizontalAlignment: horizontalAlignment })) : null));
 });
 exports.Cell.displayName = "Cell";

package/dist/cjs/components/cell/typings.d.ts

@@ -88,6 +88,15 @@ export type CellProps<S extends StructuredResult = StructuredResult> = RendererP
      * Formula errors
      */
     isError?: boolean;
+    /**
+     * Excel's green ◤ error-checking indicator (a formula error or a number stored as text that
+     * the user has not ignored).
+     */
+    showErrorIndicator?: boolean;
+    /**
+     * Data → Data Validation → Circle Invalid Data: circle this cell, which fails its validation.
+     */
+    circleInvalid?: boolean;
     /**
      * Show dropdown arrow
      */

package/dist/cjs/components/cell/typings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typings.d.ts","sourceRoot":"","sources":["../../../../components/cell/typings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typings.d.ts","sourceRoot":"","sources":["../../../../components/cell/typings.ts"],"names":[],"mappings":"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"}

package/dist/cjs/components/cell-editor/helpers.d.ts

@@ -9,12 +9,32 @@ export declare const shouldShowCalendarPopup: (numberFormat: NumberFormat | null
 export declare const isFillSelectionCommit: (e: {
     key: string;
     ctrlKey?: boolean;
+    shiftKey?: boolean;
 } | undefined) => boolean;
 /**
- * Get next cell direction from key code
+ * Excel's legacy array entry: Ctrl+Shift+Enter (Windows), ⇧⌘Return or ⌃⇧Return (Mac) commits the
+ * entry as one array formula over the selection ("Keyboard shortcuts in Excel").
+ */
+export declare const isArrayFormulaCommit: (e: {
+    key: string;
+    ctrlKey?: boolean;
+    metaKey?: boolean;
+    shiftKey?: boolean;
+} | undefined) => boolean;
+/**
+ * Excel's "After pressing Enter, move selection" (File › Options › Advanced): the direction Enter
+ * moves the active cell after an entry, and while navigating; `"none"` unticks the option, so
+ * Enter commits in place. Shift+Enter goes the other way.
+ */
+export type EnterKeyDirection = "down" | "right" | "up" | "left" | "none";
+/** Where Enter (`isShift`: Shift+Enter) moves the active cell; `null` when it stays. */
+export declare const getEnterKeyDirection: (isShift: boolean, enterKeyDirection?: EnterKeyDirection) => Direction | null;
+/**
+ * Get next cell direction from key code. Enter follows `enterKeyDirection`, and is `null` when
+ * Enter does not move.
  * @param code
  * @param isShift
  * @returns
  */
-export declare const getDirectionFromKey: (code: string, isShift: boolean) => Direction;
+export declare const getDirectionFromKey: (code: string, isShift: boolean, enterKeyDirection?: EnterKeyDirection) => Direction | null;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/cjs/components/cell-editor/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../components/cell-editor/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,uBAAuB,GAClC,cAAc,YAAY,GAAG,IAAI,GAAG,SAAS,YAIP,CAAC;AAEzC;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YACN,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,SAAS,OAAO,cAkBjE,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../components/cell-editor/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,uBAAuB,GAClC,cAAc,YAAY,GAAG,IAAI,GAAG,SAAS,YAIP,CAAC;AAEzC;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YACH,CAAC;AAErE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC/B,GACI;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GACzE,SAAS,YAI6B,CAAC;AAE7C;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;AAY1E,wFAAwF;AACxF,eAAO,MAAM,oBAAoB,GAC/B,SAAS,OAAO,EAChB,oBAAmB,iBAA0B,KAC5C,SAAS,GAAG,IAId,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,MAAM,EACZ,SAAS,OAAO,EAChB,oBAAoB,iBAAiB,KACpC,SAAS,GAAG,IAed,CAAC"}