@rowsncolumns/charts 28.1.11 → 28.1.13

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

@@ -126,7 +126,14 @@ var HIERARCHY_LEVEL_STYLES = [
     },
     {
         itemStyle: {
-            gapWidth: 1,
+            gapWidth: 2,
+            borderColor: "#ffffff",
+            borderWidth: 1,
+        },
+    },
+    {
+        itemStyle: {
+            gapWidth: 0,
             borderColor: "#ffffff",
             borderWidth: 1,
         },
@@ -149,11 +156,20 @@ var treemapBannerShown = function (layout) { return layout !== "none"; };
  * Colour a hierarchy like Excel: each top-level node takes the next
  * palette colour and every descendant inherits it (#1072).
  */
-var colorHierarchyNodes = function (nodes, palette) {
+var colorHierarchyNodes = function (nodes, palette, options) {
+    if (options === void 0) { options = {}; }
     return nodes.map(function (node, index) {
         var color = (0, utils_1.chartPaletteColorAt)(palette, index);
-        var paint = function (n) { return (tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, n), { itemStyle: { color: color } }), (n.children ? { children: n.children.map(paint) } : {}))); };
-        return paint(node);
+        var paint = function (n, depth) { return (tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, n), { 
+            // A top-level node's "border" is what echarts paints behind its
+            // banner strip: fill it with the category colour and write the name
+            // in a contrasting colour, like Excel's banner (#1086).
+            itemStyle: depth === 0 && options.banner
+                ? { color: color, borderColor: color }
+                : { color: color } }), (depth === 0 && options.banner
+            ? { upperLabel: { color: (0, hierarchy_1.contrastTextColor)(color) } }
+            : {})), (n.children ? { children: n.children.map(function (c) { return paint(c, depth + 1); }) } : {}))); };
+        return paint(node, 0);
     });
 };
 /** Sunburst rings: Excel leaves the centre empty, so even the first level is a ring (#1073). */
