@rowsncolumns/charts 28.1.10 → 28.1.11

package/dist/cjs/basic-chart/basic-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAmRrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAgFnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA4+GjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAkSrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAiGnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAkgHjB,CAAC"}

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,7 +123,6 @@ var HIERARCHY_LEVEL_STYLES = [
             borderColor: "#ffffff",
             borderWidth: 0,
         },
-        upperLabel: { show: false },
     },
     {
         itemStyle: {
@@ -132,6 +132,19 @@ var HIERARCHY_LEVEL_STYLES = [
         },
     },
 ];
+/** 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).
@@ -181,13 +194,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,7 +412,7 @@ 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, hierarchyData, rootName, drillDown, seriesDisplayName, hierarchyDepth, isTreemap, banner, levels, hierarchyLegend, legendShown, categoryLegendSeries, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, radarAxisOptions_1, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, seriesPalette, paletteColorAt, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, pointColors_1, _v, _w, dp, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, funnelPalette, funnelColor_1, stageColors_1, _x, _y, dp, funnelData, funnelLayout, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _z, _0, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _1, _2, outlier, boxSeries, boxColor, rawValues, _3, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, chartDataLabels, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, doughnutSeriesOrder, doughnutRingSet, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
         var e_1, _4, e_2, _5, e_4, _6, e_5, _7, e_3, _8, e_6, _9, e_7, _10, e_8, _11, e_9, _12, e_10, _13, e_11, _14;
         var _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138, _139, _140, _141, _142, _143, _144, _145, _146, _147, _148, _149;
         return tslib_1.__generator(this, function (_150) {
@@ -788,7 +813,28 @@ var BasicChart = function (_a) {
                         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);
+                        isTreemap = spec.chartType === "treemap";
+                        banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
+                        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;
@@ -813,7 +859,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({}, hierarchyLegend), { data: hierarchyData.map(function (node) { return node.name; }), selectedMode: false }),
                             grid: {
                                 left: 0,
                                 right: 0,
@@ -824,25 +870,21 @@ 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({ type: chartType, name: seriesDisplayName, rootName: rootName || seriesDisplayName || "", data: hierarchyData, label: tslib_1.__assign(tslib_1.__assign({ show: true, formatter: "{b}" }, (isTreemap ? { position: "insideBottomLeft" } : {})), (hierarchySeriesLabel !== null && hierarchySeriesLabel !== void 0 ? hierarchySeriesLabel : {})), 
+                                    // Only `levels[1]` (the categories) may carry a banner; see
+                                    // buildHierarchyLevels.
+                                    upperLabel: isTreemap ? { show: false } : undefined, levels: levels, 
                                     // 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 +896,7 @@ var BasicChart = function (_a) {
                             ],
                         });
                         previousChartType.current = spec.chartType;
-                        previousSeriesCount.current = 1;
+                        previousSeriesCount.current = 1 + categoryLegendSeries.length;
                         return [2 /*return*/];
                     }
                     else {

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

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

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

@@ -824,7 +824,25 @@ var BasicChart = function (_a) {
                         SUNBURST_ROOT_ID_1 = "__rnc_sunburst_root__";
                         rootTotal = hierarchyData_1.values.reduce(function (sum, value, i) { return (hierarchyData_1.parents[i] === "" ? sum + value : sum); }, 0);
                         hierarchyTrace = tslib_1.__assign({ type: chartType, labels: isSunburst ? tslib_1.__spreadArray([""], tslib_1.__read(hierarchyData_1.labels), false) : hierarchyData_1.labels, ids: isSunburst ? tslib_1.__spreadArray([SUNBURST_ROOT_ID_1], tslib_1.__read(hierarchyData_1.ids), false) : hierarchyData_1.ids, parents: isSunburst
-                                ? tslib_1.__spreadArray([""], tslib_1.__read(hierarchyData_1.parents.map(function (parent) { return parent || SUNBURST_ROOT_ID_1; })), false) : hierarchyData_1.parents, values: isSunburst ? tslib_1.__spreadArray([rootTotal], tslib_1.__read(hierarchyData_1.values), false) : hierarchyData_1.values, marker: tslib_1.__assign({ colors: isSunburst ? tslib_1.__spreadArray(["rgba(0,0,0,0)"], tslib_1.__read(nodeColors), false) : nodeColors }, (isSunburst ? { line: { width: 1 } } : {})), name: seriesName, textinfo: "label+value", branchvalues: "total" }, (isSunburst ? {} : { textposition: "bottom left" }));
+                                ? tslib_1.__spreadArray([""], tslib_1.__read(hierarchyData_1.parents.map(function (parent) { return parent || SUNBURST_ROOT_ID_1; })), false) : hierarchyData_1.parents, values: isSunburst ? tslib_1.__spreadArray([rootTotal], tslib_1.__read(hierarchyData_1.values), false) : hierarchyData_1.values, marker: tslib_1.__assign({ colors: isSunburst ? tslib_1.__spreadArray(["rgba(0,0,0,0)"], tslib_1.__read(nodeColors), false) : nodeColors }, (isSunburst ? { line: { width: 1 } } : {})), name: seriesName, textinfo: "label+value", branchvalues: "total" }, (isSunburst
+                            ? {}
+                            : {
+                                textposition: "bottom left",
+                                // Excel labels a treemap's top-level categories (in a header
+                                // strip, or not at all with parentLabelLayout "none") and its
+                                // leaves; the levels in between are never labelled (#1072).
+                                text: hierarchyData_1.labels.map(function () { return ""; }),
+                                texttemplate: hierarchyData_1.ids.map(function (id, i) {
+                                    var isLeaf = !hierarchyData_1.parents.includes(id);
+                                    if (isLeaf)
+                                        return "%{label}<br>%{value}";
+                                    var isTopLevel = hierarchyData_1.depths[i] === 0;
+                                    return isTopLevel &&
+                                        spec.parentLabelLayout !== "none"
+                                        ? "%{label}"
+                                        : "%{text}";
+                                }),
+                            }));
                         layoutForHierarchy = {
                             title: {
                                 text: (0, plotly_title_1.plotlyTitleText)(title, spec.titleTextFormat),

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

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WA+C7E,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCA7F0D,GAAG;aA0G7E,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WAoD7E,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCAlG0D,GAAG;aA+G7E,CAAC"}

package/dist/cjs/utils/overrides.js

@@ -135,10 +135,15 @@ var dataLabelFormatter = function (opts, locale) { return function (params) {
     if (opts.showPercent && params.percent !== undefined) {
         parts.push("".concat(params.percent, "%"));
     }
+    // The value shows by default unless another field was asked for instead:
+    // an importer records only the flags that are ON, so `<c:showVal val="0"/>`
+    // + `<c:showBubbleSize val="1"/>` arrives as `{ showBubbleSize: true }` and
+    // must label the bubble with its size alone (#1068 / #1079).
     var showVal = opts.showValue !== false &&
         !opts.showCategoryName &&
         !opts.showPercent &&
-        !opts.showSeriesName
+        !opts.showSeriesName &&
+        !opts.showBubbleSize
         ? true
         : !!opts.showValue;
     // A scatter / bubble point's value is its [x, y, size] tuple: the label's

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

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAmRrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAgFnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA4+GjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAkSrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAiGnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAkgHjB,CAAC"}

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

@@ -104,7 +104,8 @@ const isBubbleChartSpec = (spec) => BUBBLE_CHART_TYPES.has(spec.chartType);
 const isHierarchyChartSpec = (spec) => HIERARCHY_CHART_TYPES.has(spec.chartType);
 // 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.
 const HIERARCHY_LEVEL_STYLES = [
     {
         itemStyle: {
@@ -112,7 +113,6 @@ const HIERARCHY_LEVEL_STYLES = [
             borderColor: "#ffffff",
             borderWidth: 0,
         },
-        upperLabel: { show: false },
     },
     {
         itemStyle: {
@@ -122,6 +122,19 @@ const HIERARCHY_LEVEL_STYLES = [
         },
     },
 ];
+/** Height of the strip a treemap category name is drawn in (Excel's "Banner"). */
+const 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.
+ */
+const treemapBannerShown = (layout) => layout !== "none";
 /**
  * Colour a hierarchy like Excel: each top-level node takes the next
  * palette colour and every descendant inherits it (#1072).
@@ -170,17 +183,30 @@ const flattenChartDataValues = (chartData, extractor, hiddenStrategy, skipFirstR
     });
     return values;
 };
-const buildHierarchyLevels = (maxDepth) => {
+const buildHierarchyLevels = (maxDepth, options) => {
     if (maxDepth <= 0)
         return undefined;
     const levels = [];
-    for (let 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 (let i = 0; i <= maxDepth; i++) {
         const baseStyle = HIERARCHY_LEVEL_STYLES[Math.min(i, HIERARCHY_LEVEL_STYLES.length - 1)];
         levels.push({
             ...baseStyle,
             itemStyle: {
                 ...baseStyle.itemStyle,
             },
+            ...(options.treemap
+                ? {
+                    upperLabel: i === 1 && options.banner
+                        ? {
+                            show: true,
+                            height: TREEMAP_BANNER_HEIGHT,
+                            padding: [0, 0, 0, 4],
+                        }
+                        : { show: false },
+                }
+                : {}),
         });
     }
     return levels;
@@ -813,7 +839,30 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             const drillDown = Boolean(spec.drillDown);
             const seriesDisplayName = explicitChartTitle ?? headerTitle ?? rootName ?? "";
             const hierarchyDepth = getHierarchyDepth(hierarchyData);
-            const levels = buildHierarchyLevels(hierarchyDepth);
+            const isTreemap = spec.chartType === "treemap";
+            const banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
+            const levels = buildHierarchyLevels(hierarchyDepth, {
+                treemap: isTreemap,
+                banner,
+            });
+            // Excel lists the top-level categories with their colours in the
+            // legend. An echarts legend cannot address treemap nodes, so each
+            // category gets a data-less placeholder series carrying its name and
+            // colour; `selectedMode: false` keeps the swatches from toggling
+            // anything.
+            const hierarchyLegend = applyLegendOverrides({ ...defaultLegendConfig, show: false }, spec.legend);
+            const legendShown = hierarchyLegend.show !== false;
+            const categoryLegendSeries = legendShown
+                ? hierarchyData.map((node) => ({
+                    type: "bar",
+                    id: `rnc-hierarchy-legend-${node.id ?? node.name}`,
+                    name: node.name,
+                    data: [],
+                    silent: true,
+                    itemStyle: { color: node.itemStyle?.color },
+                    tooltip: { show: false },
+                }))
+                : [];
             // Sizes format like the cells they were read from (Excel's "Linked
             // to source"), unless the data labels carry their own pattern.
             const sizeNumberFormat = resolveSourceNumberFormat(spec.sizeData?.[0]
@@ -843,7 +892,11 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         show: false,
                     },
                 ],
-                legend: applyLegendOverrides({ ...defaultLegendConfig, show: false }, spec.legend),
+                legend: {
+                    ...hierarchyLegend,
+                    data: hierarchyData.map((node) => node.name),
+                    selectedMode: false,
+                },
                 grid: {
                     left: 0,
                     right: 0,
@@ -863,17 +916,12 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         label: {
                             show: true,
                             formatter: "{b}",
-                            ...(spec.chartType === "treemap"
-                                ? { position: "insideBottomLeft" }
-                                : {}),
+                            ...(isTreemap ? { position: "insideBottomLeft" } : {}),
                             ...(hierarchySeriesLabel ?? {}),
                         },
-                        upperLabel: spec.chartType === "treemap"
-                            ? {
-                                show: true,
-                                padding: [0, 0, 0, 4],
-                            }
-                            : undefined,
+                        // Only `levels[1]` (the categories) may carry a banner; see
+                        // buildHierarchyLevels.
+                        upperLabel: isTreemap ? { show: false } : undefined,
                         levels,
                         // Excel has no drill-down on either chart: zooming into a
                         // branch on click (and the treemap breadcrumb) is opt-in.
@@ -882,10 +930,11 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                                 ? "zoomToNode"
                                 : "rootToNode"
                             : false,
-                        ...(spec.chartType === "treemap"
+                        ...(isTreemap
                             ? { breadcrumb: { show: drillDown } }
                             : { radius: [...SUNBURST_RADIUS] }),
                     },
+                    ...categoryLegendSeries,
                 ],
             }, {
                 replaceMerge: [
@@ -898,7 +947,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 ],
             });
             previousChartType.current = spec.chartType;
-            previousSeriesCount.current = 1;
+            previousSeriesCount.current = 1 + categoryLegendSeries.length;
             return;
         }
         else {

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

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

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

@@ -853,7 +853,25 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 name: seriesName,
                 textinfo: "label+value",
                 branchvalues: "total",
-                ...(isSunburst ? {} : { textposition: "bottom left" }),
+                ...(isSunburst
+                    ? {}
+                    : {
+                        textposition: "bottom left",
+                        // Excel labels a treemap's top-level categories (in a header
+                        // strip, or not at all with parentLabelLayout "none") and its
+                        // leaves; the levels in between are never labelled (#1072).
+                        text: hierarchyData.labels.map(() => ""),
+                        texttemplate: hierarchyData.ids.map((id, i) => {
+                            const isLeaf = !hierarchyData.parents.includes(id);
+                            if (isLeaf)
+                                return "%{label}<br>%{value}";
+                            const isTopLevel = hierarchyData.depths[i] === 0;
+                            return isTopLevel &&
+                                spec.parentLabelLayout !== "none"
+                                ? "%{label}"
+                                : "%{text}";
+                        }),
+                    }),
             };
             const layoutForHierarchy = {
                 title: {

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

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WA+C7E,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCA7F0D,GAAG;aA0G7E,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WAoD7E,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCAlG0D,GAAG;aA+G7E,CAAC"}

package/dist/esm/utils/overrides.js

@@ -126,10 +126,15 @@ export const dataLabelFormatter = (opts, locale) => (params) => {
     if (opts.showPercent && params.percent !== undefined) {
         parts.push(`${params.percent}%`);
     }
+    // The value shows by default unless another field was asked for instead:
+    // an importer records only the flags that are ON, so `<c:showVal val="0"/>`
+    // + `<c:showBubbleSize val="1"/>` arrives as `{ showBubbleSize: true }` and
+    // must label the bubble with its size alone (#1068 / #1079).
     const showVal = opts.showValue !== false &&
         !opts.showCategoryName &&
         !opts.showPercent &&
-        !opts.showSeriesName
+        !opts.showSeriesName &&
+        !opts.showBubbleSize
         ? true
         : !!opts.showValue;
     // A scatter / bubble point's value is its [x, y, size] tuple: the label's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "28.1.10",
+  "version": "28.1.11",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -70,7 +70,7 @@
     "@rowsncolumns/common-types": ">=5.3.2",
     "@rowsncolumns/grid": ">=13.2.35",
     "@rowsncolumns/icons": ">=7.2.33",
-    "@rowsncolumns/spreadsheet": ">=10.4.8",
+    "@rowsncolumns/spreadsheet": ">=10.4.9",
     "@rowsncolumns/spreadsheet-state": ">=29.1.8",
     "@rowsncolumns/toolkit": ">=24.5.10",
     "@rowsncolumns/ui": ">=16.0.4",