@rowsncolumns/charts 28.1.17 → 28.1.19

package/dist/esm/utils/data-table.js

@@ -0,0 +1,48 @@
+/**
+ * Excel's chart data table (Add Chart Element → Data Table,
+ * demo-app-monorepo#49969 FT-08): one row per series under the category
+ * axis, each cell under its category, the series name (with its legend key)
+ * at the row's start. Drawn as extra category axes stacked below the plot:
+ * their labels are the formatted values, their axis line the horizontal
+ * border and their ticks — between categories — the vertical borders.
+ */
+/** Row height in pixels: 9 pt text plus padding. */
+export const DATA_TABLE_ROW_HEIGHT = 20;
+export const dataTableAxes = (rows, options, { textColor, fontSize, borderColor = "#D9D9D9", firstOffset = 22, }) => rows.map((row, index) => {
+    const keys = options.showLegendKeys !== false;
+    return {
+        type: "category",
+        position: "bottom",
+        gridIndex: 0,
+        offset: firstOffset + index * DATA_TABLE_ROW_HEIGHT,
+        data: row.values,
+        silent: true,
+        axisLine: {
+            show: options.showHorizontalBorder !== false ||
+                (options.showOutline !== false && index === rows.length - 1),
+            onZero: false,
+            lineStyle: { color: borderColor },
+        },
+        axisTick: {
+            show: options.showVerticalBorder !== false,
+            interval: 0,
+            length: DATA_TABLE_ROW_HEIGHT,
+            lineStyle: { color: borderColor },
+        },
+        axisLabel: { interval: 0, color: textColor, fontSize, margin: 6 },
+        splitLine: { show: false },
+        name: keys ? `{key|■} ${row.name}` : row.name,
+        nameLocation: "start",
+        nameGap: 8,
+        nameTextStyle: {
+            color: textColor,
+            fontSize,
+            align: "right",
+            verticalAlign: "top",
+            padding: [6, 0, 0, 0],
+            rich: { key: { color: row.color ?? textColor, fontSize } },
+        },
+    };
+});
+/** Room the row names need left of the plot (approximate glyph width). */
+export const dataTableNameWidth = (rows, fontSize, legendKeys) => Math.ceil(rows.reduce((width, row) => Math.max(width, (row.name.length + (legendKeys ? 2 : 0)) * fontSize * 0.6), 0)) + 12;

package/dist/esm/utils/echarts-gl-loader.d.ts

@@ -1,5 +1,11 @@
 export type EchartsGlLoadState = "unloaded" | "loading" | "ready" | "failed";
 export declare const getEchartsGlState: () => EchartsGlLoadState;
+/**
+ * Record that the loaded module failed at render time (echarts-gl threw
+ * from `setOption`), so the renderer keeps the 2-D fallback and never
+ * retries 3-D for the rest of the page's lifetime. Warns once per page.
+ */
+export declare const markEchartsGlFailed: (error?: unknown) => void;
 /**
  * Kick off (or join) the echarts-gl dynamic import and register the 3-D
  * charts/components the renderer uses. Resolves true when 3-D rendering is

package/dist/esm/utils/echarts-gl-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"echarts-gl-loader.d.ts","sourceRoot":"","sources":["../../../utils/echarts-gl-loader.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAK7E,eAAO,MAAM,iBAAiB,QAAO,kBAA2B,CAAC;AAEjE;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,OAAO,CAyB/C,CAAC;AAEF,sDAAsD;AACtD,eAAO,MAAM,8BAA8B,QAAO,IAGjD,CAAC"}
+{"version":3,"file":"echarts-gl-loader.d.ts","sourceRoot":"","sources":["../../../utils/echarts-gl-loader.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAK7E,eAAO,MAAM,iBAAiB,QAAO,kBAA2B,CAAC;AAgBjE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,OAAO,KAAG,IAUrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,OAAO,CA8B/C,CAAC;AAEF,sDAAsD;AACtD,eAAO,MAAM,8BAA8B,QAAO,IAGjD,CAAC"}

package/dist/esm/utils/echarts-gl-loader.js

@@ -7,12 +7,47 @@
  * draws the 2-D fallback immediately, and upgrades to 3-D when the module
  * resolves. A failed import latches the "failed" state so the renderer
  * keeps the 2-D fallback without retrying on every update.
+ *
+ * A page whose Content-Security-Policy has no `'unsafe-eval'` is treated
+ * the same way: echarts-gl's `EffectCompositor` makes claygl compile its
+ * size expressions with `new Function`, which the browser blocks there
+ * (`EvalError`, surfaced by claygl as "Invalid expression."). The import
+ * itself still succeeds, so the loader probes `new Function` once before
+ * importing and latches "failed" instead of letting `setOption` throw
+ * later (rowsncolumns/spreadsheet#1187).
  */
 import { VisualMapComponent } from "echarts/components";
 import * as echarts from "echarts/core";
 let state = "unloaded";
 let loadPromise = null;
 export const getEchartsGlState = () => state;
