@rowsncolumns/charts 28.1.10 → 28.1.12

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

@@ -114,7 +114,8 @@ var isHierarchyChartSpec = function (spec) {
 };
 // Every level keeps the colour its node was given (one solid colour per
 // top-level category, like Excel — no per-level saturation ramp); thin
-// white gaps separate the cells.
+// white gaps separate the cells. Index 0 is echarts' virtual root, 1 the
+// top-level categories, 2+ the levels beneath them.
 var HIERARCHY_LEVEL_STYLES = [
     {
         itemStyle: {
@@ -122,25 +123,53 @@ var HIERARCHY_LEVEL_STYLES = [
             borderColor: "#ffffff",
             borderWidth: 0,
         },
-        upperLabel: { show: false },
     },
     {
         itemStyle: {
-            gapWidth: 1,
+            gapWidth: 2,
+            borderColor: "#ffffff",
+            borderWidth: 1,
+        },
+    },
+    {
+        itemStyle: {
+            gapWidth: 0,
             borderColor: "#ffffff",
             borderWidth: 1,
         },
     },
 ];
+/** Height of the strip a treemap category name is drawn in (Excel's "Banner"). */
+var TREEMAP_BANNER_HEIGHT = 20;
+/**
+ * Excel's treemap `parentLabelLayout`: the top-level category names are
+ * drawn in a banner strip (or not at all); the levels between the categories
+ * and the leaves are never labelled, so small groups keep their height for
+ * the leaf cells (rowsncolumns/spreadsheet#1072). Excel's default
+ * `overlapping` writes the name over the group's top-left corner, which an
+ * echarts treemap cannot draw (an upper label always reserves its strip and
+ * is dropped when the strip is too small for the text), so it draws as a
+ * banner.
+ */
+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). */
@@ -181,13 +210,25 @@ var flattenChartDataValues = function (chartData, extractor, hiddenStrategy, ski
     });
     return values;
 };
-var buildHierarchyLevels = function (maxDepth) {
+var buildHierarchyLevels = function (maxDepth, options) {
     if (maxDepth <= 0)
         return undefined;
     var levels = [];
-    for (var i = 0; i < maxDepth; i++) {
+    // One entry per depth, the virtual root included, so every level's upper
+    // label is explicit: the categories' banner on level 1 only.
+    for (var i = 0; i <= maxDepth; i++) {
         var baseStyle = HIERARCHY_LEVEL_STYLES[Math.min(i, HIERARCHY_LEVEL_STYLES.length - 1)];
-        levels.push(tslib_1.__assign(tslib_1.__assign({}, baseStyle), { itemStyle: tslib_1.__assign({}, baseStyle.itemStyle) }));
+        levels.push(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, baseStyle), { itemStyle: tslib_1.__assign({}, baseStyle.itemStyle) }), (options.treemap
+            ? {
+                upperLabel: i === 1 && options.banner
+                    ? {
+                        show: true,
+                        height: TREEMAP_BANNER_HEIGHT,
+                        padding: [0, 0, 0, 4],
+                    }
+                    : { show: false },
+            }
+            : {})));
     }
     return levels;
 };
@@ -387,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, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, radarAxisOptions_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 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, 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, 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, histogramDomainSource, histogramCategories, _3, 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, _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 _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;
+        return tslib_1.__generator(this, function (_167) {
+            switch (_167.label) {
                 case 0:
                     (0, utils_1.debug)("Updating chart", chart);
                     threeDRenderKind = (0, three_d_1.resolve3DRenderKind)(spec.sourceChartType);
@@ -442,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 = _167.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).
@@ -557,7 +598,7 @@ var BasicChart = function (_a) {
                     });
                     seriesInputs = [];
                     i = 0;
-                    _150.label = 3;
+                    _167.label = 3;
                 case 3:
                     if (!(i < spec.series.length)) return [3 /*break*/, 7];
                     seriesEntry = spec.series[i];
@@ -566,13 +607,13 @@ var BasicChart = function (_a) {
                     _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)];
                 case 4:
-                    resolvedLabel = _b.apply(void 0, [_150.sent()]);
-                    _150.label = 5;
+                    resolvedLabel = _b.apply(void 0, [_167.sent()]);
+                    _167.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];
                     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;
+                    _167.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 3];
@@ -783,12 +824,33 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent5,
                             theme.themeColors.accent6,
                         ]);
-                        hierarchyData = colorHierarchyNodes((0, hierarchy_1.buildHierarchyTree)(hierarchyRows), hierarchyPalette);
+                        isTreemap = spec.chartType === "treemap";
+                        banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
+                        hierarchyData = colorHierarchyNodes((0, hierarchy_1.buildHierarchyTree)(hierarchyRows), hierarchyPalette, { banner: banner });
                         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);
