@rowsncolumns/charts 28.1.17 → 28.1.19

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

@@ -0,0 +1,210 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.valueAxisExtentValues = exports.excelAutoAxisScale = void 0;
+var tslib_1 = require("tslib");
+var MAX_INTERVALS = 10;
+var niceSteps = function (span) {
+    var exponent = Math.floor(Math.log10(span / MAX_INTERVALS));
+    var steps = [];
+    for (var e = exponent - 1; e <= exponent + 2; e++) {
+        var base = Math.pow(10, e);
+        steps.push(base, 2 * base, 5 * base);
+    }
+    return steps;
+};
+/** Floating-point safe multiple of `step` (`0.1 * 3` would print 0.30000000000000004). */
+var multiple = function (k, step) { return Number((k * step).toPrecision(12)); };
+var excelAutoAxisScale = function (values, fixed) {
+    var e_1, _a, e_2, _b;
+    if (fixed === void 0) { fixed = {}; }
+    var dataMin = Infinity;
+    var dataMax = -Infinity;
+    try {
+        for (var values_1 = tslib_1.__values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
+            var v = values_1_1.value;
+            if (!Number.isFinite(v))
+                continue;
+            if (v < dataMin)
+                dataMin = v;
+            if (v > dataMax)
+                dataMax = v;
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    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;
+    }
+    var fixedMin = typeof fixed.min === "number" ? fixed.min : undefined;
+    var fixedMax = typeof fixed.max === "number" ? fixed.max : undefined;
+    var 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);
+    var 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;
+    var pick = function (step) {
+        var min = fixedMin !== undefined ? fixedMin : multiple(Math.floor(lo / step), step);
+        var max = fixedMax !== undefined ? fixedMax : multiple(Math.ceil(hi / step), step);
+        return { min: min, max: max, interval: step };
+    };
+    if (typeof fixed.majorUnit === "number" && fixed.majorUnit > 0) {
+        return pick(fixed.majorUnit);
+    }
+    try {
+        for (var _c = tslib_1.__values(niceSteps(hi - lo)), _d = _c.next(); !_d.done; _d = _c.next()) {
+            var step = _d.value;
+            var scale = pick(step);
+            if ((scale.max - scale.min) / step <= MAX_INTERVALS + 1e-9)
+                return scale;
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return undefined;
+};
+exports.excelAutoAxisScale = excelAutoAxisScale;
+var pointValue = function (item) {
+    var raw = item !== null && typeof item === "object" && "value" in item
+        ? item.value
+        : item;
+    if (Array.isArray(raw))
+        return undefined;
+    var 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).
+ */
+var valueAxisExtentValues = function (series, axisIndex, axisKey) {
+    var e_3, _a, e_4, _b, e_5, _c, e_6, _d;
+    var _e, _f, _g;
+    if (axisKey === void 0) { axisKey = "yAxisIndex"; }
+    var values = [];
+    var stacks = new Map();
+    var _loop_1 = function (s) {
+        var e_7, _l;
+        if (!s || (s.type !== "bar" && s.type !== "line"))
+            return "continue";
+        // High-low / drop lines and up/down bars only span the plotted values.
+        if (String((_e = s.id) !== null && _e !== void 0 ? _e : "").startsWith("rnc-chart-lines-"))
+            return "continue";
+        if (((_f = s[axisKey]) !== null && _f !== void 0 ? _f : 0) !== axisIndex || !Array.isArray(s.data))
+            return "continue";
+        if (s.stack === undefined) {
+            try {
+                for (var _m = (e_7 = void 0, tslib_1.__values(s.data)), _o = _m.next(); !_o.done; _o = _m.next()) {
+                    var item = _o.value;
+                    var v = pointValue(item);
+                    if (v !== undefined)
+                        values.push(v);
+                }
+            }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            finally {
+                try {
+                    if (_o && !_o.done && (_l = _m.return)) _l.call(_m);
+                }
+                finally { if (e_7) throw e_7.error; }
+            }
+            return "continue";
+        }
+        var stack = (_g = stacks.get(s.stack)) !== null && _g !== void 0 ? _g : { pos: [], neg: [] };
+        stacks.set(s.stack, stack);
+        s.data.forEach(function (item, i) {
+            var _a;
+            var v = pointValue(item);
+            if (v === undefined)
+                return;
+            var side = v >= 0 ? stack.pos : stack.neg;
+            side[i] = ((_a = side[i]) !== null && _a !== void 0 ? _a : 0) + v;
+        });
+    };
+    try {
+        for (var series_1 = tslib_1.__values(series), series_1_1 = series_1.next(); !series_1_1.done; series_1_1 = series_1.next()) {
+            var s = series_1_1.value;
+            _loop_1(s);
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (series_1_1 && !series_1_1.done && (_a = series_1.return)) _a.call(series_1);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    try {
+        for (var _h = tslib_1.__values(stacks.values()), _j = _h.next(); !_j.done; _j = _h.next()) {
+            var _k = _j.value, pos = _k.pos, neg = _k.neg;
+            try {
+                for (var pos_1 = (e_5 = void 0, tslib_1.__values(pos)), pos_1_1 = pos_1.next(); !pos_1_1.done; pos_1_1 = pos_1.next()) {
+                    var v = pos_1_1.value;
+                    if (v !== undefined)
+                        values.push(v);
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (pos_1_1 && !pos_1_1.done && (_c = pos_1.return)) _c.call(pos_1);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            try {
+                for (var neg_1 = (e_6 = void 0, tslib_1.__values(neg)), neg_1_1 = neg_1.next(); !neg_1_1.done; neg_1_1 = neg_1.next()) {
+                    var v = neg_1_1.value;
+                    if (v !== undefined)
+                        values.push(v);
+                }
+            }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            finally {
+                try {
+                    if (neg_1_1 && !neg_1_1.done && (_d = neg_1.return)) _d.call(neg_1);
+                }
+                finally { if (e_6) throw e_6.error; }
+            }
+        }
+    }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    finally {
+        try {
+            if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+        }
+        finally { if (e_4) throw e_4.error; }
+    }
+    return values;
+};
+exports.valueAxisExtentValues = valueAxisExtentValues;

package/dist/cjs/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/cjs/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/cjs/utils/overrides.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSeriesLabelOption = exports.resolveSeriesDataLabels = exports.dataLabelFormatter = exports.applyAxisOverrides = exports.applyLegendOverrides = exports.textFormatToEchartsTextStyle = exports.themedTextStyle = void 0;
+exports.buildSeriesLabelOption = exports.resolveSeriesDataLabels = exports.dataLabelFormatter = exports.applyAxisOverrides = exports.DISPLAY_UNITS = exports.applyLegendOverrides = exports.textFormatToEchartsTextStyle = exports.themedTextStyle = exports.CHART_TITLE_PX = exports.CHART_TEXT_PX = exports.fontSizePx = exports.pointsToPixels = void 0;
 var tslib_1 = require("tslib");
 var axis_number_format_1 = require("./axis-number-format");
 // Map ChartSpec.legend / dataLabels / axisOptions to ECharts option
@@ -17,14 +17,32 @@ var axis_number_format_1 = require("./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.
+ */
+var pointsToPixels = function (points) {
+    return Math.round(((points * 4) / 3) * 100) / 100;
+};
+exports.pointsToPixels = pointsToPixels;
+/** An authored point size as pixels, or `fallbackPx` when none is set. */
+var fontSizePx = function (points, fallbackPx) {
+    return typeof points === "number" && points > 0 ? (0, exports.pointsToPixels)(points) : fallbackPx;
+};
+exports.fontSizePx = fontSizePx;
+/**
+ * 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).
+ */
+exports.CHART_TEXT_PX = (0, exports.pointsToPixels)(9);
+exports.CHART_TITLE_PX = (0, exports.pointsToPixels)(14);
 var themedTextStyle = function (fmt, defaults) {
     var _a, _b, _c, _d;
     return ({
         color: (_a = fmt === null || fmt === void 0 ? void 0 : fmt.color) !== null && _a !== void 0 ? _a : defaults.color,
         fontFamily: (_c = (_b = fmt === null || fmt === void 0 ? void 0 : fmt.fontFamily) !== null && _b !== void 0 ? _b : defaults.fontFamily) !== null && _c !== void 0 ? _c : "sans-serif",
-        fontSize: typeof (fmt === null || fmt === void 0 ? void 0 : fmt.fontSize) === "number" && fmt.fontSize > 0
-            ? fmt.fontSize
-            : defaults.fontSize,
+        fontSize: (0, exports.fontSizePx)(fmt === null || fmt === void 0 ? void 0 : fmt.fontSize, defaults.fontSize),
         fontWeight: (fmt ? (fmt.bold ? "bold" : "normal") : (_d = defaults.fontWeight) !== null && _d !== void 0 ? _d : "normal"),
         fontStyle: ((fmt === null || fmt === void 0 ? void 0 : fmt.italic) ? "italic" : "normal"),
     });
@@ -39,8 +57,9 @@ var textFormatToEchartsTextStyle = function (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 = (0, exports.pointsToPixels)(fmt.fontSize);
+    }
     if (fmt.bold)
         result.fontWeight = "bold";
     if (fmt.italic)
@@ -97,14 +116,40 @@ var applyLegendOverrides = function (legend, opts) {
     return next;
 };
 exports.applyLegendOverrides = applyLegendOverrides;
+/** Excel's Format Axis → Display units: the divisor and the label it shows. */
+exports.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" },
+};
+var positive = function (v) {
+    return 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.
  */
-var applyAxisOverrides = function (axis, opts, numberFormatPattern, locale) {
-    var _a, _b, _c, _d, _e;
-    var formatter = (0, axis_number_format_1.valueAxisLabelFormatter)(numberFormatPattern, locale);
+var applyAxisOverrides = function (axis, opts, numberFormatPattern, locale, placement) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var units = (opts === null || opts === void 0 ? void 0 : opts.displayUnits) ? exports.DISPLAY_UNITS[opts.displayUnits] : undefined;
+    var baseFormatter = (0, axis_number_format_1.valueAxisLabelFormatter)(numberFormatPattern, locale);
+    // Display units divide the tick labels: 25,000 on a "Thousands" axis reads 25.
+    var formatter = units
+        ? function (value) {
+            return typeof value === "number"
+                ? (baseFormatter !== null && baseFormatter !== void 0 ? baseFormatter : (function (v) { return (0, axis_number_format_1.formatAxisValue)(undefined, v, locale); }))(value / units.divisor)
+                : String(value !== null && value !== void 0 ? value : "");
+        }
+        : baseFormatter;
     if (!opts && !formatter)
         return axis;
     var next = tslib_1.__assign({}, axis);
@@ -113,8 +158,11 @@ var applyAxisOverrides = function (axis, opts, numberFormatPattern, locale) {
     }
     if (!opts)
         return next;
-    if (opts.logarithmic)
+    var 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")
@@ -129,12 +177,62 @@ var applyAxisOverrides = function (axis, opts, numberFormatPattern, locale) {
     if (opts.showMajorGridlines === true) {
         next.splitLine = tslib_1.__assign(tslib_1.__assign({}, ((_c = next.splitLine) !== null && _c !== void 0 ? _c : {})), { 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;
+    }
+    var minorSplit = positive(opts.majorUnit) && positive(opts.minorUnit)
+        ? Math.max(1, Math.round(opts.majorUnit / opts.minorUnit))
+        : 5;
+    var 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 = tslib_1.__assign(tslib_1.__assign({}, ((_d = next.axisTick) !== null && _d !== void 0 ? _d : {})), { show: false });
+    }
+    else if (opts.majorTickMark === "in") {
+        next.axisTick = tslib_1.__assign(tslib_1.__assign({}, ((_e = next.axisTick) !== null && _e !== void 0 ? _e : {})), { show: true, inside: true });
+    }
+    else if (opts.majorTickMark === "cross") {
+        next.axisTick = tslib_1.__assign(tslib_1.__assign({}, ((_f = next.axisTick) !== null && _f !== void 0 ? _f : {})), { show: true, inside: false, length: 8 });
+    }
+    // Category axis "Interval between labels / tick marks": every Nth category.
+    if (!isValueAxis && positive(opts.tickLabelSkip)) {
+        next.axisLabel = tslib_1.__assign(tslib_1.__assign({}, ((_g = next.axisLabel) !== null && _g !== void 0 ? _g : {})), { interval: Math.round(opts.tickLabelSkip) - 1 });
+    }
+    if (!isValueAxis && positive(opts.tickMarkSkip)) {
+        next.axisTick = tslib_1.__assign(tslib_1.__assign({}, ((_h = next.axisTick) !== null && _h !== void 0 ? _h : {})), { 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.
+    var side = placement !== null && placement !== void 0 ? placement : (isValueAxis ? "y" : "x");
+    if (opts.crosses === "max") {
+        next.position = side === "x" ? "top" : "right";
+        next.axisLine = tslib_1.__assign(tslib_1.__assign({}, ((_j = next.axisLine) !== null && _j !== void 0 ? _j : {})), { onZero: false });
+    }
+    else if (opts.crosses === "min" ||
+        (typeof opts.crossesAt === "number" && opts.crossesAt !== 0)) {
+        next.position = side === "x" ? "bottom" : "left";
+        next.axisLine = tslib_1.__assign(tslib_1.__assign({}, ((_k = next.axisLine) !== null && _k !== void 0 ? _k : {})), { onZero: false });
+    }
+    // The display-units label ("Thousands") rides with the axis title.
+    if (units && opts.showDisplayUnitsLabel !== false) {
+        next.name = next.name ? "".concat(next.name, " (").concat(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).
     var axisTextStyle = (0, exports.textFormatToEchartsTextStyle)(opts.textFormat);
     if (axisTextStyle) {
-        next.axisLabel = tslib_1.__assign(tslib_1.__assign({}, ((_d = next.axisLabel) !== null && _d !== void 0 ? _d : {})), axisTextStyle);
-        next.nameTextStyle = tslib_1.__assign(tslib_1.__assign({}, ((_e = next.nameTextStyle) !== null && _e !== void 0 ? _e : {})), axisTextStyle);
+        next.axisLabel = tslib_1.__assign(tslib_1.__assign({}, ((_l = next.axisLabel) !== null && _l !== void 0 ? _l : {})), axisTextStyle);
+        next.nameTextStyle = tslib_1.__assign(tslib_1.__assign({}, ((_m = next.nameTextStyle) !== null && _m !== void 0 ? _m : {})), axisTextStyle);
     }
     return next;
 };
@@ -153,6 +251,12 @@ joiner) {
     if (joiner === void 0) { joiner = ": "; }
     return function (params) {
         var parts = [];
+        // Value From Cells (FT-08): the point's cell leads; resolved by the caller.
+        if (Array.isArray(opts.cellLabels)) {
+            var 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)
@@ -168,7 +272,8 @@ joiner) {
             !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/cjs/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/cjs/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/cjs/utils/three-d.js

@@ -64,8 +64,11 @@ exports.is3DSpec = is3DSpec;
  * - 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`).
  */
-var resolve3DRenderKind = function (sourceChartType) {
+var resolve3DRenderKind = function (sourceChartType, options) {
+    if ((options === null || options === void 0 ? void 0 : options.enable3D) === false)
+        return null;
     switch ((0, exports.normalize3DSourceType)(sourceChartType)) {
         case "BAR_3D":
             return "bar3D";

package/dist/esm/basic-chart/basic-chart.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
 import type { EChartComponentProps } from "../types";
 export type BasicChartProps = EChartComponentProps;
-export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, locale, }: BasicChartProps) => React.JSX.Element;
+export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, locale, enable3D, }: BasicChartProps) => React.JSX.Element;
 //# sourceMappingURL=basic-chart.d.ts.map

package/dist/esm/basic-chart/basic-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAwTrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAiGnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAmvHjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AA2UrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAoHnD,eAAO,MAAM,UAAU,GAAI,0PAmBxB,eAAe,sBAm8HjB,CAAC"}