@rowsncolumns/charts 28.1.6 → 28.1.8

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

@@ -31,6 +31,7 @@ var hierarchy_1 = require("../utils/hierarchy");
 var histogram_1 = require("../utils/histogram");
 var legend_layout_1 = require("../utils/legend-layout");
 var of_pie_1 = require("../utils/of-pie");
+var doughnut_1 = require("../utils/doughnut");
 var overrides_1 = require("../utils/overrides");
 var radar_1 = require("../utils/radar");
 var region_map_1 = require("../utils/region-map");
@@ -193,7 +194,7 @@ var defaultLegendConfig = {
 var CATEGORY_AXIS_NAME_GAP = (0, legend_layout_1.categoryAxisNameGap)();
 var BasicChart = function (_a) {
     var _b;
-    var width = _a.width, height = _a.height, chart = _a.chart, theme = _a.theme, isDarkMode = _a.isDarkMode, sheetId = _a.sheetId, readonly = _a.readonly, getDomainValuesFromRange = _a.getDomainValuesFromRange, getSeriesValuesFromRange = _a.getSeriesValuesFromRange, getFormattingFromRange = _a.getFormattingFromRange, onDeleteChart = _a.onDeleteChart, onUpdateChart = _a.onUpdateChart, onRequestEdit = _a.onRequestEdit, onRequestCalculate = _a.onRequestCalculate, isSelected = _a.isSelected, fieldButtons = _a.fieldButtons;
+    var width = _a.width, height = _a.height, chart = _a.chart, theme = _a.theme, isDarkMode = _a.isDarkMode, sheetId = _a.sheetId, readonly = _a.readonly, getDomainValuesFromRange = _a.getDomainValuesFromRange, getSeriesValuesFromRange = _a.getSeriesValuesFromRange, getFormattingFromRange = _a.getFormattingFromRange, onDeleteChart = _a.onDeleteChart, onUpdateChart = _a.onUpdateChart, onRequestEdit = _a.onRequestEdit, onRequestCalculate = _a.onRequestCalculate, isSelected = _a.isSelected, fieldButtons = _a.fieldButtons, locale = _a.locale;
     var spec = chart.spec;
     var explicitChartTitle = (_b = chart.spec.title) !== null && _b !== void 0 ? _b : undefined;
     var hierarchyTitleRef = (0, react_1.useRef)(explicitChartTitle);
@@ -367,11 +368,11 @@ var BasicChart = function (_a) {
      * Triggers a chart update
      */
     var updateChart = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var threeDRenderKind, canRender3D, willRender3D, isRegionMap, regionSpec, geoScope, geo, labels, seriesEntry, values, _a, data, unmatched, min, max, textColor, ramp, noDataColor, borderColor, regionSeriesLabel, seriesName, chartDomains, chartSeries, legend, chartType, position, showAxis, isBubble, isHierarchy, skipHeaders_1, labelValues, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _b, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _c, categories_1, preparedSeries, sizeValues, sizeScale_1, xAxisConfig, tooltipFormatter, bubbleSeriesLabel_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, seriesPalette, paletteColorAt, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, dataLabelOptions, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
+        var threeDRenderKind, canRender3D, willRender3D, isRegionMap, regionSpec, geoScope, geo, labels, seriesEntry, values, _a, data, unmatched, min, max, textColor, ramp, noDataColor, borderColor, regionSeriesLabel, seriesName, chartDomains, chartSeries, legend, chartType, position, showAxis, isBubble, isHierarchy, skipHeaders_1, labelValues, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _b, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _c, categories_1, preparedSeries, sizeValues, sizeScale_1, xAxisConfig, tooltipFormatter, bubbleSeriesLabelFor_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, radarAxisOptions, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, seriesPalette, paletteColorAt, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, chartDataLabels, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, doughnutSeriesOrder, doughnutRingSet, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
         var e_1, _0, e_2, _1, e_4, _2, e_5, _3, e_3, _4, e_6, _5, e_7, _6, e_8, _7, e_9, _8;
-        var _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, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138;
-        return tslib_1.__generator(this, function (_139) {
-            switch (_139.label) {
+        var _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, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138, _139;
+        return tslib_1.__generator(this, function (_140) {
+            switch (_140.label) {
                 case 0:
                     (0, utils_1.debug)("Updating chart", chart);
                     threeDRenderKind = (0, three_d_1.resolve3DRenderKind)(spec.sourceChartType);
@@ -422,7 +423,7 @@ var BasicChart = function (_a) {
                     geoScope = (0, region_map_1.resolveGeoScope)(regionSpec.geoScope);
                     return [4 /*yield*/, (0, region_map_loader_1.loadRegionMapGeo)(geoScope)];
                 case 1:
-                    geo = _139.sent();
+                    geo = _140.sent();
                     // Entering the region map from a cartesian render: the previous
                     // grid/axis option doesn't merge into the map one, so start from
                     // a bare instance (theme options are re-applied after setOption).
@@ -457,7 +458,7 @@ var BasicChart = function (_a) {
                         ? "rgba(255,255,255,0.08)"
                         : "rgba(0,0,0,0.06)";
                     borderColor = isDarkMode ? "rgba(255,255,255,0.3)" : "#FFFFFF";
-                    regionSeriesLabel = (0, overrides_1.buildSeriesLabelOption)(spec.dataLabels);
+                    regionSeriesLabel = (0, overrides_1.buildSeriesLabelOption)(spec.dataLabels, undefined, locale);
                     seriesName = (seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                         ? seriesEntry.dataLabel
                         : "";
@@ -537,7 +538,7 @@ var BasicChart = function (_a) {
                     });
                     seriesInputs = [];
                     i = 0;
-                    _139.label = 3;
+                    _140.label = 3;
                 case 3:
                     if (!(i < spec.series.length)) return [3 /*break*/, 7];
                     seriesEntry = spec.series[i];
@@ -546,13 +547,13 @@ var BasicChart = function (_a) {
                     _b = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(resolvedLabel, (_17 = position.sheetId) !== null && _17 !== void 0 ? _17 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 4:
-                    resolvedLabel = _b.apply(void 0, [_139.sent()]);
-                    _139.label = 5;
+                    resolvedLabel = _b.apply(void 0, [_140.sent()]);
+                    _140.label = 5;
                 case 5:
                     xValues = (_18 = perSeriesX[i]) !== null && _18 !== void 0 ? _18 : perSeriesX[0];
                     sizeValues_1 = (_19 = perSeriesSize[i]) !== null && _19 !== void 0 ? _19 : 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 } : {})));
-                    _139.label = 6;
+                    _140.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 3];
@@ -590,7 +591,10 @@ var BasicChart = function (_a) {
                         var seriesName = params.seriesName ? "".concat(params.seriesName, "<br/>") : "";
                         return "".concat(seriesName).concat(bubbleName, "X: ").concat(label !== null && label !== void 0 ? label : "", "<br/>Y: ").concat(y !== null && y !== void 0 ? y : "", "<br/>Size: ").concat(size !== null && size !== void 0 ? size : "");
                     };
-                    bubbleSeriesLabel_1 = (0, overrides_1.buildSeriesLabelOption)(spec.dataLabels);
+                    bubbleSeriesLabelFor_1 = function (index) {
+                        var _a;
+                        return (0, overrides_1.buildSeriesLabelOption)((0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, (_a = spec.series) === null || _a === void 0 ? void 0 : _a[index]), undefined, locale);
+                    };
                     (_24 = chartRef.current) === null || _24 === void 0 ? void 0 : _24.setOption({
                         xAxis: [
                             (0, overrides_1.applyAxisOverrides)(tslib_1.__assign({}, xAxisConfig), spec.categoryAxisOptions),
@@ -601,7 +605,7 @@ var BasicChart = function (_a) {
                                 name: (_25 = spec.verticalAxisTitle) !== null && _25 !== void 0 ? _25 : "",
                                 nameLocation: "middle",
                                 nameGap: 45,
-                            }, spec.valueAxisOptions),
+                            }, spec.valueAxisOptions, undefined, locale),
                         ],
                         legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, legend), { show: preparedSeries.length > 1, data: preparedSeries.map(function (entry) { return entry.name; }) }), spec.legend),
                         grid: {
@@ -620,7 +624,7 @@ var BasicChart = function (_a) {
                         // routed through the bubble code, producing Y-scaled giant
                         // circles instead of Excel's small dots.
                         series: preparedSeries.map(function (entry, index) {
-                            var _a, _b, _c, _d, _e, _f;
+                            var _a, _b, _c, _d, _e, _f, _g;
                             var isScatter = spec.chartType === "scatter";
                             var scatterStyle = (_a = spec.scatterStyle) !== null && _a !== void 0 ? _a : (isScatter ? "lineMarker" : undefined);
                             var seriesEntry = (_b = spec.series) === null || _b === void 0 ? void 0 : _b[index];
@@ -639,13 +643,19 @@ var BasicChart = function (_a) {
                                         scatterStyle === "smoothMarker" ||
                                         !scatterStyle);
                                 var 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).
+                                var labelsWithoutMarkers = !wantsMarkers &&
+                                    Boolean((_c = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesEntry)) === null || _c === void 0 ? void 0 : _c.show);
                                 return wantsLine
-                                    ? tslib_1.__assign({ type: "line", name: entry.name, data: entry.points, showSymbol: wantsMarkers, smooth: smooth, symbol: (_c = (0, helpers_1.mapMarkerSymbolToEcharts)(symbol)) !== null && _c !== void 0 ? _c : "circle", symbolSize: (_d = perMarker === null || perMarker === void 0 ? void 0 : perMarker.size) !== null && _d !== void 0 ? _d : 6 }, (seriesColor
+                                    ? tslib_1.__assign({ type: "line", name: entry.name, data: entry.points, showSymbol: wantsMarkers || labelsWithoutMarkers, smooth: smooth, symbol: (_d = (0, helpers_1.mapMarkerSymbolToEcharts)(symbol)) !== null && _d !== void 0 ? _d : "circle", symbolSize: labelsWithoutMarkers
+                                            ? 0
+                                            : (_e = perMarker === null || perMarker === void 0 ? void 0 : perMarker.size) !== null && _e !== void 0 ? _e : 6 }, (seriesColor
                                         ? {
                                             itemStyle: { color: seriesColor },
                                             lineStyle: { color: seriesColor },
                                         }
-                                        : {})) : tslib_1.__assign({ type: "scatter", name: entry.name, data: entry.points, symbol: (_e = (0, helpers_1.mapMarkerSymbolToEcharts)(symbol)) !== null && _e !== void 0 ? _e : "circle", symbolSize: (_f = perMarker === null || perMarker === void 0 ? void 0 : perMarker.size) !== null && _f !== void 0 ? _f : 6 }, (seriesColor
+                                        : {})) : tslib_1.__assign({ type: "scatter", name: entry.name, data: entry.points, symbol: (_f = (0, helpers_1.mapMarkerSymbolToEcharts)(symbol)) !== null && _f !== void 0 ? _f : "circle", symbolSize: (_g = perMarker === null || perMarker === void 0 ? void 0 : perMarker.size) !== null && _g !== void 0 ? _g : 6 }, (seriesColor
                                     ? { itemStyle: { color: seriesColor } }
                                     : {}));
                             }
@@ -653,10 +663,11 @@ var BasicChart = function (_a) {
                                     show: true,
                                     formatter: function (params) { var _a; return (_a = params.name) !== null && _a !== void 0 ? _a : ""; },
                                 } }, (seriesColor ? { itemStyle: { color: seriesColor } } : {}));
-                        }).map(function (s) {
+                        }).map(function (s, index) {
                             var _a;
-                            return bubbleSeriesLabel_1
-                                ? tslib_1.__assign(tslib_1.__assign({}, s), { label: tslib_1.__assign(tslib_1.__assign({}, ((_a = s.label) !== null && _a !== void 0 ? _a : {})), bubbleSeriesLabel_1) }) : s;
+                            var bubbleSeriesLabel = bubbleSeriesLabelFor_1(index);
+                            return bubbleSeriesLabel
+                                ? tslib_1.__assign(tslib_1.__assign({}, s), { label: tslib_1.__assign(tslib_1.__assign({}, ((_a = s.label) !== null && _a !== void 0 ? _a : {})), bubbleSeriesLabel) }) : s;
                         }),
                     }, {
                         replaceMerge: [
@@ -695,11 +706,11 @@ var BasicChart = function (_a) {
                             var value = Array.isArray(params.value)
                                 ? params.value[params.value.length - 1]
                                 : (_a = params.value) !== null && _a !== void 0 ? _a : "";
-                            return "".concat(params.name, ": ").concat((0, axis_number_format_1.formatAxisValue)(sizeNumberFormat_1, value));
+                            return "".concat(params.name, ": ").concat((0, axis_number_format_1.formatAxisValue)(sizeNumberFormat_1, value, locale));
                         };
                         hierarchyDataLabels = spec.dataLabels;
                         hierarchySeriesLabel = (0, overrides_1.buildSeriesLabelOption)(hierarchyDataLabels && !hierarchyDataLabels.numberFormatPattern
-                            ? tslib_1.__assign(tslib_1.__assign({}, hierarchyDataLabels), { numberFormatPattern: sizeNumberFormat_1 }) : hierarchyDataLabels);
+                            ? tslib_1.__assign(tslib_1.__assign({}, hierarchyDataLabels), { numberFormatPattern: sizeNumberFormat_1 }) : hierarchyDataLabels, undefined, locale);
                         (_32 = chartRef.current) === null || _32 === void 0 ? void 0 : _32.setOption({
                             xAxis: [
                                 {
@@ -775,11 +786,11 @@ var BasicChart = function (_a) {
                     if (!isContour) return [3 /*break*/, 19];
                     categories_2 = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                     contourSeriesInputs = [];
-                    _139.label = 9;
+                    _140.label = 9;
                 case 9:
-                    _139.trys.push([9, 16, 17, 18]);
+                    _140.trys.push([9, 16, 17, 18]);
                     _d = tslib_1.__values((_34 = spec.series) !== null && _34 !== void 0 ? _34 : []), _e = _d.next();
-                    _139.label = 10;
+                    _140.label = 10;
                 case 10:
                     if (!!_e.done) return [3 /*break*/, 15];
                     seriesEntry = _e.value;
@@ -787,22 +798,22 @@ var BasicChart = function (_a) {
                     _g = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_35 = position.sheetId) !== null && _35 !== void 0 ? _35 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 11:
-                    _f = _g.apply(void 0, [_139.sent()]);
+                    _f = _g.apply(void 0, [_140.sent()]);
                     return [3 /*break*/, 13];
                 case 12:
                     _f = (_36 = seriesEntry.dataLabel) !== null && _36 !== void 0 ? _36 : "";
-                    _139.label = 13;
+                    _140.label = 13;
                 case 13:
                     dataLabel = _f;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     contourSeriesInputs.push({ name: dataLabel, values: values });
-                    _139.label = 14;
+                    _140.label = 14;
                 case 14:
                     _e = _d.next();
                     return [3 /*break*/, 10];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_1_1 = _139.sent();
+                    e_1_1 = _140.sent();
                     e_1 = { error: e_1_1 };
                     return [3 /*break*/, 18];
                 case 17:
@@ -818,7 +829,7 @@ var BasicChart = function (_a) {
                         return typeof point[2] === "number";
                     })), 2), zMin = _h[0], zMax = _h[1];
                     contourFormats_1 = (0, axis_number_format_1.resolveSeriesNumberFormats)(spec.series, getFormattingFromRange, spec.hiddenDimensionStrategy);
-                    contourLabel = (0, overrides_1.buildSeriesLabelOption)(spec.dataLabels);
+                    contourLabel = (0, overrides_1.buildSeriesLabelOption)(spec.dataLabels, undefined, locale);
                     if (!renderedAsContour.current && chartRef.current) {
                         chartRef.current.dispose();
                         chartRef.current = undefined;
@@ -836,7 +847,7 @@ var BasicChart = function (_a) {
                                 var _d = tslib_1.__read(((_a = params === null || params === void 0 ? void 0 : params.value) !== null && _a !== void 0 ? _a : []), 3), x = _d[0], y = _d[1], z = _d[2];
                                 var value = z === "-" || z === undefined
                                     ? ""
-                                    : (0, axis_number_format_1.formatAxisValue)(contourFormats_1[y], z);
+                                    : (0, axis_number_format_1.formatAxisValue)(contourFormats_1[y], z, locale);
                                 return "".concat((_b = seriesNames_1[y]) !== null && _b !== void 0 ? _b : "", "<br/>").concat((_c = categories_2[x]) !== null && _c !== void 0 ? _c : "", ": ").concat(value);
                             },
                         },
@@ -873,7 +884,7 @@ var BasicChart = function (_a) {
                                 top: "center",
                                 inRange: { color: tslib_1.__spreadArray([], tslib_1.__read(three_d_1.SURFACE_COLOR_RAMP), false) },
                                 formatter: function (value) {
-                                    return (0, axis_number_format_1.formatAxisValue)(contourFormats_1[0], value);
+                                    return (0, axis_number_format_1.formatAxisValue)(contourFormats_1[0], value, locale);
                                 },
                             },
                         ],
@@ -885,7 +896,7 @@ var BasicChart = function (_a) {
                                             var _b = tslib_1.__read(((_a = params === null || params === void 0 ? void 0 : params.value) !== null && _a !== void 0 ? _a : []), 3), y = _b[1], z = _b[2];
                                             return z === "-" || z === undefined
                                                 ? ""
-                                                : (0, axis_number_format_1.formatAxisValue)(contourFormats_1[y], z);
+                                                : (0, axis_number_format_1.formatAxisValue)(contourFormats_1[y], z, locale);
                                         } }),
                                 }
                                 : {})),