@@ -412,11 +428,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, bubblePalette_1, bubbleItemColor_1, hasBubbleSecondaryAxis, xAxisConfig, tooltipFormatter, bubbleSeriesLabelFor_1, bubbleSeries, bubbleOverlays, hierarchyRows, headerTitle, hierarchyPalette, hierarchyData, rootName, drillDown, seriesDisplayName, hierarchyDepth, isTreemap, banner, levels, hierarchyLegend, legendShown, categoryLegendSeries, 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_1, 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, pointColors_1, _v, _w, dp, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, funnelPalette, funnelColor_1, stageColors_1, _x, _y, dp, funnelData, funnelLayout, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _z, _0, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _1, _2, outlier, boxSeries, boxColor, rawValues, _3, 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, _4, e_2, _5, e_4, _6, e_5, _7, e_3, _8, e_6, _9, e_7, _10, e_8, _11, e_9, _12, e_10, _13, e_11, _14;
-        var _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, _140, _141, _142, _143, _144, _145, _146, _147, _148, _149;
-        return tslib_1.__generator(this, function (_150) {
-            switch (_150.label) {
+        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, bubblePalette_1, bubbleItemColor_1, hasBubbleSecondaryAxis, xAxisConfig, tooltipFormatter, bubbleSeriesLabelFor_1, bubbleSeries, bubbleOverlays, bubbleLegend, bubbleBand, hierarchyRows, headerTitle, hierarchyPalette, isTreemap, banner, hierarchyData, rootName, drillDown, seriesDisplayName, hierarchyDepth, levels, hierarchyLegend, legendShown, categoryLegendSeries, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchyLabelOpts, hierarchyLabel, hierarchyBand, 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_1, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, radarLegend, radarBand, radarPlotWidth, radarPlotHeight, radarGeometry, 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, pointColors_1, _v, _w, dp, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, funnelPalette, funnelColor_1, stageColors_1, _x, _y, dp, funnelData, funnelLayout, funnelLabelsOff, quartileMethod_1, showOutliers_1, showMeanMarker_1, showInnerPoints_1, showMeanLine_1, boxDomainSource, boxCategories_2, grouped_1, groups_1, boxCategories_1, boxCategories_1_1, c, boxSeriesSpecs, slots_1, boxGap, boxPlotWidth, boxBand, boxWidthMax_1, boxCount_1, slotX_1, boxLegend_1, rawValues, histogramDomainSource, histogramCategories, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, paretoLineColor, 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, e_10, _9;
+        var _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, _140, _141, _142, _143, _144, _145, _146, _147, _148, _149, _150, _151, _152, _153, _154, _155, _156, _157, _158, _159, _160, _161, _162, _163, _164, _165, _166, _167, _168, _169, _170, _171, _172, _173, _174, _175, _176, _177, _178, _179, _180;
+        return tslib_1.__generator(this, function (_181) {
+            switch (_181.label) {
                 case 0:
                     (0, utils_1.debug)("Updating chart", chart);
                     threeDRenderKind = (0, three_d_1.resolve3DRenderKind)(spec.sourceChartType);
@@ -440,7 +456,7 @@ var BasicChart = function (_a) {
                         // Leaving 3-D (spec edit) — the grid3D option doesn't merge back
                         // into a cartesian one, so re-initialize from a clean slate and
                         // let the normal 2-D flow below do a full structural render.
-                        (_15 = chartRef.current) === null || _15 === void 0 ? void 0 : _15.dispose();
+                        (_10 = chartRef.current) === null || _10 === void 0 ? void 0 : _10.dispose();
                         chartRef.current = undefined;
                         renderedIn3D.current = false;
                         previousChartType.current = undefined;
@@ -454,7 +470,7 @@ var BasicChart = function (_a) {
                         // doesn't merge back into a cartesian one, so re-initialize from
                         // a clean slate and let the normal flow below do a full
                         // structural render.
-                        (_16 = chartRef.current) === null || _16 === void 0 ? void 0 : _16.dispose();
+                        (_11 = chartRef.current) === null || _11 === void 0 ? void 0 : _11.dispose();
                         chartRef.current = undefined;
                         renderedAsRegionMap.current = false;
                         previousChartType.current = undefined;
@@ -467,7 +483,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 = _150.sent();
+                    geo = _181.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).
@@ -482,7 +498,7 @@ var BasicChart = function (_a) {
                     if (!geo) {
                         // Map asset failed to load (or unknown scope) — the loader
                         // already warned once; render an empty chart, never crash.
-                        (_17 = chartRef.current) === null || _17 === void 0 ? void 0 : _17.setOption({ series: [] }, { replaceMerge: ["series", "visualMap"] });
+                        (_12 = chartRef.current) === null || _12 === void 0 ? void 0 : _12.setOption({ series: [] }, { replaceMerge: ["series", "visualMap"] });
                         renderedAsRegionMap.current = true;
                         applyThemeOptions();
                         previousChartType.current = spec.chartType;
@@ -490,7 +506,7 @@ var BasicChart = function (_a) {
                         return [2 /*return*/];
                     }
                     labels = flattenChartDataValues(regionSpec.domains, getDomainValuesFromRange, regionSpec.hiddenDimensionStrategy, false);
-                    seriesEntry = (_18 = regionSpec.series) === null || _18 === void 0 ? void 0 : _18[0];
+                    seriesEntry = (_13 = regionSpec.series) === null || _13 === void 0 ? void 0 : _13[0];
                     values = seriesEntry
                         ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, regionSpec.hiddenDimensionStrategy)
                         : [];
@@ -506,7 +522,7 @@ var BasicChart = function (_a) {
                     seriesName = (seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                         ? seriesEntry.dataLabel
                         : "";
-                    (_19 = chartRef.current) === null || _19 === void 0 ? void 0 : _19.setOption({
+                    (_14 = chartRef.current) === null || _14 === void 0 ? void 0 : _14.setOption({
                         // The visualMap color scale is the value legend; the series
                         // legend stays hidden unless an authored override turns it on.
                         legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, defaultLegendConfig), { show: false }), spec.legend),
@@ -574,36 +590,36 @@ var BasicChart = function (_a) {
                     hierarchyTitleRef.current = explicitChartTitle;
                     skipHeaders_1 = spec.useFirstRowAsHeaders !== false;
                     labelValues = flattenChartDataValues(spec.bubbleLabels, getDomainValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders_1);
-                    perSeriesX = ((_20 = spec.domains) !== null && _20 !== void 0 ? _20 : []).map(function (dom) {
+                    perSeriesX = ((_15 = spec.domains) !== null && _15 !== void 0 ? _15 : []).map(function (dom) {
                         return flattenChartDataValues([dom], getSeriesValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders_1);
                     });
-                    perSeriesSize = ((_21 = spec.bubbleSizes) !== null && _21 !== void 0 ? _21 : []).map(function (sz) {
+                    perSeriesSize = ((_16 = spec.bubbleSizes) !== null && _16 !== void 0 ? _16 : []).map(function (sz) {
                         return flattenChartDataValues([sz], getSeriesValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders_1);
                     });
                     seriesInputs = [];
                     i = 0;
-                    _150.label = 3;
+                    _181.label = 3;
                 case 3:
                     if (!(i < spec.series.length)) return [3 /*break*/, 7];
                     seriesEntry = spec.series[i];
-                    resolvedLabel = (_22 = seriesEntry.dataLabel) !== null && _22 !== void 0 ? _22 : "";
+                    resolvedLabel = (_17 = seriesEntry.dataLabel) !== null && _17 !== void 0 ? _17 : "";
                     if (!(resolvedLabel && (0, utils_1.isAFormula)(resolvedLabel))) return [3 /*break*/, 5];
                     _b = chart_spec_utils_1.coerceCalculatedLabel;
-                    return [4 /*yield*/, onRequestCalculate(resolvedLabel, (_23 = position.sheetId) !== null && _23 !== void 0 ? _23 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
+                    return [4 /*yield*/, onRequestCalculate(resolvedLabel, (_18 = position.sheetId) !== null && _18 !== void 0 ? _18 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 4:
-                    resolvedLabel = _b.apply(void 0, [_150.sent()]);
-                    _150.label = 5;
+                    resolvedLabel = _b.apply(void 0, [_181.sent()]);
+                    _181.label = 5;
                 case 5:
-                    xValues = (_24 = perSeriesX[i]) !== null && _24 !== void 0 ? _24 : perSeriesX[0];
-                    sizeValues_1 = (_25 = perSeriesSize[i]) !== null && _25 !== void 0 ? _25 : perSeriesSize[0];
+                    xValues = (_19 = perSeriesX[i]) !== null && _19 !== void 0 ? _19 : perSeriesX[0];
+                    sizeValues_1 = (_20 = perSeriesSize[i]) !== null && _20 !== void 0 ? _20 : 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 } : {})));
-                    _150.label = 6;
+                    _181.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 3];
                 case 7:
-                    sharedXValues = (_26 = perSeriesX[0]) !== null && _26 !== void 0 ? _26 : [];
-                    sharedSizeValues = (_27 = perSeriesSize[0]) !== null && _27 !== void 0 ? _27 : [];
+                    sharedXValues = (_21 = perSeriesX[0]) !== null && _21 !== void 0 ? _21 : [];
+                    sharedSizeValues = (_22 = perSeriesSize[0]) !== null && _22 !== void 0 ? _22 : [];
                     _c = (0, bubble_1.prepareBubbleSeriesData)({
                         xValues: sharedXValues,
                         labelValues: labelValues,
@@ -624,7 +640,7 @@ var BasicChart = function (_a) {
                         theme.themeColors.accent6,
                     ]);
                     bubbleItemColor_1 = function (seriesEntry, index) {
-                        var e_12, _a;
+                        var e_11, _a;
                         var _b, _c;
                         var base = (_b = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _b !== void 0 ? _b : (0, utils_1.chartPaletteColorAt)(bubblePalette_1, index);
                         var overrides = new Map();
@@ -636,29 +652,29 @@ var BasicChart = function (_a) {
                                 }
                             }
                         }
-                        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
                         finally {
                             try {
                                 if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                             }
-                            finally { if (e_12) throw e_12.error; }
+                            finally { if (e_11) throw e_11.error; }
                         }
                         return overrides.size
                             ? function (params) { var _a, _b; return (_b = overrides.get((_a = params === null || params === void 0 ? void 0 : params.data) === null || _a === void 0 ? void 0 : _a.index)) !== null && _b !== void 0 ? _b : base; }
                             : base;
                     };
-                    hasBubbleSecondaryAxis = ((_28 = spec.series) !== null && _28 !== void 0 ? _28 : []).some(function (seriesEntry) { return seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.useSecondaryAxis; });
+                    hasBubbleSecondaryAxis = ((_23 = spec.series) !== null && _23 !== void 0 ? _23 : []).some(function (seriesEntry) { return seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.useSecondaryAxis; });
                     xAxisConfig = categories_1.length > 0
                         ? {
                             type: "category",
                             data: categories_1,
-                            name: (_29 = spec.horizontalAxisTitle) !== null && _29 !== void 0 ? _29 : "",
+                            name: (_24 = spec.horizontalAxisTitle) !== null && _24 !== void 0 ? _24 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         }
                         : {
                             type: "value",
-                            name: (_30 = spec.horizontalAxisTitle) !== null && _30 !== void 0 ? _30 : "",
+                            name: (_25 = spec.horizontalAxisTitle) !== null && _25 !== void 0 ? _25 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         };
@@ -740,14 +756,29 @@ var BasicChart = function (_a) {
                             },
                         });
                     });
-                    (_31 = chartRef.current) === null || _31 === void 0 ? void 0 : _31.setOption({
+                    bubbleLegend = (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);
+                    bubbleBand = (0, legend_layout_1.reserveEchartsLegendBand)({
+                        position: (_26 = spec.legend) === null || _26 === void 0 ? void 0 : _26.position,
+                        visible: bubbleLegend.show !== false,
+                        labels: preparedSeries.map(function (entry) { return entry.name; }),
+                        legendFontSize: (_31 = (_28 = (_27 = bubbleLegend.textStyle) === null || _27 === void 0 ? void 0 : _27.fontSize) !== null && _28 !== void 0 ? _28 : (_30 = (_29 = spec.legend) === null || _29 === void 0 ? void 0 : _29.textFormat) === null || _30 === void 0 ? void 0 : _30.fontSize) !== null && _31 !== void 0 ? _31 : 12,
+                        legendItemWidth: defaultLegendConfig.itemWidth,
+                        width: width !== null && width !== void 0 ? width : 0,
+                        height: height !== null && height !== void 0 ? height : 0,
+                        hasTitle: Boolean(explicitChartTitle),
+                        titleFontSize: (_33 = (_32 = spec.titleTextFormat) === null || _32 === void 0 ? void 0 : _32.fontSize) !== null && _33 !== void 0 ? _33 : 16,
+                        hasBottomAxisTitle: Boolean(spec.horizontalAxisTitle),
+                        bottomAxisNameGap: 30,
+                        hasLeftAxisTitle: Boolean(spec.verticalAxisTitle),
+                    });
+                    (_34 = chartRef.current) === null || _34 === void 0 ? void 0 : _34.setOption({
                         xAxis: [
                             (0, overrides_1.applyAxisOverrides)(tslib_1.__assign({}, xAxisConfig), spec.categoryAxisOptions),
                         ],
                         yAxis: tslib_1.__spreadArray([
                             (0, overrides_1.applyAxisOverrides)({
                                 type: "value",
-                                name: (_32 = spec.verticalAxisTitle) !== null && _32 !== void 0 ? _32 : "",
+                                name: (_35 = spec.verticalAxisTitle) !== null && _35 !== void 0 ? _35 : "",
                                 nameLocation: "middle",
                                 nameGap: 45,
                             }, spec.valueAxisOptions, undefined, locale)
@@ -762,13 +793,10 @@ var BasicChart = function (_a) {
                                 }, spec.secondaryValueAxisOptions, undefined, locale),
                             ]
                             : [])), false),
-                        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: {
-                            left: "3%",
-                            right: "4%",
-                            bottom: "3%",
-                            containLabel: true,
-                        },
+                        legend: tslib_1.__assign(tslib_1.__assign({}, bubbleLegend), bubbleBand.legend),
+                        // The plot shrinks to leave the legend its own band, as the
+                        // category charts do (#1089).
+                        grid: bubbleBand.grid,
                         tooltip: {
                             trigger: "item",
                             formatter: tooltipFormatter,
@@ -808,13 +836,13 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent5,
                             theme.themeColors.accent6,
                         ]);
-                        hierarchyData = colorHierarchyNodes((0, hierarchy_1.buildHierarchyTree)(hierarchyRows), hierarchyPalette);
-                        rootName = hierarchyData.length === 1 ? (_34 = (_33 = hierarchyData[0]) === null || _33 === void 0 ? void 0 : _33.name) !== null && _34 !== void 0 ? _34 : "" : "";
-                        drillDown = Boolean(spec.drillDown);
-                        seriesDisplayName = (_36 = (_35 = explicitChartTitle !== null && explicitChartTitle !== void 0 ? explicitChartTitle : headerTitle) !== null && _35 !== void 0 ? _35 : rootName) !== null && _36 !== void 0 ? _36 : "";
-                        hierarchyDepth = getHierarchyDepth(hierarchyData);
                         isTreemap = spec.chartType === "treemap";
                         banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
+                        hierarchyData = colorHierarchyNodes((0, hierarchy_1.buildHierarchyTree)(hierarchyRows), hierarchyPalette, { banner: banner });
+                        rootName = hierarchyData.length === 1 ? (_37 = (_36 = hierarchyData[0]) === null || _36 === void 0 ? void 0 : _36.name) !== null && _37 !== void 0 ? _37 : "" : "";
+                        drillDown = Boolean(spec.drillDown);
+                        seriesDisplayName = (_39 = (_38 = explicitChartTitle !== null && explicitChartTitle !== void 0 ? explicitChartTitle : headerTitle) !== null && _38 !== void 0 ? _38 : rootName) !== null && _39 !== void 0 ? _39 : "";
+                        hierarchyDepth = getHierarchyDepth(hierarchyData);
                         levels = buildHierarchyLevels(hierarchyDepth, {
                             treemap: isTreemap,
                             banner: banner,
@@ -835,7 +863,7 @@ var BasicChart = function (_a) {
                                 });
                             })
                             : [];
-                        sizeNumberFormat_1 = (0, axis_number_format_1.resolveSourceNumberFormat)((_38 = (_37 = spec.sizeData) === null || _37 === void 0 ? void 0 : _37[0]) === null || _38 === void 0 ? void 0 : _38.sources, getFormattingFromRange, spec.hiddenDimensionStrategy);
+                        sizeNumberFormat_1 = (0, axis_number_format_1.resolveSourceNumberFormat)((_41 = (_40 = spec.sizeData) === null || _40 === void 0 ? void 0 : _40[0]) === null || _41 === void 0 ? void 0 : _41.sources, getFormattingFromRange, spec.hiddenDimensionStrategy);
                         tooltipFormatter = function (params) {
                             var _a;
                             var value = Array.isArray(params.value)
@@ -844,9 +872,27 @@ var BasicChart = function (_a) {
                             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, undefined, locale);
-                        (_39 = chartRef.current) === null || _39 === void 0 ? void 0 : _39.setOption({
+                        hierarchyLabelOpts = hierarchyDataLabels && !hierarchyDataLabels.numberFormatPattern
+                            ? tslib_1.__assign(tslib_1.__assign({}, hierarchyDataLabels), { numberFormatPattern: sizeNumberFormat_1 }) : hierarchyDataLabels;
+                        hierarchyLabel = (hierarchyLabelOpts === null || hierarchyLabelOpts === void 0 ? void 0 : hierarchyLabelOpts.show) === false
+                            ? { show: false }
+                            : (hierarchyLabelOpts === null || hierarchyLabelOpts === void 0 ? void 0 : hierarchyLabelOpts.show)
+                                ? tslib_1.__assign({ show: true, formatter: (0, overrides_1.dataLabelFormatter)(hierarchyLabelOpts, locale, isTreemap ? "\n" : ": ") }, (isTreemap ? { position: "insideBottomLeft" } : {})) : tslib_1.__assign({ show: true, formatter: "{b}" }, (isTreemap ? { position: "insideBottomLeft" } : {}));
+                        hierarchyBand = (0, legend_layout_1.reserveEchartsLegendBand)({
+                            position: (_42 = spec.legend) === null || _42 === void 0 ? void 0 : _42.position,
+                            visible: legendShown && hierarchyData.length > 0,
+                            labels: hierarchyData.map(function (node) { return node.name; }),
+                            legendFontSize: (_47 = (_44 = (_43 = hierarchyLegend.textStyle) === null || _43 === void 0 ? void 0 : _43.fontSize) !== null && _44 !== void 0 ? _44 : (_46 = (_45 = spec.legend) === null || _45 === void 0 ? void 0 : _45.textFormat) === null || _46 === void 0 ? void 0 : _46.fontSize) !== null && _47 !== void 0 ? _47 : 12,
+                            legendItemWidth: defaultLegendConfig.itemWidth,
+                            width: width !== null && width !== void 0 ? width : 0,
+                            height: height !== null && height !== void 0 ? height : 0,
+                            hasTitle: Boolean(explicitChartTitle !== null && explicitChartTitle !== void 0 ? explicitChartTitle : headerTitle),
+                            titleFontSize: (_49 = (_48 = spec.titleTextFormat) === null || _48 === void 0 ? void 0 : _48.fontSize) !== null && _49 !== void 0 ? _49 : 16,
+                            hasBottomAxisTitle: false,
+                            bottomAxisNameGap: 0,
+                            hasLeftAxisTitle: false,
+                        });
+                        (_50 = chartRef.current) === null || _50 === void 0 ? void 0 : _50.setOption({
                             xAxis: [
                                 {
                                     type: "category",
@@ -859,7 +905,7 @@ var BasicChart = function (_a) {
                                     show: false,
                                 },
                             ],
-                            legend: tslib_1.__assign(tslib_1.__assign({}, hierarchyLegend), { data: hierarchyData.map(function (node) { return node.name; }), selectedMode: false }),
+                            legend: tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, hierarchyLegend), hierarchyBand.legend), { data: hierarchyData.map(function (node) { return node.name; }), selectedMode: false }),
                             grid: {
                                 left: 0,
                                 right: 0,
@@ -871,17 +917,27 @@ var BasicChart = function (_a) {
                                 formatter: tooltipFormatter,
                             },
                             series: tslib_1.__spreadArray([
-                                tslib_1.__assign({ type: chartType, name: seriesDisplayName, rootName: rootName || seriesDisplayName || "", data: hierarchyData, label: tslib_1.__assign(tslib_1.__assign({ show: true, formatter: "{b}" }, (isTreemap ? { position: "insideBottomLeft" } : {})), (hierarchySeriesLabel !== null && hierarchySeriesLabel !== void 0 ? hierarchySeriesLabel : {})), 
+                                tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({ type: chartType, name: seriesDisplayName, rootName: rootName || seriesDisplayName || "", data: hierarchyData, label: hierarchyLabel, 
                                     // Only `levels[1]` (the categories) may carry a banner; see
                                     // buildHierarchyLevels.
-                                    upperLabel: isTreemap ? { show: false } : undefined, levels: levels, 
+                                    upperLabel: isTreemap ? { show: false } : undefined, levels: levels }, (isTreemap
+                                    ? {
+                                        // Excel has no wheel zoom / drag pan on a treemap; the
+                                        // sheet keeps scrolling under the pointer (#1086).
+                                        roam: drillDown,
+                                        left: hierarchyBand.grid.left,
+                                        right: hierarchyBand.grid.right,
+                                        top: hierarchyBand.grid.top,
+                                        bottom: hierarchyBand.grid.bottom,
+                                    }
+                                    : {})), { 
                                     // Excel has no drill-down on either chart: zooming into a
                                     // branch on click (and the treemap breadcrumb) is opt-in.
                                     nodeClick: drillDown
                                         ? spec.chartType === "treemap"
                                             ? "zoomToNode"
                                             : "rootToNode"
-                                        : false }, (isTreemap
+                                        : false }), (isTreemap
                                     ? { breadcrumb: { show: drillDown } }
                                     : { radius: tslib_1.__spreadArray([], tslib_1.__read(SUNBURST_RADIUS), false) }))
                             ], tslib_1.__read(categoryLegendSeries), false),
@@ -908,7 +964,7 @@ var BasicChart = function (_a) {
                     }
                     isContour = (0, three_d_1.isContourSpec)(spec);
                     if (renderedAsContour.current && !isContour) {
-                        (_40 = chartRef.current) === null || _40 === void 0 ? void 0 : _40.dispose();
+                        (_51 = chartRef.current) === null || _51 === void 0 ? void 0 : _51.dispose();
                         chartRef.current = undefined;
                         renderedAsContour.current = false;
                         previousChartType.current = undefined;
@@ -919,39 +975,39 @@ 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 = [];
-                    _150.label = 9;
+                    _181.label = 9;
                 case 9:
-                    _150.trys.push([9, 16, 17, 18]);
-                    _d = tslib_1.__values((_41 = spec.series) !== null && _41 !== void 0 ? _41 : []), _e = _d.next();
-                    _150.label = 10;
+                    _181.trys.push([9, 16, 17, 18]);
+                    _d = tslib_1.__values((_52 = spec.series) !== null && _52 !== void 0 ? _52 : []), _e = _d.next();
+                    _181.label = 10;
                 case 10:
                     if (!!_e.done) return [3 /*break*/, 15];
                     seriesEntry = _e.value;
                     if (!(!(0, utils_1.isNil)(seriesEntry.dataLabel) && (0, utils_1.isAFormula)(seriesEntry.dataLabel))) return [3 /*break*/, 12];
                     _g = chart_spec_utils_1.coerceCalculatedLabel;
-                    return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_42 = position.sheetId) !== null && _42 !== void 0 ? _42 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
+                    return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_53 = position.sheetId) !== null && _53 !== void 0 ? _53 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 11:
-                    _f = _g.apply(void 0, [_150.sent()]);
+                    _f = _g.apply(void 0, [_181.sent()]);
                     return [3 /*break*/, 13];
                 case 12:
-                    _f = (_43 = seriesEntry.dataLabel) !== null && _43 !== void 0 ? _43 : "";
-                    _150.label = 13;
+                    _f = (_54 = seriesEntry.dataLabel) !== null && _54 !== void 0 ? _54 : "";
+                    _181.label = 13;
                 case 13:
                     dataLabel = _f;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     contourSeriesInputs.push({ name: dataLabel, values: values });
-                    _150.label = 14;
+                    _181.label = 14;
                 case 14:
                     _e = _d.next();
                     return [3 /*break*/, 10];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_1_1 = _150.sent();
+                    e_1_1 = _181.sent();
                     e_1 = { error: e_1_1 };
                     return [3 /*break*/, 18];
                 case 17:
                     try {
-                        if (_e && !_e.done && (_4 = _d.return)) _4.call(_d);
+                        if (_e && !_e.done && (_0 = _d.return)) _0.call(_d);
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
@@ -971,7 +1027,7 @@ var BasicChart = function (_a) {
                         chartRef.current = echarts.init(el.current);
                         bindSeriesSelection(chartRef.current);
                     }
-                    (_44 = chartRef.current) === null || _44 === void 0 ? void 0 : _44.setOption({
+                    (_55 = chartRef.current) === null || _55 === void 0 ? void 0 : _55.setOption({
                         tooltip: {
                             textStyle: { fontSize: 12 },
                             trigger: "item",
@@ -991,7 +1047,7 @@ var BasicChart = function (_a) {
                                 type: "category",
                                 data: categories_2,
                                 splitArea: { show: true },
-                                name: (_45 = spec.horizontalAxisTitle) !== null && _45 !== void 0 ? _45 : "",
+                                name: (_56 = spec.horizontalAxisTitle) !== null && _56 !== void 0 ? _56 : "",
                                 nameLocation: "middle",
                                 nameGap: 30,
                             }, spec.categoryAxisOptions),
@@ -1001,7 +1057,7 @@ var BasicChart = function (_a) {
                                 type: "category",
                                 data: seriesNames_1,
                                 splitArea: { show: true },
-                                name: (_46 = spec.verticalAxisTitle) !== null && _46 !== void 0 ? _46 : "",
+                                name: (_57 = spec.verticalAxisTitle) !== null && _57 !== void 0 ? _57 : "",
                                 nameLocation: "middle",
                                 nameGap: 50,
                             },
@@ -1054,39 +1110,39 @@ 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 = [];
-                    _150.label = 20;
+                    _181.label = 20;
                 case 20:
-                    _150.trys.push([20, 27, 28, 29]);
-                    _j = tslib_1.__values((_47 = spec.series) !== null && _47 !== void 0 ? _47 : []), _k = _j.next();
-                    _150.label = 21;
+                    _181.trys.push([20, 27, 28, 29]);
+                    _j = tslib_1.__values((_58 = spec.series) !== null && _58 !== void 0 ? _58 : []), _k = _j.next();
+                    _181.label = 21;
                 case 21:
                     if (!!_k.done) return [3 /*break*/, 26];
                     seriesEntry = _k.value;
                     if (!(!(0, utils_1.isNil)(seriesEntry.dataLabel) && (0, utils_1.isAFormula)(seriesEntry.dataLabel))) return [3 /*break*/, 23];
                     _m = chart_spec_utils_1.coerceCalculatedLabel;
-                    return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_48 = position.sheetId) !== null && _48 !== void 0 ? _48 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
+                    return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_59 = position.sheetId) !== null && _59 !== void 0 ? _59 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 22:
-                    _l = _m.apply(void 0, [_150.sent()]);
+                    _l = _m.apply(void 0, [_181.sent()]);
                     return [3 /*break*/, 24];
                 case 23:
-                    _l = (_49 = seriesEntry.dataLabel) !== null && _49 !== void 0 ? _49 : "";
-                    _150.label = 24;
+                    _l = (_60 = seriesEntry.dataLabel) !== null && _60 !== void 0 ? _60 : "";
+                    _181.label = 24;
                 case 24:
                     dataLabel = _l;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     threeDSeriesInputs.push({ name: dataLabel, values: values });
-                    _150.label = 25;
+                    _181.label = 25;
                 case 25:
                     _k = _j.next();
                     return [3 /*break*/, 21];
                 case 26: return [3 /*break*/, 29];
                 case 27:
-                    e_2_1 = _150.sent();
+                    e_2_1 = _181.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 29];
                 case 28:
                     try {
-                        if (_k && !_k.done && (_5 = _j.return)) _5.call(_j);
+                        if (_k && !_k.done && (_1 = _j.return)) _1.call(_j);
                     }
                     finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];
@@ -1160,7 +1216,7 @@ var BasicChart = function (_a) {
                         catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
-                                if (threeDSeriesInputs_1_1 && !threeDSeriesInputs_1_1.done && (_6 = threeDSeriesInputs_1.return)) _6.call(threeDSeriesInputs_1);
+                                if (threeDSeriesInputs_1_1 && !threeDSeriesInputs_1_1.done && (_2 = threeDSeriesInputs_1.return)) _2.call(threeDSeriesInputs_1);
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
@@ -1250,12 +1306,12 @@ var BasicChart = function (_a) {
                             inRange: { color: tslib_1.__spreadArray([], tslib_1.__read(three_d_1.SURFACE_COLOR_RAMP), false) },
                         };
                     }
-                    (_50 = chartRef.current) === null || _50 === void 0 ? void 0 : _50.setOption(tslib_1.__assign(tslib_1.__assign({ tooltip: {
+                    (_61 = chartRef.current) === null || _61 === void 0 ? void 0 : _61.setOption(tslib_1.__assign(tslib_1.__assign({ tooltip: {
                             textStyle: { fontSize: 12 },
                             formatter: threeDTooltipFormatter,
                         }, legend: threeDRenderKind === "line3D" || stackedBar3D_1
                             ? (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, defaultLegendConfig), { show: seriesNames_2.length > 1, data: seriesNames_2 }), spec.legend)
-                            : { show: false }, xAxis3D: tslib_1.__assign(tslib_1.__assign({}, xAxis3D), { name: (_51 = spec.horizontalAxisTitle) !== null && _51 !== void 0 ? _51 : "" }), yAxis3D: tslib_1.__assign(tslib_1.__assign({}, yAxis3D), { name: "" }), zAxis3D: { type: "value", name: (_52 = spec.verticalAxisTitle) !== null && _52 !== void 0 ? _52 : "" }, grid3D: {
+                            : { show: false }, xAxis3D: tslib_1.__assign(tslib_1.__assign({}, xAxis3D), { name: (_62 = spec.horizontalAxisTitle) !== null && _62 !== void 0 ? _62 : "" }), yAxis3D: tslib_1.__assign(tslib_1.__assign({}, yAxis3D), { name: "" }), zAxis3D: { type: "value", name: (_63 = spec.verticalAxisTitle) !== null && _63 !== void 0 ? _63 : "" }, grid3D: {
                             boxDepth: Math.max(20, Math.min(100, seriesNames_2.length * 20)),
                             viewControl: { autoRotate: false },
                         } }, (visualMap ? { visualMap: [visualMap] } : {})), { series: threeDSeries }), {
@@ -1286,7 +1342,7 @@ var BasicChart = function (_a) {
                         categories = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders);
                         radarSeriesInputs = [];
                         try {
-                            for (_p = tslib_1.__values((_53 = spec.series) !== null && _53 !== void 0 ? _53 : []), _q = _p.next(); !_q.done; _q = _p.next()) {
+                            for (_p = tslib_1.__values((_64 = spec.series) !== null && _64 !== void 0 ? _64 : []), _q = _p.next(); !_q.done; _q = _p.next()) {
                                 seriesEntry = _q.value;
                                 label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                                     ? seriesEntry.dataLabel
@@ -1298,14 +1354,14 @@ var BasicChart = function (_a) {
                         catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
-                                if (_q && !_q.done && (_7 = _p.return)) _7.call(_p);
+                                if (_q && !_q.done && (_3 = _p.return)) _3.call(_p);
                             }
                             finally { if (e_5) throw e_5.error; }
                         }
                         radarAxisOptions_1 = spec.valueAxisOptions;
                         indicators_1 = (0, radar_1.buildRadarIndicators)(categories, radarSeriesInputs, radarAxisOptions_1);
                         radarData = (0, radar_1.buildRadarSeriesData)(radarSeriesInputs, indicators_1.length);
-                        radarStyle_1 = (_54 = spec.radarStyle) !== null && _54 !== void 0 ? _54 : "standard";
+                        radarStyle_1 = (_65 = spec.radarStyle) !== null && _65 !== void 0 ? _65 : "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; });
                         radarFormats_1 = (0, axis_number_format_1.resolveSeriesNumberFormats)(spec.series, getFormattingFromRange, spec.hiddenDimensionStrategy);
                         radarDataLabels_1 = spec.dataLabels;
@@ -1322,8 +1378,34 @@ var BasicChart = function (_a) {
                             });
                             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/>");
                         };
-                        (_55 = chartRef.current) === null || _55 === void 0 ? void 0 : _55.setOption({
-                            radar: {
+                        radarLegend = (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);
+                        radarBand = (0, legend_layout_1.reserveEchartsLegendBand)({
+                            position: (_66 = spec.legend) === null || _66 === void 0 ? void 0 : _66.position,
+                            visible: radarLegend.show !== false,
+                            labels: radarData.map(function (d) { return d.name; }),
+                            legendFontSize: (_71 = (_68 = (_67 = radarLegend.textStyle) === null || _67 === void 0 ? void 0 : _67.fontSize) !== null && _68 !== void 0 ? _68 : (_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 : 12,
+                            legendItemWidth: defaultLegendConfig.itemWidth,
+                            width: width !== null && width !== void 0 ? width : 0,
+                            height: height !== null && height !== void 0 ? height : 0,
+                            hasTitle: Boolean(explicitChartTitle),
+                            titleFontSize: (_73 = (_72 = spec.titleTextFormat) === null || _72 === void 0 ? void 0 : _72.fontSize) !== null && _73 !== void 0 ? _73 : 16,
+                            hasBottomAxisTitle: false,
+                            bottomAxisNameGap: 0,
+                            hasLeftAxisTitle: false,
+                        });
+                        radarPlotWidth = Math.max(0, (width !== null && width !== void 0 ? width : 0) - radarBand.grid.left - radarBand.grid.right);
+                        radarPlotHeight = Math.max(0, (height !== null && height !== void 0 ? height : 0) - radarBand.grid.top - radarBand.grid.bottom);
+                        radarGeometry = radarPlotWidth > 0 && radarPlotHeight > 0
+                            ? {
+                                center: [
+                                    radarBand.grid.left + radarPlotWidth / 2,
+                                    radarBand.grid.top + radarPlotHeight / 2,
+                                ],
+                                radius: Math.max(10, Math.min(radarPlotWidth, radarPlotHeight) / 2 - 30),
+                            }
+                            : {};
+                        (_74 = chartRef.current) === null || _74 === void 0 ? void 0 : _74.setOption({
+                            radar: tslib_1.__assign(tslib_1.__assign({}, radarGeometry), { 
                                 // The common scale's tick labels along ONE axis, as Excel draws
                                 // them: echarts labels every indicator axis, so each indicator
                                 // carries its own `axisLabel.show` (an indicator's own options win
@@ -1333,15 +1415,13 @@ var BasicChart = function (_a) {
                                     ? indicators_1
                                     : [{ name: "", min: 0, max: 1 }]).map(function (indicator, index) { return (tslib_1.__assign(tslib_1.__assign({}, indicator), { axisLabel: {
                                         show: index === 0 && (radarAxisOptions_1 === null || radarAxisOptions_1 === void 0 ? void 0 : radarAxisOptions_1.visible) !== false,
-                                    } })); }),
-                                axisLabel: {
+                                    } })); }), axisLabel: {
                                     show: (radarAxisOptions_1 === null || radarAxisOptions_1 === void 0 ? void 0 : radarAxisOptions_1.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),
+                                } }),
+                            legend: tslib_1.__assign(tslib_1.__assign({}, radarLegend), radarBand.legend),
                             tooltip: { trigger: "item", formatter: radarTooltipFormatter },
                             series: [
                                 {
@@ -1378,9 +1458,9 @@ var BasicChart = function (_a) {
                     // V-variants additionally get a volume column sub-pane below the
                     // price plot.
                     if (spec.chartType === "stock") {
-                        variant_1 = ((_56 = spec.stockVariant) !== null && _56 !== void 0 ? _56 : "HLC");
+                        variant_1 = ((_75 = spec.stockVariant) !== null && _75 !== void 0 ? _75 : "HLC");
                         categories = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesValues = ((_57 = spec.series) !== null && _57 !== void 0 ? _57 : []).map(function (seriesEntry) {
+                        seriesValues = ((_76 = spec.series) !== null && _76 !== void 0 ? _76 : []).map(function (seriesEntry) {
                             return flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
                         });
                         stockFormats_1 = (0, axis_number_format_1.resolveSeriesNumberFormats)(spec.series, getFormattingFromRange, spec.hiddenDimensionStrategy);
@@ -1398,7 +1478,7 @@ var BasicChart = function (_a) {
                         upColor_1 = theme.themeColors.accent1;
                         downColor_1 = theme.themeColors.accent2;
                         volumePoints = (0, stock_1.toVolumeSeries)(seriesValues, variant_1);
-                        hasVolume = ((_58 = volumePoints === null || volumePoints === void 0 ? void 0 : volumePoints.length) !== null && _58 !== void 0 ? _58 : 0) > 0;
+                        hasVolume = ((_77 = volumePoints === null || volumePoints === void 0 ? void 0 : volumePoints.length) !== null && _77 !== void 0 ? _77 : 0) > 0;
                         stockGrid = hasVolume
                             ? [
                                 { left: "10%", right: "4%", top: "8%", height: "56%" },
@@ -1412,7 +1492,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_59 = spec.horizontalAxisTitle) !== null && _59 !== void 0 ? _59 : "",
+                            name: (_78 = spec.horizontalAxisTitle) !== null && _78 !== void 0 ? _78 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         }, spec.categoryAxisOptions);
@@ -1454,14 +1534,14 @@ var BasicChart = function (_a) {
                         // (no open) fall through to the line-derived rendering below.
                         if (variant_1 === "OHLC" || variant_1 === "VOHLC") {
                             candleData = (0, stock_1.toCandlestick)(seriesValues, variant_1);
-                            (_60 = chartRef.current) === null || _60 === void 0 ? void 0 : _60.setOption({
+                            (_79 = chartRef.current) === null || _79 === void 0 ? void 0 : _79.setOption({
                                 xAxis: stockXAxis,
                                 yAxis: tslib_1.__spreadArray([
                                     (0, overrides_1.applyAxisOverrides)({
                                         type: "value",
                                         show: true,
                                         scale: true,
-                                        name: (_61 = spec.verticalAxisTitle) !== null && _61 !== void 0 ? _61 : "",
+                                        name: (_80 = spec.verticalAxisTitle) !== null && _80 !== void 0 ? _80 : "",
                                         nameLocation: "middle",
                                         nameGap: 50,
                                         gridIndex: 0,
@@ -1506,13 +1586,13 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent3,
                             theme.themeColors.accent4,
                         ]);
-                        (_62 = chartRef.current) === null || _62 === void 0 ? void 0 : _62.setOption({
+                        (_81 = chartRef.current) === null || _81 === void 0 ? void 0 : _81.setOption({
                             xAxis: stockXAxis,
                             yAxis: tslib_1.__spreadArray([
                                 (0, overrides_1.applyAxisOverrides)({
                                     type: "value",
                                     show: true,
-                                    name: (_63 = spec.verticalAxisTitle) !== null && _63 !== void 0 ? _63 : "",
+                                    name: (_82 = spec.verticalAxisTitle) !== null && _82 !== void 0 ? _82 : "",
                                     nameLocation: "middle",
                                     nameGap: 50,
                                     gridIndex: 0,
@@ -1551,14 +1631,14 @@ var BasicChart = function (_a) {
                     ofPieLayout = null;
                     isHorizontalBarChart = spec.chartType === "bar";
                     shouldAggregate = (0, aggregation_1.shouldAggregateSeries)(spec.series);
-                    primaryDomainSource = (_66 = (_65 = (_64 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _64 === void 0 ? void 0 : _64[0]) === null || _65 === void 0 ? void 0 : _65.sources) === null || _66 === void 0 ? void 0 : _66[0];
+                    primaryDomainSource = (_85 = (_84 = (_83 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _83 === void 0 ? void 0 : _83[0]) === null || _84 === void 0 ? void 0 : _84.sources) === null || _85 === void 0 ? void 0 : _85[0];
                     rawPrimaryDomainValues = primaryDomainSource
-                        ? (0, aggregation_1.sanitizeDomainValues)((_67 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _67 !== void 0 ? _67 : [])
+                        ? (0, aggregation_1.sanitizeDomainValues)((_86 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _86 !== void 0 ? _86 : [])
                         : [];
                     aggregateDomainValues = (0, aggregation_1.getDomainValuesForAxis)(rawPrimaryDomainValues, shouldAggregate);
                     categoryLevels = isCircularChart
                         ? undefined
-                        : (0, category_levels_1.resolveCategoryLevels)((_68 = spec.categoryLevels) === null || _68 === void 0 ? void 0 : _68.map(function (level) {
+                        : (0, category_levels_1.resolveCategoryLevels)((_87 = spec.categoryLevels) === null || _87 === void 0 ? void 0 : _87.map(function (level) {
                             return flattenChartDataValues([level], getDomainValuesFromRange, spec.hiddenDimensionStrategy, false);
                         }));
                     if (categoryLevels) {
@@ -1569,15 +1649,15 @@ var BasicChart = function (_a) {
                             axisTick: { show: true },
                             splitLine: { show: true },
                             name: isHorizontalBarChart
-                                ? (_69 = spec.verticalAxisTitle) !== null && _69 !== void 0 ? _69 : ""
-                                : (_70 = spec.horizontalAxisTitle) !== null && _70 !== void 0 ? _70 : "",
+                                ? (_88 = spec.verticalAxisTitle) !== null && _88 !== void 0 ? _88 : ""
+                                : (_89 = spec.horizontalAxisTitle) !== null && _89 !== void 0 ? _89 : "",
                             nameLocation: "middle",
                             nameGap: CATEGORY_AXIS_NAME_GAP + 24 * categoryLevels.outer.length,
                         })), false));
                     }
                     // One category axis per domain (Excel): a domain drawn from several
                     // ranges lists their categories in sequence on that single axis.
-                    (categoryLevels ? [] : (_71 = spec.domains) !== null && _71 !== void 0 ? _71 : []).forEach(function (domain, domainIndex) {
+                    (categoryLevels ? [] : (_90 = spec.domains) !== null && _90 !== void 0 ? _90 : []).forEach(function (domain, domainIndex) {
                         var _a, _b;
                         var axisData = domain.sources.flatMap(function (sheetRange, sourceIndex) {
                             var _a;
@@ -1613,8 +1693,8 @@ var BasicChart = function (_a) {
                             splitLine: { show: true },
                             gridIndex: 0,
                             name: isHorizontalBarChart
-                                ? (_72 = spec.verticalAxisTitle) !== null && _72 !== void 0 ? _72 : ""
-                                : (_73 = spec.horizontalAxisTitle) !== null && _73 !== void 0 ? _73 : "",
+                                ? (_91 = spec.verticalAxisTitle) !== null && _91 !== void 0 ? _91 : ""
+                                : (_92 = spec.horizontalAxisTitle) !== null && _92 !== void 0 ? _92 : "",
                             nameLocation: "middle",
                             nameGap: CATEGORY_AXIS_NAME_GAP,
                         });
@@ -1646,7 +1726,7 @@ var BasicChart = function (_a) {
                     };
                     sideBySideBarCount = isStacked
                         ? 1
-                        : ((_74 = spec.series) !== null && _74 !== void 0 ? _74 : []).reduce(function (count, s) {
+                        : ((_93 = spec.series) !== null && _93 !== void 0 ? _93 : []).reduce(function (count, s) {
                             var _a;
                             var seriesType = (_a = s.seriesChartType) !== null && _a !== void 0 ? _a : spec.chartType;
                             return seriesType === "bar" || seriesType === "column"
@@ -1670,29 +1750,29 @@ var BasicChart = function (_a) {
                         return (0, utils_1.chartPaletteColorAt)(seriesPalette, index);
                     };
                     _loop_1 = function (specSeriesIndex, series) {
-                        var dataLabel, _151, _152, 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, _153, _154, dp, fallback_1, overrides_3, _155, _156, dp, positiveColor_1, negativeColor_1;
-                        var e_13, _157, e_14, _158, e_15, _159;
-                        return tslib_1.__generator(this, function (_160) {
-                            switch (_160.label) {
+                        var dataLabel, _182, _183, 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, _184, _185, dp, fallback_1, overrides_3, _186, _187, dp, positiveColor_1, negativeColor_1;
+                        var e_12, _188, e_13, _189, e_14, _190;
+                        return tslib_1.__generator(this, function (_191) {
+                            switch (_191.label) {
                                 case 0:
                                     if (!(!(0, utils_1.isNil)(series.dataLabel) && (0, utils_1.isAFormula)(series.dataLabel))) return [3 /*break*/, 2];
-                                    _152 = chart_spec_utils_1.coerceCalculatedLabel;
-                                    return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_76 = position.sheetId) !== null && _76 !== void 0 ? _76 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
+                                    _183 = chart_spec_utils_1.coerceCalculatedLabel;
+                                    return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_95 = position.sheetId) !== null && _95 !== void 0 ? _95 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                                 case 1:
-                                    _151 = _152.apply(void 0, [_160.sent()]);
+                                    _182 = _183.apply(void 0, [_191.sent()]);
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    _151 = (_77 = series.dataLabel) !== null && _77 !== void 0 ? _77 : "";
-                                    _160.label = 3;
+                                    _182 = (_96 = series.dataLabel) !== null && _96 !== void 0 ? _96 : "";
+                                    _191.label = 3;
                                 case 3:
-                                    dataLabel = _151;
+                                    dataLabel = _182;
                                     // Label
                                     if (dataLabel) {
-                                        (_78 = legend.data) === null || _78 === void 0 ? void 0 : _78.push(dataLabel);
+                                        (_97 = legend.data) === null || _97 === void 0 ? void 0 : _97.push(dataLabel);
                                     }
-                                    effectiveChartType = (_79 = series.seriesChartType) !== null && _79 !== void 0 ? _79 : spec.chartType;
+                                    effectiveChartType = (_98 = series.seriesChartType) !== null && _98 !== void 0 ? _98 : spec.chartType;
                                     lineLike = (0, empty_cells_1.isLineLikeChartType)(effectiveChartType);
-                                    domainSources = (_82 = (_81 = (_80 = spec.domains) === null || _80 === void 0 ? void 0 : _80[0]) === null || _81 === void 0 ? void 0 : _81.sources) !== null && _82 !== void 0 ? _82 : [];
+                                    domainSources = (_101 = (_100 = (_99 = spec.domains) === null || _99 === void 0 ? void 0 : _99[0]) === null || _100 === void 0 ? void 0 : _100.sources) !== null && _101 !== void 0 ? _101 : [];
                                     pieDomainLabels = isCircularChart &&
                                         (domainSources.length > 1 || series.sources.length > 1)
                                         ? domainSources.flatMap(function (sheetRange) {
@@ -1724,7 +1804,7 @@ var BasicChart = function (_a) {
                                     seriesEntry = tslib_1.__assign(tslib_1.__assign({ type: seriesEchartsType, 
                                         // Ties the rendered series back to spec.series for click selection
                                         // One rendered series per spec series (source index 0).
-                                        id: (0, series_click_1.chartSeriesId)(specSeriesIndex, 0), name: dataLabel, data: data, stack: isStacked ? "dataLabel" : undefined, smooth: (_83 = spec.smooth) !== null && _83 !== void 0 ? _83 : undefined, radius: (_84 = spec.radius) !== null && _84 !== void 0 ? _84 : (isCircularChart ? [0, "75%"] : undefined) }, ((0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike)
+                                        id: (0, series_click_1.chartSeriesId)(specSeriesIndex, 0), name: dataLabel, data: data, stack: isStacked ? "dataLabel" : undefined, smooth: (_102 = spec.smooth) !== null && _102 !== void 0 ? _102 : undefined, radius: (_103 = spec.radius) !== null && _103 !== void 0 ? _103 : (isCircularChart ? [0, "75%"] : undefined) }, ((0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike)
                                         ? { connectNulls: true }
                                         : {})), seriesStyleAttrs);
                                     // Plot this series against a secondary value axis. The 2nd
@@ -1749,17 +1829,17 @@ var BasicChart = function (_a) {
                                     }
                                     seriesAny = series;
                                     if (effectiveChartType === "line") {
-                                        markerSymbol = (_85 = seriesAny.marker) === null || _85 === void 0 ? void 0 : _85.symbol;
+                                        markerSymbol = (_104 = seriesAny.marker) === null || _104 === void 0 ? void 0 : _104.symbol;
                                         wantsMarkers = markerSymbol === "none"
                                             ? false
                                             : Boolean(spec.showMarkers) || !(0, utils_1.isNil)(markerSymbol);
                                         labelsWithoutMarkers = !wantsMarkers &&
-                                            Boolean((_86 = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesAny)) === null || _86 === void 0 ? void 0 : _86.show);
+                                            Boolean((_105 = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesAny)) === null || _105 === void 0 ? void 0 : _105.show);
                                         seriesEntry.showSymbol = wantsMarkers || labelsWithoutMarkers;
                                         if (wantsMarkers) {
                                             seriesEntry.symbol =
-                                                (_87 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _87 !== void 0 ? _87 : "circle";
-                                            seriesEntry.symbolSize = (_89 = (_88 = seriesAny.marker) === null || _88 === void 0 ? void 0 : _88.size) !== null && _89 !== void 0 ? _89 : 6;
+                                                (_106 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _106 !== void 0 ? _106 : "circle";
+                                            seriesEntry.symbolSize = (_108 = (_107 = seriesAny.marker) === null || _107 === void 0 ? void 0 : _107.size) !== null && _108 !== void 0 ? _108 : 6;
                                         }
                                         else {
                                             if (labelsWithoutMarkers) {
@@ -1774,17 +1854,17 @@ var BasicChart = function (_a) {
                                                         seriesEntry.symbol = "none";
                                                     marked = tslib_1.__spreadArray([], tslib_1.__read(data), false);
                                                     try {
-                                                        for (isolated_1 = (e_13 = void 0, tslib_1.__values(isolated)), isolated_1_1 = isolated_1.next(); !isolated_1_1.done; isolated_1_1 = isolated_1.next()) {
+                                                        for (isolated_1 = (e_12 = 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_13_1) { e_13 = { error: e_13_1 }; }
+                                                    catch (e_12_1) { e_12 = { error: e_12_1 }; }
                                                     finally {
                                                         try {
-                                                            if (isolated_1_1 && !isolated_1_1.done && (_157 = isolated_1.return)) _157.call(isolated_1);
+                                                            if (isolated_1_1 && !isolated_1_1.done && (_188 = isolated_1.return)) _188.call(isolated_1);
                                                         }
-                                                        finally { if (e_13) throw e_13.error; }
+                                                        finally { if (e_12) throw e_12.error; }
                                                     }
                                                     seriesEntry.data = marked;
                                                 }
@@ -1794,9 +1874,9 @@ var BasicChart = function (_a) {
                                     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({}, ((_90 = seriesEntry.itemStyle) !== null && _90 !== void 0 ? _90 : {})), { color: gradient });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_109 = seriesEntry.itemStyle) !== null && _109 !== void 0 ? _109 : {})), { color: gradient });
                                         if (effectiveChartType === "area") {
-                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_91 = seriesEntry.areaStyle) !== null && _91 !== void 0 ? _91 : {})), { color: gradient });
+                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_110 = seriesEntry.areaStyle) !== null && _110 !== void 0 ? _110 : {})), { color: gradient });
                                         }
                                     }
                                     else if (seriesAny.noFill) {
@@ -1804,58 +1884,58 @@ 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({}, ((_92 = seriesEntry.itemStyle) !== null && _92 !== void 0 ? _92 : {})), { color: "transparent", borderColor: "transparent" });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_111 = seriesEntry.itemStyle) !== null && _111 !== void 0 ? _111 : {})), { color: "transparent", borderColor: "transparent" });
                                     }
                                     else if (isBarOrColumn &&
                                         Array.isArray(seriesAny.dataPointColors) &&
                                         seriesAny.dataPointColors.length) {
                                         overrides_2 = new Map();
                                         try {
-                                            for (_153 = (e_14 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _154 = _153.next(); !_154.done; _154 = _153.next()) {
-                                                dp = _154.value;
+                                            for (_184 = (e_13 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _185 = _184.next(); !_185.done; _185 = _184.next()) {
+                                                dp = _185.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_2.set(dp.idx, dp.color);
                                                 }
                                             }
                                         }
-                                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
                                         finally {
                                             try {
-                                                if (_154 && !_154.done && (_158 = _153.return)) _158.call(_153);
+                                                if (_185 && !_185.done && (_189 = _184.return)) _189.call(_184);
                                             }
-                                            finally { if (e_14) throw e_14.error; }
+                                            finally { if (e_13) throw e_13.error; }
                                         }
-                                        fallback_1 = (_93 = series.color) !== null && _93 !== void 0 ? _93 : paletteColorAt(specSeriesIndex);
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_94 = seriesEntry.itemStyle) !== null && _94 !== void 0 ? _94 : {})), { color: function (params) { var _a; return (_a = overrides_2.get(params.dataIndex)) !== null && _a !== void 0 ? _a : fallback_1; } });
+                                        fallback_1 = (_112 = series.color) !== null && _112 !== void 0 ? _112 : paletteColorAt(specSeriesIndex);
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_113 = seriesEntry.itemStyle) !== null && _113 !== void 0 ? _113 : {})), { 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 (_155 = (e_15 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _156 = _155.next(); !_156.done; _156 = _155.next()) {
-                                                dp = _156.value;
+                                            for (_186 = (e_14 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _187 = _186.next(); !_187.done; _187 = _186.next()) {
+                                                dp = _187.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_3.set(dp.idx, dp.color);
                                                 }
                                             }
                                         }
-                                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                                         finally {
                                             try {
-                                                if (_156 && !_156.done && (_159 = _155.return)) _159.call(_155);
+                                                if (_187 && !_187.done && (_190 = _186.return)) _190.call(_186);
                                             }
-                                            finally { if (e_15) throw e_15.error; }
+                                            finally { if (e_14) throw e_14.error; }
                                         }
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_95 = seriesEntry.itemStyle) !== null && _95 !== void 0 ? _95 : {})), { color: function (params) {
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_114 = seriesEntry.itemStyle) !== null && _114 !== void 0 ? _114 : {})), { 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 = (_96 = series.color) !== null && _96 !== void 0 ? _96 : paletteColorAt(specSeriesIndex);
-                                        negativeColor_1 = (_97 = series.negativeColor) !== null && _97 !== void 0 ? _97 : "#FF0000";
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_98 = seriesEntry.itemStyle) !== null && _98 !== void 0 ? _98 : {})), { color: function (params) {
+                                        positiveColor_1 = (_115 = series.color) !== null && _115 !== void 0 ? _115 : paletteColorAt(specSeriesIndex);
+                                        negativeColor_1 = (_116 = series.negativeColor) !== null && _116 !== void 0 ? _116 : "#FF0000";
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_117 = seriesEntry.itemStyle) !== null && _117 !== void 0 ? _117 : {})), { color: function (params) {
                                                 var _a, _b;
                                                 var value = Array.isArray(params.data)
                                                     ? params.data[1]
@@ -1866,10 +1946,10 @@ var BasicChart = function (_a) {
                                             } });
                                     }
                                     else if (series.color) {
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_99 = seriesEntry.itemStyle) !== null && _99 !== void 0 ? _99 : {})), { color: series.color });
-                                        seriesEntry.lineStyle = tslib_1.__assign(tslib_1.__assign({}, ((_100 = seriesEntry.lineStyle) !== null && _100 !== void 0 ? _100 : {})), { color: series.color });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_118 = seriesEntry.itemStyle) !== null && _118 !== void 0 ? _118 : {})), { color: series.color });
+                                        seriesEntry.lineStyle = tslib_1.__assign(tslib_1.__assign({}, ((_119 = seriesEntry.lineStyle) !== null && _119 !== void 0 ? _119 : {})), { color: series.color });
                                         if (effectiveChartType === "area") {
-                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_101 = seriesEntry.areaStyle) !== null && _101 !== void 0 ? _101 : {})), { color: series.color });
+                                            seriesEntry.areaStyle = tslib_1.__assign(tslib_1.__assign({}, ((_120 = seriesEntry.areaStyle) !== null && _120 !== void 0 ? _120 : {})), { color: series.color });
                                         }
                                     }
                                     chartSeries.push(seriesEntry);
@@ -1878,29 +1958,29 @@ var BasicChart = function (_a) {
                             }
                         });
                     };
-                    _150.label = 31;
+                    _181.label = 31;
                 case 31:
-                    _150.trys.push([31, 36, 37, 38]);
-                    _r = tslib_1.__values(((_75 = spec.series) !== null && _75 !== void 0 ? _75 : []).entries()), _s = _r.next();
-                    _150.label = 32;
+                    _181.trys.push([31, 36, 37, 38]);
+                    _r = tslib_1.__values(((_94 = spec.series) !== null && _94 !== void 0 ? _94 : []).entries()), _s = _r.next();
+                    _181.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:
-                    _150.sent();
-                    _150.label = 34;
+                    _181.sent();
+                    _181.label = 34;
                 case 34:
                     _s = _r.next();
                     return [3 /*break*/, 32];
                 case 35: return [3 /*break*/, 38];
                 case 36:
-                    e_3_1 = _150.sent();
+                    e_3_1 = _181.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 38];
                 case 37:
                     try {
-                        if (_s && !_s.done && (_8 = _r.return)) _8.call(_r);
+                        if (_s && !_s.done && (_4 = _r.return)) _4.call(_r);
                     }
                     finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
@@ -1913,7 +1993,7 @@ var BasicChart = function (_a) {
                     }
                     if (isOfPie) {
                         labels = rawPrimaryDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_102 = spec.series) === null || _102 === void 0 ? void 0 : _102[0];
+                        seriesEntry = (_121 = spec.series) === null || _121 === void 0 ? void 0 : _121[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); })
                             : [];
@@ -1960,7 +2040,7 @@ var BasicChart = function (_a) {
                         };
                         chartSeries.push({
                             type: "pie",
-                            name: (_103 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _103 !== void 0 ? _103 : "",
+                            name: (_122 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _122 !== void 0 ? _122 : "",
                             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
@@ -1978,7 +2058,7 @@ var BasicChart = function (_a) {
                             if (ofPieType_1 === "pie") {
                                 chartSeries.push({
                                     type: "pie",
-                                    name: (_104 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _104 !== void 0 ? _104 : "",
+                                    name: (_123 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _123 !== void 0 ? _123 : "",
                                     center: ["".concat(SECONDARY_CX_1 * 100, "%"), "".concat(CY_1 * 100, "%")],
                                     radius: [0, "".concat(secondaryRadiusPct_1, "%")],
                                     data: secondary.map(function (s, i) { return ({
@@ -2073,16 +2153,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 = (_107 = (_106 = (_105 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _105 === void 0 ? void 0 : _105[0]) === null || _106 === void 0 ? void 0 : _106.sources) === null || _107 === void 0 ? void 0 : _107[0];
+                        primaryDomainSource_1 = (_126 = (_125 = (_124 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _124 === void 0 ? void 0 : _124[0]) === null || _125 === void 0 ? void 0 : _125.sources) === null || _126 === void 0 ? void 0 : _126[0];
                         rawDomainValues = primaryDomainSource_1
-                            ? (0, aggregation_1.sanitizeDomainValues)((_108 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _108 !== void 0 ? _108 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_127 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _127 !== void 0 ? _127 : [])
                             : [];
                         labels = rawDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_109 = spec.series) === null || _109 === void 0 ? void 0 : _109[0];
+                        seriesEntry = (_128 = spec.series) === null || _128 === void 0 ? void 0 : _128[0];
                         rawValues_1 = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); })
                             : [];
-                        totalIndices = new Set((_110 = spec.totalIndices) !== null && _110 !== void 0 ? _110 : []);
+                        totalIndices = new Set((_129 = spec.totalIndices) !== null && _129 !== void 0 ? _129 : []);
                         steps = (0, waterfall_1.computeWaterfall)(rawValues_1, labels, totalIndices);
                         chartDomains.length = 0;
                         chartDomains.push({
@@ -2092,7 +2172,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_111 = spec.horizontalAxisTitle) !== null && _111 !== void 0 ? _111 : "",
+                            name: (_130 = spec.horizontalAxisTitle) !== null && _130 !== void 0 ? _130 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
@@ -2109,12 +2189,12 @@ var BasicChart = function (_a) {
                             label: { show: false },
                             tooltip: { show: false },
                         });
-                        accent_1 = (_112 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _112 !== void 0 ? _112 : theme.themeColors.accent1;
-                        decreaseColor_1 = (_114 = (_113 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.negativeColor) !== null && _113 !== void 0 ? _113 : theme.themeColors.accent2) !== null && _114 !== void 0 ? _114 : accent_1;
-                        totalColor_1 = (_115 = theme.themeColors.accent3) !== null && _115 !== void 0 ? _115 : accent_1;
+                        accent_1 = (_131 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _131 !== void 0 ? _131 : theme.themeColors.accent1;
+                        decreaseColor_1 = (_133 = (_132 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.negativeColor) !== null && _132 !== void 0 ? _132 : theme.themeColors.accent2) !== null && _133 !== void 0 ? _133 : accent_1;
+                        totalColor_1 = (_134 = theme.themeColors.accent3) !== null && _134 !== void 0 ? _134 : accent_1;
                         pointColors_1 = new Map();
                         try {
-                            for (_v = tslib_1.__values((_116 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _116 !== void 0 ? _116 : []), _w = _v.next(); !_w.done; _w = _v.next()) {
+                            for (_v = tslib_1.__values((_135 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _135 !== void 0 ? _135 : []), _w = _v.next(); !_w.done; _w = _v.next()) {
                                 dp = _w.value;
                                 if (typeof (dp === null || dp === void 0 ? void 0 : dp.idx) === "number" && typeof (dp === null || dp === void 0 ? void 0 : dp.color) === "string") {
                                     pointColors_1.set(dp.idx, dp.color);
@@ -2124,7 +2204,7 @@ var BasicChart = function (_a) {
                         catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
-                                if (_w && !_w.done && (_9 = _v.return)) _9.call(_v);
+                                if (_w && !_w.done && (_5 = _v.return)) _5.call(_v);
                             }
                             finally { if (e_6) throw e_6.error; }
                         }
@@ -2136,7 +2216,7 @@ var BasicChart = function (_a) {
                             type: "bar",
                             id: (0, series_click_1.chartSeriesId)(0, 0),
                             stack: "waterfall",
-                            name: (_117 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _117 !== void 0 ? _117 : "",
+                            name: (_136 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _136 !== void 0 ? _136 : "",
                             // A bar's height is the step's magnitude; the signed source value
                             // rides along as `originalValue` so labels and tooltips read
                             // "-90" for a decrease, like Excel.
@@ -2170,12 +2250,12 @@ var BasicChart = function (_a) {
                         legend.data = [];
                     }
                     else if (spec.chartType === "funnel") {
-                        primaryDomainSource_2 = (_120 = (_119 = (_118 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _118 === void 0 ? void 0 : _118[0]) === null || _119 === void 0 ? void 0 : _119.sources) === null || _120 === void 0 ? void 0 : _120[0];
+                        primaryDomainSource_2 = (_139 = (_138 = (_137 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _137 === void 0 ? void 0 : _137[0]) === null || _138 === void 0 ? void 0 : _138.sources) === null || _139 === void 0 ? void 0 : _139[0];
                         rawDomainValues = primaryDomainSource_2
-                            ? (0, aggregation_1.sanitizeDomainValues)((_121 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _121 !== void 0 ? _121 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_140 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _140 !== void 0 ? _140 : [])
                             : [];
                         labels_1 = rawDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
-                        seriesEntry = (_122 = spec.series) === null || _122 === void 0 ? void 0 : _122[0];
+                        seriesEntry = (_141 = spec.series) === null || _141 === void 0 ? void 0 : _141[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : 0); })
                             : [];
@@ -2189,10 +2269,10 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent5,
                             theme.themeColors.accent6,
                         ]);
-                        funnelColor_1 = (_123 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _123 !== void 0 ? _123 : (0, utils_1.chartPaletteColorAt)(funnelPalette, 0);
+                        funnelColor_1 = (_142 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _142 !== void 0 ? _142 : (0, utils_1.chartPaletteColorAt)(funnelPalette, 0);
                         stageColors_1 = new Map();
                         try {
-                            for (_x = tslib_1.__values((_124 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _124 !== void 0 ? _124 : []), _y = _x.next(); !_y.done; _y = _x.next()) {
+                            for (_x = tslib_1.__values((_143 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _143 !== void 0 ? _143 : []), _y = _x.next(); !_y.done; _y = _x.next()) {
                                 dp = _y.value;
                                 if (typeof (dp === null || dp === void 0 ? void 0 : dp.idx) === "number" && typeof (dp === null || dp === void 0 ? void 0 : dp.color) === "string") {
                                     stageColors_1.set(dp.idx, dp.color);
@@ -2202,7 +2282,7 @@ var BasicChart = function (_a) {
                         catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
-                                if (_y && !_y.done && (_10 = _x.return)) _10.call(_x);
+                                if (_y && !_y.done && (_6 = _x.return)) _6.call(_x);
                             }
                             finally { if (e_7) throw e_7.error; }
                         }
@@ -2220,104 +2300,202 @@ var BasicChart = function (_a) {
                             top: 60,
                             bottom: 20,
                         };
-                        chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "funnel", id: (0, series_click_1.chartSeriesId)(0, 0), name: (_125 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _125 !== void 0 ? _125 : "", data: funnelData }, funnelLayout), { itemStyle: {
+                        funnelLabelsOff = ((_144 = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesEntry)) === null || _144 === void 0 ? void 0 : _144.show) ===
+                            false;
+                        chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "funnel", id: (0, series_click_1.chartSeriesId)(0, 0), name: (_145 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _145 !== void 0 ? _145 : "", data: funnelData }, funnelLayout), { itemStyle: {
                                 color: function (params) { var _a; return (_a = stageColors_1.get(params.dataIndex)) !== null && _a !== void 0 ? _a : funnelColor_1; },
-                            }, label: {
-                                show: true,
-                                position: "inside",
-                                formatter: function (params) {
-                                    return (0, axis_number_format_1.formatAxisValue)(undefined, params.value, locale);
-                                },
-                            } }));
+                            }, label: funnelLabelsOff
+                                ? { show: false }
+                                : {
+                                    show: true,
+                                    position: "inside",
+                                    formatter: function (params) {
+                                        return (0, axis_number_format_1.formatAxisValue)(undefined, params.value, locale);
+                                    },
+                                } }));
                         // The stage names sit to the left of the bars, where Excel's
                         // category axis puts them: an invisible twin funnel carries them.
                         chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "funnel", id: FUNNEL_NAMES_ID, data: funnelData }, funnelLayout), { silent: true, itemStyle: { color: "transparent", borderWidth: 0 }, emphasis: { disabled: true }, tooltip: { show: false }, label: { show: true, position: "left", formatter: "{b}" }, labelLine: { show: false }, z: 1 }));
-                        legend.data = [];
+                        // The legend lists the series (shown when `legend.position` says so).
+                        legend.data = (seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) ? [seriesEntry.dataLabel] : [];
                     }
                     else if (spec.chartType === "boxplot") {
-                        quartileMethod = spec.quartileMethod;
-                        showOutliers = spec.showOutliers;
-                        showMeanMarker = spec.showMeanMarker === true;
-                        boxStats = [];
-                        boxLabels = [];
-                        outlierPoints = [];
-                        meanPoints = [];
-                        try {
-                            for (_z = tslib_1.__values((_126 = spec.series) !== null && _126 !== void 0 ? _126 : []), _0 = _z.next(); !_0.done; _0 = _z.next()) {
-                                seriesEntry = _0.value;
-                                label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
-                                    ? seriesEntry.dataLabel
-                                    : "";
-                                rawValues = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
-                                summary = (0, boxplot_1.computeBoxplotSummary)(rawValues, { quartileMethod: quartileMethod });
-                                if (summary) {
-                                    boxIndex = boxStats.length;
-                                    lo = showOutliers === true ? summary.lowerWhisker : summary.min;
-                                    hi = showOutliers === true ? summary.upperWhisker : summary.max;
-                                    boxStats.push([lo, summary.q1, summary.median, summary.q3, hi]);
-                                    boxLabels.push(label);
-                                    if (showOutliers === true) {
-                                        try {
-                                            for (_1 = (e_9 = void 0, tslib_1.__values(summary.outliers)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
-                                                outlier = _2.value;
-                                                outlierPoints.push([boxIndex, outlier]);
-                                            }
-                                        }
-                                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
-                                        finally {
-                                            try {
-                                                if (_2 && !_2.done && (_12 = _1.return)) _12.call(_1);
-                                            }
-                                            finally { if (e_9) throw e_9.error; }
-                                        }
-                                    }
-                                    if (showMeanMarker) {
-                                        meanPoints.push([boxIndex, summary.mean]);
-                                    }
+                        quartileMethod_1 = spec.quartileMethod;
+                        showOutliers_1 = spec.showOutliers !== false;
+                        showMeanMarker_1 = spec.showMeanMarker === true;
+                        showInnerPoints_1 = spec.showInnerPoints === true;
+                        showMeanLine_1 = spec.showMeanLine === true;
+                        boxDomainSource = (_148 = (_147 = (_146 = spec.domains) === null || _146 === void 0 ? void 0 : _146[0]) === null || _147 === void 0 ? void 0 : _147.sources) === null || _148 === void 0 ? void 0 : _148[0];
+                        boxCategories_2 = boxDomainSource
+                            ? ((_149 = getDomainValuesFromRange(boxDomainSource, spec.hiddenDimensionStrategy)) !== null && _149 !== void 0 ? _149 : []).map(function (v) { return (v === null || v === undefined ? "" : "".concat(v).trim()); })
+                            : [];
+                        grouped_1 = boxCategories_2.some(function (c) { return c !== ""; });
+                        groups_1 = [];
+                        if (grouped_1) {
+                            try {
+                                for (boxCategories_1 = tslib_1.__values(boxCategories_2), boxCategories_1_1 = boxCategories_1.next(); !boxCategories_1_1.done; boxCategories_1_1 = boxCategories_1.next()) {
+                                    c = boxCategories_1_1.value;
+                                    if (c !== "" && !groups_1.includes(c))
+                                        groups_1.push(c);
                                 }
                             }
-                        }
-                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
-                        finally {
-                            try {
-                                if (_0 && !_0.done && (_11 = _z.return)) _11.call(_z);
+                            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                            finally {
+                                try {
+                                    if (boxCategories_1_1 && !boxCategories_1_1.done && (_7 = boxCategories_1.return)) _7.call(boxCategories_1);
+                                }
+                                finally { if (e_8) throw e_8.error; }
                             }
-                            finally { if (e_8) throw e_8.error; }
                         }
+                        boxSeriesSpecs = (_150 = spec.series) !== null && _150 !== void 0 ? _150 : [];
+                        slots_1 = grouped_1 ? groups_1 : boxSeriesSpecs.map(function (s, i) {
+                            return s.dataLabel && !(0, utils_1.isAFormula)(s.dataLabel) ? s.dataLabel : "Series ".concat(i + 1);
+                        });
+                        boxGap = typeof spec.gapWidth === "number" ? Math.max(0, spec.gapWidth) : 150;
+                        boxPlotWidth = Math.max(0, (width !== null && width !== void 0 ? width : 0) * 0.85 - 40);
+                        boxBand = slots_1.length ? boxPlotWidth / slots_1.length : boxPlotWidth;
+                        boxWidthMax_1 = Math.max(2, Math.round(boxBand / (Math.max(1, boxSeriesSpecs.length) + boxGap / 100)));
+                        boxCount_1 = Math.max(1, boxSeriesSpecs.length);
+                        slotX_1 = function (slotIndex, seriesIndex) {
+                            return slotIndex + ((seriesIndex + 0.5) / boxCount_1 - 0.5) * 0.8;
+                        };
                         chartDomains.length = 0;
                         chartDomains.push({
                             type: "category",
-                            data: boxLabels,
+                            data: slots_1,
                             show: showAxis,
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_127 = spec.horizontalAxisTitle) !== null && _127 !== void 0 ? _127 : "",
+                            name: (_151 = spec.horizontalAxisTitle) !== null && _151 !== void 0 ? _151 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
                         chartSeries.length = 0;
-                        boxSeries = {
-                            type: "boxplot",
-                            name: "",
-                            data: boxStats,
-                        };
-                        boxColor = (_129 = (_128 = spec.series) === null || _128 === void 0 ? void 0 : _128[0]) === null || _129 === void 0 ? void 0 : _129.color;
-                        if (boxColor) {
-                            boxSeries.itemStyle = { color: boxColor, borderColor: boxColor };
-                        }
-                        chartSeries.push(boxSeries);
-                        if (outlierPoints.length > 0) {
-                            chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "scatter", name: "", data: outlierPoints, symbolSize: 6 }, (boxColor ? { itemStyle: { color: boxColor } } : {})), { tooltip: { show: false } }));
-                        }
-                        if (meanPoints.length > 0) {
-                            chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "scatter", name: "", data: meanPoints, symbol: "diamond", symbolSize: 9 }, (boxColor ? { itemStyle: { color: boxColor } } : {})), { tooltip: { show: false } }));
-                        }
-                        legend.data = [];
+                        boxLegend_1 = [];
+                        boxSeriesSpecs.forEach(function (seriesEntry, seriesIndex) {
+                            var _a;
+                            var label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
+                                ? seriesEntry.dataLabel
+                                : "";
+                            var rawValues = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
+                            var color = (_a = seriesEntry.color) !== null && _a !== void 0 ? _a : paletteColorAt(seriesIndex);
+                            var boxData = [];
+                            var outlierPoints = [];
+                            var innerPoints = [];
+                            var meanPoints = [];
+                            var meanLine = [];
+                            var slotValues = grouped_1
+                                ? groups_1.map(function (g) { return rawValues.filter(function (_, i) { return boxCategories_2[i] === g; }); })
+                                : slots_1.map(function (_, i) { return (i === seriesIndex ? rawValues : []); });
+                            slotValues.forEach(function (values, slotIndex) {
+                                var e_15, _a, e_16, _b;
+                                var summary = (0, boxplot_1.computeBoxplotSummary)(values, { quartileMethod: quartileMethod_1 });
+                                if (!summary) {
+                                    boxData.push([]);
+                                    meanLine.push(null);
+                                    return;
+                                }
+                                // Whiskers stop at the most extreme points inside the 1.5×IQR
+                                // fences; hiding the outliers hides the points only (Excel).
+                                boxData.push([
+                                    summary.lowerWhisker,
+                                    summary.q1,
+                                    summary.median,
+                                    summary.q3,
+                                    summary.upperWhisker,
+                                ]);
+                                meanLine.push(summary.mean);
+                                var x = slotX_1(slotIndex, seriesIndex);
+                                if (showOutliers_1) {
+                                    try {
+                                        for (var _c = tslib_1.__values(summary.outliers), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                            var outlier = _d.value;
+                                            outlierPoints.push([x, outlier]);
+                                        }
+                                    }
+                                    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                                    finally {
+                                        try {
+                                            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                                        }
+                                        finally { if (e_15) throw e_15.error; }
+                                    }
+                                }
+                                if (showInnerPoints_1) {
+                                    try {
+                                        for (var values_1 = tslib_1.__values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
+                                            var v = values_1_1.value;
+                                            if (v >= summary.lowerWhisker && v <= summary.upperWhisker) {
+                                                innerPoints.push([x, v]);
+                                            }
+                                        }
+                                    }
+                                    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                                    finally {
+                                        try {
+                                            if (values_1_1 && !values_1_1.done && (_b = values_1.return)) _b.call(values_1);
+                                        }
+                                        finally { if (e_16) throw e_16.error; }
+                                    }
+                                }
+                                if (showMeanMarker_1)
+                                    meanPoints.push([x, summary.mean]);
+                            });
+                            if (label)
+                                boxLegend_1.push(label);
+                            chartSeries.push({
+                                type: "boxplot",
+                                id: (0, series_click_1.chartSeriesId)(seriesIndex, 0),
+                                name: label,
+                                data: boxData,
+                                boxWidth: [2, boxWidthMax_1],
+                                itemStyle: { color: color, borderColor: color },
+                            });
+                            var pointSeries = function (name, points, extra) {
+                                return (tslib_1.__assign({ type: "scatter", name: name, data: points, itemStyle: { color: color }, tooltip: { show: false } }, extra));
+                            };
+                            if (outlierPoints.length > 0) {
+                                chartSeries.push(pointSeries("", outlierPoints, { symbolSize: 6 }));
+                            }
+                            if (innerPoints.length > 0) {
+                                chartSeries.push(pointSeries("", innerPoints, { symbolSize: 4, itemStyle: { color: color, opacity: 0.6 } }));
+                            }
+                            if (meanPoints.length > 0) {
+                                chartSeries.push(pointSeries("", meanPoints, { symbol: "diamond", symbolSize: 9 }));
+                            }
+                            if (showMeanLine_1 && meanLine.some(function (m) { return m !== null; })) {
+                                chartSeries.push({
+                                    type: "line",
+                                    name: "",
+                                    data: meanLine.map(function (m, slotIndex) {
+                                        return m === null ? null : [slotX_1(slotIndex, seriesIndex), m];
+                                    }),
+                                    showSymbol: false,
+                                    lineStyle: { color: color, type: "dashed", width: 1 },
+                                    itemStyle: { color: color },
+                                    tooltip: { show: false },
+                                    z: 3,
+                                });
+                            }
+                        });
+                        // The legend lists the series (shown when `legend.position` says so).
+                        legend.data = boxLegend_1;
                     }
                     else if (spec.chartType === "histogram") {
                         rawValues = flattenChartDataValues(spec.series, getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); });
-                        _3 = (0, histogram_1.binHistogram)(rawValues, spec.binCount), labels = _3.labels, counts = _3.counts;
+                        histogramDomainSource = (_154 = (_153 = (_152 = spec.domains) === null || _152 === void 0 ? void 0 : _152[0]) === null || _153 === void 0 ? void 0 : _153.sources) === null || _154 === void 0 ? void 0 : _154[0];
+                        histogramCategories = histogramDomainSource
+                            ? ((_155 = getDomainValuesFromRange(histogramDomainSource, spec.hiddenDimensionStrategy)) !== null && _155 !== void 0 ? _155 : [])
+                            : [];
+                        _z = histogramCategories.length
+                            ? (0, histogram_1.aggregateByCategory)(histogramCategories, rawValues, (_158 = (_157 = (_156 = spec.series) === null || _156 === void 0 ? void 0 : _156[0]) === null || _157 === void 0 ? void 0 : _157.aggregateType) !== null && _158 !== void 0 ? _158 : "SUM")
+                            : (0, histogram_1.binHistogram)(rawValues, spec.binCount, {
+                                binSize: spec.binSize,
+                                intervalClosed: spec.intervalClosed,
+                                overflow: spec.overflow,
+                                underflow: spec.underflow,
+                            }), labels = _z.labels, counts = _z.counts;
                         isPareto_1 = (0, histogram_1.isParetoSpec)(spec);
                         cumulativePercents = [];
                         if (isPareto_1) {
@@ -2334,34 +2512,32 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_130 = spec.horizontalAxisTitle) !== null && _130 !== void 0 ? _130 : "",
+                            name: (_159 = spec.horizontalAxisTitle) !== null && _159 !== void 0 ? _159 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
                         chartSeries.length = 0;
                         histogramSeries = {
                             type: "bar",
-                            name: (_133 = (_132 = (_131 = spec.series) === null || _131 === void 0 ? void 0 : _131[0]) === null || _132 === void 0 ? void 0 : _132.dataLabel) !== null && _133 !== void 0 ? _133 : "",
+                            name: (_162 = (_161 = (_160 = spec.series) === null || _160 === void 0 ? void 0 : _160[0]) === null || _161 === void 0 ? void 0 : _161.dataLabel) !== null && _162 !== void 0 ? _162 : "",
                             data: counts,
-                            barCategoryGap: "1%",
+                            // Excel's histogram columns touch unless `gapWidth` says otherwise
+                            // (#1087); the gap maps like a column chart's.
+                            barCategoryGap: (_164 = (0, bar_layout_1.gapWidthToBarCategoryGap)((_163 = spec.gapWidth) !== null && _163 !== void 0 ? _163 : 0, { seriesCount: 1 })) !== null && _164 !== void 0 ? _164 : "0%",
                         };
-                        histogramColor = (_135 = (_134 = spec.series) === null || _134 === void 0 ? void 0 : _134[0]) === null || _135 === void 0 ? void 0 : _135.color;
+                        histogramColor = (_166 = (_165 = spec.series) === null || _165 === void 0 ? void 0 : _165[0]) === null || _166 === void 0 ? void 0 : _166.color;
                         if (histogramColor) {
                             histogramSeries.itemStyle = { color: histogramColor };
                         }
                         chartSeries.push(histogramSeries);
                         if (isPareto_1) {
-                            // Cumulative-% overlay on the secondary axis (yAxisIndex 1);
-                            // the matching 0-100% axis element is appended with the other
-                            // value axes below.
-                            chartSeries.push({
-                                type: "line",
-                                name: "Cumulative %",
-                                data: cumulativePercents,
-                                yAxisIndex: 1,
-                                symbol: "circle",
-                                symbolSize: 6,
-                            });
+                            paretoLineColor = spec.paretoLineColor;
+                            chartSeries.push(tslib_1.__assign({ type: "line", name: "Cumulative %", data: cumulativePercents, yAxisIndex: 1, showSymbol: false, symbol: "none" }, (paretoLineColor
+                                ? {
+                                    itemStyle: { color: paretoLineColor },
+                                    lineStyle: { color: paretoLineColor },
+                                }
+                                : {})));
                         }
                         legend.data = [];
                     }
@@ -2382,20 +2558,20 @@ var BasicChart = function (_a) {
                     isPareto = spec.chartType === "histogram" && (0, histogram_1.isParetoSpec)(spec);
                     hasSecondaryAxis = !isCircularChart &&
                         !isHorizontalBarChart &&
-                        (((_136 = spec.series) !== null && _136 !== void 0 ? _136 : []).some(function (s) { return s.useSecondaryAxis; }) || isPareto);
+                        (((_167 = spec.series) !== null && _167 !== void 0 ? _167 : []).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: ((_137 = spec.series) !== null && _137 !== void 0 ? _137 : []).filter(function (s) { return !s.useSecondaryAxis; }),
+                            series: ((_168 = spec.series) !== null && _168 !== void 0 ? _168 : []).filter(function (s) { return !s.useSecondaryAxis; }),
                             getFormattingFromRange: getFormattingFromRange,
                             hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                         });
                     secondaryAxisNumberFormat = (0, axis_number_format_1.resolveValueAxisNumberFormat)({
                         axisOptions: spec.secondaryValueAxisOptions,
-                        series: ((_138 = spec.series) !== null && _138 !== void 0 ? _138 : []).filter(function (s) { return s.useSecondaryAxis; }),
+                        series: ((_169 = spec.series) !== null && _169 !== void 0 ? _169 : []).filter(function (s) { return s.useSecondaryAxis; }),
                         getFormattingFromRange: getFormattingFromRange,
                         hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                     });
@@ -2424,17 +2600,17 @@ var BasicChart = function (_a) {
                     finalLegend = (0, overrides_1.applyLegendOverrides)(legend, spec.legend);
                     bottomAxisNameGap = isHorizontalBarChart
                         ? valueAxisBase.nameGap
-                        : Number((_140 = (_139 = chartDomains[0]) === null || _139 === void 0 ? void 0 : _139.nameGap) !== null && _140 !== void 0 ? _140 : CATEGORY_AXIS_NAME_GAP);
+                        : Number((_171 = (_170 = chartDomains[0]) === null || _170 === void 0 ? void 0 : _170.nameGap) !== null && _171 !== void 0 ? _171 : CATEGORY_AXIS_NAME_GAP);
                     legendBand = (0, legend_layout_1.reserveEchartsLegendBand)({
-                        position: (_141 = spec.legend) === null || _141 === void 0 ? void 0 : _141.position,
+                        position: (_172 = spec.legend) === null || _172 === void 0 ? void 0 : _172.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: (_146 = (_143 = (_142 = finalLegend.textStyle) === null || _142 === void 0 ? void 0 : _142.fontSize) !== null && _143 !== void 0 ? _143 : (_145 = (_144 = spec.legend) === null || _144 === void 0 ? void 0 : _144.textFormat) === null || _145 === void 0 ? void 0 : _145.fontSize) !== null && _146 !== void 0 ? _146 : 12,
+                        legendFontSize: (_177 = (_174 = (_173 = finalLegend.textStyle) === null || _173 === void 0 ? void 0 : _173.fontSize) !== null && _174 !== void 0 ? _174 : (_176 = (_175 = spec.legend) === null || _175 === void 0 ? void 0 : _175.textFormat) === null || _176 === void 0 ? void 0 : _176.fontSize) !== null && _177 !== void 0 ? _177 : 12,
                         legendItemWidth: defaultLegendConfig.itemWidth,
                         width: width !== null && width !== void 0 ? width : 0,
                         height: height !== null && height !== void 0 ? height : 0,
                         hasTitle: Boolean(title),
-                        titleFontSize: (_148 = (_147 = spec.titleTextFormat) === null || _147 === void 0 ? void 0 : _147.fontSize) !== null && _148 !== void 0 ? _148 : 16,
+                        titleFontSize: (_179 = (_178 = spec.titleTextFormat) === null || _178 === void 0 ? void 0 : _178.fontSize) !== null && _179 !== void 0 ? _179 : 16,
                         hasBottomAxisTitle: !isCircularChart && Boolean(spec.horizontalAxisTitle),
                         bottomAxisNameGap: bottomAxisNameGap,
                         hasLeftAxisTitle: !isCircularChart && Boolean(spec.verticalAxisTitle),
@@ -2507,12 +2683,12 @@ var BasicChart = function (_a) {
                                 }
                             }
                         }
-                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
                         finally {
                             try {
-                                if (barSeries_1_1 && !barSeries_1_1.done && (_13 = barSeries_1.return)) _13.call(barSeries_1);
+                                if (barSeries_1_1 && !barSeries_1_1.done && (_8 = barSeries_1.return)) _8.call(barSeries_1);
                             }
-                            finally { if (e_10) throw e_10.error; }
+                            finally { if (e_9) throw e_9.error; }
                         }
                         try {
                             for (barSeries_2 = tslib_1.__values(barSeries), barSeries_2_1 = barSeries_2.next(); !barSeries_2_1.done; barSeries_2_1 = barSeries_2.next()) {
@@ -2529,12 +2705,12 @@ var BasicChart = function (_a) {
                                 });
                             }
                         }
-                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
                         finally {
                             try {
-                                if (barSeries_2_1 && !barSeries_2_1.done && (_14 = barSeries_2.return)) _14.call(barSeries_2);
+                                if (barSeries_2_1 && !barSeries_2_1.done && (_9 = barSeries_2.return)) _9.call(barSeries_2);
                             }
-                            finally { if (e_11) throw e_11.error; }
+                            finally { if (e_10) throw e_10.error; }
                         }
                     }
                     seriesWithLabels = chartSeries.map(function (s) {
@@ -2604,7 +2780,7 @@ var BasicChart = function (_a) {
                         return next;
                     });
                     // Update charts
-                    (_149 = chartRef.current) === null || _149 === void 0 ? void 0 : _149.setOption({
+                    (_180 = chartRef.current) === null || _180 === void 0 ? void 0 : _180.setOption({
                         xAxis: (function () {
                             var _a, _b;
                             if (isOfPie) {