-                        levels = buildHierarchyLevels(hierarchyDepth);
+                        levels = buildHierarchyLevels(hierarchyDepth, {
+                            treemap: isTreemap,
+                            banner: banner,
+                        });
+                        hierarchyLegend = (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, defaultLegendConfig), { show: false }), spec.legend);
+                        legendShown = hierarchyLegend.show !== false;
+                        categoryLegendSeries = legendShown
+                            ? hierarchyData.map(function (node) {
+                                var _a, _b;
+                                return ({
+                                    type: "bar",
+                                    id: "rnc-hierarchy-legend-".concat((_a = node.id) !== null && _a !== void 0 ? _a : node.name),
+                                    name: node.name,
+                                    data: [],
+                                    silent: true,
+                                    itemStyle: { color: (_b = node.itemStyle) === null || _b === void 0 ? void 0 : _b.color },
+                                    tooltip: { show: false },
+                                });
+                            })
+                            : [];
                         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);
                         tooltipFormatter = function (params) {
                             var _a;
@@ -798,9 +860,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: (_39 = spec.legend) === null || _39 === void 0 ? void 0 : _39.position,
+                            visible: legendShown && hierarchyData.length > 0,
+                            labels: hierarchyData.map(function (node) { return node.name; }),
+                            legendFontSize: (_44 = (_41 = (_40 = hierarchyLegend.textStyle) === null || _40 === void 0 ? void 0 : _40.fontSize) !== null && _41 !== void 0 ? _41 : (_43 = (_42 = spec.legend) === null || _42 === void 0 ? void 0 : _42.textFormat) === null || _43 === void 0 ? void 0 : _43.fontSize) !== null && _44 !== void 0 ? _44 : 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: (_46 = (_45 = spec.titleTextFormat) === null || _45 === void 0 ? void 0 : _45.fontSize) !== null && _46 !== void 0 ? _46 : 16,
+                            hasBottomAxisTitle: false,
+                            bottomAxisNameGap: 0,
+                            hasLeftAxisTitle: false,
+                        });
+                        (_47 = chartRef.current) === null || _47 === void 0 ? void 0 : _47.setOption({
                             xAxis: [
                                 {
                                     type: "category",
@@ -813,7 +893,7 @@ var BasicChart = function (_a) {
                                     show: false,
                                 },
                             ],
-                            legend: (0, overrides_1.applyLegendOverrides)(tslib_1.__assign(tslib_1.__assign({}, defaultLegendConfig), { show: false }), spec.legend),
+                            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,
@@ -824,25 +904,31 @@ var BasicChart = function (_a) {
                                 trigger: "item",
                                 formatter: tooltipFormatter,
                             },
-                            series: [
-                                tslib_1.__assign({ type: chartType, name: seriesDisplayName, rootName: rootName || seriesDisplayName || "", data: hierarchyData, label: tslib_1.__assign(tslib_1.__assign({ show: true, formatter: "{b}" }, (spec.chartType === "treemap"
-                                        ? { position: "insideBottomLeft" }
-                                        : {})), (hierarchySeriesLabel !== null && hierarchySeriesLabel !== void 0 ? hierarchySeriesLabel : {})), upperLabel: spec.chartType === "treemap"
-                                        ? {
-                                            show: true,
-                                            padding: [0, 0, 0, 4],
-                                        }
-                                        : undefined, levels: levels, 
+                            series: tslib_1.__spreadArray([
+                                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 }, (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 }, (spec.chartType === "treemap"
+                                        : false }), (isTreemap
                                     ? { breadcrumb: { show: drillDown } }
-                                    : { radius: tslib_1.__spreadArray([], tslib_1.__read(SUNBURST_RADIUS), false) })),
-                            ],
+                                    : { radius: tslib_1.__spreadArray([], tslib_1.__read(SUNBURST_RADIUS), false) }))
+                            ], tslib_1.__read(categoryLegendSeries), false),
                         }, {
                             replaceMerge: [
                                 "series",
@@ -854,7 +940,7 @@ var BasicChart = function (_a) {
                             ],
                         });
                         previousChartType.current = spec.chartType;
