@rowsncolumns/charts 28.1.7 → 28.1.8

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

@@ -21,6 +21,8 @@ var error_bars_1 = require("../../utils/error-bars");
 var category_levels_1 = require("../../utils/category-levels");
 var gradient_1 = require("../../utils/gradient");
 var legend_layout_1 = require("../../utils/legend-layout");
+var doughnut_1 = require("../../utils/doughnut");
+var overrides_1 = require("../../utils/overrides");
 var plotly_title_1 = require("../../utils/plotly-title");
 var pie_explosion_1 = require("../../utils/pie-explosion");
 var plotly_click_1 = require("../../utils/plotly-click");
@@ -491,11 +493,11 @@ var BasicChart = function (_a) {
      * Triggers a chart update
      */
     var updateChart = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var traces, chartType, position, isBubble, isHierarchy, textColor, bgColor, gridColor, skipHeaders_1, labels, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _a, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _b, categories_1, preparedSeries, sizeValues, sizeScale_1, hasStringX_1, palette_1, isScatter_1, scatterStyle_1, plotlyModeForScatterStyle_1, lineShapeFor_1, traces_1, titleFmt, xAxisFmt, yAxisFmt, legendFmt, bubbleLayout, hierarchyRows, headerTitle, hierarchyData, seriesName, hierarchyTrace, layoutForHierarchy, labels, seriesEntry, rawValues_1, locations_1, z_1, ramp_1, colorscale, geoScope, regionTrace, surfaceToken, categories, surfaceSeriesInputs, _c, _d, seriesEntry, dataLabel, _e, _f, values, e_2_1, seriesNames, surfaceTrace, surfaceLayout, categories, radarStyle, radarTraces, radarInputs, _g, _h, seriesEntry, label, values, indicators, _loop_1, i, maxR, variant, categories, seriesValues, volumePoints_1, hasVolume, buildVolumeTrace, volumeLayout, priceYAxisDomain, roles, xs_1, candleTrace, lineSeries, stockPalette_1, xs_2, stockTraces, isStacked, isHorizontalBarChart, lineTraceVariant, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, domainData, categoryLevels, multicategoryX, aggregateDomainValues, domainAxisData, secondaryDomainData, categoriesFor, assignCartesianData, themeColorPalette, applyTraceColor, hasSecondaryAxis, hasSecondaryCategoryAxis, valueAxisKey, categoryAxisKey, secondaryValueAxisRef, secondaryCategoryAxisRef, isPareto, isOfPie, ofPieHandled, ofPieExtras, decorateCartesianTrace, domainSources, seriesIndex, _loop_2, _j, _k, series, e_3_1, authoredTitleFmt, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, _l, legendOverrides, showlegend, axisFontSize, primaryValues, leftAxisLabelDepth, leftAxisDepth, rightAxisDepth, bottomAxisTitleStandoff, legendBand, newLayout, dlOpts, doughnutHole, seriesNumberFormats, traceNumberFormat, piePull, formattedTraces, sortedTraces;
+        var traces, chartType, position, isBubble, isHierarchy, textColor, bgColor, gridColor, skipHeaders_1, labels, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _a, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _b, categories_1, preparedSeries, sizeValues, sizeScale_1, hasStringX_1, palette_1, isScatter_1, scatterStyle_1, plotlyModeForScatterStyle_1, lineShapeFor_1, traces_1, titleFmt, xAxisFmt, yAxisFmt, legendFmt, bubbleLayout, hierarchyRows, headerTitle, hierarchyData, seriesName, hierarchyTrace, layoutForHierarchy, labels, seriesEntry, rawValues_1, locations_1, z_1, ramp_1, colorscale, geoScope, regionTrace, surfaceToken, categories, surfaceSeriesInputs, _c, _d, seriesEntry, dataLabel, _e, _f, values, e_2_1, seriesNames, surfaceTrace, surfaceLayout, categories, radarStyle, radarTraces, radarInputs, _g, _h, seriesEntry, label, values, radarAxisOptions, indicators, _loop_1, i, radarScale, variant, categories, seriesValues, volumePoints_1, hasVolume, buildVolumeTrace, volumeLayout, priceYAxisDomain, roles, xs_1, candleTrace, lineSeries, stockPalette_1, xs_2, stockTraces, isStacked, isHorizontalBarChart, lineTraceVariant, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, domainData, categoryLevels, multicategoryX, aggregateDomainValues, domainAxisData, secondaryDomainData, categoriesFor, assignCartesianData, themeColorPalette, applyTraceColor, hasSecondaryAxis, hasSecondaryCategoryAxis, valueAxisKey, categoryAxisKey, secondaryValueAxisRef, secondaryCategoryAxisRef, isPareto, isOfPie, ofPieHandled, ofPieExtras, decorateCartesianTrace, domainSources, seriesIndex, _loop_2, _j, _k, series, e_3_1, authoredTitleFmt, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, _l, legendOverrides, showlegend, axisFontSize, primaryValues, leftAxisLabelDepth, leftAxisDepth, rightAxisDepth, bottomAxisTitleStandoff, legendBand, newLayout, dlOpts, doughnutSeriesOrder, doughnutRingSet, traceDataLabels, doughnutHole, seriesNumberFormats, traceNumberFormat, piePull, formattedTraces, sortedTraces;
         var e_2, _m, e_4, _o, e_3, _p, _q, _r;
-        var _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75;
-        return tslib_1.__generator(this, function (_76) {
-            switch (_76.label) {
+        var _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76;
+        return tslib_1.__generator(this, function (_77) {
+            switch (_77.label) {
                 case 0:
                     (0, utils_1.debug)("Updating chart", chart);
                     traces = [];
@@ -520,7 +522,7 @@ var BasicChart = function (_a) {
                     });
                     seriesInputs = [];
                     i = 0;
-                    _76.label = 1;
+                    _77.label = 1;
                 case 1:
                     if (!(i < spec.series.length)) return [3 /*break*/, 5];
                     seriesEntry = spec.series[i];
@@ -529,13 +531,13 @@ var BasicChart = function (_a) {
                     _a = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(resolvedLabel, (_w = chart.position.sheetId) !== null && _w !== void 0 ? _w : sheetId, chart.position.overlayPosition.anchorCell.rowIndex, chart.position.overlayPosition.anchorCell.columnIndex)];
                 case 2:
-                    resolvedLabel = _a.apply(void 0, [_76.sent()]);
-                    _76.label = 3;
+                    resolvedLabel = _a.apply(void 0, [_77.sent()]);
+                    _77.label = 3;
                 case 3:
                     xValues = (_x = perSeriesX[i]) !== null && _x !== void 0 ? _x : perSeriesX[0];
                     sizeValues_1 = (_y = perSeriesSize[i]) !== null && _y !== void 0 ? _y : perSeriesSize[0];
                     seriesInputs.push(tslib_1.__assign(tslib_1.__assign({ name: resolvedLabel, values: flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders_1) }, (xValues ? { xValues: xValues } : {})), (sizeValues_1 ? { sizeValues: sizeValues_1 } : {})));
-                    _76.label = 4;
+                    _77.label = 4;
                 case 4:
                     i++;
                     return [3 /*break*/, 1];
@@ -810,11 +812,11 @@ var BasicChart = function (_a) {
                     if (!(surfaceToken === "SURFACE" || surfaceToken === "SURFACE_3D")) return [3 /*break*/, 17];
                     categories = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                     surfaceSeriesInputs = [];
-                    _76.label = 7;
+                    _77.label = 7;
                 case 7:
-                    _76.trys.push([7, 14, 15, 16]);
+                    _77.trys.push([7, 14, 15, 16]);
                     _c = tslib_1.__values((_18 = spec.series) !== null && _18 !== void 0 ? _18 : []), _d = _c.next();
-                    _76.label = 8;
+                    _77.label = 8;
                 case 8:
                     if (!!_d.done) return [3 /*break*/, 13];
                     seriesEntry = _d.value;
@@ -822,22 +824,22 @@ var BasicChart = function (_a) {
                     _f = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_19 = position.sheetId) !== null && _19 !== void 0 ? _19 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 9:
-                    _e = _f.apply(void 0, [_76.sent()]);
+                    _e = _f.apply(void 0, [_77.sent()]);
                     return [3 /*break*/, 11];
                 case 10:
                     _e = (_20 = seriesEntry.dataLabel) !== null && _20 !== void 0 ? _20 : "";
-                    _76.label = 11;
+                    _77.label = 11;
                 case 11:
                     dataLabel = _e;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
                     surfaceSeriesInputs.push({ name: dataLabel, values: values });
-                    _76.label = 12;
+                    _77.label = 12;
                 case 12:
                     _d = _c.next();
                     return [3 /*break*/, 8];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_2_1 = _76.sent();
+                    e_2_1 = _77.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 16];
                 case 15:
@@ -911,7 +913,8 @@ var BasicChart = function (_a) {
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
-                        indicators = (0, radar_1.buildRadarIndicators)(categories, radarInputs);
+                        radarAxisOptions = spec.valueAxisOptions;
+                        indicators = (0, radar_1.buildRadarIndicators)(categories, radarInputs, radarAxisOptions);
                         _loop_1 = function (i) {
                             var input = radarInputs[i];
                             var seriesColor = (_29 = (_28 = (_27 = spec.series) === null || _27 === void 0 ? void 0 : _27[i]) === null || _28 === void 0 ? void 0 : _28.color) !== null && _29 !== void 0 ? _29 : undefined;
@@ -922,7 +925,7 @@ var BasicChart = function (_a) {
                         for (i = 0; i < radarInputs.length; i++) {
                             _loop_1(i);
                         }
-                        maxR = indicators.reduce(function (m, ind) { return Math.max(m, ind.max); }, 0);
+                        radarScale = (_30 = indicators[0]) !== null && _30 !== void 0 ? _30 : { min: 0, max: 1 };
                         setPlotData(radarTraces);
                         setLayout({
                             title: { text: (0, plotly_title_1.plotlyTitleText)(title, spec.titleTextFormat) },
@@ -932,8 +935,8 @@ var BasicChart = function (_a) {
                             showlegend: radarTraces.length > 1,
                             polar: {
                                 radialaxis: {
-                                    visible: true,
-                                    range: [0, maxR > 0 ? maxR : 1],
+                                    visible: (radarAxisOptions === null || radarAxisOptions === void 0 ? void 0 : radarAxisOptions.visible) !== false,
+                                    range: [radarScale.min, radarScale.max],
                                 },
                             },
                             margin: { l: 50, r: 50, t: 50, b: 50 },
@@ -946,13 +949,13 @@ var BasicChart = function (_a) {
                     // V-variants additionally get a volume column sub-pane below the
                     // price plot.
                     if (spec.chartType === "stock") {
-                        variant = ((_30 = spec.stockVariant) !== null && _30 !== void 0 ? _30 : "HLC");
+                        variant = ((_31 = spec.stockVariant) !== null && _31 !== void 0 ? _31 : "HLC");
                         categories = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesValues = ((_31 = spec.series) !== null && _31 !== void 0 ? _31 : []).map(function (seriesEntry) {
+                        seriesValues = ((_32 = spec.series) !== null && _32 !== void 0 ? _32 : []).map(function (seriesEntry) {
                             return flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
                         });
                         volumePoints_1 = (0, stock_1.toVolumeSeries)(seriesValues, variant);
-                        hasVolume = ((_32 = volumePoints_1 === null || volumePoints_1 === void 0 ? void 0 : volumePoints_1.length) !== null && _32 !== void 0 ? _32 : 0) > 0;
+                        hasVolume = ((_33 = volumePoints_1 === null || volumePoints_1 === void 0 ? void 0 : volumePoints_1.length) !== null && _33 !== void 0 ? _33 : 0) > 0;
                         buildVolumeTrace = function (xs) {
                             return ({
                                 type: "bar",
@@ -985,25 +988,25 @@ var BasicChart = function (_a) {
                             roles = (0, stock_1.assignStockRoles)(seriesValues, variant);
                             xs_1 = categories.length > 0
                                 ? categories
-                                : ((_33 = roles.close) !== null && _33 !== void 0 ? _33 : []).map(function (_, i) { return i + 1; });
+                                : ((_34 = roles.close) !== null && _34 !== void 0 ? _34 : []).map(function (_, i) { return i + 1; });
                             candleTrace = {
                                 type: "candlestick",
                                 x: xs_1,
-                                open: ((_34 = roles.open) !== null && _34 !== void 0 ? _34 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
-                                high: ((_35 = roles.high) !== null && _35 !== void 0 ? _35 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
-                                low: ((_36 = roles.low) !== null && _36 !== void 0 ? _36 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
-                                close: ((_37 = roles.close) !== null && _37 !== void 0 ? _37 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
+                                open: ((_35 = roles.open) !== null && _35 !== void 0 ? _35 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
+                                high: ((_36 = roles.high) !== null && _36 !== void 0 ? _36 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
+                                low: ((_37 = roles.low) !== null && _37 !== void 0 ? _37 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
+                                close: ((_38 = roles.close) !== null && _38 !== void 0 ? _38 : []).map(function (v) { return v !== null && v !== void 0 ? v : null; }),
                                 increasing: { line: { color: theme.themeColors.accent1 } },
                                 decreasing: { line: { color: theme.themeColors.accent2 } },
                             };
                             setPlotData(hasVolume ? [candleTrace, buildVolumeTrace(xs_1)] : [candleTrace]);
                             setLayout(tslib_1.__assign(tslib_1.__assign({ title: { text: (0, plotly_title_1.plotlyTitleText)(title, spec.titleTextFormat) }, font: { color: textColor }, paper_bgcolor: bgColor, plot_bgcolor: bgColor, showlegend: false, xaxis: {
-                                    title: { text: (_38 = spec.horizontalAxisTitle) !== null && _38 !== void 0 ? _38 : "" },
+                                    title: { text: (_39 = spec.horizontalAxisTitle) !== null && _39 !== void 0 ? _39 : "" },
                                     automargin: true,
                                     showgrid: true,
                                     gridcolor: gridColor,
                                     rangeslider: { visible: false },
-                                }, yaxis: tslib_1.__assign({ title: { text: (_39 = spec.verticalAxisTitle) !== null && _39 !== void 0 ? _39 : "" }, automargin: true, showgrid: true, gridcolor: gridColor }, priceYAxisDomain) }, volumeLayout), { margin: { l: 50, r: 50, t: 50, b: 50 }, autosize: true }));
+                                }, yaxis: tslib_1.__assign({ title: { text: (_40 = spec.verticalAxisTitle) !== null && _40 !== void 0 ? _40 : "" }, automargin: true, showgrid: true, gridcolor: gridColor }, priceYAxisDomain) }, volumeLayout), { margin: { l: 50, r: 50, t: 50, b: 50 }, autosize: true }));
                             return [2 /*return*/];
                         }
                         lineSeries = (0, stock_1.toLineSeries)(seriesValues, variant);
@@ -1015,7 +1018,7 @@ var BasicChart = function (_a) {
                         ]);
                         xs_2 = categories.length > 0
                             ? categories
-                            : ((_41 = (_40 = lineSeries[0]) === null || _40 === void 0 ? void 0 : _40.values) !== null && _41 !== void 0 ? _41 : []).map(function (_, i) { return i + 1; });
+                            : ((_42 = (_41 = lineSeries[0]) === null || _41 === void 0 ? void 0 : _41.values) !== null && _42 !== void 0 ? _42 : []).map(function (_, i) { return i + 1; });
                         stockTraces = lineSeries.map(function (s, i) { return ({
                             type: "scatter",
                             mode: "lines",
@@ -1026,11 +1029,11 @@ var BasicChart = function (_a) {
                         }); });
                         setPlotData(hasVolume ? tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(stockTraces), false), [buildVolumeTrace(xs_2)], false) : stockTraces);
                         setLayout(tslib_1.__assign(tslib_1.__assign({ title: { text: (0, plotly_title_1.plotlyTitleText)(title, spec.titleTextFormat) }, font: { color: textColor }, paper_bgcolor: bgColor, plot_bgcolor: bgColor, showlegend: stockTraces.length > 1, xaxis: {
-                                title: { text: (_42 = spec.horizontalAxisTitle) !== null && _42 !== void 0 ? _42 : "" },
+                                title: { text: (_43 = spec.horizontalAxisTitle) !== null && _43 !== void 0 ? _43 : "" },
                                 automargin: true,
                                 showgrid: true,
                                 gridcolor: gridColor,
-                            }, yaxis: tslib_1.__assign({ title: { text: (_43 = spec.verticalAxisTitle) !== null && _43 !== void 0 ? _43 : "" }, automargin: true, showgrid: true, gridcolor: gridColor }, priceYAxisDomain) }, volumeLayout), { margin: { l: 50, r: 50, t: 50, b: 50 }, autosize: true }));
+                            }, yaxis: tslib_1.__assign({ title: { text: (_44 = spec.verticalAxisTitle) !== null && _44 !== void 0 ? _44 : "" }, automargin: true, showgrid: true, gridcolor: gridColor }, priceYAxisDomain) }, volumeLayout), { margin: { l: 50, r: 50, t: 50, b: 50 }, autosize: true }));
                         return [2 /*return*/];
                     }
                     isStacked = spec.stackedType && spec.stackedType !== "UNSTACKED";
@@ -1077,12 +1080,12 @@ var BasicChart = function (_a) {
                         return extra;
                     };
                     shouldAggregate = (0, aggregation_1.shouldAggregateSeries)(spec.series);
-                    primaryDomainSource = (_46 = (_45 = (_44 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _44 === void 0 ? void 0 : _44[0]) === null || _45 === void 0 ? void 0 : _45.sources) === null || _46 === void 0 ? void 0 : _46[0];
+                    primaryDomainSource = (_47 = (_46 = (_45 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _45 === void 0 ? void 0 : _45[0]) === null || _46 === void 0 ? void 0 : _46.sources) === null || _47 === void 0 ? void 0 : _47[0];
                     rawPrimaryDomainValues = primaryDomainSource
-                        ? (0, aggregation_1.sanitizeDomainValues)((_47 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _47 !== void 0 ? _47 : [])
+                        ? (0, aggregation_1.sanitizeDomainValues)((_48 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _48 !== void 0 ? _48 : [])
                         : [];
                     domainData = (0, aggregation_1.getDomainValuesForAxis)(rawPrimaryDomainValues, shouldAggregate);
-                    categoryLevels = (0, category_levels_1.resolveCategoryLevels)((_48 = spec.categoryLevels) === null || _48 === void 0 ? void 0 : _48.map(function (level) {
+                    categoryLevels = (0, category_levels_1.resolveCategoryLevels)((_49 = spec.categoryLevels) === null || _49 === void 0 ? void 0 : _49.map(function (level) {
                         return flattenChartDataValues([level], getDomainValuesFromRange, spec.hiddenDimensionStrategy, false);
                     }));
                     multicategoryX = categoryLevels
@@ -1092,7 +1095,7 @@ var BasicChart = function (_a) {
                         domainData = categoryLevels.leaf;
                     }
                     aggregateDomainValues = domainData;
-                    domainAxisData = (categoryLevels ? [] : (_49 = spec.domains) !== null && _49 !== void 0 ? _49 : []).map(function (domain, domainIndex) {
+                    domainAxisData = (categoryLevels ? [] : (_50 = spec.domains) !== null && _50 !== void 0 ? _50 : []).map(function (domain, domainIndex) {
                         return domain.sources.flatMap(function (sheetRange, sourceIndex) {
                             var _a;
                             if (domainIndex === 0 && sourceIndex === 0) {
@@ -1161,12 +1164,12 @@ var BasicChart = function (_a) {
                         if ((isBarOrColumn || isPie) &&
                             Array.isArray(options === null || options === void 0 ? void 0 : options.dataPointColors) &&
                             (options === null || options === void 0 ? void 0 : options.dataPointColors.length)) {
-                            var overrides_1 = new Map();
+                            var overrides_2 = new Map();
                             try {
                                 for (var _u = tslib_1.__values(options.dataPointColors), _v = _u.next(); !_v.done; _v = _u.next()) {
                                     var dp = _v.value;
                                     if (typeof dp.idx === "number" && typeof dp.color === "string") {
-                                        overrides_1.set(dp.idx, dp.color);
+                                        overrides_2.set(dp.idx, dp.color);
                                     }
                                 }
                             }
@@ -1189,7 +1192,7 @@ var BasicChart = function (_a) {
                                     : 0;
                                 target.marker = tslib_1.__assign(tslib_1.__assign({}, ((_j = target.marker) !== null && _j !== void 0 ? _j : {})), { colors: Array.from({ length: labelCount }, function (_, i) {
                                         var _a, _b;
-                                        return (_b = (_a = overrides_1.get(i)) !== null && _a !== void 0 ? _a : seriesColor) !== null && _b !== void 0 ? _b : existing_1[i % Math.max(1, existing_1.length)];
+                                        return (_b = (_a = overrides_2.get(i)) !== null && _a !== void 0 ? _a : seriesColor) !== null && _b !== void 0 ? _b : existing_1[i % Math.max(1, existing_1.length)];
                                     }) });
                                 return trace;
                             }
@@ -1199,7 +1202,7 @@ var BasicChart = function (_a) {
                                 : Array.isArray(target.x)
                                     ? target.x
                                     : [];
-                            var colors = yArray.map(function (_, i) { var _a; return (_a = overrides_1.get(i)) !== null && _a !== void 0 ? _a : fallback_1; });
+                            var colors = yArray.map(function (_, i) { var _a; return (_a = overrides_2.get(i)) !== null && _a !== void 0 ? _a : fallback_1; });
                             target.marker = tslib_1.__assign(tslib_1.__assign({}, ((_k = target.marker) !== null && _k !== void 0 ? _k : {})), { color: colors });
                             return trace;
                         }
@@ -1348,29 +1351,29 @@ var BasicChart = function (_a) {
                             finally { if (e_6) throw e_6.error; }
                         }
                     };
-                    domainSources = (_52 = (_51 = (_50 = spec.domains) === null || _50 === void 0 ? void 0 : _50[0]) === null || _51 === void 0 ? void 0 : _51.sources) !== null && _52 !== void 0 ? _52 : [];
+                    domainSources = (_53 = (_52 = (_51 = spec.domains) === null || _51 === void 0 ? void 0 : _51[0]) === null || _52 === void 0 ? void 0 : _52.sources) !== null && _53 !== void 0 ? _53 : [];
                     seriesIndex = 0;
                     _loop_2 = function (series) {
-                        var currentSeriesIndex, dataLabel, _77, _78, effectiveChartType, lineLike, pieDomainLabels, piePointOffset, seriesData, seriesPlotlyType, seriesTraceStyle, rawValues, binCount, _79, labels, counts, cumulativePercents, barTrace, trace, rawValues, quartileMethod, showOutliers, showMeanMarker, usePrecomputed, trace, summary, hideOutliers, rawValues, totalIndices_1, trace, rawValues, trace, pieData, _80, main_1, secondary, otherTotal, total, ofPieType, secondScale, halfAngle, paletteAt_1, MAIN_DOMAIN_X, CY, SECONDARY_CX, BAR_LEFT, BAR_RIGHT, plotW, plotH, hasGeometry, r, r2, clampFrac, rx2, ry2, barHalf, shapes, connectorColor, mainCx, px, pyTop, pyBottom, tx, half, line, pieData, trace, _81, x, y, orientation_1, trace, numericValues, _82, x, y, orientation_2, trace;
-                        return tslib_1.__generator(this, function (_83) {
-                            switch (_83.label) {
+                        var currentSeriesIndex, dataLabel, _78, _79, effectiveChartType, lineLike, pieDomainLabels, piePointOffset, seriesData, seriesPlotlyType, seriesTraceStyle, rawValues, binCount, _80, labels, counts, cumulativePercents, barTrace, trace, rawValues, quartileMethod, showOutliers, showMeanMarker, usePrecomputed, trace, summary, hideOutliers, rawValues, totalIndices_1, trace, rawValues, trace, pieData, _81, main_1, secondary, otherTotal, total, ofPieType, secondScale, halfAngle, paletteAt_1, MAIN_DOMAIN_X, CY, SECONDARY_CX, BAR_LEFT, BAR_RIGHT, plotW, plotH, hasGeometry, r, r2, clampFrac, rx2, ry2, barHalf, shapes, connectorColor, mainCx, px, pyTop, pyBottom, tx, half, line, pieData, trace, _82, x, y, orientation_1, trace, numericValues, _83, x, y, orientation_2, trace;
+                        return tslib_1.__generator(this, function (_84) {
+                            switch (_84.label) {
                                 case 0:
                                     currentSeriesIndex = seriesIndex++;
                                     if (!(!(0, utils_1.isNil)(series.dataLabel) && (0, utils_1.isAFormula)(series.dataLabel))) return [3 /*break*/, 2];
-                                    _78 = chart_spec_utils_1.coerceCalculatedLabel;
-                                    return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_54 = position.sheetId) !== null && _54 !== void 0 ? _54 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
+                                    _79 = chart_spec_utils_1.coerceCalculatedLabel;
+                                    return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_55 = position.sheetId) !== null && _55 !== void 0 ? _55 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                                 case 1:
-                                    _77 = _78.apply(void 0, [_83.sent()]);
+                                    _78 = _79.apply(void 0, [_84.sent()]);
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    _77 = (_55 = series.dataLabel) !== null && _55 !== void 0 ? _55 : "";
-                                    _83.label = 3;
+                                    _78 = (_56 = series.dataLabel) !== null && _56 !== void 0 ? _56 : "";
+                                    _84.label = 3;
                                 case 3:
-                                    dataLabel = _77;
+                                    dataLabel = _78;
                                     // A series with no ranges draws nothing.
                                     if (series.sources.length === 0)
                                         return [2 /*return*/, "continue"];
-                                    effectiveChartType = (_56 = series.seriesChartType) !== null && _56 !== void 0 ? _56 : spec.chartType;
+                                    effectiveChartType = (_57 = series.seriesChartType) !== null && _57 !== void 0 ? _57 : spec.chartType;
                                     lineLike = (0, empty_cells_1.isLineLikeChartType)(effectiveChartType);
                                     pieDomainLabels = (spec.chartType === "pie" || spec.chartType === "doughnut") &&
                                         (domainSources.length > 1 || series.sources.length > 1)
@@ -1408,14 +1411,14 @@ var BasicChart = function (_a) {
                                             : seriesData;
                                         binCount = spec.binCount;
                                         if (isPareto) {
-                                            _79 = (0, histogram_1.computePareto)((0, histogram_1.binHistogram)(rawValues, binCount)), labels = _79.labels, counts = _79.counts, cumulativePercents = _79.cumulativePercents;
+                                            _80 = (0, histogram_1.computePareto)((0, histogram_1.binHistogram)(rawValues, binCount)), labels = _80.labels, counts = _80.counts, cumulativePercents = _80.cumulativePercents;
                                             barTrace = {
                                                 type: "bar",
                                                 x: labels,
                                                 y: counts,
                                                 name: dataLabel,
                                             };
-                                            applyTraceColor(barTrace, (_57 = series.color) !== null && _57 !== void 0 ? _57 : undefined, {
+                                            applyTraceColor(barTrace, (_58 = series.color) !== null && _58 !== void 0 ? _58 : undefined, {
                                                 noFill: series.noFill,
                                                 dataPointColors: series.dataPointColors,
                                                 seriesIndex: currentSeriesIndex,
@@ -1436,7 +1439,7 @@ var BasicChart = function (_a) {
                                             trace = tslib_1.__assign({ type: "histogram", x: rawValues.map(function (v) { return (v !== null && v !== void 0 ? v : null); }), name: dataLabel }, (typeof binCount === "number" && binCount > 0
                                                 ? { nbinsx: binCount }
                                                 : {}));
-                                            applyTraceColor(trace, (_58 = series.color) !== null && _58 !== void 0 ? _58 : undefined, {
+                                            applyTraceColor(trace, (_59 = series.color) !== null && _59 !== void 0 ? _59 : undefined, {
                                                 noFill: series.noFill,
                                                 dataPointColors: series.dataPointColors,
                                                 seriesIndex: currentSeriesIndex,
@@ -1486,7 +1489,7 @@ var BasicChart = function (_a) {
                                                 // default and `showOutliers: true` alike).
                                                 boxpoints: "outliers" }, (showMeanMarker ? { boxmean: true } : {}));
                                         }
-                                        applyTraceColor(trace, (_59 = series.color) !== null && _59 !== void 0 ? _59 : undefined, {
+                                        applyTraceColor(trace, (_60 = series.color) !== null && _60 !== void 0 ? _60 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             seriesIndex: currentSeriesIndex,
@@ -1498,7 +1501,7 @@ var BasicChart = function (_a) {
                                         rawValues = "values" in seriesData
                                             ? seriesData.values
                                             : seriesData;
-                                        totalIndices_1 = new Set((_60 = spec.totalIndices) !== null && _60 !== void 0 ? _60 : []);
+                                        totalIndices_1 = new Set((_61 = spec.totalIndices) !== null && _61 !== void 0 ? _61 : []);
                                         trace = {
                                             type: "waterfall",
                                             x: categoriesFor(series),
@@ -1508,7 +1511,7 @@ var BasicChart = function (_a) {
                                             }),
                                             name: dataLabel,
                                         };
-                                        applyTraceColor(trace, (_61 = series.color) !== null && _61 !== void 0 ? _61 : undefined, {
+                                        applyTraceColor(trace, (_62 = series.color) !== null && _62 !== void 0 ? _62 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             seriesIndex: currentSeriesIndex,
@@ -1526,7 +1529,7 @@ var BasicChart = function (_a) {
                                             x: rawValues.map(function (v) { return (v !== null && v !== void 0 ? v : null); }),
                                             name: dataLabel,
                                         };
-                                        applyTraceColor(trace, (_62 = series.color) !== null && _62 !== void 0 ? _62 : undefined, {
+                                        applyTraceColor(trace, (_63 = series.color) !== null && _63 !== void 0 ? _63 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             seriesIndex: currentSeriesIndex,
@@ -1544,10 +1547,10 @@ var BasicChart = function (_a) {
                                             return [2 /*return*/, "continue"];
                                         ofPieHandled = true;
                                         pieData = seriesData;
-                                        _80 = (0, of_pie_1.splitOfPie)(pieData.values, pieData.labels, {
+                                        _81 = (0, of_pie_1.splitOfPie)(pieData.values, pieData.labels, {
                                             splitType: spec.splitType,
                                             splitPos: spec.splitPos,
-                                        }), main_1 = _80.main, secondary = _80.secondary, otherTotal = _80.otherTotal, total = _80.total;
+                                        }), main_1 = _81.main, secondary = _81.secondary, otherTotal = _81.otherTotal, total = _81.total;
                                         ofPieType = (0, of_pie_1.resolveOfPieType)(spec.ofPieType);
                                         secondScale = (0, of_pie_1.clampSecondPieSize)(spec.secondPieSize) / 100;
                                         halfAngle = (0, of_pie_1.otherSliceHalfAngle)(otherTotal, total);
@@ -1680,7 +1683,7 @@ var BasicChart = function (_a) {
                                         trace.meta = {
                                             rncSeriesIndex: currentSeriesIndex,
                                         };
-                                        applyTraceColor(trace, (_63 = series.color) !== null && _63 !== void 0 ? _63 : undefined, {
+                                        applyTraceColor(trace, (_64 = series.color) !== null && _64 !== void 0 ? _64 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             seriesIndex: currentSeriesIndex,
@@ -1689,13 +1692,13 @@ var BasicChart = function (_a) {
                                         traces.push(trace);
                                     }
                                     else if ("values" in seriesData && "labels" in seriesData) {
-                                        _81 = assignCartesianData(categoriesFor(series), seriesData.values), x = _81.x, y = _81.y, orientation_1 = _81.orientation;
+                                        _82 = assignCartesianData(categoriesFor(series), seriesData.values), x = _82.x, y = _82.y, orientation_1 = _82.orientation;
                                         trace = tslib_1.__assign(tslib_1.__assign({ type: seriesPlotlyType, x: x, y: y, orientation: orientation_1, name: dataLabel, stackgroup: isStacked ? "one" : undefined }, seriesTraceStyle), lineTraceVariant(series, effectiveChartType, seriesData.values));
                                         // Ties the trace back to spec.series for click selection
                                         trace.meta = {
                                             rncSeriesIndex: currentSeriesIndex,
                                         };
-                                        applyTraceColor(trace, (_64 = series.color) !== null && _64 !== void 0 ? _64 : undefined, {
+                                        applyTraceColor(trace, (_65 = series.color) !== null && _65 !== void 0 ? _65 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             invertIfNegative: series.invertIfNegative,
@@ -1710,13 +1713,13 @@ var BasicChart = function (_a) {
                                     }
                                     else {
                                         numericValues = seriesData;
-                                        _82 = assignCartesianData(categoriesFor(series), numericValues), x = _82.x, y = _82.y, orientation_2 = _82.orientation;
+                                        _83 = assignCartesianData(categoriesFor(series), numericValues), x = _83.x, y = _83.y, orientation_2 = _83.orientation;
                                         trace = tslib_1.__assign(tslib_1.__assign({ type: seriesPlotlyType, x: x, y: y, orientation: orientation_2, name: dataLabel, stackgroup: isStacked ? "one" : undefined }, seriesTraceStyle), lineTraceVariant(series, effectiveChartType, numericValues));
                                         // Ties the trace back to spec.series for click selection
                                         trace.meta = {
                                             rncSeriesIndex: currentSeriesIndex,
                                         };
-                                        applyTraceColor(trace, (_65 = series.color) !== null && _65 !== void 0 ? _65 : undefined, {
+                                        applyTraceColor(trace, (_66 = series.color) !== null && _66 !== void 0 ? _66 : undefined, {
                                             noFill: series.noFill,
                                             dataPointColors: series.dataPointColors,
                                             invertIfNegative: series.invertIfNegative,
@@ -1733,24 +1736,24 @@ var BasicChart = function (_a) {
                             }
                         });
                     };
-                    _76.label = 18;
+                    _77.label = 18;
                 case 18:
-                    _76.trys.push([18, 23, 24, 25]);
-                    _j = tslib_1.__values((_53 = spec.series) !== null && _53 !== void 0 ? _53 : []), _k = _j.next();
-                    _76.label = 19;
+                    _77.trys.push([18, 23, 24, 25]);
+                    _j = tslib_1.__values((_54 = spec.series) !== null && _54 !== void 0 ? _54 : []), _k = _j.next();
+                    _77.label = 19;
                 case 19:
                     if (!!_k.done) return [3 /*break*/, 22];
                     series = _k.value;
                     return [5 /*yield**/, _loop_2(series)];
                 case 20:
-                    _76.sent();
-                    _76.label = 21;
+                    _77.sent();
+                    _77.label = 21;
                 case 21:
                     _k = _j.next();
                     return [3 /*break*/, 19];
                 case 22: return [3 /*break*/, 25];
                 case 23:
-                    e_3_1 = _76.sent();
+                    e_3_1 = _77.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 25];
                 case 24:
@@ -1767,13 +1770,13 @@ var BasicChart = function (_a) {
                         ? undefined
                         : (0, axis_number_format_1.resolveValueAxisNumberFormat)({
                             axisOptions: spec.valueAxisOptions,
-                            series: ((_66 = spec.series) !== null && _66 !== void 0 ? _66 : []).filter(function (s) { return !s.useSecondaryAxis; }),
+                            series: ((_67 = spec.series) !== null && _67 !== void 0 ? _67 : []).filter(function (s) { return !s.useSecondaryAxis; }),
                             getFormattingFromRange: getFormattingFromRange,
                             hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                         });
                     secondaryAxisNumberFormat = (0, axis_number_format_1.resolveValueAxisNumberFormat)({
                         axisOptions: spec.secondaryValueAxisOptions,
-                        series: ((_67 = spec.series) !== null && _67 !== void 0 ? _67 : []).filter(function (s) { return s.useSecondaryAxis; }),
+                        series: ((_68 = spec.series) !== null && _68 !== void 0 ? _68 : []).filter(function (s) { return s.useSecondaryAxis; }),
                         getFormattingFromRange: getFormattingFromRange,
                         hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                     });
@@ -1821,14 +1824,14 @@ var BasicChart = function (_a) {
                         ? VALUE_AXIS_TITLE_STANDOFF
                         : legend_layout_1.BAND_GAP;
                     legendBand = (0, legend_layout_1.reservePlotlyLegendBand)({
-                        position: (_68 = spec.legend) === null || _68 === void 0 ? void 0 : _68.position,
+                        position: (_69 = spec.legend) === null || _69 === void 0 ? void 0 : _69.position,
                         visible: showlegend !== false,
                         labels: (0, legend_layout_1.legendLabelsFrom)(undefined, traces.map(function (trace) { return trace === null || trace === void 0 ? void 0 : trace.name; })),
-                        legendFontSize: (_71 = (_70 = (_69 = spec.legend) === null || _69 === void 0 ? void 0 : _69.textFormat) === null || _70 === void 0 ? void 0 : _70.fontSize) !== null && _71 !== void 0 ? _71 : axisFontSize,
+                        legendFontSize: (_72 = (_71 = (_70 = spec.legend) === null || _70 === void 0 ? void 0 : _70.textFormat) === null || _71 === void 0 ? void 0 : _71.fontSize) !== null && _72 !== void 0 ? _72 : axisFontSize,
                         width: Math.max(0, (width !== null && width !== void 0 ? width : 0) - 2),
                         height: Math.max(0, (height !== null && height !== void 0 ? height : 0) - 2),
                         hasTitle: Boolean(title),
-                        titleFontSize: (_72 = authoredTitleFmt === null || authoredTitleFmt === void 0 ? void 0 : authoredTitleFmt.fontSize) !== null && _72 !== void 0 ? _72 : 16,
+                        titleFontSize: (_73 = authoredTitleFmt === null || authoredTitleFmt === void 0 ? void 0 : authoredTitleFmt.fontSize) !== null && _73 !== void 0 ? _73 : 16,
                         hasBottomAxisTitle: Boolean(spec.horizontalAxisTitle),
                         hasLeftAxisTitle: Boolean(spec.verticalAxisTitle),
                         leftAxisDepth: leftAxisDepth,
@@ -1840,7 +1843,7 @@ var BasicChart = function (_a) {
                                 family: "Untitled Sans, apple-system, sans-serif",
                                 size: 16,
                                 color: textColor,
-                            }, authoredTitleFmt), x: 0.02, xanchor: "left" }, legendBand.title), showlegend: showlegend === undefined ? true : showlegend, legend: tslib_1.__assign(tslib_1.__assign({}, legendOverrides), ((_73 = legendBand.legend) !== null && _73 !== void 0 ? _73 : {})), margin: legendBand.margin, autosize: true }, ((spec.chartType === "bar" || spec.chartType === "column") &&
+                            }, authoredTitleFmt), x: 0.02, xanchor: "left" }, legendBand.title), showlegend: showlegend === undefined ? true : showlegend, legend: tslib_1.__assign(tslib_1.__assign({}, legendOverrides), ((_74 = legendBand.legend) !== null && _74 !== void 0 ? _74 : {})), margin: legendBand.margin, autosize: true }, ((spec.chartType === "bar" || spec.chartType === "column") &&
                         spec.stackedType
                         ? tslib_1.__assign({ barmode: spec.stackedType === "STACKED" ||
                                 spec.stackedType === "PERCENT_STACKED"
@@ -1853,7 +1856,7 @@ var BasicChart = function (_a) {
                             color: textColor,
                         }, paper_bgcolor: bgColor, plot_bgcolor: bgColor, xaxis: applyAxisOverridesPlotly({
                             title: {
-                                text: (_74 = spec.horizontalAxisTitle) !== null && _74 !== void 0 ? _74 : "",
+                                text: (_75 = spec.horizontalAxisTitle) !== null && _75 !== void 0 ? _75 : "",
                                 font: { color: textColor },
                                 standoff: bottomAxisTitleStandoff,
                             },
@@ -1871,7 +1874,7 @@ var BasicChart = function (_a) {
                         isHorizontalBarChart
                             ? spec.valueAxisOptions
                             : spec.categoryAxisOptions, isHorizontalBarChart ? primaryAxisNumberFormat : undefined), yaxis: applyAxisOverridesPlotly({
-                            title: tslib_1.__assign({ text: (_75 = spec.verticalAxisTitle) !== null && _75 !== void 0 ? _75 : "", font: { color: textColor } }, (isHorizontalBarChart
+                            title: tslib_1.__assign({ text: (_76 = spec.verticalAxisTitle) !== null && _76 !== void 0 ? _76 : "", font: { color: textColor } }, (isHorizontalBarChart
                                 ? {}
                                 : { standoff: VALUE_AXIS_TITLE_STANDOFF })),
                             showgrid: !isHorizontalBarChart,
@@ -1907,6 +1910,21 @@ var BasicChart = function (_a) {
                             _r) : {})), (ofPieExtras
                         ? tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({ shapes: ofPieExtras.shapes }, (ofPieExtras.barmode ? { barmode: ofPieExtras.barmode } : {})), (ofPieExtras.xaxis2 ? { xaxis2: ofPieExtras.xaxis2 } : {})), (ofPieExtras.yaxis2 ? { yaxis2: ofPieExtras.yaxis2 } : {})) : {}));
                     dlOpts = spec.dataLabels;
+                    doughnutSeriesOrder = spec.chartType === "doughnut"
+                        ? traces
+                            .filter(function (t) { return (t === null || t === void 0 ? void 0 : t.type) === "pie"; })
+                            .map(function (t) { var _a; return (_a = t === null || t === void 0 ? void 0 : t.meta) === null || _a === void 0 ? void 0 : _a.rncSeriesIndex; })
+                            .filter(function (i) { return typeof i === "number"; })
+                            .sort(function (a, b) { return a - b; })
+                        : [];
+                    doughnutRingSet = spec.chartType === "doughnut"
+                        ? (0, doughnut_1.doughnutRings)((0, doughnut_1.clampDoughnutHole)(spec.doughnutHoleSize), doughnutSeriesOrder.length)
+                        : [];
+                    traceDataLabels = function (trace) {
+                        var _a, _b;
+                        var specIndex = (_a = trace === null || trace === void 0 ? void 0 : trace.meta) === null || _a === void 0 ? void 0 : _a.rncSeriesIndex;
+                        return (0, overrides_1.resolveSeriesDataLabels)(dlOpts, typeof specIndex === "number" ? (_b = spec.series) === null || _b === void 0 ? void 0 : _b[specIndex] : undefined);
+                    };
                     doughnutHole = spec.doughnutHoleSize;
                     seriesNumberFormats = (0, axis_number_format_1.resolveSeriesNumberFormats)(spec.series, getFormattingFromRange, spec.hiddenDimensionStrategy);
                     traceNumberFormat = function (trace) {
@@ -1920,10 +1938,15 @@ var BasicChart = function (_a) {
                     };
                     piePull = isOfPie ? undefined : (0, pie_explosion_1.explosionToPlotlyPull)((0, pie_explosion_1.resolveExplosion)(spec));
                     formattedTraces = traces.map(function (trace) {
-                        var _a;
+                        var _a, _b, _c, _d;
                         var pattern = traceNumberFormat(trace);
-                        var next = applyDataLabelsToTracePlotly(trace, dlOpts, spec.chartType, pattern, locale);
+                        var 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 (!((_a = traceDataLabels(trace)) === null || _a === void 0 ? void 0 : _a.show)) {
+                                next = tslib_1.__assign(tslib_1.__assign({}, next), { textinfo: "none" });
+                            }
                             // Hover values format like the slice's source cell.
                             if (pattern && !next.text) {
                                 var values = Array.isArray(next.values) ? next.values : [];
@@ -1940,7 +1963,7 @@ var BasicChart = function (_a) {
                         }
                         else if (!next.hovertemplate &&
                             (next.type === "bar" || next.type === "scatter") &&
-                            typeof ((_a = next.meta) === null || _a === void 0 ? void 0 : _a.rncSeriesIndex) === "number") {
+                            typeof ((_b = next.meta) === null || _b === void 0 ? void 0 : _b.rncSeriesIndex) === "number") {
                             // Hover values read like the series' own cells (Excel's data tip
                             // shows the cell text) — the series format alone, not the axis
                             // fallback the labels use, since that resolves to the first series
@@ -1962,9 +1985,14 @@ var BasicChart = function (_a) {
                         // (doughnutHoleSize); clamp like the echarts renderer and default
                         // to 0.5 when unset.
                         if (spec.chartType === "doughnut" && next.type === "pie") {
-                            next = tslib_1.__assign(tslib_1.__assign({}, next), { hole: typeof doughnutHole === "number"
-                                    ? Math.max(0, Math.min(0.9, doughnutHole))
-                                    : 0.5 });
+                            var rank = doughnutSeriesOrder.indexOf((_c = next.meta) === null || _c === void 0 ? void 0 : _c.rncSeriesIndex);
+                            var ring = (_d = doughnutRingSet[rank]) !== null && _d !== void 0 ? _d : (0, doughnut_1.doughnutRings)((0, doughnut_1.clampDoughnutHole)(doughnutHole), 1)[0];
+                            // Plotly's `hole` is a fraction of the trace's own radius.
+                            next = tslib_1.__assign(tslib_1.__assign({}, next), { hole: ring.inner / ring.outer });
+                            if (doughnutRingSet.length > 1) {
+                                var half = ring.outer / 2;
+                                next = tslib_1.__assign(tslib_1.__assign({}, next), { domain: { x: [0.5 - half, 0.5 + half], y: [0.5 - half, 0.5 + half] } });
+                            }
                         }
                         return next;
                     });

package/dist/cjs/tsconfig.cjs.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"}