@@ -910,11 +921,11 @@ var BasicChart = function (_a) {
                     if (!(willRender3D && threeDRenderKind)) return [3 /*break*/, 30];
                     categories_3 = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                     threeDSeriesInputs = [];
-                    _139.label = 20;
+                    _140.label = 20;
                 case 20:
-                    _139.trys.push([20, 27, 28, 29]);
+                    _140.trys.push([20, 27, 28, 29]);
                     _j = tslib_1.__values((_40 = spec.series) !== null && _40 !== void 0 ? _40 : []), _k = _j.next();
-                    _139.label = 21;
+                    _140.label = 21;
                 case 21:
                     if (!!_k.done) return [3 /*break*/, 26];
                     seriesEntry = _k.value;
@@ -922,22 +933,22 @@ var BasicChart = function (_a) {
                     _m = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_41 = position.sheetId) !== null && _41 !== void 0 ? _41 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 22:
-                    _l = _m.apply(void 0, [_139.sent()]);
+                    _l = _m.apply(void 0, [_140.sent()]);
                     return [3 /*break*/, 24];
                 case 23:
                     _l = (_42 = seriesEntry.dataLabel) !== null && _42 !== void 0 ? _42 : "";
-                    _139.label = 24;
+                    _140.label = 24;
                 case 24:
                     dataLabel = _l;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     threeDSeriesInputs.push({ name: dataLabel, values: values });
-                    _139.label = 25;
+                    _140.label = 25;
                 case 25:
                     _k = _j.next();
                     return [3 /*break*/, 21];
                 case 26: return [3 /*break*/, 29];
                 case 27:
-                    e_2_1 = _139.sent();
+                    e_2_1 = _140.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 29];
                 case 28:
@@ -991,7 +1002,7 @@ var BasicChart = function (_a) {
                             : (_j = (_h = seriesNames_2[Math.round((_g = value[1]) !== null && _g !== void 0 ? _g : 0)]) !== null && _h !== void 0 ? _h : params === null || params === void 0 ? void 0 : params.seriesName) !== null && _j !== void 0 ? _j : "";
                         var valueLabel = spec.stackedType === "PERCENT_STACKED" && stackedBar3D_1
                             ? "".concat(Math.round(((_k = value[2]) !== null && _k !== void 0 ? _k : 0) * 10) / 10, "%")
-                            : (0, axis_number_format_1.formatAxisValue)(threeDFormats_1[seriesIndex], value[2]);
+                            : (0, axis_number_format_1.formatAxisValue)(threeDFormats_1[seriesIndex], value[2], locale);
                         return "".concat(seriesLabel ? "".concat(seriesLabel, "<br/>") : "").concat(categoryLabel, ": ").concat(valueLabel);
                     };
                     threeDSeries = void 0;
@@ -1158,7 +1169,8 @@ var BasicChart = function (_a) {
                             }
                             finally { if (e_5) throw e_5.error; }
                         }
-                        indicators_1 = (0, radar_1.buildRadarIndicators)(categories, radarSeriesInputs);
+                        radarAxisOptions = spec.valueAxisOptions;
+                        indicators_1 = (0, radar_1.buildRadarIndicators)(categories, radarSeriesInputs, radarAxisOptions);
                         radarData = (0, radar_1.buildRadarSeriesData)(radarSeriesInputs, indicators_1.length);
                         radarStyle_1 = (_47 = spec.radarStyle) !== null && _47 !== void 0 ? _47 : "standard";
                         radarColors_1 = radarSeriesInputs.map(function (_, i) { var _a, _b; return (_b = (_a = spec.series) === null || _a === void 0 ? void 0 : _a[i]) === null || _b === void 0 ? void 0 : _b.color; });
@@ -1166,14 +1178,14 @@ var BasicChart = function (_a) {
                         radarDataLabels_1 = spec.dataLabels;
                         radarSeriesLabelFor_1 = function (seriesIndex) {
                             return (0, overrides_1.buildSeriesLabelOption)(radarDataLabels_1 && !radarDataLabels_1.numberFormatPattern
-                                ? tslib_1.__assign(tslib_1.__assign({}, radarDataLabels_1), { numberFormatPattern: radarFormats_1[seriesIndex] }) : radarDataLabels_1);
+                                ? tslib_1.__assign(tslib_1.__assign({}, radarDataLabels_1), { numberFormatPattern: radarFormats_1[seriesIndex] }) : radarDataLabels_1, undefined, locale);
                         };
                         radarTooltipFormatter = function (params) {
                             var _a, _b;
                             var values = Array.isArray(params === null || params === void 0 ? void 0 : params.value) ? params.value : [];
                             var pattern = radarFormats_1[(_a = params === null || params === void 0 ? void 0 : params.dataIndex) !== null && _a !== void 0 ? _a : 0];
                             var lines = indicators_1.map(function (indicator, i) {
-                                return "".concat(indicator.name, ": ").concat((0, axis_number_format_1.formatAxisValue)(pattern, values[i]));
+                                return "".concat(indicator.name, ": ").concat((0, axis_number_format_1.formatAxisValue)(pattern, values[i], locale));
                             });
                             return tslib_1.__spreadArray([(_b = params === null || params === void 0 ? void 0 : params.name) !== null && _b !== void 0 ? _b : ""], tslib_1.__read(lines), false).filter(Boolean).join("<br/>");
                         };
@@ -1181,7 +1193,16 @@ var BasicChart = function (_a) {
                             radar: {
                                 indicator: indicators_1.length
                                     ? indicators_1
-                                    : [{ 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 === null || radarAxisOptions === void 0 ? void 0 : radarAxisOptions.visible) !== false,
+                                    formatter: function (value) {
+                                        return (0, axis_number_format_1.formatAxisValue)(radarFormats_1[0], value, locale);
+                                    },
+                                },
                             },
                             legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, legend), { show: radarData.length > 1, data: radarData.map(function (d) { return d.name; }) }), spec.legend),
                             tooltip: { trigger: "item", formatter: radarTooltipFormatter },
@@ -1235,7 +1256,7 @@ var BasicChart = function (_a) {
                         stockDataLabels_1 = spec.dataLabels;
                         stockSeriesLabelFor_1 = function (role) {
                             return (0, overrides_1.buildSeriesLabelOption)(stockDataLabels_1 && !stockDataLabels_1.numberFormatPattern
-                                ? tslib_1.__assign(tslib_1.__assign({}, stockDataLabels_1), { numberFormatPattern: stockFormatFor_1(role) }) : stockDataLabels_1);
+                                ? tslib_1.__assign(tslib_1.__assign({}, stockDataLabels_1), { numberFormatPattern: stockFormatFor_1(role) }) : stockDataLabels_1, undefined, locale);
                         };
                         upColor_1 = theme.themeColors.accent1;
                         downColor_1 = theme.themeColors.accent2;