+/**
+ * True when the page lets scripts construct functions from source — what
+ * claygl needs for every GL chart. False under a CSP whose `script-src`
+ * lacks `'unsafe-eval'`.
+ */
+const canEvaluateCode = () => {
+    try {
+        new Function("");
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+/**
+ * Record that the loaded module failed at render time (echarts-gl threw
+ * from `setOption`), so the renderer keeps the 2-D fallback and never
+ * retries 3-D for the rest of the page's lifetime. Warns once per page.
+ */
+export const markEchartsGlFailed = (error) => {
+    if (state !== "failed") {
+        // eslint-disable-next-line no-console
+        console.warn("echarts-gl failed to render a 3-D chart; 3-D charts render as their 2-D fallback on this page.", error);
+    }
+    state = "failed";
+    loadPromise = Promise.resolve(false);
+};
 /**
  * Kick off (or join) the echarts-gl dynamic import and register the 3-D
  * charts/components the renderer uses. Resolves true when 3-D rendering is
@@ -20,6 +55,11 @@ export const getEchartsGlState = () => state;
  */
 export const loadEchartsGl = () => {
     if (!loadPromise) {
+        if (!canEvaluateCode()) {
+            state = "failed";
+            loadPromise = Promise.resolve(false);
+            return loadPromise;
+        }
         state = "loading";
         loadPromise = Promise.all([
             import("echarts-gl/charts"),

package/dist/esm/utils/excel-axis-scale.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Excel's automatic value-axis scale (Format Axis → Bounds / Units left on
+ * "Auto"). Excel does not publish the rule; this is the behaviour Jon Peltier
+ * measured ("How Excel Calculates Automatic Chart Axis Limits",
+ * peltiertech.com) and that LV-05 of demo-app-monorepo#49969 compared:
+ *
+ * - The minimum is 0 when every value is ≥ 0 and the data spans more than a
+ *   sixth of the maximum (the mirror rule pins the maximum to 0 for an
+ *   all-negative series); a narrower positive range starts half its span
+ *   below the smallest value.
+ * - The maximum is the largest value plus 5% of the range, rounded up to the
+ *   next major unit (so data ending at 17 gets an 18 ceiling, 100 gets 120).
+ * - The major unit is the smallest 1-2-5 step that splits the range into at
+ *   most ten intervals.
+ *
+ * echarts' own nicing (1-2-3-5 steps aimed at five intervals) gives steps of
+ * 3 or 25 Excel never draws, so the renderer hands echarts these bounds.
+ */
+export type ExcelAxisScale = {
+    min: number;
+    max: number;
+    interval: number;
+};
+export declare const excelAutoAxisScale: (values: Iterable<number>, fixed?: {
+    min?: number | null;
+    max?: number | null;
+    majorUnit?: number | null;
+}) => ExcelAxisScale | undefined;
+/**
+ * The values a cartesian value axis has to fit: every point of the bar / line
+ * series plotted against `axisIndex`, with stacked series summed per category
+ * (positives and negatives apart, as Excel stacks them).
+ */
+export declare const valueAxisExtentValues: (series: ReadonlyArray<any>, axisIndex: number, axisKey?: "yAxisIndex" | "xAxisIndex") => number[];
+//# sourceMappingURL=excel-axis-scale.d.ts.map

package/dist/esm/utils/excel-axis-scale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"excel-axis-scale.d.ts","sourceRoot":"","sources":["../../../utils/excel-axis-scale.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAiB5E,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,QAAQ,CAAC,MAAM,CAAC,EACxB,QAAO;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,KAClF,cAAc,GAAG,SA6CnB,CAAC;AAYF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,aAAa,CAAC,GAAG,CAAC,EAC1B,WAAW,MAAM,EACjB,UAAS,YAAY,GAAG,YAA2B,KAClD,MAAM,EA6BR,CAAC"}

package/dist/esm/utils/excel-axis-scale.js

@@ -0,0 +1,122 @@
+const MAX_INTERVALS = 10;
+const niceSteps = (span) => {
+    const exponent = Math.floor(Math.log10(span / MAX_INTERVALS));
+    const steps = [];
+    for (let e = exponent - 1; e <= exponent + 2; e++) {
+        const base = 10 ** e;
+        steps.push(base, 2 * base, 5 * base);
+    }
+    return steps;
+};
+/** Floating-point safe multiple of `step` (`0.1 * 3` would print 0.30000000000000004). */
+const multiple = (k, step) => Number((k * step).toPrecision(12));
+export const excelAutoAxisScale = (values, fixed = {}) => {
+    let dataMin = Infinity;
+    let dataMax = -Infinity;
+    for (const v of values) {
+        if (!Number.isFinite(v))
+            continue;
+        if (v < dataMin)
+            dataMin = v;
+        if (v > dataMax)
+            dataMax = v;
+    }
+    if (!Number.isFinite(dataMin))
+        return undefined;
+    if (dataMin === dataMax) {
+        // One distinct value: Excel spans 0..value (or value..0).
+        if (dataMin > 0)
+            dataMin = 0;
+        else if (dataMax < 0)
+            dataMax = 0;
+        else
+            dataMax = 1;
+    }
+    const fixedMin = typeof fixed.min === "number" ? fixed.min : undefined;
+    const fixedMax = typeof fixed.max === "number" ? fixed.max : undefined;
+    let lo;
+    if (fixedMin !== undefined)
+        lo = fixedMin;
+    else if (dataMin >= 0)
+        lo = (dataMax - dataMin) / dataMax > 1 / 6 ? 0 : dataMin - (dataMax - dataMin) / 2;
+    else if (dataMax <= 0)
+        lo = dataMin - 0.05 * (0 - dataMin);
+    else
+        lo = dataMin - 0.05 * (dataMax - dataMin);
+    let hi;
+    if (fixedMax !== undefined)
+        hi = fixedMax;
+    else if (dataMax <= 0)
+        hi = (dataMax - dataMin) / -dataMin > 1 / 6 ? 0 : dataMax + (dataMax - dataMin) / 2;
+    else
+        hi = dataMax + 0.05 * (dataMax - lo);
+    if (!(hi > lo))
+        return undefined;
+    const pick = (step) => {
+        const min = fixedMin !== undefined ? fixedMin : multiple(Math.floor(lo / step), step);
+        const max = fixedMax !== undefined ? fixedMax : multiple(Math.ceil(hi / step), step);
+        return { min, max, interval: step };
+    };
+    if (typeof fixed.majorUnit === "number" && fixed.majorUnit > 0) {
+        return pick(fixed.majorUnit);
+    }
+    for (const step of niceSteps(hi - lo)) {
+        const scale = pick(step);
+        if ((scale.max - scale.min) / step <= MAX_INTERVALS + 1e-9)
+            return scale;
+    }
+    return undefined;
+};
+const pointValue = (item) => {
+    const raw = item !== null && typeof item === "object" && "value" in item
+        ? item.value
+        : item;
+    if (Array.isArray(raw))
+        return undefined;
+    const n = typeof raw === "number" ? raw : raw == null || raw === "" ? NaN : Number(raw);
+    return Number.isFinite(n) ? n : undefined;
+};
+/**
+ * The values a cartesian value axis has to fit: every point of the bar / line
+ * series plotted against `axisIndex`, with stacked series summed per category
+ * (positives and negatives apart, as Excel stacks them).
+ */
+export const valueAxisExtentValues = (series, axisIndex, axisKey = "yAxisIndex") => {
+    const values = [];
+    const stacks = new Map();
+    for (const s of series) {
+        if (!s || (s.type !== "bar" && s.type !== "line"))
+            continue;
+        // High-low / drop lines and up/down bars only span the plotted values.
+        if (String(s.id ?? "").startsWith("rnc-chart-lines-"))
+            continue;
+        if ((s[axisKey] ?? 0) !== axisIndex || !Array.isArray(s.data))
+            continue;
+        if (s.stack === undefined) {
+            for (const item of s.data) {
+                const v = pointValue(item);
+                if (v !== undefined)
+                    values.push(v);
+            }
+            continue;
+        }
+        const stack = stacks.get(s.stack) ?? { pos: [], neg: [] };
+        stacks.set(s.stack, stack);
+        s.data.forEach((item, i) => {
+            const v = pointValue(item);
+            if (v === undefined)
+                return;
+            const side = v >= 0 ? stack.pos : stack.neg;
+            side[i] = (side[i] ?? 0) + v;
+        });
+    }
+    for (const { pos, neg } of stacks.values()) {
+        for (const v of pos)
+            if (v !== undefined)
+                values.push(v);
+        for (const v of neg)
+            if (v !== undefined)
+                values.push(v);
+    }
+    return values;
+};

package/dist/esm/utils/overrides.d.ts

@@ -7,6 +7,20 @@ import type { LegendComponentOption } from "echarts";
  * Underline / strikethrough have no canvas text decoration in echarts and
  * are not drawn.
  */
+/**
+ * `ChartTextFormat.fontSize` is in points (OOXML `sz` / 100, the editor's
+ * Size field); echarts draws pixels. 9 pt → 12 px, 14 pt → 18.67 px.
+ */
+export declare const pointsToPixels: (points: number) => number;
+/** An authored point size as pixels, or `fallbackPx` when none is set. */
+export declare const fontSizePx: (points: unknown, fallbackPx: number) => number;
+/**
+ * Excel's chart text defaults (Office 2013+ chart styles): the theme's body
+ * (minor) font, 9 pt in Text 1 at 65% (#595959 on the light theme), and a
+ * 14 pt regular title (RD-24).
+ */
+export declare const CHART_TEXT_PX: number;
+export declare const CHART_TITLE_PX: number;
 export declare const themedTextStyle: (fmt: any, defaults: {
     color: string;
     fontSize: number;
@@ -15,19 +29,26 @@ export declare const themedTextStyle: (fmt: any, defaults: {
 }) => {
     color: any;
     fontFamily: any;
-    fontSize: any;
+    fontSize: number;
     fontWeight: "bold" | "normal";
     fontStyle: "italic" | "normal";
 };
 /** Build an echarts `textStyle` from a parsed `ChartTextFormat`. */
 export declare const textFormatToEchartsTextStyle: (fmt: any) => Record<string, any> | undefined;
 export declare const applyLegendOverrides: (legend: LegendComponentOption, opts: any) => LegendComponentOption;
+/** Excel's Format Axis → Display units: the divisor and the label it shows. */
+export declare const DISPLAY_UNITS: Record<string, {
+    divisor: number;
+    label: string;
+}>;
 /**
  * `numberFormatPattern` is the axis' RESOLVED format (explicit pattern or
  * the linked source-cell format — see `resolveValueAxisNumberFormat`); it
- * becomes the tick-label formatter.
+ * becomes the tick-label formatter. `placement` says which side of the plot
+ * the axis runs along (`x` horizontal, `y` vertical) for Excel's axis
+ * crossing; it defaults to `x` for a category axis and `y` for a value axis.
  */
-export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string) => any;
+export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string, placement?: "x" | "y") => any;
 export declare const dataLabelFormatter: (opts: any, locale?: string, joiner?: string) => (params: any) => string;
 /**
  * The data-label options one series renders with: its own

package/dist/esm/utils/overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAC1B,KAAK,GAAG,EACR,UAAU;IACR,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;CAChC;;;;gBASG,MAAM,GACN,QAAQ;eACsC,QAAQ,GAAG,QAAQ;CACrE,CAAC;AAEH,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,SAAS,MAAM,EAEf,eAAa,MACT,QAAQ,GAAG,WAoDhB,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCAlGH,GAAG;aAoHhB,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD;;;;;;;GAOG;AACH;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,WACD,CAAC;AAE7C,0EAA0E;AAC1E,eAAO,MAAM,UAAU,GAAI,QAAQ,OAAO,EAAE,YAAY,MAAM,WACkB,CAAC;AAEjF;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAoB,CAAC;AAC/C,eAAO,MAAM,cAAc,QAAqB,CAAC;AAEjD,eAAO,MAAM,eAAe,GAC1B,KAAK,GAAG,EACR,UAAU;IACR,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;CAChC;;;;gBAMG,MAAM,GACN,QAAQ;eACsC,QAAQ,GAAG,QAAQ;CACrE,CAAC;AAEH,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCAWpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAU5E,CAAC;AAKF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,EACf,YAAY,GAAG,GAAG,GAAG,QAmGtB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,SAAS,MAAM,EAEf,eAAa,MACT,QAAQ,GAAG,WA0DhB,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCAxGH,GAAG;aA0HhB,CAAC"}

package/dist/esm/utils/overrides.js

@@ -13,12 +13,24 @@ import { formatAxisValue, valueAxisLabelFormatter } from "./axis-number-format";
  * Underline / strikethrough have no canvas text decoration in echarts and
  * are not drawn.
  */
+/**
+ * `ChartTextFormat.fontSize` is in points (OOXML `sz` / 100, the editor's
+ * Size field); echarts draws pixels. 9 pt → 12 px, 14 pt → 18.67 px.
+ */
+export const pointsToPixels = (points) => Math.round(((points * 4) / 3) * 100) / 100;
+/** An authored point size as pixels, or `fallbackPx` when none is set. */
+export const fontSizePx = (points, fallbackPx) => typeof points === "number" && points > 0 ? pointsToPixels(points) : fallbackPx;
+/**
+ * Excel's chart text defaults (Office 2013+ chart styles): the theme's body
+ * (minor) font, 9 pt in Text 1 at 65% (#595959 on the light theme), and a
+ * 14 pt regular title (RD-24).
+ */
+export const CHART_TEXT_PX = pointsToPixels(9);
+export const CHART_TITLE_PX = pointsToPixels(14);
 export const themedTextStyle = (fmt, defaults) => ({
     color: fmt?.color ?? defaults.color,
     fontFamily: fmt?.fontFamily ?? defaults.fontFamily ?? "sans-serif",
-    fontSize: typeof fmt?.fontSize === "number" && fmt.fontSize > 0
-        ? fmt.fontSize
-        : defaults.fontSize,
+    fontSize: fontSizePx(fmt?.fontSize, defaults.fontSize),
     fontWeight: (fmt ? (fmt.bold ? "bold" : "normal") : defaults.fontWeight ?? "normal"),
     fontStyle: (fmt?.italic ? "italic" : "normal"),
 });
@@ -31,8 +43,9 @@ export const textFormatToEchartsTextStyle = (fmt) => {
         result.color = fmt.color;
     if (fmt.fontFamily)
         result.fontFamily = fmt.fontFamily;
-    if (typeof fmt.fontSize === "number")
-        result.fontSize = fmt.fontSize;
+    if (typeof fmt.fontSize === "number" && fmt.fontSize > 0) {
+        result.fontSize = pointsToPixels(fmt.fontSize);
+    }
     if (fmt.bold)
         result.fontWeight = "bold";
     if (fmt.italic)
@@ -86,13 +99,35 @@ export const applyLegendOverrides = (legend, opts) => {
     }
     return next;
 };
+/** Excel's Format Axis → Display units: the divisor and the label it shows. */
+export const DISPLAY_UNITS = {
+    hundreds: { divisor: 1e2, label: "Hundreds" },
+    thousands: { divisor: 1e3, label: "Thousands" },
+    tenThousands: { divisor: 1e4, label: "10000" },
+    hundredThousands: { divisor: 1e5, label: "100000" },
+    millions: { divisor: 1e6, label: "Millions" },
+    tenMillions: { divisor: 1e7, label: "10000000" },
+    hundredMillions: { divisor: 1e8, label: "100000000" },
+    billions: { divisor: 1e9, label: "Billions" },
+    trillions: { divisor: 1e12, label: "Trillions" },
+};
+const positive = (v) => typeof v === "number" && Number.isFinite(v) && v > 0;
 /**
  * `numberFormatPattern` is the axis' RESOLVED format (explicit pattern or
  * the linked source-cell format — see `resolveValueAxisNumberFormat`); it
- * becomes the tick-label formatter.
+ * becomes the tick-label formatter. `placement` says which side of the plot
+ * the axis runs along (`x` horizontal, `y` vertical) for Excel's axis
+ * crossing; it defaults to `x` for a category axis and `y` for a value axis.
  */
-export const applyAxisOverrides = (axis, opts, numberFormatPattern, locale) => {
-    const formatter = valueAxisLabelFormatter(numberFormatPattern, locale);
+export const applyAxisOverrides = (axis, opts, numberFormatPattern, locale, placement) => {
+    const units = opts?.displayUnits ? DISPLAY_UNITS[opts.displayUnits] : undefined;
+    const baseFormatter = valueAxisLabelFormatter(numberFormatPattern, locale);
+    // Display units divide the tick labels: 25,000 on a "Thousands" axis reads 25.
+    const formatter = units
+        ? (value) => typeof value === "number"
+            ? (baseFormatter ?? ((v) => formatAxisValue(undefined, v, locale)))(value / units.divisor)
+            : String(value ?? "")
+        : baseFormatter;
     if (!opts && !formatter)
         return axis;
     const next = { ...axis };
@@ -101,8 +136,11 @@ export const applyAxisOverrides = (axis, opts, numberFormatPattern, locale) => {
     }
     if (!opts)
         return next;
-    if (opts.logarithmic)
+    const isValueAxis = next.type !== "category";
+    if (opts.logarithmic) {
         next.type = "log";
+        next.logBase = positive(opts.logBase) && opts.logBase >= 2 ? opts.logBase : 10;
+    }
     if (opts.reverse)
         next.inverse = true;
     if (typeof opts.min === "number")
@@ -117,6 +155,62 @@ export const applyAxisOverrides = (axis, opts, numberFormatPattern, locale) => {
     if (opts.showMajorGridlines === true) {
         next.splitLine = { ...(next.splitLine ?? {}), show: true };
     }
+    // Format Axis → Units (FT-08). A value axis' major unit is the tick
+    // interval; minor ticks / gridlines split it by major ÷ minor (Excel's
+    // automatic minor unit is a fifth of the major).
+    if (isValueAxis && positive(opts.majorUnit) && !opts.logarithmic) {
+        next.interval = opts.majorUnit;
+    }
+    const minorSplit = positive(opts.majorUnit) && positive(opts.minorUnit)
+        ? Math.max(1, Math.round(opts.majorUnit / opts.minorUnit))
+        : 5;
+    const minorTicks = typeof opts.minorTickMark === "string" && opts.minorTickMark !== "none";
+    if (isValueAxis && (minorTicks || opts.showMinorGridlines)) {
+        next.minorTick = { show: minorTicks, splitNumber: minorSplit };
+    }
+    if (isValueAxis && opts.showMinorGridlines) {
+        next.minorSplitLine = { show: true, lineStyle: { color: "#F2F2F2" } };
+    }
+    // Format Axis → Tick Marks: none / inside / outside / cross.
+    if (opts.majorTickMark === "none") {
+        next.axisTick = { ...(next.axisTick ?? {}), show: false };
+    }
+    else if (opts.majorTickMark === "in") {
+        next.axisTick = { ...(next.axisTick ?? {}), show: true, inside: true };
+    }
+    else if (opts.majorTickMark === "cross") {
+        next.axisTick = { ...(next.axisTick ?? {}), show: true, inside: false, length: 8 };
+    }
+    // Category axis "Interval between labels / tick marks": every Nth category.
+    if (!isValueAxis && positive(opts.tickLabelSkip)) {
+        next.axisLabel = {
+            ...(next.axisLabel ?? {}),
+            interval: Math.round(opts.tickLabelSkip) - 1,
+        };
+    }
+    if (!isValueAxis && positive(opts.tickMarkSkip)) {
+        next.axisTick = {
+            ...(next.axisTick ?? {}),
+            interval: Math.round(opts.tickMarkSkip) - 1,
+        };
+    }
+    // Where this axis crosses the perpendicular one (OOXML's `<c:crosses>` /
+    // `<c:crossesAt>` on this axis). echarts places an axis at the other's zero
+    // or at either plot edge, so a `crossesAt` other than 0 draws at the edge.
+    const side = placement ?? (isValueAxis ? "y" : "x");
+    if (opts.crosses === "max") {
+        next.position = side === "x" ? "top" : "right";
+        next.axisLine = { ...(next.axisLine ?? {}), onZero: false };
+    }
+    else if (opts.crosses === "min" ||
+        (typeof opts.crossesAt === "number" && opts.crossesAt !== 0)) {
+        next.position = side === "x" ? "bottom" : "left";
+        next.axisLine = { ...(next.axisLine ?? {}), onZero: false };
+    }
+    // The display-units label ("Thousands") rides with the axis title.
+    if (units && opts.showDisplayUnitsLabel !== false) {
+        next.name = next.name ? `${next.name} (${units.label})` : units.label;
+    }
     // Axis label text style (tick labels) + axis title font come from
     // <c:txPr>. Without this echarts uses its default (~black on light).
     const axisTextStyle = textFormatToEchartsTextStyle(opts.textFormat);
@@ -138,6 +232,12 @@ export const dataLabelFormatter = (opts, locale,
 // A treemap block stacks the parts (name, value) on their own lines.
 joiner = ": ") => (params) => {
     const parts = [];
+    // Value From Cells (FT-08): the point's cell leads; resolved by the caller.
+    if (Array.isArray(opts.cellLabels)) {
+        const cell = opts.cellLabels[params.dataIndex];
+        if (cell !== undefined && cell !== null && cell !== "")
+            parts.push(String(cell));
+    }
     if (opts.showSeriesName && params.seriesName)
         parts.push(params.seriesName);
     if (opts.showCategoryName && params.name)
@@ -153,7 +253,8 @@ joiner = ": ") => (params) => {
         !opts.showCategoryName &&
         !opts.showPercent &&
         !opts.showSeriesName &&
-        !opts.showBubbleSize
+        !opts.showBubbleSize &&
+        !Array.isArray(opts.cellLabels)
         ? true
         : !!opts.showValue;
     // A scatter / bubble point's value is its [x, y, size] tuple: the label's

package/dist/esm/utils/three-d.d.ts

@@ -44,14 +44,25 @@ export declare const normalize3DSourceType: (sourceChartType?: string | null) =>
 export declare const is3DSpec: (spec: {
     sourceChartType?: string | null;
 } | null | undefined) => boolean;
+/** Host opt-out of the WebGL pipeline (`enable3D` on the renderer / editor). */
+export type ThreeDRenderOptions = {
+    /**
+     * `false` keeps every spec on its 2-D fallback: echarts-gl is never
+     * loaded and the Chart editor offers no echarts-gl preset. The spec's
+     * `sourceChartType` is untouched, so the xlsx export still writes the
+     * 3-D chart (rowsncolumns/spreadsheet#1187). Default `true`.
+     */
+    enable3D?: boolean;
+};
 /**
  * Map a `sourceChartType` token to the echarts-gl series kind it renders
  * as, or null when the 3-D pipeline should not run:
  * - PIE_3D — echarts-gl has no pie3D, so the 2-D pie fallback stays.
  * - AREA_3D — echarts-gl has no area3D; rendered as line3D.
  * - non-3-D / unknown tokens.
+ * - any token when the host turned 3-D off (`enable3D: false`).
  */
-export declare const resolve3DRenderKind: (sourceChartType?: string | null) => ThreeDRenderKind | null;
+export declare const resolve3DRenderKind: (sourceChartType?: string | null, options?: ThreeDRenderOptions) => ThreeDRenderKind | null;
 /** Excel's Contour: the surface grid seen from above, as a flat heatmap. */
 export declare const isContourSpec: (spec: {
     sourceChartType?: string | null;

package/dist/esm/utils/three-d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"three-d.d.ts","sourceRoot":"","sources":["../../../utils/three-d.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,QAAA,MAAM,cAAc,8EAOV,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAIrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GACnB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAgE,CAAC;AAEpE;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAcrB,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,aAAa,GACxB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAqE,CAAC;AAEzE,uFAAuF;AACvF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,YAAY,EAcd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAKnD,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,iBAAiB,EAAE,KAAG,MACO,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,iBAAiB,EAAE,KAAG,WAAW,EAUvE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,iBAAiB,EAAE,KAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAA;CAAE,EASpC,CAAC;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,WAAW,EAcb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,KAAG,CAAC,MAAM,EAAE,MAAM,CASrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAY/C,CAAC"}
+{"version":3,"file":"three-d.d.ts","sourceRoot":"","sources":["../../../utils/three-d.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,QAAA,MAAM,cAAc,8EAOV,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAIrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GACnB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAgE,CAAC;AAEpE,gFAAgF;AAChF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,GAC9B,kBAAkB,MAAM,GAAG,IAAI,EAC/B,UAAU,mBAAmB,KAC5B,gBAAgB,GAAG,IAerB,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,aAAa,GACxB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAqE,CAAC;AAEzE,uFAAuF;AACvF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,YAAY,EAcd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAKnD,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,iBAAiB,EAAE,KAAG,MACO,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,iBAAiB,EAAE,KAAG,WAAW,EAUvE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,iBAAiB,EAAE,KAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAA;CAAE,EASpC,CAAC;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,WAAW,EAcb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,KAAG,CAAC,MAAM,EAAE,MAAM,CASrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAY/C,CAAC"}

package/dist/esm/utils/three-d.js

@@ -58,8 +58,11 @@ export const is3DSpec = (spec) => normalize3DSourceType(spec?.sourceChartType) !
  * - PIE_3D — echarts-gl has no pie3D, so the 2-D pie fallback stays.
  * - AREA_3D — echarts-gl has no area3D; rendered as line3D.
  * - non-3-D / unknown tokens.
+ * - any token when the host turned 3-D off (`enable3D: false`).
  */
-export const resolve3DRenderKind = (sourceChartType) => {
+export const resolve3DRenderKind = (sourceChartType, options) => {
+    if (options?.enable3D === false)
+        return null;
     switch (normalize3DSourceType(sourceChartType)) {
         case "BAR_3D":
             return "bar3D";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "28.1.17",
+  "version": "28.1.19",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -67,14 +67,14 @@
   },
   "devDependencies": {
     "@rowsncolumns/calculator": ">=7.3.1",
-    "@rowsncolumns/common-types": ">=5.3.2",
-    "@rowsncolumns/grid": ">=13.2.35",
+    "@rowsncolumns/common-types": ">=5.4.0",
+    "@rowsncolumns/grid": ">=13.4.0",
     "@rowsncolumns/icons": ">=7.2.33",
-    "@rowsncolumns/spreadsheet": ">=10.4.13",
-    "@rowsncolumns/spreadsheet-state": ">=29.1.8",
+    "@rowsncolumns/spreadsheet": ">=10.8.0",
+    "@rowsncolumns/spreadsheet-state": ">=29.4.0",
     "@rowsncolumns/toolkit": ">=24.5.14",
-    "@rowsncolumns/ui": ">=16.0.4",
-    "@rowsncolumns/utils": ">=9.5.5",
+    "@rowsncolumns/ui": ">=16.2.0",
+    "@rowsncolumns/utils": ">=9.7.0",
     "@types/react-plotly.js": "^2.6.3",
     "echarts": "^5.6.0",
     "formik": "^2.4.6",