-                        previousSeriesCount.current = 1;
+                        previousSeriesCount.current = 1 + categoryLegendSeries.length;
                         return [2 /*return*/];
                     }
                     else {
@@ -866,7 +952,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();
+                        (_48 = chartRef.current) === null || _48 === void 0 ? void 0 : _48.dispose();
                         chartRef.current = undefined;
                         renderedAsContour.current = false;
                         previousChartType.current = undefined;
@@ -877,34 +963,34 @@ 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;
+                    _167.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;
+                    _167.trys.push([9, 16, 17, 18]);
+                    _d = tslib_1.__values((_49 = spec.series) !== null && _49 !== void 0 ? _49 : []), _e = _d.next();
+                    _167.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, (_50 = position.sheetId) !== null && _50 !== void 0 ? _50 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 11:
-                    _f = _g.apply(void 0, [_150.sent()]);
+                    _f = _g.apply(void 0, [_167.sent()]);
                     return [3 /*break*/, 13];
                 case 12:
-                    _f = (_43 = seriesEntry.dataLabel) !== null && _43 !== void 0 ? _43 : "";
-                    _150.label = 13;
+                    _f = (_51 = seriesEntry.dataLabel) !== null && _51 !== void 0 ? _51 : "";
+                    _167.label = 13;
                 case 13:
                     dataLabel = _f;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     contourSeriesInputs.push({ name: dataLabel, values: values });
-                    _150.label = 14;
+                    _167.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 = _167.sent();
                     e_1 = { error: e_1_1 };
                     return [3 /*break*/, 18];
                 case 17:
@@ -929,7 +1015,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({
+                    (_52 = chartRef.current) === null || _52 === void 0 ? void 0 : _52.setOption({
                         tooltip: {
                             textStyle: { fontSize: 12 },
                             trigger: "item",
@@ -949,7 +1035,7 @@ var BasicChart = function (_a) {
                                 type: "category",
                                 data: categories_2,
                                 splitArea: { show: true },
-                                name: (_45 = spec.horizontalAxisTitle) !== null && _45 !== void 0 ? _45 : "",
+                                name: (_53 = spec.horizontalAxisTitle) !== null && _53 !== void 0 ? _53 : "",
                                 nameLocation: "middle",
                                 nameGap: 30,
                             }, spec.categoryAxisOptions),
@@ -959,7 +1045,7 @@ var BasicChart = function (_a) {
                                 type: "category",
                                 data: seriesNames_1,
                                 splitArea: { show: true },
-                                name: (_46 = spec.verticalAxisTitle) !== null && _46 !== void 0 ? _46 : "",
+                                name: (_54 = spec.verticalAxisTitle) !== null && _54 !== void 0 ? _54 : "",
                                 nameLocation: "middle",
                                 nameGap: 50,
                             },
@@ -1012,34 +1098,34 @@ 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;
+                    _167.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;
+                    _167.trys.push([20, 27, 28, 29]);
+                    _j = tslib_1.__values((_55 = spec.series) !== null && _55 !== void 0 ? _55 : []), _k = _j.next();
+                    _167.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, (_56 = position.sheetId) !== null && _56 !== void 0 ? _56 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 22:
-                    _l = _m.apply(void 0, [_150.sent()]);
+                    _l = _m.apply(void 0, [_167.sent()]);
                     return [3 /*break*/, 24];
                 case 23:
-                    _l = (_49 = seriesEntry.dataLabel) !== null && _49 !== void 0 ? _49 : "";
-                    _150.label = 24;
+                    _l = (_57 = seriesEntry.dataLabel) !== null && _57 !== void 0 ? _57 : "";
+                    _167.label = 24;
                 case 24:
                     dataLabel = _l;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     threeDSeriesInputs.push({ name: dataLabel, values: values });
-                    _150.label = 25;
+                    _167.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 = _167.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 29];
                 case 28:
@@ -1208,12 +1294,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: {
+                    (_58 = chartRef.current) === null || _58 === void 0 ? void 0 : _58.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: (_59 = spec.horizontalAxisTitle) !== null && _59 !== void 0 ? _59 : "" }), yAxis3D: tslib_1.__assign(tslib_1.__assign({}, yAxis3D), { name: "" }), zAxis3D: { type: "value", name: (_60 = spec.verticalAxisTitle) !== null && _60 !== void 0 ? _60 : "" }, grid3D: {
                             boxDepth: Math.max(20, Math.min(100, seriesNames_2.length * 20)),
                             viewControl: { autoRotate: false },
                         } }, (visualMap ? { visualMap: [visualMap] } : {})), { series: threeDSeries }), {
@@ -1244,7 +1330,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((_61 = spec.series) !== null && _61 !== void 0 ? _61 : []), _q = _p.next(); !_q.done; _q = _p.next()) {
                                 seriesEntry = _q.value;
                                 label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                                     ? seriesEntry.dataLabel
@@ -1263,7 +1349,7 @@ var BasicChart = function (_a) {
                         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 = (_62 = spec.radarStyle) !== null && _62 !== void 0 ? _62 : "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;
@@ -1280,7 +1366,7 @@ 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({
+                        (_63 = chartRef.current) === null || _63 === void 0 ? void 0 : _63.setOption({
                             radar: {
                                 // The common scale's tick labels along ONE axis, as Excel draws
                                 // them: echarts labels every indicator axis, so each indicator
@@ -1336,9 +1422,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 = ((_64 = spec.stockVariant) !== null && _64 !== void 0 ? _64 : "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 = ((_65 = spec.series) !== null && _65 !== void 0 ? _65 : []).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);
@@ -1356,7 +1442,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 = ((_66 = volumePoints === null || volumePoints === void 0 ? void 0 : volumePoints.length) !== null && _66 !== void 0 ? _66 : 0) > 0;
                         stockGrid = hasVolume
                             ? [
                                 { left: "10%", right: "4%", top: "8%", height: "56%" },
@@ -1370,7 +1456,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_59 = spec.horizontalAxisTitle) !== null && _59 !== void 0 ? _59 : "",
+                            name: (_67 = spec.horizontalAxisTitle) !== null && _67 !== void 0 ? _67 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         }, spec.categoryAxisOptions);
@@ -1412,14 +1498,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({
+                            (_68 = chartRef.current) === null || _68 === void 0 ? void 0 : _68.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: (_69 = spec.verticalAxisTitle) !== null && _69 !== void 0 ? _69 : "",
                                         nameLocation: "middle",
                                         nameGap: 50,
                                         gridIndex: 0,
@@ -1464,13 +1550,13 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent3,
                             theme.themeColors.accent4,
                         ]);
-                        (_62 = chartRef.current) === null || _62 === void 0 ? void 0 : _62.setOption({
+                        (_70 = chartRef.current) === null || _70 === void 0 ? void 0 : _70.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: (_71 = spec.verticalAxisTitle) !== null && _71 !== void 0 ? _71 : "",
                                     nameLocation: "middle",
                                     nameGap: 50,
                                     gridIndex: 0,
@@ -1509,14 +1595,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 = (_74 = (_73 = (_72 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _72 === void 0 ? void 0 : _72[0]) === null || _73 === void 0 ? void 0 : _73.sources) === null || _74 === void 0 ? void 0 : _74[0];
                     rawPrimaryDomainValues = primaryDomainSource
-                        ? (0, aggregation_1.sanitizeDomainValues)((_67 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _67 !== void 0 ? _67 : [])
+                        ? (0, aggregation_1.sanitizeDomainValues)((_75 = getDomainValuesFromRange(primaryDomainSource, spec.hiddenDimensionStrategy)) !== null && _75 !== void 0 ? _75 : [])
                         : [];
                     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)((_76 = spec.categoryLevels) === null || _76 === void 0 ? void 0 : _76.map(function (level) {
                             return flattenChartDataValues([level], getDomainValuesFromRange, spec.hiddenDimensionStrategy, false);
                         }));
                     if (categoryLevels) {
@@ -1527,15 +1613,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 : "",
+                                ? (_77 = spec.verticalAxisTitle) !== null && _77 !== void 0 ? _77 : ""
+                                : (_78 = spec.horizontalAxisTitle) !== null && _78 !== void 0 ? _78 : "",
                             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 ? [] : (_79 = spec.domains) !== null && _79 !== void 0 ? _79 : []).forEach(function (domain, domainIndex) {
                         var _a, _b;
                         var axisData = domain.sources.flatMap(function (sheetRange, sourceIndex) {
                             var _a;
@@ -1571,8 +1657,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 : "",
+                                ? (_80 = spec.verticalAxisTitle) !== null && _80 !== void 0 ? _80 : ""
+                                : (_81 = spec.horizontalAxisTitle) !== null && _81 !== void 0 ? _81 : "",
                             nameLocation: "middle",
                             nameGap: CATEGORY_AXIS_NAME_GAP,
                         });
@@ -1604,7 +1690,7 @@ var BasicChart = function (_a) {
                     };
                     sideBySideBarCount = isStacked
                         ? 1
-                        : ((_74 = spec.series) !== null && _74 !== void 0 ? _74 : []).reduce(function (count, s) {
+                        : ((_82 = spec.series) !== null && _82 !== void 0 ? _82 : []).reduce(function (count, s) {
                             var _a;
                             var seriesType = (_a = s.seriesChartType) !== null && _a !== void 0 ? _a : spec.chartType;
                             return seriesType === "bar" || seriesType === "column"
@@ -1628,29 +1714,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, _168, _169, 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, _170, _171, dp, fallback_1, overrides_3, _172, _173, dp, positiveColor_1, negativeColor_1;
+                        var e_13, _174, e_14, _175, e_15, _176;
+                        return tslib_1.__generator(this, function (_177) {
+                            switch (_177.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)];
+                                    _169 = chart_spec_utils_1.coerceCalculatedLabel;
+                                    return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_84 = position.sheetId) !== null && _84 !== void 0 ? _84 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                                 case 1:
-                                    _151 = _152.apply(void 0, [_160.sent()]);
+                                    _168 = _169.apply(void 0, [_177.sent()]);
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    _151 = (_77 = series.dataLabel) !== null && _77 !== void 0 ? _77 : "";
-                                    _160.label = 3;
+                                    _168 = (_85 = series.dataLabel) !== null && _85 !== void 0 ? _85 : "";
+                                    _177.label = 3;
                                 case 3:
-                                    dataLabel = _151;
+                                    dataLabel = _168;
                                     // Label
                                     if (dataLabel) {
-                                        (_78 = legend.data) === null || _78 === void 0 ? void 0 : _78.push(dataLabel);
+                                        (_86 = legend.data) === null || _86 === void 0 ? void 0 : _86.push(dataLabel);
                                     }
-                                    effectiveChartType = (_79 = series.seriesChartType) !== null && _79 !== void 0 ? _79 : spec.chartType;
+                                    effectiveChartType = (_87 = series.seriesChartType) !== null && _87 !== void 0 ? _87 : 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 = (_90 = (_89 = (_88 = spec.domains) === null || _88 === void 0 ? void 0 : _88[0]) === null || _89 === void 0 ? void 0 : _89.sources) !== null && _90 !== void 0 ? _90 : [];
                                     pieDomainLabels = isCircularChart &&
                                         (domainSources.length > 1 || series.sources.length > 1)
                                         ? domainSources.flatMap(function (sheetRange) {
@@ -1682,7 +1768,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: (_91 = spec.smooth) !== null && _91 !== void 0 ? _91 : undefined, radius: (_92 = spec.radius) !== null && _92 !== void 0 ? _92 : (isCircularChart ? [0, "75%"] : undefined) }, ((0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike)
                                         ? { connectNulls: true }
                                         : {})), seriesStyleAttrs);
                                     // Plot this series against a secondary value axis. The 2nd
@@ -1707,17 +1793,17 @@ var BasicChart = function (_a) {
                                     }
                                     seriesAny = series;
                                     if (effectiveChartType === "line") {
-                                        markerSymbol = (_85 = seriesAny.marker) === null || _85 === void 0 ? void 0 : _85.symbol;
+                                        markerSymbol = (_93 = seriesAny.marker) === null || _93 === void 0 ? void 0 : _93.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((_94 = (0, overrides_1.resolveSeriesDataLabels)(spec.dataLabels, seriesAny)) === null || _94 === void 0 ? void 0 : _94.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;
+                                                (_95 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _95 !== void 0 ? _95 : "circle";
+                                            seriesEntry.symbolSize = (_97 = (_96 = seriesAny.marker) === null || _96 === void 0 ? void 0 : _96.size) !== null && _97 !== void 0 ? _97 : 6;
                                         }
                                         else {
                                             if (labelsWithoutMarkers) {
@@ -1740,7 +1826,7 @@ var BasicChart = function (_a) {
                                                     catch (e_13_1) { e_13 = { error: e_13_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 && (_174 = isolated_1.return)) _174.call(isolated_1);
                                                         }
                                                         finally { if (e_13) throw e_13.error; }
                                                     }
@@ -1752,9 +1838,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({}, ((_98 = seriesEntry.itemStyle) !== null && _98 !== void 0 ? _98 : {})), { 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({}, ((_99 = seriesEntry.areaStyle) !== null && _99 !== void 0 ? _99 : {})), { color: gradient });
                                         }
                                     }
                                     else if (seriesAny.noFill) {
@@ -1762,15 +1848,15 @@ var BasicChart = function (_a) {
                                         // with `transparent` so layout is preserved but nothing
                                         // paints. Legend entries are also suppressed via `name: ""`
                                         // since the series carries no semantic information.
-                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_92 = seriesEntry.itemStyle) !== null && _92 !== void 0 ? _92 : {})), { color: "transparent", borderColor: "transparent" });
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_100 = seriesEntry.itemStyle) !== null && _100 !== void 0 ? _100 : {})), { 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 (_170 = (e_14 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _171 = _170.next(); !_171.done; _171 = _170.next()) {
+                                                dp = _171.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_2.set(dp.idx, dp.color);
                                                 }
@@ -1779,20 +1865,20 @@ var BasicChart = function (_a) {
                                         catch (e_14_1) { e_14 = { error: e_14_1 }; }
                                         finally {
                                             try {
-                                                if (_154 && !_154.done && (_158 = _153.return)) _158.call(_153);
+                                                if (_171 && !_171.done && (_175 = _170.return)) _175.call(_170);
                                             }
                                             finally { if (e_14) throw e_14.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 = (_101 = series.color) !== null && _101 !== void 0 ? _101 : paletteColorAt(specSeriesIndex);
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_102 = seriesEntry.itemStyle) !== null && _102 !== void 0 ? _102 : {})), { 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 (_172 = (e_15 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _173 = _172.next(); !_173.done; _173 = _172.next()) {
+                                                dp = _173.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_3.set(dp.idx, dp.color);
                                                 }
@@ -1801,19 +1887,19 @@ var BasicChart = function (_a) {
                                         catch (e_15_1) { e_15 = { error: e_15_1 }; }
                                         finally {
                                             try {
-                                                if (_156 && !_156.done && (_159 = _155.return)) _159.call(_155);
+                                                if (_173 && !_173.done && (_176 = _172.return)) _176.call(_172);
                                             }
                                             finally { if (e_15) throw e_15.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({}, ((_103 = seriesEntry.itemStyle) !== null && _103 !== void 0 ? _103 : {})), { 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 = (_104 = series.color) !== null && _104 !== void 0 ? _104 : paletteColorAt(specSeriesIndex);
+                                        negativeColor_1 = (_105 = series.negativeColor) !== null && _105 !== void 0 ? _105 : "#FF0000";
+                                        seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_106 = seriesEntry.itemStyle) !== null && _106 !== void 0 ? _106 : {})), { color: function (params) {
                                                 var _a, _b;
                                                 var value = Array.isArray(params.data)
                                                     ? params.data[1]
@@ -1824,10 +1910,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({}, ((_107 = seriesEntry.itemStyle) !== null && _107 !== void 0 ? _107 : {})), { color: series.color });
+                                        seriesEntry.lineStyle = tslib_1.__assign(tslib_1.__assign({}, ((_108 = seriesEntry.lineStyle) !== null && _108 !== void 0 ? _108 : {})), { 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({}, ((_109 = seriesEntry.areaStyle) !== null && _109 !== void 0 ? _109 : {})), { color: series.color });
                                         }
                                     }
                                     chartSeries.push(seriesEntry);
@@ -1836,24 +1922,24 @@ var BasicChart = function (_a) {
                             }
                         });
                     };
-                    _150.label = 31;
+                    _167.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;
+                    _167.trys.push([31, 36, 37, 38]);
+                    _r = tslib_1.__values(((_83 = spec.series) !== null && _83 !== void 0 ? _83 : []).entries()), _s = _r.next();
+                    _167.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;
+                    _167.sent();
+                    _167.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 = _167.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 38];
                 case 37:
@@ -1871,7 +1957,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 = (_110 = spec.series) === null || _110 === void 0 ? void 0 : _110[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : Number(v)); })
                             : [];
@@ -1918,7 +2004,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: (_111 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _111 !== void 0 ? _111 : "",
                             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
@@ -1936,7 +2022,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: (_112 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _112 !== void 0 ? _112 : "",
                                     center: ["".concat(SECONDARY_CX_1 * 100, "%"), "".concat(CY_1 * 100, "%")],
                                     radius: [0, "".concat(secondaryRadiusPct_1, "%")],
                                     data: secondary.map(function (s, i) { return ({
@@ -2031,16 +2117,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 = (_115 = (_114 = (_113 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _113 === void 0 ? void 0 : _113[0]) === null || _114 === void 0 ? void 0 : _114.sources) === null || _115 === void 0 ? void 0 : _115[0];
                         rawDomainValues = primaryDomainSource_1
-                            ? (0, aggregation_1.sanitizeDomainValues)((_108 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _108 !== void 0 ? _108 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_116 = getDomainValuesFromRange(primaryDomainSource_1, spec.hiddenDimensionStrategy)) !== null && _116 !== void 0 ? _116 : [])
                             : [];
                         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 = (_117 = spec.series) === null || _117 === void 0 ? void 0 : _117[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((_118 = spec.totalIndices) !== null && _118 !== void 0 ? _118 : []);
                         steps = (0, waterfall_1.computeWaterfall)(rawValues_1, labels, totalIndices);
                         chartDomains.length = 0;
                         chartDomains.push({
@@ -2050,7 +2136,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_111 = spec.horizontalAxisTitle) !== null && _111 !== void 0 ? _111 : "",
+                            name: (_119 = spec.horizontalAxisTitle) !== null && _119 !== void 0 ? _119 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
@@ -2067,12 +2153,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 = (_120 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _120 !== void 0 ? _120 : theme.themeColors.accent1;
+                        decreaseColor_1 = (_122 = (_121 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.negativeColor) !== null && _121 !== void 0 ? _121 : theme.themeColors.accent2) !== null && _122 !== void 0 ? _122 : accent_1;
+                        totalColor_1 = (_123 = theme.themeColors.accent3) !== null && _123 !== void 0 ? _123 : 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((_124 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _124 !== void 0 ? _124 : []), _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);
@@ -2094,7 +2180,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: (_125 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _125 !== void 0 ? _125 : "",
                             // 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.
@@ -2128,12 +2214,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 = (_128 = (_127 = (_126 = spec === null || spec === void 0 ? void 0 : spec.domains) === null || _126 === void 0 ? void 0 : _126[0]) === null || _127 === void 0 ? void 0 : _127.sources) === null || _128 === void 0 ? void 0 : _128[0];
                         rawDomainValues = primaryDomainSource_2
-                            ? (0, aggregation_1.sanitizeDomainValues)((_121 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _121 !== void 0 ? _121 : [])
+                            ? (0, aggregation_1.sanitizeDomainValues)((_129 = getDomainValuesFromRange(primaryDomainSource_2, spec.hiddenDimensionStrategy)) !== null && _129 !== void 0 ? _129 : [])
                             : [];
                         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 = (_130 = spec.series) === null || _130 === void 0 ? void 0 : _130[0];
                         rawValues = seriesEntry
                             ? flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(function (v) { return (typeof v === "number" ? v : 0); })
                             : [];
@@ -2147,10 +2233,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 = (_131 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.color) !== null && _131 !== void 0 ? _131 : (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((_132 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataPointColors) !== null && _132 !== void 0 ? _132 : []), _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);
@@ -2178,7 +2264,7 @@ 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: {
+                        chartSeries.push(tslib_1.__assign(tslib_1.__assign({ type: "funnel", id: (0, series_click_1.chartSeriesId)(0, 0), name: (_133 = seriesEntry === null || seriesEntry === void 0 ? void 0 : seriesEntry.dataLabel) !== null && _133 !== void 0 ? _133 : "", 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,
@@ -2201,7 +2287,7 @@ var BasicChart = function (_a) {
                         outlierPoints = [];
                         meanPoints = [];
                         try {
-                            for (_z = tslib_1.__values((_126 = spec.series) !== null && _126 !== void 0 ? _126 : []), _0 = _z.next(); !_0.done; _0 = _z.next()) {
+                            for (_z = tslib_1.__values((_134 = spec.series) !== null && _134 !== void 0 ? _134 : []), _0 = _z.next(); !_0.done; _0 = _z.next()) {
                                 seriesEntry = _0.value;
                                 label = seriesEntry.dataLabel && !(0, utils_1.isAFormula)(seriesEntry.dataLabel)
                                     ? seriesEntry.dataLabel
@@ -2250,7 +2336,7 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_127 = spec.horizontalAxisTitle) !== null && _127 !== void 0 ? _127 : "",
+                            name: (_135 = spec.horizontalAxisTitle) !== null && _135 !== void 0 ? _135 : "",
                             nameLocation: "middle",
                             nameGap: 30,
                         });
@@ -2260,7 +2346,7 @@ var BasicChart = function (_a) {
                             name: "",
                             data: boxStats,
                         };
-                        boxColor = (_129 = (_128 = spec.series) === null || _128 === void 0 ? void 0 : _128[0]) === null || _129 === void 0 ? void 0 : _129.color;
+                        boxColor = (_137 = (_136 = spec.series) === null || _136 === void 0 ? void 0 : _136[0]) === null || _137 === void 0 ? void 0 : _137.color;
                         if (boxColor) {
                             boxSeries.itemStyle = { color: boxColor, borderColor: boxColor };
                         }
@@ -2275,7 +2361,18 @@ var BasicChart = function (_a) {
                     }
                     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 = (_140 = (_139 = (_138 = spec.domains) === null || _138 === void 0 ? void 0 : _138[0]) === null || _139 === void 0 ? void 0 : _139.sources) === null || _140 === void 0 ? void 0 : _140[0];
+                        histogramCategories = histogramDomainSource
+                            ? ((_141 = getDomainValuesFromRange(histogramDomainSource, spec.hiddenDimensionStrategy)) !== null && _141 !== void 0 ? _141 : [])
+                            : [];
+                        _3 = histogramCategories.length
+                            ? (0, histogram_1.aggregateByCategory)(histogramCategories, rawValues, (_144 = (_143 = (_142 = spec.series) === null || _142 === void 0 ? void 0 : _142[0]) === null || _143 === void 0 ? void 0 : _143.aggregateType) !== null && _144 !== void 0 ? _144 : "SUM")
+                            : (0, histogram_1.binHistogram)(rawValues, spec.binCount, {
+                                binSize: spec.binSize,
+                                intervalClosed: spec.intervalClosed,
+                                overflow: spec.overflow,
+                                underflow: spec.underflow,
+                            }), labels = _3.labels, counts = _3.counts;
                         isPareto_1 = (0, histogram_1.isParetoSpec)(spec);
                         cumulativePercents = [];
                         if (isPareto_1) {
@@ -2292,34 +2389,32 @@ var BasicChart = function (_a) {
                             axisLine: { show: true },
                             axisTick: { show: true },
                             splitLine: { show: false },
-                            name: (_130 = spec.horizontalAxisTitle) !== null && _130 !== void 0 ? _130 : "",
+                            name: (_145 = spec.horizontalAxisTitle) !== null && _145 !== void 0 ? _145 : "",
                             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: (_148 = (_147 = (_146 = spec.series) === null || _146 === void 0 ? void 0 : _146[0]) === null || _147 === void 0 ? void 0 : _147.dataLabel) !== null && _148 !== void 0 ? _148 : "",
                             data: counts,
-                            barCategoryGap: "1%",
+                            // Excel's histogram columns touch unless `gapWidth` says otherwise
+                            // (#1087); the gap maps like a column chart's.
+                            barCategoryGap: (_150 = (0, bar_layout_1.gapWidthToBarCategoryGap)((_149 = spec.gapWidth) !== null && _149 !== void 0 ? _149 : 0, { seriesCount: 1 })) !== null && _150 !== void 0 ? _150 : "0%",
                         };
-                        histogramColor = (_135 = (_134 = spec.series) === null || _134 === void 0 ? void 0 : _134[0]) === null || _135 === void 0 ? void 0 : _135.color;
+                        histogramColor = (_152 = (_151 = spec.series) === null || _151 === void 0 ? void 0 : _151[0]) === null || _152 === void 0 ? void 0 : _152.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 = [];
                     }
@@ -2340,20 +2435,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);
+                        (((_153 = spec.series) !== null && _153 !== void 0 ? _153 : []).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: ((_154 = spec.series) !== null && _154 !== void 0 ? _154 : []).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: ((_155 = spec.series) !== null && _155 !== void 0 ? _155 : []).filter(function (s) { return s.useSecondaryAxis; }),
                         getFormattingFromRange: getFormattingFromRange,
                         hiddenDimensionStrategy: spec.hiddenDimensionStrategy,
                     });
@@ -2382,17 +2477,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((_157 = (_156 = chartDomains[0]) === null || _156 === void 0 ? void 0 : _156.nameGap) !== null && _157 !== void 0 ? _157 : CATEGORY_AXIS_NAME_GAP);
                     legendBand = (0, legend_layout_1.reserveEchartsLegendBand)({
-                        position: (_141 = spec.legend) === null || _141 === void 0 ? void 0 : _141.position,
+                        position: (_158 = spec.legend) === null || _158 === void 0 ? void 0 : _158.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: (_163 = (_160 = (_159 = finalLegend.textStyle) === null || _159 === void 0 ? void 0 : _159.fontSize) !== null && _160 !== void 0 ? _160 : (_162 = (_161 = spec.legend) === null || _161 === void 0 ? void 0 : _161.textFormat) === null || _162 === void 0 ? void 0 : _162.fontSize) !== null && _163 !== void 0 ? _163 : 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: (_165 = (_164 = spec.titleTextFormat) === null || _164 === void 0 ? void 0 : _164.fontSize) !== null && _165 !== void 0 ? _165 : 16,
                         hasBottomAxisTitle: !isCircularChart && Boolean(spec.horizontalAxisTitle),
                         bottomAxisNameGap: bottomAxisNameGap,
                         hasLeftAxisTitle: !isCircularChart && Boolean(spec.verticalAxisTitle),
@@ -2562,7 +2657,7 @@ var BasicChart = function (_a) {
                         return next;
                     });
                     // Update charts
-                    (_149 = chartRef.current) === null || _149 === void 0 ? void 0 : _149.setOption({
+                    (_166 = chartRef.current) === null || _166 === void 0 ? void 0 : _166.setOption({
                         xAxis: (function () {
                             var _a, _b;
                             if (isOfPie) {