@rowsncolumns/charts 28.1.7 → 28.1.8

package/dist/cjs/utils/doughnut.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Doughnut geometry shared by the renderers (rowsncolumns/spreadsheet#1064,
+ * #1065). Every fraction here is of the doughnut's OUTER radius — Excel's
+ * `<c:holeSize val="75"/>` is 0.75 of the outer edge, whatever the chart
+ * draws that edge at (echarts: 75% of the chart; plotly: the trace domain).
+ */
+/** `doughnutHoleSize` clamped to Excel's 0-90% range; 0.5 when unset. */
+export declare const clampDoughnutHole: (hole: unknown) => number;
+export type DoughnutRing = {
+    inner: number;
+    outer: number;
+};
+/**
+ * Excel draws a doughnut's series as concentric rings, nested from the hole
+ * outwards — series 0 innermost — splitting the band between the hole and
+ * the outer edge evenly. One ring (the whole band) for a single series.
+ */
+export declare const doughnutRings: (hole: number, count: number) => DoughnutRing[];
+//# sourceMappingURL=doughnut.d.ts.map

package/dist/cjs/utils/doughnut.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doughnut.d.ts","sourceRoot":"","sources":["../../../utils/doughnut.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,yEAAyE;AACzE,eAAO,MAAM,iBAAiB,GAAI,MAAM,OAAO,KAAG,MACiB,CAAC;AAEpE,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,KAAG,YAAY,EAOvE,CAAC"}

package/dist/cjs/utils/doughnut.js

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ * Doughnut geometry shared by the renderers (rowsncolumns/spreadsheet#1064,
+ * #1065). Every fraction here is of the doughnut's OUTER radius — Excel's
+ * `<c:holeSize val="75"/>` is 0.75 of the outer edge, whatever the chart
+ * draws that edge at (echarts: 75% of the chart; plotly: the trace domain).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doughnutRings = exports.clampDoughnutHole = void 0;
+/** `doughnutHoleSize` clamped to Excel's 0-90% range; 0.5 when unset. */
+var clampDoughnutHole = function (hole) {
+    return typeof hole === "number" ? Math.max(0, Math.min(0.9, hole)) : 0.5;
+};
+exports.clampDoughnutHole = clampDoughnutHole;
+/**
+ * Excel draws a doughnut's series as concentric rings, nested from the hole
+ * outwards — series 0 innermost — splitting the band between the hole and
+ * the outer edge evenly. One ring (the whole band) for a single series.
+ */
+var doughnutRings = function (hole, count) {
+    var n = Math.max(1, Math.floor(count));
+    var band = 1 - hole;
+    return Array.from({ length: n }, function (_, k) { return ({
+        inner: hole + (band * k) / n,
+        outer: hole + (band * (k + 1)) / n,
+    }); });
+};
+exports.doughnutRings = doughnutRings;

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

@@ -9,6 +9,15 @@ export declare const applyLegendOverrides: (legend: LegendComponentOption, opts:
  */
 export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string) => any;
 export declare const dataLabelFormatter: (opts: any, locale?: string) => (params: any) => string;
+/**
+ * The data-label options one series renders with: its own
+ * `ChartData.dataLabels` when it has them (OOXML's `<c:ser><c:dLbls>`
+ * override — `{ show: false }` turns a labelled chart's labels off for
+ * that series alone), else the chart-level `ChartSpec.dataLabels`.
+ */
+export declare const resolveSeriesDataLabels: <T>(chartLevel: T | null | undefined, series: {
+    dataLabels?: T | null;
+} | null | undefined) => T | null | undefined;
 export declare const buildSeriesLabelOption: (opts: any, seriesType?: string, locale?: string) => {
     readonly show: true;
     readonly position: any;

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,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,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WAiC7E,CAAC;AAgCF,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCApE0D,GAAG;aAiF7E,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,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,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WAiC7E,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;;;iCA/E0D,GAAG;aA4F7E,CAAC"}

package/dist/cjs/utils/overrides.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSeriesLabelOption = exports.dataLabelFormatter = exports.applyAxisOverrides = exports.applyLegendOverrides = exports.textFormatToEchartsTextStyle = void 0;
+exports.buildSeriesLabelOption = exports.resolveSeriesDataLabels = exports.dataLabelFormatter = exports.applyAxisOverrides = exports.applyLegendOverrides = exports.textFormatToEchartsTextStyle = void 0;
 var tslib_1 = require("tslib");
 var axis_number_format_1 = require("./axis-number-format");
 // Map ChartSpec.legend / dataLabels / axisOptions to ECharts option
@@ -183,6 +183,14 @@ var ECHARTS_POINT_DLBL_POS = {
     right: "right",
 };
 var POINT_SERIES_TYPES = new Set(["line", "scatter", "effectScatter"]);
+/**
+ * The data-label options one series renders with: its own
+ * `ChartData.dataLabels` when it has them (OOXML's `<c:ser><c:dLbls>`
+ * override — `{ show: false }` turns a labelled chart's labels off for
+ * that series alone), else the chart-level `ChartSpec.dataLabels`.
+ */
+var resolveSeriesDataLabels = function (chartLevel, series) { var _a; return (_a = series === null || series === void 0 ? void 0 : series.dataLabels) !== null && _a !== void 0 ? _a : chartLevel; };
+exports.resolveSeriesDataLabels = resolveSeriesDataLabels;
 var buildSeriesLabelOption = function (opts, seriesType, locale) {
     var _a;
     if (!(opts === null || opts === void 0 ? void 0 : opts.show))

package/dist/cjs/utils/radar.d.ts

@@ -16,15 +16,41 @@ export type RadarSeriesInput = {
 };
 export type RadarIndicator = {
     name: string;
+    min: number;
     max: number;
 };
+export type RadarAxisScale = {
+    min: number;
+    max: number;
+};
+/** The value-axis options a radar's common scale reads (`ChartAxisOptions`). */
+export type RadarAxisOptions = {
+    min?: number | null;
+    max?: number | null;
+    visible?: boolean | null;
+} | null | undefined;
+/**
+ * The next "nice" axis bound at or above `value` — the top tick a value
+ * axis would auto-scale to: the step is 1 / 2 / 5 × a power of ten sized
+ * for about five divisions, and the bound is the first multiple of that
+ * step at or above the value (9 → 10, 33 → 40, 0.7 → 0.8).
+ */
+export declare const niceAxisCeiling: (value: number) => number;
+/**
+ * One value scale shared by every radar axis, as Excel draws it: `max` is
+ * the spec's `valueAxisOptions.max` when set, else the largest value across
+ * all series and categories rounded up to a nice bound (never below 1);
+ * `min` is `valueAxisOptions.min` when set (and below `max`), else 0.
+ */
+export declare const radarValueScale: (series: RadarSeriesInput[], axisOptions?: RadarAxisOptions) => RadarAxisScale;
 /**
- * Build echarts radar indicators from category labels and series.
- * The `max` per indicator is the largest value seen across all series at
- * that category (rounded up a touch so the polygon doesn't touch the
- * rim). When every series is empty at an index, `max` defaults to 1.
+ * Build echarts radar indicators from category labels and series. Every
+ * indicator carries the SAME `min` / `max` — the common scale of
+ * {@link radarValueScale} — so values on different axes compare, and a
+ * single series draws the shape of its data rather than a regular polygon
+ * (rowsncolumns/spreadsheet#1066).
  */
-export declare const buildRadarIndicators: (categories: (string | number | boolean | null | undefined)[], series: RadarSeriesInput[]) => RadarIndicator[];
+export declare const buildRadarIndicators: (categories: (string | number | boolean | null | undefined)[], series: RadarSeriesInput[], axisOptions?: RadarAxisOptions) => RadarIndicator[];
 /**
  * Shape series into echarts radar data: one entry per series with its
  * value vector aligned to the indicator order. Missing/non-numeric

package/dist/cjs/utils/radar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"radar.d.ts","sourceRoot":"","sources":["../../../utils/radar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAQ3D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EAC5D,QAAQ,gBAAgB,EAAE,KACzB,cAAc,EAahB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,gBAAgB,EAAE,EAC1B,gBAAgB,MAAM,KACrB,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAQzC,CAAC"}
+{"version":3,"file":"radar.d.ts","sourceRoot":"","sources":["../../../utils/radar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAQxE,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B,GAAG,IAAI,GAAG,SAAS,CAAC;AAErB;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,KAAG,MAW/C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,gBAAgB,EAAE,EAC1B,cAAc,gBAAgB,KAC7B,cAaF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EAC5D,QAAQ,gBAAgB,EAAE,EAC1B,cAAc,gBAAgB,KAC7B,cAAc,EAGhB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,gBAAgB,EAAE,EAC1B,gBAAgB,MAAM,KACrB,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAQzC,CAAC"}

package/dist/cjs/utils/radar.js

@@ -12,7 +12,7 @@
  * labels and per-series numeric values.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRadarSeriesData = exports.buildRadarIndicators = void 0;
+exports.buildRadarSeriesData = exports.buildRadarIndicators = exports.radarValueScale = exports.niceAxisCeiling = void 0;
 var tslib_1 = require("tslib");
 var isFiniteNum = function (v) {
     return typeof v === "number" && Number.isFinite(v);
@@ -21,36 +21,76 @@ var toNumber = function (v) {
     return isFiniteNum(v) ? v : 0;
 };
 /**
- * Build echarts radar indicators from category labels and series.
- * The `max` per indicator is the largest value seen across all series at
- * that category (rounded up a touch so the polygon doesn't touch the
- * rim). When every series is empty at an index, `max` defaults to 1.
+ * The next "nice" axis bound at or above `value` — the top tick a value
+ * axis would auto-scale to: the step is 1 / 2 / 5 × a power of ten sized
+ * for about five divisions, and the bound is the first multiple of that
+ * step at or above the value (9 → 10, 33 → 40, 0.7 → 0.8).
  */
-var buildRadarIndicators = function (categories, series) {
-    return categories.map(function (label, i) {
-        var e_1, _a;
-        var max = 0;
-        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;
-                var v = s.values[i];
-                if (isFiniteNum(v))
-                    max = Math.max(max, v);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
+var niceAxisCeiling = function (value) {
+    if (!isFiniteNum(value) || value <= 0)
+        return 1;
+    var rough = value / 5;
+    var magnitude = Math.pow(10, Math.floor(Math.log10(rough)));
+    var residual = rough / magnitude;
+    var step = (residual <= 1 ? 1 : residual <= 2 ? 2 : residual <= 5 ? 5 : 10) *
+        magnitude;
+    var ceiling = Math.ceil(value / step - 1e-9) * step;
+    // Avoid 0.30000000000000004-style bounds from the float arithmetic.
+    return Number(ceiling.toPrecision(12));
+};
+exports.niceAxisCeiling = niceAxisCeiling;
+/**
+ * One value scale shared by every radar axis, as Excel draws it: `max` is
+ * the spec's `valueAxisOptions.max` when set, else the largest value across
+ * all series and categories rounded up to a nice bound (never below 1);
+ * `min` is `valueAxisOptions.min` when set (and below `max`), else 0.
+ */
+var radarValueScale = function (series, axisOptions) {
+    var e_1, _a, e_2, _b;
+    var largest = 0;
+    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;
             try {
-                if (series_1_1 && !series_1_1.done && (_a = series_1.return)) _a.call(series_1);
+                for (var _c = (e_2 = void 0, tslib_1.__values(s.values)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var v = _d.value;
+                    if (isFiniteNum(v))
+                        largest = Math.max(largest, v);
+                }
+            }
+            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; }
             }
-            finally { if (e_1) throw e_1.error; }
         }
-        return {
-            name: String(label !== null && label !== void 0 ? label : ""),
-            // Pad by 10% so the outermost ring has breathing room; never 0.
-            max: max > 0 ? max * 1.1 : 1,
-        };
-    });
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (series_1_1 && !series_1_1.done && (_a = series_1.return)) _a.call(series_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    var max = isFiniteNum(axisOptions === null || axisOptions === void 0 ? void 0 : axisOptions.max)
+        ? axisOptions.max
+        : (0, exports.niceAxisCeiling)(largest);
+    var min = isFiniteNum(axisOptions === null || axisOptions === void 0 ? void 0 : axisOptions.min) && axisOptions.min < max ? axisOptions.min : 0;
+    return { min: min, max: max };
+};
+exports.radarValueScale = radarValueScale;
+/**
+ * Build echarts radar indicators from category labels and series. Every
+ * indicator carries the SAME `min` / `max` — the common scale of
+ * {@link radarValueScale} — so values on different axes compare, and a
+ * single series draws the shape of its data rather than a regular polygon
+ * (rowsncolumns/spreadsheet#1066).
+ */
+var buildRadarIndicators = function (categories, series, axisOptions) {
+    var _a = (0, exports.radarValueScale)(series, axisOptions), min = _a.min, max = _a.max;
+    return categories.map(function (label) { return ({ name: String(label !== null && label !== void 0 ? label : ""), min: min, max: max }); });
 };
 exports.buildRadarIndicators = buildRadarIndicators;
 /**

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;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA02GjB,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;AAqQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAq6GjB,CAAC"}

package/dist/esm/basic-chart/basic-chart.js

@@ -27,7 +27,8 @@ import { buildHierarchyTree, extractHierarchyRows, getHierarchyHeaderTitle, } fr
 import { binHistogram, computePareto, isParetoSpec, } from "../utils/histogram";
 import { categoryAxisNameGap, legendLabelsFrom, reserveEchartsLegendBand, } from "../utils/legend-layout";
 import { clampSecondPieSize, isOfPieChartSpec, otherSliceHalfAngle, resolveOfPieType, splitOfPie, } from "../utils/of-pie";
-import { applyAxisOverrides, applyLegendOverrides, buildSeriesLabelOption, } from "../utils/overrides";
+import { clampDoughnutHole, doughnutRings } from "../utils/doughnut";
+import { applyAxisOverrides, applyLegendOverrides, buildSeriesLabelOption, resolveSeriesDataLabels, } from "../utils/overrides";
 import { buildRadarIndicators, buildRadarSeriesData } from "../utils/radar";
 import { buildRegionMapData, buildSequentialColorRamp, isRegionMapSpec, resolveGeoScope, warnOnceForUnmatchedRegions, } from "../utils/region-map";
 import { loadRegionMapGeo } from "../utils/region-map-loader";
@@ -581,8 +582,9 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             };
             // Spec-level overrides — axis min/max/visibility/textFormat, legend
             // position/visibility, dataLabel toggles. Same helpers as the
-            // non-bubble layout below.
-            const bubbleSeriesLabel = buildSeriesLabelOption(spec.dataLabels, undefined, locale);
+            // non-bubble layout below. A series' own `dataLabels` replace the
+            // chart-level ones for it (#1059).
+            const bubbleSeriesLabelFor = (index) => buildSeriesLabelOption(resolveSeriesDataLabels(spec.dataLabels, spec.series?.[index]), undefined, locale);
             chartRef.current?.setOption({
                 xAxis: [
                     applyAxisOverrides({ ...xAxisConfig }, spec.categoryAxisOptions),
@@ -637,7 +639,9 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         const smooth = scatterStyle === "smooth" || scatterStyle === "smoothMarker";
                         // Labels hang off the point symbols: a marker-less line keeps
                         // an invisible 0-size symbol per point when they show (#1049).
-                        const labelsWithoutMarkers = !wantsMarkers && Boolean(spec.dataLabels?.show);
+                        const labelsWithoutMarkers = !wantsMarkers &&
+                            Boolean(resolveSeriesDataLabels(spec.dataLabels, seriesEntry)
+                                ?.show);
                         return wantsLine
                             ? {
                                 type: "line",
@@ -678,9 +682,12 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         },
                         ...(seriesColor ? { itemStyle: { color: seriesColor } } : {}),
                     };
-                }).map((s) => bubbleSeriesLabel
-                    ? { ...s, label: { ...(s.label ?? {}), ...bubbleSeriesLabel } }
-                    : s),
+                }).map((s, index) => {
+                    const bubbleSeriesLabel = bubbleSeriesLabelFor(index);
+                    return bubbleSeriesLabel
+                        ? { ...s, label: { ...(s.label ?? {}), ...bubbleSeriesLabel } }
+                        : s;
+                }),
             }, {
                 replaceMerge: [
                     "series",
@@ -1142,7 +1149,10 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 const values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map((v) => (typeof v === "number" ? v : Number(v)));
                 radarSeriesInputs.push({ name: label, values });
             }
-            const indicators = buildRadarIndicators(categories, radarSeriesInputs);
+            // One value scale for every axis (Excel), from the spec's value-axis
+            // min / max when set (#1066).
+            const radarAxisOptions = spec.valueAxisOptions;
+            const indicators = buildRadarIndicators(categories, radarSeriesInputs, radarAxisOptions);
             const radarData = buildRadarSeriesData(radarSeriesInputs, indicators.length);
             const radarStyle = spec.radarStyle ?? "standard";
             const radarColors = radarSeriesInputs.map((_, i) => spec.series?.[i]?.color);
@@ -1168,7 +1178,14 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 radar: {
                     indicator: indicators.length
                         ? indicators
-                        : [{ name: "", max: 1 }],
+                        : [{ name: "", min: 0, max: 1 }],
+                    // The common scale's tick labels along one axis, as Excel draws
+                    // them (echarts labels the first indicator axis only); hidden
+                    // with the spec's value axis.
+                    axisLabel: {
+                        show: radarAxisOptions?.visible !== false,
+                        formatter: (value) => formatAxisValue(radarFormats[0], value, locale),
+                    },
                 },
                 legend: applyLegendOverrides({
                     ...legend,
@@ -1788,7 +1805,8 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 // marker-less line with labels (Excel's default "Line" with values
                 // shown) keeps an invisible 0-size symbol per point for the label
                 // to hang off (#1049).
-                const labelsWithoutMarkers = !wantsMarkers && Boolean(spec.dataLabels?.show);
+                const labelsWithoutMarkers = !wantsMarkers &&
+                    Boolean(resolveSeriesDataLabels(spec.dataLabels, seriesAny)?.show);
                 seriesEntry.showSymbol = wantsMarkers || labelsWithoutMarkers;
                 if (wantsMarkers) {
                     seriesEntry.symbol =
@@ -2456,19 +2474,37 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 }
                 : legendBand.grid;
         // Data labels fall back to the series' axis format when the spec has
-        // no explicit `<c:dLbls><c:numFmt>` — Excel's "Linked to source".
-        const dataLabelOptions = spec.dataLabels;
-        const seriesLabelOptionFor = (s) => buildSeriesLabelOption(dataLabelOptions && !dataLabelOptions.numberFormatPattern
-            ? {
-                ...dataLabelOptions,
-                numberFormatPattern: seriesNumberFormatFor(s),
-            }
-            : dataLabelOptions, s?.type, locale);
+        // no explicit `<c:dLbls><c:numFmt>` — Excel's "Linked to source". A
+        // series' own `dataLabels` replace the chart-level ones for it (#1059).
+        const chartDataLabels = spec.dataLabels;
+        const seriesLabelOptionFor = (s) => {
+            const specIndex = chartSeriesSpecIndex(s?.id);
+            const dataLabelOptions = resolveSeriesDataLabels(chartDataLabels, specIndex === undefined ? undefined : spec.series?.[specIndex]);
+            return buildSeriesLabelOption(dataLabelOptions && !dataLabelOptions.numberFormatPattern
+                ? {
+                    ...dataLabelOptions,
+                    numberFormatPattern: seriesNumberFormatFor(s),
+                }
+                : dataLabelOptions, s?.type, locale);
+        };
         // For doughnut, surface the inner-radius hole on each pie series.
         // Excel persists `holeSize` as a 0-90 percentage; we normalize to a
         // 0-1 fraction (doughnutHoleSize). Default to 0.5 when unset.
         const isDoughnut = spec.chartType === "doughnut";
         const doughnutHoleSize = spec.doughnutHoleSize;
+        // Excel nests a doughnut's series as concentric rings, series 0
+        // innermost (#1065): the ring each pie series draws is its rank among
+        // the spec-tagged pie series.
+        const doughnutSeriesOrder = isDoughnut
+            ? chartSeries
+                .filter((s) => s?.type === "pie")
+                .map((s) => chartSeriesSpecIndex(s?.id))
+                .filter((i) => i !== undefined)
+                .sort((a, b) => a - b)
+            : [];
+        const doughnutRingSet = isDoughnut
+            ? doughnutRings(clampDoughnutHole(doughnutHoleSize), doughnutSeriesOrder.length)
+            : [];
         // Exploded pie / doughnut: every slice sits in the `select` state,
         // offset outward by the spec's percentage of the pie radius.
         const explosion = isCircularChart && !isOfPie ? resolveExplosion(spec) : 0;
@@ -2519,6 +2555,12 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             if (seriesLabelOption) {
                 next.label = { ...(s?.label ?? {}), ...seriesLabelOption };
             }
+            else if (s?.type === "pie") {
+                // echarts labels every pie slice by default (category name on a
+                // leader line); Excel draws nothing until data labels are on (#1062).
+                next.label = { ...(s?.label ?? {}), show: false };
+                next.labelLine = { ...(s?.labelLine ?? {}), show: false };
+            }
             // Tooltip values of the value-axis series (a boxplot / candlestick
             // tooltip lists its own statistics and keeps echarts' default).
             const seriesTooltipValueFormatter = VALUE_TOOLTIP_SERIES_TYPES.has(s?.type)
@@ -2547,10 +2589,15 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 }
             }
             if (isDoughnut && next.type === "pie") {
-                const inner = typeof doughnutHoleSize === "number"
-                    ? Math.round(Math.max(0, Math.min(0.9, doughnutHoleSize)) * 100)
-                    : 50;
-                next.radius = [`${inner}%`, "75%"];
+                // The hole is a fraction of the OUTER radius (Excel's `<c:holeSize>`),
+                // and the doughnut's outer edge sits at 75% of the chart — so every
+                // ring edge is its fraction of 75%, not of the whole chart (#1064:
+                // Excel's default 0.75 used to meet the outer edge, an empty ring).
+                const rank = doughnutSeriesOrder.indexOf(chartSeriesSpecIndex(s?.id));
+                const ring = doughnutRingSet[rank] ??
+                    doughnutRings(clampDoughnutHole(doughnutHoleSize), 1)[0];
+                const pct = (fraction) => `${Math.round(fraction * 75 * 100) / 100}%`;
+                next.radius = [pct(ring.inner), pct(ring.outer)];
             }
             return next;
         });

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

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../../plotly/basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAuZxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA00EjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../../plotly/basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAyZxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAq3EjB,CAAC"}

package/dist/esm/plotly/basic-chart/basic-chart.js

@@ -17,6 +17,8 @@ import { computeErrorBars, resolveCustomErrorBarValues, } from "../../utils/erro
 import { plotlyMulticategoryX, resolveCategoryLevels, } from "../../utils/category-levels";
 import { gradientToPlotly } from "../../utils/gradient";
 import { BAND_GAP, legendLabelsFrom, measureTextWidth, reservePlotlyLegendBand, } from "../../utils/legend-layout";
+import { clampDoughnutHole, doughnutRings } from "../../utils/doughnut";
+import { resolveSeriesDataLabels } from "../../utils/overrides";
 import { plotlyTitleText } from "../../utils/plotly-title";
 import { explosionToPlotlyPull, resolveExplosion, } from "../../utils/pie-explosion";
 import { resolvePlotlyClickSelection, wasDragged, } from "../../utils/plotly-click";
@@ -882,7 +884,10 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             }
             // buildRadarIndicators keeps category/value alignment consistent
             // with the echarts renderer (and validates we have axes).
-            const indicators = buildRadarIndicators(categories, radarInputs);
+            // One value scale for every axis (Excel), from the spec's value-axis
+            // min / max when set (#1066).
+            const radarAxisOptions = spec.valueAxisOptions;
+            const indicators = buildRadarIndicators(categories, radarInputs, radarAxisOptions);
             for (let i = 0; i < radarInputs.length; i++) {
                 const input = radarInputs[i];
                 const seriesColor = spec.series?.[i]?.color ?? undefined;
@@ -898,7 +903,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     ...(seriesColor ? { line: { color: seriesColor } } : {}),
                 });
             }
-            const maxR = indicators.reduce((m, ind) => Math.max(m, ind.max), 0);
+            const radarScale = indicators[0] ?? { min: 0, max: 1 };
             setPlotData(radarTraces);
             setLayout({
                 title: { text: plotlyTitleText(title, spec.titleTextFormat) },
@@ -908,8 +913,8 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 showlegend: radarTraces.length > 1,
                 polar: {
                     radialaxis: {
-                        visible: true,
-                        range: [0, maxR > 0 ? maxR : 1],
+                        visible: radarAxisOptions?.visible !== false,
+                        range: [radarScale.min, radarScale.max],
                     },
                 },
                 margin: { l: 50, r: 50, t: 50, b: 50 },
@@ -2044,8 +2049,26 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 : {}),
         };
         // Phase 5.1: apply data labels per trace, and set the doughnut hole
-        // when chartType === "doughnut".
+        // when chartType === "doughnut". A series' own `dataLabels` replace the
+        // chart-level ones for its trace (#1059).
         const dlOpts = spec.dataLabels;
+        // Excel nests a doughnut's series as concentric rings, series 0
+        // innermost (#1065): each pie trace is scaled into a centred sub-domain
+        // whose radius is its ring's outer edge, with the hole at the inner one.
+        const doughnutSeriesOrder = spec.chartType === "doughnut"
+            ? traces
+                .filter((t) => t?.type === "pie")
+                .map((t) => t?.meta?.rncSeriesIndex)
+                .filter((i) => typeof i === "number")
+                .sort((a, b) => a - b)
+            : [];
+        const doughnutRingSet = spec.chartType === "doughnut"
+            ? doughnutRings(clampDoughnutHole(spec.doughnutHoleSize), doughnutSeriesOrder.length)
+            : [];
+        const traceDataLabels = (trace) => {
+            const specIndex = trace?.meta?.rncSeriesIndex;
+            return resolveSeriesDataLabels(dlOpts, typeof specIndex === "number" ? spec.series?.[specIndex] : undefined);
+        };
         const doughnutHole = spec.doughnutHoleSize;
         // Data labels are linked to each series' OWN source cells (Excel's
         // `<c:dLbls><c:numFmt sourceLinked="1">`); the axis format only steps
@@ -2064,8 +2087,13 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
         const piePull = isOfPie ? undefined : explosionToPlotlyPull(resolveExplosion(spec));
         const formattedTraces = traces.map((trace) => {
             const pattern = traceNumberFormat(trace);
-            let next = applyDataLabelsToTracePlotly(trace, dlOpts, spec.chartType, pattern, locale);
+            let next = applyDataLabelsToTracePlotly(trace, traceDataLabels(trace), spec.chartType, pattern, locale);
             if (next.type === "pie") {
+                // Plotly's pie prints every slice's percentage by default; Excel
+                // draws nothing until data labels are on (#1062).
+                if (!traceDataLabels(trace)?.show) {
+                    next = { ...next, textinfo: "none" };
+                }
                 // Hover values format like the slice's source cell.
                 if (pattern && !next.text) {
                     const values = Array.isArray(next.values) ? next.values : [];
@@ -2108,12 +2136,17 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             // (doughnutHoleSize); clamp like the echarts renderer and default
             // to 0.5 when unset.
             if (spec.chartType === "doughnut" && next.type === "pie") {
-                next = {
-                    ...next,
-                    hole: typeof doughnutHole === "number"
-                        ? Math.max(0, Math.min(0.9, doughnutHole))
-                        : 0.5,
-                };
+                const rank = doughnutSeriesOrder.indexOf(next.meta?.rncSeriesIndex);
+                const ring = doughnutRingSet[rank] ?? doughnutRings(clampDoughnutHole(doughnutHole), 1)[0];
+                // Plotly's `hole` is a fraction of the trace's own radius.
+                next = { ...next, hole: ring.inner / ring.outer };
+                if (doughnutRingSet.length > 1) {
+                    const half = ring.outer / 2;
+                    next = {
+                        ...next,
+                        domain: { x: [0.5 - half, 0.5 + half], y: [0.5 - half, 0.5 + half] },
+                    };
+                }
             }
             return next;
         });

package/dist/esm/tsconfig.esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/plot.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}
+{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/plot.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/doughnut.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}

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

@@ -0,0 +1,19 @@
+/**
+ * Doughnut geometry shared by the renderers (rowsncolumns/spreadsheet#1064,
+ * #1065). Every fraction here is of the doughnut's OUTER radius — Excel's
+ * `<c:holeSize val="75"/>` is 0.75 of the outer edge, whatever the chart
+ * draws that edge at (echarts: 75% of the chart; plotly: the trace domain).
+ */
+/** `doughnutHoleSize` clamped to Excel's 0-90% range; 0.5 when unset. */
+export declare const clampDoughnutHole: (hole: unknown) => number;
+export type DoughnutRing = {
+    inner: number;
+    outer: number;
+};
+/**
+ * Excel draws a doughnut's series as concentric rings, nested from the hole
+ * outwards — series 0 innermost — splitting the band between the hole and
+ * the outer edge evenly. One ring (the whole band) for a single series.
+ */
+export declare const doughnutRings: (hole: number, count: number) => DoughnutRing[];
+//# sourceMappingURL=doughnut.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"doughnut.d.ts","sourceRoot":"","sources":["../../../utils/doughnut.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,yEAAyE;AACzE,eAAO,MAAM,iBAAiB,GAAI,MAAM,OAAO,KAAG,MACiB,CAAC;AAEpE,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,KAAG,YAAY,EAOvE,CAAC"}

package/dist/esm/utils/doughnut.js

@@ -0,0 +1,21 @@
+/**
+ * Doughnut geometry shared by the renderers (rowsncolumns/spreadsheet#1064,
+ * #1065). Every fraction here is of the doughnut's OUTER radius — Excel's
+ * `<c:holeSize val="75"/>` is 0.75 of the outer edge, whatever the chart
+ * draws that edge at (echarts: 75% of the chart; plotly: the trace domain).
+ */
+/** `doughnutHoleSize` clamped to Excel's 0-90% range; 0.5 when unset. */
+export const clampDoughnutHole = (hole) => typeof hole === "number" ? Math.max(0, Math.min(0.9, hole)) : 0.5;
+/**
+ * Excel draws a doughnut's series as concentric rings, nested from the hole
+ * outwards — series 0 innermost — splitting the band between the hole and
+ * the outer edge evenly. One ring (the whole band) for a single series.
+ */
+export const doughnutRings = (hole, count) => {
+    const n = Math.max(1, Math.floor(count));
+    const band = 1 - hole;
+    return Array.from({ length: n }, (_, k) => ({
+        inner: hole + (band * k) / n,
+        outer: hole + (band * (k + 1)) / n,
+    }));
+};