@rowsncolumns/spreadsheet 10.6.0 → 10.6.4

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"}