@rowsncolumns/spreadsheet 10.5.17 → 10.6.4

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

@@ -3,7 +3,7 @@
 // (scale font down when text overflows) and textRotation (numeric degrees
 // or stacked "vertical" layout).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRotatedTextLayout = exports.stackTextVertically = exports.getKonvaRotationDegrees = exports.computeShrinkToFitFontSize = exports.fillCellText = exports.isFillAlignment = exports.alignmentImpliesWrap = exports.resolveCanvasTextAlign = void 0;
+exports.layoutDistributedLines = exports.getRotatedTextLayout = exports.stackTextVertically = exports.getKonvaRotationDegrees = exports.computeShrinkToFitFontSize = exports.fillCellText = exports.isFillAlignment = exports.getUnderlineStrokes = exports.resolveReadingOrderAlignment = exports.getVerticalSpreadLineHeight = exports.resolveCanvasVerticalAlign = exports.verticalAlignmentImpliesWrap = exports.alignmentImpliesWrap = exports.resolveCanvasTextAlign = void 0;
 var tslib_1 = require("tslib");
 /**
  * Map a cell's `horizontalAlignment` onto the canvas text alignment. Excel's
@@ -36,6 +36,74 @@ exports.resolveCanvasTextAlign = resolveCanvasTextAlign;
  */
 var utils_1 = require("@rowsncolumns/utils");
 Object.defineProperty(exports, "alignmentImpliesWrap", { enumerable: true, get: function () { return utils_1.alignmentImpliesWrap; } });