@@ -1279,10 +1300,10 @@ var BasicChart = function (_a) {
                                 tslib_1.__assign({ type: "bar", name: "Volume", xAxisIndex: 1, yAxisIndex: 1, data: (volumePoints !== null && volumePoints !== void 0 ? volumePoints : []).map(function (p) { return ({
                                         value: p.value,
                                         itemStyle: { color: p.up ? upColor_1 : downColor_1 },
-                                    }); }) }, ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("volume"))
+                                    }); }) }, ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("volume"), locale)
                                     ? {
                                         tooltip: {
-                                            valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("volume")),
+                                            valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("volume"), locale),
                                         },
                                     }
                                     : {})),
@@ -1307,7 +1328,7 @@ var BasicChart = function (_a) {
                                         nameLocation: "middle",
                                         nameGap: 50,
                                         gridIndex: 0,
-                                    }, spec.valueAxisOptions)
+                                    }, spec.valueAxisOptions, undefined, locale)
                                 ], tslib_1.__read((hasVolume ? [volumeYAxis] : [])), false),
                                 legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, legend), { show: false }), spec.legend),
                                 grid: stockGrid,
@@ -1319,10 +1340,10 @@ var BasicChart = function (_a) {
                                             color0: downColor_1,
                                             borderColor: upColor_1,
                                             borderColor0: downColor_1,
-                                        } }, ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("close"))
+                                        } }, ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("close"), locale)
                                         ? {
                                             tooltip: {
-                                                valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("close")),
+                                                valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1("close"), locale),
                                             },
                                         }
                                         : {}))
@@ -1358,7 +1379,7 @@ var BasicChart = function (_a) {
                                     nameLocation: "middle",
                                     nameGap: 50,
                                     gridIndex: 0,
-                                }, spec.valueAxisOptions)
+                                }, spec.valueAxisOptions, undefined, locale)
                             ], tslib_1.__read((hasVolume ? [volumeYAxis] : [])), false),
                             legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, legend), { show: lineSeries.length > 1, data: lineSeries.map(function (s) { return s.name; }) }), spec.legend),
                             grid: stockGrid,
@@ -1366,10 +1387,10 @@ var BasicChart = function (_a) {
                             axisPointer: stockAxisPointer,
                             series: tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(lineSeries.map(function (s, i) { return (tslib_1.__assign(tslib_1.__assign({ type: "line", name: s.name, data: s.values, showSymbol: false, itemStyle: { color: (0, utils_1.chartPaletteColorAt)(stockColors_1, i) }, lineStyle: { color: (0, utils_1.chartPaletteColorAt)(stockColors_1, i) } }, (stockSeriesLabelFor_1(s.role)
                                 ? { label: stockSeriesLabelFor_1(s.role) }
-                                : {})), ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1(s.role))
+                                : {})), ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1(s.role), locale)
                                 ? {
                                     tooltip: {
-                                        valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1(s.role)),
+                                        valueFormatter: (0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1(s.role), locale),
                                     },
                                 }
                                 : {}))); })), false), tslib_1.__read(volumeSeries), false),