+Object.defineProperty(exports, "verticalAlignmentImpliesWrap", { enumerable: true, get: function () { return utils_1.verticalAlignmentImpliesWrap; } });
+/**
+ * Map a cell's `verticalAlignment` onto the canvas text node. Excel's
+ * vertical `justify` spreads wrapped lines from the top edge to the bottom
+ * one and `distributed` does the same with the free space split above and
+ * below — so a single line sits at the top (justify) or the middle
+ * (distributed). {@link getVerticalSpreadLineHeight} spreads the lines.
+ */
+var resolveCanvasVerticalAlign = function (align) {
+    switch (align) {
+        case "top":
+        case "justify":
+            return "top";
+        case "middle":
+        case "distributed":
+            return "middle";
+        default:
+            return "bottom";
+    }
+};
+exports.resolveCanvasVerticalAlign = resolveCanvasVerticalAlign;
+/**
+ * Line-height multiplier that spreads `lineCount` wrapped lines over
+ * `availableHeight` (Excel's vertical justify / distributed). Never tighter
+ * than the font's own `baseLineHeight`; one line keeps it.
+ */
+var getVerticalSpreadLineHeight = function (lineCount, availableHeight, fontSize, baseLineHeight) {
+    if (lineCount < 2 || fontSize <= 0)
+        return baseLineHeight;
+    var spread = availableHeight / (lineCount * fontSize);
+    return Math.max(baseLineHeight, spread);
+};
+exports.getVerticalSpreadLineHeight = getVerticalSpreadLineHeight;
+/**
+ * The default horizontal alignment of a cell with no explicit one, under
+ * its text direction (Format Cells → Alignment → Text direction). A
+ * right-to-left reading order starts text at the right edge, as Excel does;
+ * the value-driven default (numbers right) otherwise stands.
+ */
+var resolveReadingOrderAlignment = function (readingOrder, defaultAlignment) {
+    return readingOrder === "rtl" && (!defaultAlignment || defaultAlignment === "left")
+        ? "right"
+        : defaultAlignment;
+};
+exports.resolveReadingOrderAlignment = resolveReadingOrderAlignment;
+/**
+ * The strokes Excel draws for an underline type (Format Cells → Font →
+ * Underline). `single` / `double` run under the text; the accounting types
+ * run the width of the cell, lower, clear of the descenders. `baselineY` is
+ * the text baseline, `fontSize` in canvas pixels.
+ */
+var getUnderlineStrokes = function (_a) {
+    var style = _a.style, textX = _a.textX, textWidth = _a.textWidth, cellX = _a.cellX, cellWidth = _a.cellWidth, baselineY = _a.baselineY, fontSize = _a.fontSize, scale = _a.scale;
+    var gap = Math.max(2 * scale, Math.round(fontSize * 0.12));
+    var accounting = style === "singleAccounting" || style === "doubleAccounting";
+    var _b = tslib_1.__read(accounting
+        ? [cellX + scale, cellX + cellWidth - scale]
+        : [textX, textX + textWidth], 2), x1 = _b[0], x2 = _b[1];
+    var y = accounting
+        ? baselineY + Math.round(fontSize * 0.22)
+        : baselineY + Math.max(scale, Math.round(fontSize * 0.1));
+    var strokes = [{ x1: x1, x2: x2, y: y }];
+    if (style === "double" || style === "doubleAccounting") {
+        strokes.push({ x1: x1, x2: x2, y: y + gap });
+    }
+    return strokes;
+};
+exports.getUnderlineStrokes = getUnderlineStrokes;
 /**
  * Excel's `fill` alignment keeps the text inside the cell too: the value is
  * repeated to the cell edge and never spills into the neighbour.
@@ -190,3 +258,78 @@ var getRotatedTextLayout = function (_a) {
     };
 };
 exports.getRotatedTextLayout = getRotatedTextLayout;
+/**
+ * Excel's horizontal `distributed` alignment: the text wraps at word
+ * boundaries and every line — the last one too — spreads its words from the
+ * left edge to the right one; a line holding a single word is centred
+ * (Format Cells ▸ Alignment ▸ Horizontal ▸ Distributed (Indent)). Returns
+ * the words of each line with their x inside `width`.
+ */
+var layoutDistributedLines = function (text, width, measure) {
+    var e_1, _a;
+    var spaceWidth = measure(" ");
+    var lines = [];
+    var _loop_1 = function (paragraph) {
+        var e_2, _d;
+        var words = paragraph.split(/\s+/).filter(Boolean);
+        var line = [];
+        var lineWidth = 0;
+        var flush = function () {
+            if (!line.length) {
+                lines.push([]);
+                return;
+            }
+            var used = line.reduce(function (total, word) { return total + word.width; }, 0);
+            if (line.length === 1) {
+                lines.push([
+                    { text: line[0].text, x: Math.max(0, (width - used) / 2) },
+                ]);
+            }
+            else {
+                var gap_1 = Math.max(spaceWidth, (width - used) / (line.length - 1));
+                var cursor_1 = 0;
+                lines.push(line.map(function (word) {
+                    var placed = { text: word.text, x: cursor_1 };
+                    cursor_1 += word.width + gap_1;
+                    return placed;
+                }));
+            }
+            line = [];
+            lineWidth = 0;
+        };
+        try {
+            for (var words_1 = (e_2 = void 0, tslib_1.__values(words)), words_1_1 = words_1.next(); !words_1_1.done; words_1_1 = words_1.next()) {
+                var word = words_1_1.value;
+                var wordWidth = measure(word);
+                var next = line.length === 0 ? wordWidth : lineWidth + spaceWidth + wordWidth;
+                if (line.length > 0 && next > width)
+                    flush();
+                lineWidth = line.length === 0 ? wordWidth : lineWidth + spaceWidth + wordWidth;
+                line.push({ text: word, width: wordWidth });
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (words_1_1 && !words_1_1.done && (_d = words_1.return)) _d.call(words_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        flush();
+    };
+    try {
+        for (var _b = tslib_1.__values(text.split("\n")), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var paragraph = _c.value;
+            _loop_1(paragraph);
+        }
+    }
+    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; }
+    }
+    return lines;
+};
+exports.layoutDistributedLines = layoutDistributedLines;

package/dist/cjs/components/cell/cell-background.d.ts

@@ -1,6 +1,8 @@
 import type { RendererProps } from "@rowsncolumns/grid";
 import React from "react";
 import type { FillPattern, GradientFill } from "../../types";
+/** Excel's Automatic pattern colour: a pattern with no colour of its own. */
+export declare const AUTOMATIC_PATTERN_COLOR = "#000000";
 type CellBackgroundProps = RendererProps & {
     backgroundColor?: string;
     defaultBackgroundColor: string;

package/dist/cjs/components/cell/cell-background.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-background.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-background.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE7D,KAAK,mBAAmB,GAAG,aAAa,GAAG;IACzC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAChC,CAAC;AAmFF,eAAO,MAAM,cAAc,GAAI,+IAa5B,mBAAmB,sBA2FrB,CAAC"}
+{"version":3,"file":"cell-background.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-background.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE7D,6EAA6E;AAC7E,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD,KAAK,mBAAmB,GAAG,aAAa,GAAG;IACzC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAChC,CAAC;AAmFF,eAAO,MAAM,cAAc,GAAI,+IAa5B,mBAAmB,sBAwFrB,CAAC"}

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CellBackground = void 0;
+exports.CellBackground = 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"));
 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
@@ -119,10 +121,7 @@ var CellBackground = function (_a) {
         // bgColor is ignored when pattern=solid). For "none" or absent, fall
         // back to the regular backgroundColor path.
         var useSolid = fillPattern === "solid" && foregroundColor;
-        var useTile = fillPattern &&
-            fillPattern !== "solid" &&
-            fillPattern !== "none" &&
-            foregroundColor;
+        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) {
@@ -138,7 +137,7 @@ var CellBackground = function (_a) {
             context.setAttr("fillStyle", foregroundColor);
         }
         else if (useTile) {
-            var tile = (0, fill_patterns_1.getPatternCanvas)(fillPattern, foregroundColor, backgroundColor);
+            var tile = (0, fill_patterns_1.getPatternCanvas)(fillPattern, foregroundColor !== null && foregroundColor !== void 0 ? foregroundColor : exports.AUTOMATIC_PATTERN_COLOR, backgroundColor);
             var ctxPattern = tile && (native === null || native === void 0 ? void 0 : native.createPattern(tile, "repeat"));
             if (ctxPattern) {
                 context.setAttr("fillStyle", ctxPattern);

package/dist/cjs/components/cell/cell-backgrounds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-backgrounds.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-backgrounds.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,KAAkB,MAAM,OAAO,CAAC;AAkBvC,MAAM,WAAW,oBAAoB;IACnC,mGAAmG;IACnG,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,uFAAuF;IACvF,SAAS,EAAE,CACT,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,KAChB,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,8FAA8F;IAC9F,YAAY,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,iBAAiB,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAChC;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,GAAI,mFAO7B,oBAAoB,sBAiHtB,CAAC"}
+{"version":3,"file":"cell-backgrounds.d.ts","sourceRoot":"","sources":["../../../../components/cell/cell-backgrounds.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,KAAkB,MAAM,OAAO,CAAC;AAkBvC,MAAM,WAAW,oBAAoB;IACnC,mGAAmG;IACnG,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,uFAAuF;IACvF,SAAS,EAAE,CACT,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,KAChB,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,8FAA8F;IAC9F,YAAY,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,iBAAiB,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAChC;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,GAAI,mFAO7B,oBAAoB,sBAqHtB,CAAC"}

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

@@ -35,7 +35,11 @@ var CellBackgrounds = function (_a) {
                 var fillPattern = (_b = format === null || format === void 0 ? void 0 : format.fillPattern) !== null && _b !== void 0 ? _b : null;
                 var gradient = (_c = format === null || format === void 0 ? void 0 : format.gradient) !== null && _c !== void 0 ? _c : null;
                 var foregroundColor = resolveColor(format === null || format === void 0 ? void 0 : format.foregroundColor);
-                var hasPaintedPattern = fillPattern && fillPattern !== "none" ? !!foregroundColor : false;
+                // A pattern with no colour of its own paints in Excel's Automatic
+                // (black); a solid pattern needs its foreground.
+                var hasPaintedPattern = fillPattern === "solid"
+                    ? !!foregroundColor
+                    : !!fillPattern && fillPattern !== "none";
                 var hasGradient = !!gradient && ((_e = (_d = gradient.stops) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0) > 0;
                 var backgroundColor = resolveColor(format === null || format === void 0 ? void 0 : format.backgroundColor);
                 var isMergedCell = !!cell.isMergedCell;

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

@@ -60,7 +60,7 @@ var resolveSegmentStyle = function (seg, base, theme) {
         color: f.color != null
             ? (0, themes_1.getStringifiedColor)(f.color, theme) || base.color
             : base.color,
-        fontFamily: (_f = f.fontFamily) !== null && _f !== void 0 ? _f : base.fontFamily,
+        fontFamily: (_f = (0, themes_1.resolveThemeFontFamily)(f.fontFamily, theme)) !== null && _f !== void 0 ? _f : base.fontFamily,
         // f.fontSize is in points to mirror the editor's TextFormat type,
         // but at this paint layer everything is in pixels — scale ratio is
         // applied by the caller via baseFontSize. For per-segment override

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;AA4CjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAU3C,eAAO,MAAM,IAAI,oCAAgB,SAAS,uBA0oBxC,CAAC"}
+{"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"}