@@ -1627,22 +1648,22 @@ var BasicChart = function (_a) {
                         return (0, utils_1.chartPaletteColorAt)(seriesPalette, index);
                     };
                     _loop_1 = function (specSeriesIndex, series) {
-                        var dataLabel, _140, _141, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, isolated, marked, isolated_1, isolated_1_1, i, gradientArgs, gradient, overrides_2, _142, _143, dp, fallback_1, overrides_3, _144, _145, dp, positiveColor_1, negativeColor_1;
-                        var e_11, _146, e_12, _147, e_13, _148;
-                        return tslib_1.__generator(this, function (_149) {
-                            switch (_149.label) {
+                        var dataLabel, _141, _142, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, labelsWithoutMarkers, isolated, marked, isolated_1, isolated_1_1, i, gradientArgs, gradient, overrides_2, _143, _144, dp, fallback_1, overrides_3, _145, _146, dp, positiveColor_1, negativeColor_1;
+                        var e_11, _147, e_12, _148, e_13, _149;
+                        return tslib_1.__generator(this, function (_150) {
+                            switch (_150.label) {
                                 case 0:
                                     if (!(!(0, utils_1.isNil)(series.dataLabel) && (0, utils_1.isAFormula)(series.dataLabel))) return [3 /*break*/, 2];
-                                    _141 = chart_spec_utils_1.coerceCalculatedLabel;
+                                    _142 = chart_spec_utils_1.coerceCalculatedLabel;
                                     return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_69 = position.sheetId) !== null && _69 !== void 0 ? _69 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                                 case 1:
-                                    _140 = _141.apply(void 0, [_149.sent()]);
+                                    _141 = _142.apply(void 0, [_150.sent()]);
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    _140 = (_70 = series.dataLabel) !== null && _70 !== void 0 ? _70 : "";
-                                    _149.label = 3;
+                                    _141 = (_70 = series.dataLabel) !== null && _70 !== void 0 ? _70 : "";
+                                    _150.label = 3;
                                 case 3:
-                                    dataLabel = _140;
+                                    dataLabel = _141;
                                     // Label
                                     if (dataLabel) {
                                         (_71 = legend.data) === null || _71 === void 0 ? void 0 : _71.push(dataLabel);
@@ -1710,41 +1731,50 @@ var BasicChart = function (_a) {
                                         wantsMarkers = markerSymbol === "none"
                                             ? false
                                             : Boolean(spec.showMarkers) || !(0, utils_1.isNil)(markerSymbol);
-                                        seriesEntry.showSymbol = wantsMarkers;
+                                        labelsWithoutMarkers = !wantsMarkers &&
+                                            Boolean((_79 = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesAny)) === null || _79 === void 0 ? void 0 : _79.show);
+                                        seriesEntry.showSymbol = wantsMarkers || labelsWithoutMarkers;
                                         if (wantsMarkers) {
                                             seriesEntry.symbol =
-                                                (_79 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _79 !== void 0 ? _79 : "circle";
-                                            seriesEntry.symbolSize = (_81 = (_80 = seriesAny.marker) === null || _80 === void 0 ? void 0 : _80.size) !== null && _81 !== void 0 ? _81 : 6;
+                                                (_80 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _80 !== void 0 ? _80 : "circle";
+                                            seriesEntry.symbolSize = (_82 = (_81 = seriesAny.marker) === null || _81 === void 0 ? void 0 : _81.size) !== null && _82 !== void 0 ? _82 : 6;
                                         }
-                                        else if (Array.isArray(data)) {
-                                            isolated = (0, empty_cells_1.isolatedPointIndexes)(data, (0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike));
-                                            if (isolated.length) {
-                                                seriesEntry.showSymbol = true;
-                                                seriesEntry.symbol = "none";
-                                                marked = tslib_1.__spreadArray([], tslib_1.__read(data), false);
-                                                try {
-                                                    for (isolated_1 = (e_11 = void 0, tslib_1.__values(isolated)), isolated_1_1 = isolated_1.next(); !isolated_1_1.done; isolated_1_1 = isolated_1.next()) {
-                                                        i = isolated_1_1.value;
-                                                        marked[i] = { value: marked[i], symbol: "circle", symbolSize: 6 };
-                                                    }
-                                                }
-                                                catch (e_11_1) { e_11 = { error: e_11_1 }; }
-                                                finally {
+                                        else {
+                                            if (labelsWithoutMarkers) {
+                                                seriesEntry.symbol = "circle";
+                                                seriesEntry.symbolSize = 0;
+                                            }
+                                            if (Array.isArray(data)) {
+                                                isolated = (0, empty_cells_1.isolatedPointIndexes)(data, (0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike));
+                                                if (isolated.length) {
+                                                    seriesEntry.showSymbol = true;
+                                                    if (!labelsWithoutMarkers)
+                                                        seriesEntry.symbol = "none";
+                                                    marked = tslib_1.__spreadArray([], tslib_1.__read(data), false);
                                                     try {
-                                                        if (isolated_1_1 && !isolated_1_1.done && (_146 = isolated_1.return)) _146.call(isolated_1);
+                                                        for (isolated_1 = (e_11 = void 0, tslib_1.__values(isolated)), isolated_1_1 = isolated_1.next(); !isolated_1_1.done; isolated_1_1 = isolated_1.next()) {
+                                                            i = isolated_1_1.value;
+                                                            marked[i] = { value: marked[i], symbol: "circle", symbolSize: 6 };
+                                                        }
                                                     }
-                                                    finally { if (e_11) throw e_11.error; }
+                                                    catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                                                    finally {
+                                                        try {
+                                                            if (isolated_1_1 && !isolated_1_1.done && (_147 = isolated_1.return)) _147.call(isolated_1);
+                                                        }
+                                                        finally { if (e_11) throw e_11.error; }
+                                                    }
+                                                    seriesEntry.data = marked;
                                                 }
-                                                seriesEntry.data = marked;
                                             }
                                         }
                                     }
                                     gradientArgs = (0, gradient_1.gradientToEcharts)(series.gradient);
                                     if (gradientArgs && !seriesAny.noFill) {
                                         gradient = new echarts.graphic.LinearGradient(gradientArgs.x, gradientArgs.y, gradientArgs.x2, gradientArgs.y2, gradientArgs.colorStops);
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_82 = seriesEntry.itemStyle) !== null && _82 !== void 0 ? _82 : {})), { color: gradient });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_83 = seriesEntry.itemStyle) !== null && _83 !== void 0 ? _83 : {})), { color: gradient });
                                         if (effectiveChartType === "area") {
-                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_83 = seriesEntry.areaStyle) !== null && _83 !== void 0 ? _83 : {})), { color: gradient });
+                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_84 = seriesEntry.areaStyle) !== null && _84 !== void 0 ? _84 : {})), { color: gradient });
                                         }
                                     }
                                     else if (seriesAny.noFill) {
@@ -1752,15 +1782,15 @@ var BasicChart = function (_a) {
                                         // with `transparent` so layout is preserved but nothing
                                         // paints. Legend entries are also suppressed via `name: ""`
                                         // since the series carries no semantic information.
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_84 = seriesEntry.itemStyle) !== null && _84 !== void 0 ? _84 : {})), { color: "transparent", borderColor: "transparent" });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_85 = seriesEntry.itemStyle) !== null && _85 !== void 0 ? _85 : {})), { color: "transparent", borderColor: "transparent" });
                                     }
                                     else if (isBarOrColumn &&
                                         Array.isArray(seriesAny.dataPointColors) &&
                                         seriesAny.dataPointColors.length) {
                                         overrides_2 = new Map();
                                         try {
-                                            for (_142 = (e_12 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _143 = _142.next(); !_143.done; _143 = _142.next()) {
-                                                dp = _143.value;
+                                            for (_143 = (e_12 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _144 = _143.next(); !_144.done; _144 = _143.next()) {
+                                                dp = _144.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_2.set(dp.idx, dp.color);
                                                 }
@@ -1769,20 +1799,20 @@ var BasicChart = function (_a) {
                                         catch (e_12_1) { e_12 = { error: e_12_1 }; }
                                         finally {
                                             try {
-                                                if (_143 && !_143.done && (_147 = _142.return)) _147.call(_142);
+                                                if (_144 && !_144.done && (_148 = _143.return)) _148.call(_143);
                                             }
                                             finally { if (e_12) throw e_12.error; }
                                         }
-                                        fallback_1 = (_85 = series.color) !== null && _85 !== void 0 ? _85 : paletteColorAt(specSeriesIndex);
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_86 = seriesEntry.itemStyle) !== null && _86 !== void 0 ? _86 : {})), { color: function (params) { var _a; return (_a = overrides_2.get(params.dataIndex)) !== null && _a !== void 0 ? _a : fallback_1; } });
+                                        fallback_1 = (_86 = series.color) !== null && _86 !== void 0 ? _86 : paletteColorAt(specSeriesIndex);
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_87 = seriesEntry.itemStyle) !== null && _87 !== void 0 ? _87 : {})), { color: function (params) { var _a; return (_a = overrides_2.get(params.dataIndex)) !== null && _a !== void 0 ? _a : fallback_1; } });
                                     }
                                     else if (isCircularChart &&
                                         Array.isArray(seriesAny.dataPointColors) &&
                                         seriesAny.dataPointColors.length) {
                                         overrides_3 = new Map();
                                         try {
-                                            for (_144 = (e_13 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _145 = _144.next(); !_145.done; _145 = _144.next()) {
-                                                dp = _145.value;
+                                            for (_145 = (e_13 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _146 = _145.next(); !_146.done; _146 = _145.next()) {
+                                                dp = _146.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_3.set(dp.idx, dp.color);
                                                 }
@@ -1791,19 +1821,19 @@ var BasicChart = function (_a) {
                                         catch (e_13_1) { e_13 = { error: e_13_1 }; }
                                         finally {
                                             try {
-                                                if (_145 && !_145.done && (_148 = _144.return)) _148.call(_144);
+                                                if (_146 && !_146.done && (_149 = _145.return)) _149.call(_145);
                                             }
                                             finally { if (e_13) throw e_13.error; }
                                         }
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_87 = seriesEntry.itemStyle) !== null && _87 !== void 0 ? _87 : {})), { color: function (params) {
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_88 = seriesEntry.itemStyle) !== null && _88 !== void 0 ? _88 : {})), { color: function (params) {
                                                 var _a, _b;
                                                 return (_b = (_a = overrides_3.get(params.dataIndex)) !== null && _a !== void 0 ? _a : series.color) !== null && _b !== void 0 ? _b : paletteColorAt(params.dataIndex);
                                             } });
                                     }
                                     else if (isBarOrColumn && series.invertIfNegative) {
-                                        positiveColor_1 = (_88 = series.color) !== null && _88 !== void 0 ? _88 : paletteColorAt(specSeriesIndex);
-                                        negativeColor_1 = (_89 = series.negativeColor) !== null && _89 !== void 0 ? _89 : "#FF0000";
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_90 = seriesEntry.itemStyle) !== null && _90 !== void 0 ? _90 : {})), { color: function (params) {
+                                        positiveColor_1 = (_89 = series.color) !== null && _89 !== void 0 ? _89 : paletteColorAt(specSeriesIndex);
+                                        negativeColor_1 = (_90 = series.negativeColor) !== null && _90 !== void 0 ? _90 : "#FF0000";
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_91 = seriesEntry.itemStyle) !== null && _91 !== void 0 ? _91 : {})), { color: function (params) {
                                                 var _a, _b;
                                                 var value = Array.isArray(params.data)
                                                     ? params.data[1]
@@ -1814,10 +1844,10 @@ var BasicChart = function (_a) {
                                             } });
                                     }
                                     else if (series.color) {
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_91 = seriesEntry.itemStyle) !== null && _91 !== void 0 ? _91 : {})), { color: series.color });
-                                        seriesEntry.lineStyle = tslib_1.__assign(tslib_1.__assign({}, ((_92 = seriesEntry.lineStyle) !== null && _92 !== void 0 ? _92 : {})), { color: series.color });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_92 = seriesEntry.itemStyle) !== null && _92 !== void 0 ? _92 : {})), { color: series.color });
+                                        seriesEntry.lineStyle = tslib_1.__assign(tslib_1.__assign({}, ((_93 = seriesEntry.lineStyle) !== null && _93 !== void 0 ? _93 : {})), { color: series.color });
                                         if (effectiveChartType === "area") {
-                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_93 = seriesEntry.areaStyle) !== null && _93 !== void 0 ? _93 : {})), { color: series.color });
+                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_94 = seriesEntry.areaStyle) !== null && _94 !== void 0 ? _94 : {})), { color: series.color });
                                         }
                                     }
                                     chartSeries.push(seriesEntry);
@@ -1826,24 +1856,24 @@ var BasicChart = function (_a) {
                             }
                         });
                     };
-                    _139.label = 31;
+                    _140.label = 31;
                 case 31:
-                    _139.trys.push([31, 36, 37, 38]);
+                    _140.trys.push([31, 36, 37, 38]);
                     _r = tslib_1.__values(((_68 = spec.series) !== null && _68 !== void 0 ? _68 : []).entries()), _s = _r.next();
-                    _139.label = 32;
+                    _140.label = 32;
                 case 32:
                     if (!!_s.done) return [3 /*break*/, 35];
                     _t = tslib_1.__read(_s.value, 2), specSeriesIndex = _t[0], series = _t[1];
                     return [5 /*yield**/, _loop_1(specSeriesIndex, series)];
                 case 33:
-                    _139.sent();
-                    _139.label = 34;
+                    _140.sent();
+                    _140.label = 34;
                 case 34:
                     _s = _r.next();
                     return [3 /*break*/, 32];
                 case 35: return [3 /*break*/, 38];
                 case 36:
-                    e_3_1 = _139.sent();
+                    e_3_1 = _140.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 38];
                 case 37:
@@ -1861,7 +1891,7 @@ var BasicChart = function (_a) {
                     }
                     if (isOfPie) {
                         labels = rawPrimaryDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_94 = spec.series) === null || _94 === void 0 ? void 0 : _94[0];
+                        seriesEntry = (_95 = spec.series) === null || _95 === void 0 ? void 0 : _95[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); })
                             : [];
@@ -1908,7 +1938,7 @@ var BasicChart = function (_a) {
                         };
                         chartSeries.push({
                             type: "pie",
-                            name: (_95 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _95 !== void 0 ? _95 : "",
+                            name: (_96 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _96 !== void 0 ? _96 : "",
                             center: ["".concat(MAIN_CX_1 * 100, "%"), "".concat(CY_1 * 100, "%")],
                             radius: [0, "".concat(MAIN_RADIUS_PCT_1, "%")],
                             // Rotate the pie so the "Other" slice's angular midpoint faces
@@ -1926,7 +1956,7 @@ var BasicChart = function (_a) {
                             if (ofPieType_1 === "pie") {
                                 chartSeries.push({
                                     type: "pie",
-                                    name: (_96 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _96 !== void 0 ? _96 : "",
+                                    name: (_97 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _97 !== void 0 ? _97 : "",
                                     center: ["".concat(SECONDARY_CX_1 * 100, "%"), "".concat(CY_1 * 100, "%")],
                                     radius: [0, "".concat(secondaryRadiusPct_1, "%")],
                                     data: secondary.map(function (s, i) { return ({
@@ -2021,16 +2051,16 @@ var BasicChart = function (_a) {
                         legend.data = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(main_1.map(function (s) { return s.label; })), false), tslib_1.__read(secondary.map(function (s) { return s.label; })), false);
                     }
                     else if (spec.chartType === "waterfall") {
-                        primaryDomainSource_1 = (_99 = (_98 = (_97 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _97 === void 0 ? void 0 : _97[0]) === null || _98 === void 0 ? void 0 : _98.sources) === null || _99 === void 0 ? void 0 : _99[0];
+                        primaryDomainSource_1 = (_100 = (_99 = (_98 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _98 === void 0 ? void 0 : _98[0]) === null || _99 === void 0 ? void 0 : _99.sources) === null || _100 === void 0 ? void 0 : _100[0];
                         rawDomainValues = primaryDomainSource_1
-                            ? (0, aggregation_1.sanitizeDomainValues)((_100 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _100 !== void 0 ? _100 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_101 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _101 !== void 0 ? _101 : [])
                             : [];
                         labels = rawDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_101 = spec.series) === null || _101 === void 0 ? void 0 : _101[0];
+                        seriesEntry = (_102 = spec.series) === null || _102 === void 0 ? void 0 : _102[0];
                         rawValues_1 = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); })
                             : [];
-                        totalIndices = new Set((_102 = spec.totalIndices) !== null && _102 !== void 0 ? _102 : []);
+                        totalIndices = new Set((_103 = spec.totalIndices) !== null && _103 !== void 0 ? _103 : []);
                         steps = (0, waterfall_1.computeWaterfall)(rawValues_1, labels, totalIndices);
                         chartDomains.length = 0;
                         chartDomains.push({
@@ -2040,7 +2070,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_103 = spec.horizontalAxisTitle) !== null && _103 !== void 0 ? _103 : "",
+                            name: (_104 = spec.horizontalAxisTitle) !== null && _104 !== void 0 ? _104 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
@@ -2053,9 +2083,9 @@ var BasicChart = function (_a) {
                             data: steps.map(function (s) { return s.placeholder; }),
                             silent: true,
                         });
-                        accent_1 = (_104 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _104 !== void 0 ? _104 : theme.themeColors.accent1;
-                        decreaseColor_1 = (_106 = (_105 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.negativeColor) !== null && _105 !== void 0 ? _105 : theme.themeColors.accent2) !== null && _106 !== void 0 ? _106 : accent_1;
-                        totalColor_1 = (_107 = theme.themeColors.accent3) !== null && _107 !== void 0 ? _107 : accent_1;
+                        accent_1 = (_105 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _105 !== void 0 ? _105 : theme.themeColors.accent1;
+                        decreaseColor_1 = (_107 = (_106 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.negativeColor) !== null && _106 !== void 0 ? _106 : theme.themeColors.accent2) !== null && _107 !== void 0 ? _107 : accent_1;
+                        totalColor_1 = (_108 = theme.themeColors.accent3) !== null && _108 !== void 0 ? _108 : accent_1;
                         connectors = steps.slice(0, -1).map(function (s, i) { return [
                             { coord: [i, s.cumulative] },
                             { coord: [i + 1, s.cumulative] },
@@ -2063,7 +2093,7 @@ var BasicChart = function (_a) {
                         chartSeries.push({
                             type: "bar",
                             stack: "waterfall",
-                            name: (_108 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _108 !== void 0 ? _108 : "",
+                            name: (_109 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _109 !== void 0 ? _109 : "",
                             data: steps.map(function (s, i) { return ({
                                 value: s.value,
                                 itemStyle: {
@@ -2090,12 +2120,12 @@ var BasicChart = function (_a) {
                         legend.data = [];
                     }
                     else if (spec.chartType === "funnel") {
-                        primaryDomainSource_2 = (_111 = (_110 = (_109 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _109 === void 0 ? void 0 : _109[0]) === null || _110 === void 0 ? void 0 : _110.sources) === null || _111 === void 0 ? void 0 : _111[0];
+                        primaryDomainSource_2 = (_112 = (_111 = (_110 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _110 === void 0 ? void 0 : _110[0]) === null || _111 === void 0 ? void 0 : _111.sources) === null || _112 === void 0 ? void 0 : _112[0];
                         rawDomainValues = primaryDomainSource_2
-                            ? (0, aggregation_1.sanitizeDomainValues)((_112 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _112 !== void 0 ? _112 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_113 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _113 !== void 0 ? _113 : [])
                             : [];
                         labels_1 = rawDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_113 = spec.series) === null || _113 === void 0 ? void 0 : _113[0];
+                        seriesEntry = (_114 = spec.series) === null || _114 === void 0 ? void 0 : _114[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : 0); })
                             : [];
@@ -2103,7 +2133,7 @@ var BasicChart = function (_a) {
                         chartSeries.length = 0;
                         chartSeries.push({
                             type: "funnel",
-                            name: (_114 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _114 !== void 0 ? _114 : "",
+                            name: (_115 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _115 !== void 0 ? _115 : "",
                             data: rawValues.map(function (value, i) {
                                 var _a;
                                 return ({
@@ -2124,7 +2154,7 @@ var BasicChart = function (_a) {
                         outlierPoints = [];
                         meanPoints = [];
                         try {
-                            for (_v = tslib_1.__values((_115 = spec.series) !== null && _115 !== void 0 ? _115 : []), _w = _v.next(); !_w.done; _w = _v.next()) {
+                            for (_v = tslib_1.__values((_116 = spec.series) !== null && _116 !== void 0 ? _116 : []), _w = _v.next(); !_w.done; _w = _v.next()) {
                                 seriesEntry = _w.value;
                                 label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                                     ? seriesEntry.dataLabel
@@ -2173,7 +2203,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_116 = spec.horizontalAxisTitle) !== null && _116 !== void 0 ? _116 : "",
+                            name: (_117 = spec.horizontalAxisTitle) !== null && _117 !== void 0 ? _117 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
@@ -2183,7 +2213,7 @@ var BasicChart = function (_a) {
                             name: "",
                             data: boxStats,
                         };
-                        boxColor = (_118 = (_117 = spec.series) === null || _117 === void 0 ? void 0 : _117[0]) === null || _118 === void 0 ? void 0 : _118.color;
+                        boxColor = (_119 = (_118 = spec.series) === null || _118 === void 0 ? void 0 : _118[0]) === null || _119 === void 0 ? void 0 : _119.color;
                         if (boxColor) {
                             boxSeries.itemStyle = { color: boxColor, borderColor: boxColor };
                         }
@@ -2215,18 +2245,18 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_119 = spec.horizontalAxisTitle) !== null && _119 !== void 0 ? _119 : "",
+                            name: (_120 = spec.horizontalAxisTitle) !== null && _120 !== void 0 ? _120 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
                         chartSeries.length = 0;
                         histogramSeries = {
                             type: "bar",
-                            name: (_122 = (_121 = (_120 = spec.series) === null || _120 === void 0 ? void 0 : _120[0]) === null || _121 === void 0 ? void 0 : _121.dataLabel) !== null && _122 !== void 0 ? _122 : "",
+                            name: (_123 = (_122 = (_121 = spec.series) === null || _121 === void 0 ? void 0 : _121[0]) === null || _122 === void 0 ? void 0 : _122.dataLabel) !== null && _123 !== void 0 ? _123 : "",
                             data: counts,
                             barCategoryGap: "1%",
                         };
-                        histogramColor = (_124 = (_123 = spec.series) === null || _123 === void 0 ? void 0 : _123[0]) === null || _124 === void 0 ? void 0 : _124.color;
+                        histogramColor = (_125 = (_124 = spec.series) === null || _124 === void 0 ? void 0 : _124[0]) === null || _125 === void 0 ? void 0 : _125.color;
                         if (histogramColor) {
                             histogramSeries.itemStyle = { color: histogramColor };
                         }
@@ -2263,20 +2293,20 @@ var BasicChart = function (_a) {
                     isPareto = spec.chartType === "histogram" && (0, histogram_1.isParetoSpec)(spec);
                     hasSecondaryAxis = !isCircularChart &&
                         !isHorizontalBarChart &&
-                        (((_125 = spec.series) !== null && _125 !== void 0 ? _125 : []).some(function (s) { return s.useSecondaryAxis; }) || isPareto);
+                        (((_126 = spec.series) !== null && _126 !== void 0 ? _126 : []).some(function (s) { return s.useSecondaryAxis; }) || isPareto);
                     isPercentStackedBars = spec.stackedType === "PERCENT_STACKED" &&
                         (spec.chartType === "bar" || spec.chartType === "column");
                     primaryAxisNumberFormat = isPercentStackedBars
                         ? undefined
                         : (0, axis_number_format_1.resolveValueAxisNumberFormat)({
                             axisOptions: spec.valueAxisOptions,
-                            series: ((_126 = spec.series) !== null && _126 !== void 0 ? _126 : []).filter(function (s) { return !s.useSecondaryAxis; }),
+                            series: ((_127 = spec.series) !== null && _127 !== void 0 ? _127 : []).filter(function (s) { return !s.useSecondaryAxis; }),
                             getFormattingFromRange: getFormattingFromRange,
                             hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                         });
                     secondaryAxisNumberFormat = (0, axis_number_format_1.resolveValueAxisNumberFormat)({
                         axisOptions: spec.secondaryValueAxisOptions,
-                        series: ((_127 = spec.series) !== null && _127 !== void 0 ? _127 : []).filter(function (s) { return s.useSecondaryAxis; }),
+                        series: ((_128 = spec.series) !== null && _128 !== void 0 ? _128 : []).filter(function (s) { return s.useSecondaryAxis; }),
                         getFormattingFromRange: getFormattingFromRange,
                         hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                     });
@@ -2298,24 +2328,24 @@ var BasicChart = function (_a) {
                         trigger: isCircularChart ? "item" : "axis",
                         formatter: isCircularChart
                             ? primaryAxisNumberFormat
-                                ? (0, axis_number_format_1.circularTooltipFormatter)(primaryAxisNumberFormat)
+                                ? (0, axis_number_format_1.circularTooltipFormatter)(primaryAxisNumberFormat, locale)
                                 : "{b}: {c} ({d}%)"
                             : undefined,
                     };
                     finalLegend = (0, overrides_1.applyLegendOverrides)(legend, spec.legend);
                     bottomAxisNameGap = isHorizontalBarChart
                         ? valueAxisBase.nameGap
-                        : Number((_129 = (_128 = chartDomains[0]) === null || _128 === void 0 ? void 0 : _128.nameGap) !== null && _129 !== void 0 ? _129 : CATEGORY_AXIS_NAME_GAP);
+                        : Number((_130 = (_129 = chartDomains[0]) === null || _129 === void 0 ? void 0 : _129.nameGap) !== null && _130 !== void 0 ? _130 : CATEGORY_AXIS_NAME_GAP);
                     legendBand = (0, legend_layout_1.reserveEchartsLegendBand)({
-                        position: (_130 = spec.legend) === null || _130 === void 0 ? void 0 : _130.position,
+                        position: (_131 = spec.legend) === null || _131 === void 0 ? void 0 : _131.position,
                         visible: finalLegend.show !== false,
                         labels: (0, legend_layout_1.legendLabelsFrom)(finalLegend.data, chartSeries.map(function (s) { return s === null || s === void 0 ? void 0 : s.name; })),
-                        legendFontSize: (_135 = (_132 = (_131 = finalLegend.textStyle) === null || _131 === void 0 ? void 0 : _131.fontSize) !== null && _132 !== void 0 ? _132 : (_134 = (_133 = spec.legend) === null || _133 === void 0 ? void 0 : _133.textFormat) === null || _134 === void 0 ? void 0 : _134.fontSize) !== null && _135 !== void 0 ? _135 : 12,
+                        legendFontSize: (_136 = (_133 = (_132 = finalLegend.textStyle) === null || _132 === void 0 ? void 0 : _132.fontSize) !== null && _133 !== void 0 ? _133 : (_135 = (_134 = spec.legend) === null || _134 === void 0 ? void 0 : _134.textFormat) === null || _135 === void 0 ? void 0 : _135.fontSize) !== null && _136 !== void 0 ? _136 : 12,
                         legendItemWidth: defaultLegendConfig.itemWidth,
                         width: width !== null && width !== void 0 ? width : 0,
                         height: height !== null && height !== void 0 ? height : 0,
                         hasTitle: Boolean(title),
-                        titleFontSize: (_137 = (_136 = spec.titleTextFormat) === null || _136 === void 0 ? void 0 : _136.fontSize) !== null && _137 !== void 0 ? _137 : 16,
+                        titleFontSize: (_138 = (_137 = spec.titleTextFormat) === null || _137 === void 0 ? void 0 : _137.fontSize) !== null && _138 !== void 0 ? _138 : 16,
                         hasBottomAxisTitle: !isCircularChart && Boolean(spec.horizontalAxisTitle),
                         bottomAxisNameGap: bottomAxisNameGap,
                         hasLeftAxisTitle: !isCircularChart && Boolean(spec.verticalAxisTitle),
@@ -2335,13 +2365,26 @@ var BasicChart = function (_a) {
                                 bottom: 0,
                             }
                             : legendBand.grid;
-                    dataLabelOptions = spec.dataLabels;
+                    chartDataLabels = spec.dataLabels;
                     seriesLabelOptionFor = function (s) {
+                        var _a;
+                        var specIndex = (0, series_click_1.chartSeriesSpecIndex)(s === null || s === void 0 ? void 0 : s.id);
+                        var dataLabelOptions = (0, overrides_1.resolveSeriesDataLabels)(chartDataLabels, specIndex === undefined ? undefined : (_a = spec.series) === null || _a === void 0 ? void 0 : _a[specIndex]);
                         return (0, overrides_1.buildSeriesLabelOption)(dataLabelOptions && !dataLabelOptions.numberFormatPattern
-                            ? tslib_1.__assign(tslib_1.__assign({}, dataLabelOptions), { numberFormatPattern: seriesNumberFormatFor(s) }) : dataLabelOptions);
+                            ? tslib_1.__assign(tslib_1.__assign({}, dataLabelOptions), { numberFormatPattern: seriesNumberFormatFor(s) }) : dataLabelOptions, s === null || s === void 0 ? void 0 : s.type, locale);
                     };
                     isDoughnut = spec.chartType === "doughnut";
                     doughnutHoleSize = spec.doughnutHoleSize;
+                    doughnutSeriesOrder = isDoughnut
+                        ? chartSeries
+                            .filter(function (s) { return (s === null || s === void 0 ? void 0 : s.type) === "pie"; })
+                            .map(function (s) { return (0, series_click_1.chartSeriesSpecIndex)(s === null || s === void 0 ? void 0 : s.id); })
+                            .filter(function (i) { return i !== undefined; })
+                            .sort(function (a, b) { return a - b; })
+                        : [];
+                    doughnutRingSet = isDoughnut
+                        ? (0, doughnut_1.doughnutRings)((0, doughnut_1.clampDoughnutHole)(doughnutHoleSize), doughnutSeriesOrder.length)
+                        : [];
                     explosion = isCircularChart && !isOfPie ? (0, pie_explosion_1.resolveExplosion)(spec) : 0;
                     explodedRef.current = explosion > 0;
                     explosionOffset = (0, pie_explosion_1.explosionOffsetPx)(explosion, (0, pie_explosion_1.pieRadiusPx)(isDoughnut ? [0, "75%"] : spec.radius, width !== null && width !== void 0 ? width : 0, height !== null && height !== void 0 ? height : 0));
@@ -2406,24 +2449,30 @@ var BasicChart = function (_a) {
                         }
                     }
                     seriesWithLabels = chartSeries.map(function (s) {
-                        var _a, _b, _c, _d, _e;
+                        var _a, _b, _c, _d, _e, _f, _g, _h;
                         var next = tslib_1.__assign({}, s);
                         var seriesLabelOption = seriesLabelOptionFor(s);
                         if (seriesLabelOption) {
                             next.label = tslib_1.__assign(tslib_1.__assign({}, ((_a = s === null || s === void 0 ? void 0 : s.label) !== null && _a !== void 0 ? _a : {})), seriesLabelOption);
                         }
+                        else if ((s === null || s === void 0 ? void 0 : 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 = tslib_1.__assign(tslib_1.__assign({}, ((_b = s === null || s === void 0 ? void 0 : s.label) !== null && _b !== void 0 ? _b : {})), { show: false });
+                            next.labelLine = tslib_1.__assign(tslib_1.__assign({}, ((_c = s === null || s === void 0 ? void 0 : s.labelLine) !== null && _c !== void 0 ? _c : {})), { show: false });
+                        }
                         // Tooltip values of the value-axis series (a boxplot / candlestick
                         // tooltip lists its own statistics and keeps echarts' default).
                         var seriesTooltipValueFormatter = VALUE_TOOLTIP_SERIES_TYPES.has(s === null || s === void 0 ? void 0 : s.type)
-                            ? (0, axis_number_format_1.valueAxisLabelFormatter)(seriesNumberFormatFor(s))
+                            ? (0, axis_number_format_1.valueAxisLabelFormatter)(seriesNumberFormatFor(s), locale)
                             : undefined;
-                        if (seriesTooltipValueFormatter && ((_b = s === null || s === void 0 ? void 0 : s.tooltip) === null || _b === void 0 ? void 0 : _b.show) !== false) {
-                            next.tooltip = tslib_1.__assign(tslib_1.__assign({}, ((_c = s === null || s === void 0 ? void 0 : s.tooltip) !== null && _c !== void 0 ? _c : {})), { valueFormatter: seriesTooltipValueFormatter });
+                        if (seriesTooltipValueFormatter && ((_d = s === null || s === void 0 ? void 0 : s.tooltip) === null || _d === void 0 ? void 0 : _d.show) !== false) {
+                            next.tooltip = tslib_1.__assign(tslib_1.__assign({}, ((_e = s === null || s === void 0 ? void 0 : s.tooltip) !== null && _e !== void 0 ? _e : {})), { valueFormatter: seriesTooltipValueFormatter });
                         }
                         if (next.type === "pie") {
                             var pieNumberFormat = seriesNumberFormatFor(s);
-                            if (pieNumberFormat && ((_d = s === null || s === void 0 ? void 0 : s.tooltip) === null || _d === void 0 ? void 0 : _d.show) !== false) {
-                                next.tooltip = tslib_1.__assign(tslib_1.__assign({}, ((_e = s === null || s === void 0 ? void 0 : s.tooltip) !== null && _e !== void 0 ? _e : {})), { formatter: (0, axis_number_format_1.circularTooltipFormatter)(pieNumberFormat) });
+                            if (pieNumberFormat && ((_f = s === null || s === void 0 ? void 0 : s.tooltip) === null || _f === void 0 ? void 0 : _f.show) !== false) {
+                                next.tooltip = tslib_1.__assign(tslib_1.__assign({}, ((_g = s === null || s === void 0 ? void 0 : s.tooltip) !== null && _g !== void 0 ? _g : {})), { formatter: (0, axis_number_format_1.circularTooltipFormatter)(pieNumberFormat, locale) });
                             }
                             if (explosionOffset > 0 && Array.isArray(next.data)) {
                                 next.selectedMode = "multiple";
@@ -2435,15 +2484,19 @@ var BasicChart = function (_a) {
                             }
                         }
                         if (isDoughnut && next.type === "pie") {
-                            var inner = typeof doughnutHoleSize === "number"
-                                ? Math.round(Math.max(0, Math.min(0.9, doughnutHoleSize)) * 100)
-                                : 50;
-                            next.radius = ["".concat(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).
+                            var rank = doughnutSeriesOrder.indexOf((0, series_click_1.chartSeriesSpecIndex)(s === null || s === void 0 ? void 0 : s.id));
+                            var ring = (_h = doughnutRingSet[rank]) !== null && _h !== void 0 ? _h : (0, doughnut_1.doughnutRings)((0, doughnut_1.clampDoughnutHole)(doughnutHoleSize), 1)[0];
+                            var pct = function (fraction) { return "".concat(Math.round(fraction * 75 * 100) / 100, "%"); };
+                            next.radius = [pct(ring.inner), pct(ring.outer)];
                         }
                         return next;
                     });
                     // Update charts
-                    (_138 = chartRef.current) === null || _138 === void 0 ? void 0 : _138.setOption({
+                    (_139 = chartRef.current) === null || _139 === void 0 ? void 0 : _139.setOption({
                         xAxis: (function () {
                             var _a, _b;
                             if (isOfPie) {
@@ -2487,7 +2540,7 @@ var BasicChart = function (_a) {
                             }
                             if (isHorizontalBarChart) {
                                 return [
-                                    (0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: (_a = spec.horizontalAxisTitle) !== null && _a !== void 0 ? _a : "" }), spec.valueAxisOptions, primaryAxisNumberFormat),
+                                    (0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: (_a = spec.horizontalAxisTitle) !== null && _a !== void 0 ? _a : "" }), spec.valueAxisOptions, primaryAxisNumberFormat, locale),
                                 ];
                             }
                             var base = chartDomains.length > 0
@@ -2565,7 +2618,8 @@ var BasicChart = function (_a) {
                                                 : [];
                                         }),
                                         pattern: primaryAxisNumberFormat,
-                                    }) }), spec.valueAxisOptions, primaryAxisNumberFormat),
+                                        locale: locale,
+                                    }) }), spec.valueAxisOptions, primaryAxisNumberFormat, locale),
                             ];
                             if (hasSecondaryAxis) {
                                 axes.push((0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: "", splitLine: { show: false } }), (isPareto
@@ -2574,7 +2628,7 @@ var BasicChart = function (_a) {
                                         max: 100,
                                         axisLabel: { formatter: "{value}%" },
                                     }
-                                    : {})), spec.secondaryValueAxisOptions, secondaryAxisNumberFormat));
+                                    : {})), spec.secondaryValueAxisOptions, secondaryAxisNumberFormat, locale));
                             }
                             return axes;
                         })(),
@@ -2716,6 +2770,7 @@ var BasicChart = function (_a) {
         getDomainValuesFromRange,
         getSeriesValuesFromRange,
         getFormattingFromRange,
+        locale,
         glUpgradeTick,
     ]);
     // Resize chart