@rowsncolumns/charts 28.1.11 → 28.1.12

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

@@ -23,12 +23,12 @@ import { applyEmptyCellsPolicy, connectsAcrossEmptyCells, isolatedPointIndexes,
 import { getEchartsGlState, loadEchartsGl, } from "../utils/echarts-gl-loader";
 import { echartsGroupedCategoryAxes, resolveCategoryLevels, } from "../utils/category-levels";
 import { gradientToEcharts } from "../utils/gradient";
-import { buildHierarchyTree, extractHierarchyRows, getHierarchyHeaderTitle, } from "../utils/hierarchy";
-import { binHistogram, computePareto, isParetoSpec, } from "../utils/histogram";
+import { buildHierarchyTree, contrastTextColor, extractHierarchyRows, getHierarchyHeaderTitle, } from "../utils/hierarchy";
+import { aggregateByCategory, binHistogram, computePareto, isParetoSpec, } from "../utils/histogram";
 import { categoryAxisNameGap, legendLabelsFrom, reserveEchartsLegendBand, } from "../utils/legend-layout";
 import { clampSecondPieSize, isOfPieChartSpec, otherSliceHalfAngle, resolveOfPieType, splitOfPie, } from "../utils/of-pie";
 import { clampDoughnutHole, doughnutRings } from "../utils/doughnut";
-import { applyAxisOverrides, applyLegendOverrides, buildSeriesLabelOption, resolveSeriesDataLabels, } from "../utils/overrides";
+import { applyAxisOverrides, dataLabelFormatter, applyLegendOverrides, buildSeriesLabelOption, resolveSeriesDataLabels, } from "../utils/overrides";
 import { buildRadarIndicators, buildRadarSeriesData } from "../utils/radar";
 import { buildRegionMapData, buildSequentialColorRamp, isRegionMapSpec, resolveGeoScope, warnOnceForUnmatchedRegions, } from "../utils/region-map";
 import { loadRegionMapGeo } from "../utils/region-map-loader";
@@ -116,7 +116,14 @@ const HIERARCHY_LEVEL_STYLES = [
     },
     {
         itemStyle: {
-            gapWidth: 1,
+            gapWidth: 2,
+            borderColor: "#ffffff",
+            borderWidth: 1,
+        },
+    },
+    {
+        itemStyle: {
+            gapWidth: 0,
             borderColor: "#ffffff",
             borderWidth: 1,
         },
@@ -139,14 +146,22 @@ 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).
  */
-const colorHierarchyNodes = (nodes, palette) => nodes.map((node, index) => {
+const colorHierarchyNodes = (nodes, palette, options = {}) => nodes.map((node, index) => {
     const color = chartPaletteColorAt(palette, index);
-    const paint = (n) => ({
+    const paint = (n, depth) => ({
         ...n,
-        itemStyle: { color },
-        ...(n.children ? { children: n.children.map(paint) } : {}),
+        // 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, borderColor: color }
+            : { color },
+        ...(depth === 0 && options.banner
+            ? { upperLabel: { color: contrastTextColor(color) } }
+            : {}),
+        ...(n.children ? { children: n.children.map((c) => paint(c, depth + 1)) } : {}),
     });
-    return paint(node);
+    return paint(node, 0);
 });
 /** Sunburst rings: Excel leaves the centre empty, so even the first level is a ring (#1073). */
 const SUNBURST_RADIUS = ["15%", "80%"];
@@ -834,13 +849,13 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 theme.themeColors.accent5,
                 theme.themeColors.accent6,
             ]);
-            const hierarchyData = colorHierarchyNodes(buildHierarchyTree(hierarchyRows), hierarchyPalette);
+            const isTreemap = spec.chartType === "treemap";
+            const banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
+            const hierarchyData = colorHierarchyNodes(buildHierarchyTree(hierarchyRows), hierarchyPalette, { banner });
             const rootName = hierarchyData.length === 1 ? hierarchyData[0]?.name ?? "" : "";
             const drillDown = Boolean(spec.drillDown);
             const seriesDisplayName = explicitChartTitle ?? headerTitle ?? rootName ?? "";
             const hierarchyDepth = getHierarchyDepth(hierarchyData);
-            const isTreemap = spec.chartType === "treemap";
-            const banner = isTreemap && treemapBannerShown(spec.parentLabelLayout);
             const levels = buildHierarchyLevels(hierarchyDepth, {
                 treemap: isTreemap,
                 banner,
@@ -873,12 +888,45 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     : params.value ?? "";
                 return `${params.name}: ${formatAxisValue(sizeNumberFormat, value, locale)}`;
             };
-            // Spec-level overrides — treemap/sunburst default to no legend,
-            // but an authored legend (visibility/position) still wins.
+            // Data labels: a treemap block's label always sits in its bottom-left
+            // corner (the bar placements mean nothing on a block) with each part
+            // — name, value — on its own line; `{ show: false }` turns the labels
+            // off entirely (#1086). Without `dataLabels` the block shows its name.
             const hierarchyDataLabels = spec.dataLabels;
-            const hierarchySeriesLabel = buildSeriesLabelOption(hierarchyDataLabels && !hierarchyDataLabels.numberFormatPattern
+            const hierarchyLabelOpts = hierarchyDataLabels && !hierarchyDataLabels.numberFormatPattern
                 ? { ...hierarchyDataLabels, numberFormatPattern: sizeNumberFormat }
-                : hierarchyDataLabels, undefined, locale);
+                : hierarchyDataLabels;
+            const hierarchyLabel = hierarchyLabelOpts?.show === false
+                ? { show: false }
+                : hierarchyLabelOpts?.show
+                    ? {
+                        show: true,
+                        formatter: dataLabelFormatter(hierarchyLabelOpts, locale, isTreemap ? "\n" : ": "),
+                        ...(isTreemap ? { position: "insideBottomLeft" } : {}),
+                    }
+                    : {
+                        show: true,
+                        formatter: "{b}",
+                        ...(isTreemap ? { position: "insideBottomLeft" } : {}),
+                    };
+            // Reserve a band for the legend (and the title) so neither paints
+            // over the blocks (#1086), as the cartesian layout does.
+            const hierarchyBand = reserveEchartsLegendBand({
+                position: spec.legend?.position,
+                visible: legendShown && hierarchyData.length > 0,
+                labels: hierarchyData.map((node) => node.name),
+                legendFontSize: hierarchyLegend.textStyle?.fontSize ??
+                    spec.legend?.textFormat?.fontSize ??
+                    12,
+                legendItemWidth: defaultLegendConfig.itemWidth,
+                width: width ?? 0,
+                height: height ?? 0,
+                hasTitle: Boolean(explicitChartTitle ?? headerTitle),
+                titleFontSize: spec.titleTextFormat?.fontSize ?? 16,
+                hasBottomAxisTitle: false,
+                bottomAxisNameGap: 0,
+                hasLeftAxisTitle: false,
+            });
             chartRef.current?.setOption({
                 xAxis: [
                     {
@@ -894,6 +942,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 ],
                 legend: {
                     ...hierarchyLegend,
+                    ...hierarchyBand.legend,
                     data: hierarchyData.map((node) => node.name),
                     selectedMode: false,
                 },
@@ -913,16 +962,22 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         name: seriesDisplayName,
                         rootName: rootName || seriesDisplayName || "",
                         data: hierarchyData,
-                        label: {
-                            show: true,
-                            formatter: "{b}",
-                            ...(isTreemap ? { position: "insideBottomLeft" } : {}),
-                            ...(hierarchySeriesLabel ?? {}),
-                        },
+                        label: hierarchyLabel,
                         // Only `levels[1]` (the categories) may carry a banner; see
                         // buildHierarchyLevels.
                         upperLabel: isTreemap ? { show: false } : undefined,
                         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
@@ -2418,7 +2473,21 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
         }
         else if (spec.chartType === "histogram") {
             const rawValues = flattenChartDataValues(spec.series, getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map((v) => (typeof v === "number" ? v : Number(v)));
-            let { labels, counts } = binHistogram(rawValues, spec.binCount);
+            // A domain names a category column: Excel's "By Category" histogram
+            // / Pareto over categories aggregates the values per category (sum
+            // unless the series says otherwise) instead of binning them (#1087).
+            const histogramDomainSource = spec.domains?.[0]?.sources?.[0];
+            const histogramCategories = histogramDomainSource
+                ? (getDomainValuesFromRange(histogramDomainSource, spec.hiddenDimensionStrategy) ?? [])
+                : [];
+            let { labels, counts } = histogramCategories.length
+                ? aggregateByCategory(histogramCategories, rawValues, spec.series?.[0]?.aggregateType ?? "SUM")
+                : binHistogram(rawValues, spec.binCount, {
+                    binSize: spec.binSize,
+                    intervalClosed: spec.intervalClosed,
+                    overflow: spec.overflow,
+                    underflow: spec.underflow,
+                });
             // Pareto — a histogram whose bins are sorted descending with a
             // cumulative-% line overlaid on a secondary 0-100% axis. The
             // authored type arrives as `sourceChartType: "PARETO"` on an
@@ -2448,7 +2517,10 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 type: "bar",
                 name: spec.series?.[0]?.dataLabel ?? "",
                 data: counts,
-                barCategoryGap: "1%",
+                // Excel's histogram columns touch unless `gapWidth` says otherwise
+                // (#1087); the gap maps like a column chart's.
+                barCategoryGap: gapWidthToBarCategoryGap(spec.gapWidth ?? 0, { seriesCount: 1 }) ??
+                    "0%",
             };
             const histogramColor = spec.series?.[0]?.color;
             if (histogramColor) {
@@ -2458,14 +2530,21 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             if (isPareto) {
                 // Cumulative-% overlay on the secondary axis (yAxisIndex 1);
                 // the matching 0-100% axis element is appended with the other
-                // value axes below.
+                // value axes below. Excel draws the Pareto line without markers.
+                const paretoLineColor = spec.paretoLineColor;
                 chartSeries.push({
                     type: "line",
                     name: "Cumulative %",
                     data: cumulativePercents,
                     yAxisIndex: 1,
-                    symbol: "circle",
-                    symbolSize: 6,
+                    showSymbol: false,
+                    symbol: "none",
+                    ...(paretoLineColor
+                        ? {
+                            itemStyle: { color: paretoLineColor },
+                            lineStyle: { color: paretoLineColor },
+                        }
+                        : {}),
                 });
             }
             legend.data = [];

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,sBAilFjB,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;AA+ZxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAmGnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA4nFjB,CAAC"}

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

@@ -25,7 +25,7 @@ import { resolvePlotlyClickSelection, wasDragged, } from "../../utils/plotly-cli
 import { buildPlotlySurfaceTrace } from "../../utils/plotly-surface";
 import { normalize3DSourceType, } from "../../utils/three-d";
 import { extractHierarchyRows, getHierarchyHeaderTitle, hierarchyNodeColors, toPlotlyHierarchy, } from "../../utils/hierarchy";
-import { binHistogram, computePareto, isParetoSpec, } from "../../utils/histogram";
+import { aggregateByCategory, binHistogram, computePareto, hasExcelBinning, isParetoSpec, } from "../../utils/histogram";
 import { clampSecondPieSize, isOfPieChartSpec, otherSliceHalfAngle, resolveOfPieType, splitOfPie, } from "../../utils/of-pie";
 import { buildRadarIndicators } from "../../utils/radar";
 import { buildSequentialColorRamp, isRegionMapSpec, resolveGeoScope, WORLD_GEO_SCOPE, } from "../../utils/region-map";
@@ -851,9 +851,10 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     ...(isSunburst ? { line: { width: 1 } } : {}),
                 },
                 name: seriesName,
-                textinfo: "label+value",
+                // `dataLabels: { show: false }` turns the labels off (#1086).
+                textinfo: spec.dataLabels?.show === false ? "none" : "label+value",
                 branchvalues: "total",
-                ...(isSunburst
+                ...(isSunburst || spec.dataLabels?.show === false
                     ? {}
                     : {
                         textposition: "bottom left",
@@ -1619,12 +1620,29 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             if (effectiveChartType === "histogram") {
                 const rawValues = seriesValuesOf(seriesData);
                 const binCount = spec.binCount;
+                const binningOptions = {
+                    binSize: spec.binSize,
+                    intervalClosed: spec.intervalClosed,
+                    overflow: spec.overflow,
+                    underflow: spec.underflow,
+                };
+                // A domain names a category column: aggregate per category (Excel's
+                // "By Category" / Pareto over categories) instead of binning
+                // (#1087). Excel binning options also pre-bin with the shared util,
+                // since plotly's native histogram cannot close intervals on the
+                // right or add overflow bins.
+                const categories = domainData;
+                const prebinned = categories.length
+                    ? aggregateByCategory(categories, rawValues, series.aggregateType ?? "SUM")
+                    : hasExcelBinning(binningOptions)
+                        ? binHistogram(rawValues, binCount, binningOptions)
+                        : null;
                 if (isPareto) {
                     // Plotly's native histogram trace bins in axis order and
                     // can't reorder bins, so Pareto pre-bins with the shared
                     // util, sorts descending, and renders a bar trace plus the
                     // cumulative-% line pointed at the y2 overlay axis.
-                    const { labels, counts, cumulativePercents } = computePareto(binHistogram(rawValues, binCount));
+                    const { labels, counts, cumulativePercents } = computePareto(prebinned ?? binHistogram(rawValues, binCount));
                     const barTrace = {
                         type: "bar",
                         x: labels,
@@ -1638,16 +1656,34 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         effectiveChartType,
                     });
                     traces.push(barTrace);
+                    const paretoLineColor = spec.paretoLineColor;
+                    // Excel draws the Pareto line without markers.
                     traces.push({
                         type: "scatter",
-                        mode: "lines+markers",
+                        mode: "lines",
                         x: labels,
                         y: cumulativePercents,
                         name: "Cumulative %",
                         yaxis: "y2",
+                        ...(paretoLineColor ? { line: { color: paretoLineColor } } : {}),
                     });
                     hasSecondaryAxis = true;
                 }
+                else if (prebinned) {
+                    const barTrace = {
+                        type: "bar",
+                        x: prebinned.labels,
+                        y: prebinned.counts,
+                        name: dataLabel,
+                    };
+                    applyTraceColor(barTrace, series.color ?? undefined, {
+                        noFill: series.noFill,
+                        dataPointColors: series.dataPointColors,
+                        seriesIndex: currentSeriesIndex,
+                        effectiveChartType,
+                    });
+                    traces.push(barTrace);
+                }
                 else {
                     const trace = {
                         type: "histogram",
@@ -2131,7 +2167,10 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             // gapWidth=150 (default) → ~0.4 bargap.
             ...(typeof spec.gapWidth === "number"
                 ? { bargap: Math.max(0, Math.min(0.95, spec.gapWidth / 400)) }
-                : {}),
+                : spec.chartType === "histogram"
+                    ? // Excel's histogram columns touch by default (#1087).
+                        { bargap: 0 }
+                    : {}),
             font: {
                 family: "Untitled Sans, apple-system, sans-serif",
                 size: 12,

package/dist/esm/utils/hierarchy.d.ts

@@ -46,5 +46,11 @@ export declare const toPlotlyHierarchy: (rows: HierarchyRow[]) => PlotlyHierarch
  * Returns the colour per node of `toPlotlyHierarchy`'s flat arrays.
  */
 export declare const hierarchyNodeColors: (hierarchy: Pick<PlotlyHierarchy, "ids" | "parents">, palette: string[]) => string[];
+/**
+ * Black or white, whichever reads on `background` (a `#rgb` / `#rrggbb`
+ * colour; anything else gets white) — for a treemap banner filled with
+ * its category's colour (rowsncolumns/spreadsheet#1086).
+ */
+export declare const contrastTextColor: (background: string | undefined) => string;
 export {};
 //# sourceMappingURL=hierarchy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hierarchy.d.ts","sourceRoot":"","sources":["../../../utils/hierarchy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,SAAS,EACT,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,CACf,KAAK,EAAE,UAAU,EACjB,cAAc,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,KAClD,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG;IACzB,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,wBAAwB,EAAE,SAAS,CAAC;IACpC,wBAAwB,EAAE,SAAS,CAAC;IACpC,uBAAuB,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC;CAChE,CAAC;AA0CF,eAAO,MAAM,uBAAuB,GAClC,MAAM,YAAY,EAClB,SAAS,cAAc,KACtB,MAAM,GAAG,SAgBX,CAAC;AAyCF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,YAAY,EAClB,SAAS,cAAc,KACtB,YAAY,EAiFd,CAAC;AAiDF,eAAO,MAAM,kBAAkB,GAAI,MAAM,YAAY,EAAE,KAAG,aAAa,EAmDtE,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6EAA6E;IAC7E,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,yCAAyC;IACzC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,oCAAoC;IACpC,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,YAAY,EAAE,KAAG,eAwBxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,SAAS,CAAC,EACnD,SAAS,MAAM,EAAE,KAChB,MAAM,EAYR,CAAC"}
+{"version":3,"file":"hierarchy.d.ts","sourceRoot":"","sources":["../../../utils/hierarchy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,SAAS,EACT,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,CACf,KAAK,EAAE,UAAU,EACjB,cAAc,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,KAClD,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG;IACzB,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,wBAAwB,EAAE,SAAS,CAAC;IACpC,wBAAwB,EAAE,SAAS,CAAC;IACpC,uBAAuB,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC;CAChE,CAAC;AA0CF,eAAO,MAAM,uBAAuB,GAClC,MAAM,YAAY,EAClB,SAAS,cAAc,KACtB,MAAM,GAAG,SAgBX,CAAC;AAyCF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,YAAY,EAClB,SAAS,cAAc,KACtB,YAAY,EAiFd,CAAC;AAiDF,eAAO,MAAM,kBAAkB,GAAI,MAAM,YAAY,EAAE,KAAG,aAAa,EAmDtE,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6EAA6E;IAC7E,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,yCAAyC;IACzC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,oCAAoC;IACpC,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,YAAY,EAAE,KAAG,eAwBxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,SAAS,CAAC,EACnD,SAAS,MAAM,EAAE,KAChB,MAAM,EAYR,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,GAAG,SAAS,KAAG,MAelE,CAAC"}

package/dist/esm/utils/hierarchy.js

@@ -266,3 +266,24 @@ export const hierarchyNodeColors = (hierarchy, palette) => {
         return color;
     });
 };
+/**
+ * Black or white, whichever reads on `background` (a `#rgb` / `#rrggbb`
+ * colour; anything else gets white) — for a treemap banner filled with
+ * its category's colour (rowsncolumns/spreadsheet#1086).
+ */
+export const contrastTextColor = (background) => {
+    const hex = (background ?? "").trim().replace(/^#/, "");
+    const full = hex.length === 3
+        ? hex
+            .split("")
+            .map((c) => c + c)
+            .join("")
+        : hex;
+    if (!/^[0-9a-f]{6}$/i.test(full))
+        return "#ffffff";
+    const r = parseInt(full.slice(0, 2), 16);
+    const g = parseInt(full.slice(2, 4), 16);
+    const b = parseInt(full.slice(4, 6), 16);
+    const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+    return luminance > 0.6 ? "#000000" : "#ffffff";
+};

package/dist/esm/utils/histogram.d.ts

@@ -39,8 +39,47 @@ export declare const isParetoSpec: (spec: {
  */
 export declare const computePareto: (bins: HistogramBins) => ParetoData;
 /**
- * Bin a set of numeric values into `binCount` equal-width bins.
- * When `binCount` is omitted, uses Sturges' rule: ceil(log2(n) + 1).
+ * Excel's `<cx:binning>` options (rowsncolumns/spreadsheet#1087). Any of
+ * them present switches the histogram to Excel's conventions: intervals
+ * closed on the right by default and automatic bins by Excel's rule.
  */
-export declare const binHistogram: (values: (number | null | undefined)[], binCount?: number | null) => HistogramBins;
+export type HistogramBinningOptions = {
+    /** Fixed bin width (`<cx:binSize>`); wins over `binCount`. */
+    binSize?: number | null;
+    /** Which side of an interval is closed (`intervalClosed`); Excel's default is `r`. */
+    intervalClosed?: "l" | "r" | null;
+    /** Values above this collect in a final `> overflow` bin. */
+    overflow?: number | null;
+    /** Values below this collect in a first `< underflow` bin. */
+    underflow?: number | null;
+};
+/** True when the spec authored any Excel binning option. */
+export declare const hasExcelBinning: (options: HistogramBinningOptions | null | undefined) => boolean;
+/**
+ * Excel's automatic bin width: Scott's normal reference rule,
+ * 3.5 · σ / ∛n with the sample standard deviation, rounded up to two
+ * significant digits. For the 20 values 12 … 95 of #1087 (σ ≈ 23.86) that
+ * is 30.77 → 31, i.e. Excel's three bins [12, 43], (43, 74], (74, 105].
+ */
+export declare const excelAutoBinWidth: (numeric: number[]) => number;
+/**
+ * Bin a set of numeric values into equal-width bins.
+ *
+ * Default (no Excel options): `binCount` bins over [min, max], closed on
+ * the left — or Sturges' rule, ceil(log2(n) + 1), when `binCount` is
+ * omitted. With Excel binning options (#1087): bins start at the minimum
+ * (or the underflow bound), are `binSize` wide — else (max − min) /
+ * `binCount`, else Excel's automatic width — closed on the right unless
+ * `intervalClosed` is `l`, and values beyond `overflow` / `underflow`
+ * collect in their own end bins.
+ */
+export declare const binHistogram: (values: (number | null | undefined)[], binCount?: number | null, options?: HistogramBinningOptions | null) => HistogramBins;
+export type HistogramAggregateType = "SUM" | "AVERAGE" | "COUNT" | "MAX" | "MIN" | "MEDIAN";
+/**
+ * Excel's histogram "By Category" / Pareto over categories
+ * (`<cx:aggregation/>`, #1087): one column per distinct category in order
+ * of first appearance, its value the aggregate (sum by default) of the
+ * series values of that category — instead of binning the values.
+ */
+export declare const aggregateByCategory: (categories: (string | number | null | undefined)[], values: (number | null | undefined)[], aggregateType?: HistogramAggregateType | null | undefined) => HistogramBins;
 //# sourceMappingURL=histogram.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"histogram.d.ts","sourceRoot":"","sources":["../../../utils/histogram.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,gDAAgD;IAChD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,mEAAmE;IACnE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,KAAG,OAGgD,CAAC;AAErD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,aAAa,KAAG,UAmBnD,CAAC;AASF;;;GAGG;AACH,eAAO,MAAM,YAAY,GACvB,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,WAAW,MAAM,GAAG,IAAI,KACvB,aA0CF,CAAC"}
+{"version":3,"file":"histogram.d.ts","sourceRoot":"","sources":["../../../utils/histogram.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,gDAAgD;IAChD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,mEAAmE;IACnE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,KAAG,OAGgD,CAAC;AAErD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,aAAa,KAAG,UAmBnD,CAAC;AAUF;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,sFAAsF;IACtF,cAAc,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;IAClC,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAKF,4DAA4D;AAC5D,eAAO,MAAM,eAAe,GAC1B,SAAS,uBAAuB,GAAG,IAAI,GAAG,SAAS,KAClD,OAQA,CAAC;AASJ;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,EAAE,KAAG,MASrD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GACvB,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,WAAW,MAAM,GAAG,IAAI,EACxB,UAAU,uBAAuB,GAAG,IAAI,KACvC,aA4CF,CAAC;AAiFF,MAAM,MAAM,sBAAsB,GAC9B,KAAK,GACL,SAAS,GACT,OAAO,GACP,KAAK,GACL,KAAK,GACL,QAAQ,CAAC;AAEb;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,YAAY,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EAClD,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,gBAAe,sBAAsB,GAAG,IAAI,GAAG,SAAiB,KAC/D,aA0CF,CAAC"}

package/dist/esm/utils/histogram.js

@@ -45,17 +45,58 @@ export const computePareto = (bins) => {
 const formatBinBound = (value) => {
     if (!Number.isFinite(value))
         return String(value);
+    if (value === 0)
+        return "0";
     const abs = Math.abs(value);
     if (abs >= 1000 || abs < 0.01)
         return value.toExponential(2);
     return Number.parseFloat(value.toFixed(2)).toString();
 };
+const isFinite_ = (v) => typeof v === "number" && Number.isFinite(v);
+/** True when the spec authored any Excel binning option. */
+export const hasExcelBinning = (options) => Boolean(options &&
+    (isFinite_(options.binSize) ||
+        options.intervalClosed === "l" ||
+        options.intervalClosed === "r" ||
+        isFinite_(options.overflow) ||
+        isFinite_(options.underflow)));
+/** Round up to two significant digits (31 for 30.77, 0.038 for 0.0377). */
+const ceilToTwoSignificant = (value) => {
+    if (!(value > 0))
+        return value;
+    const magnitude = 10 ** (Math.floor(Math.log10(value)) - 1);
+    return Math.ceil(value / magnitude - 1e-9) * magnitude;
+};
+/**
+ * Excel's automatic bin width: Scott's normal reference rule,
+ * 3.5 · σ / ∛n with the sample standard deviation, rounded up to two
+ * significant digits. For the 20 values 12 … 95 of #1087 (σ ≈ 23.86) that
+ * is 30.77 → 31, i.e. Excel's three bins [12, 43], (43, 74], (74, 105].
+ */
+export const excelAutoBinWidth = (numeric) => {
+    const n = numeric.length;
+    if (n < 2)
+        return 1;
+    const mean = numeric.reduce((sum, v) => sum + v, 0) / n;
+    const variance = numeric.reduce((sum, v) => sum + (v - mean) ** 2, 0) / (n - 1);
+    const sigma = Math.sqrt(variance);
+    if (!(sigma > 0))
+        return 1;
+    return ceilToTwoSignificant((3.5 * sigma) / Math.cbrt(n));
+};
 /**
- * Bin a set of numeric values into `binCount` equal-width bins.
- * When `binCount` is omitted, uses Sturges' rule: ceil(log2(n) + 1).
+ * Bin a set of numeric values into equal-width bins.
+ *
+ * Default (no Excel options): `binCount` bins over [min, max], closed on
+ * the left — or Sturges' rule, ceil(log2(n) + 1), when `binCount` is
+ * omitted. With Excel binning options (#1087): bins start at the minimum
+ * (or the underflow bound), are `binSize` wide — else (max − min) /
+ * `binCount`, else Excel's automatic width — closed on the right unless
+ * `intervalClosed` is `l`, and values beyond `overflow` / `underflow`
+ * collect in their own end bins.
  */
-export const binHistogram = (values, binCount) => {
-    const numeric = values.filter((v) => typeof v === "number" && Number.isFinite(v));
+export const binHistogram = (values, binCount, options) => {
+    const numeric = values.filter(isFinite_);
     if (numeric.length === 0) {
         return { labels: [], counts: [] };
     }
@@ -67,6 +108,9 @@ export const binHistogram = (values, binCount) => {
         if (v > max)
             max = v;
     }
+    if (hasExcelBinning(options)) {
+        return binExcel(numeric, min, max, binCount, options);
+    }
     const sturges = Math.max(1, Math.ceil(Math.log2(numeric.length) + 1));
     const bins = typeof binCount === "number" && binCount > 0
         ? Math.floor(binCount)
@@ -93,3 +137,126 @@ export const binHistogram = (values, binCount) => {
     }
     return { labels, counts };
 };
+const binExcel = (numeric, min, max, binCount, options) => {
+    const rightClosed = options.intervalClosed !== "l";
+    const underflow = isFinite_(options.underflow) ? options.underflow : null;
+    const overflow = isFinite_(options.overflow) ? options.overflow : null;
+    // The regular bins span the values between the end bins.
+    const inRange = numeric.filter((v) => (underflow === null || v >= underflow) &&
+        (overflow === null || v <= overflow));
+    const start = underflow ?? (inRange.length ? Math.min(...inRange) : min);
+    const end = overflow ?? (inRange.length ? Math.max(...inRange) : max);
+    const span = end - start;
+    let width;
+    if (isFinite_(options.binSize) && options.binSize > 0) {
+        width = options.binSize;
+    }
+    else if (typeof binCount === "number" && binCount > 0) {
+        width = span > 0 ? span / Math.floor(binCount) : 1;
+    }
+    else {
+        width = excelAutoBinWidth(inRange.length ? inRange : numeric);
+    }
+    // Enough bins to reach the last value; a right-closed layout needs one
+    // more when the span is an exact multiple (the boundary value belongs to
+    // the bin below, so the top bin stays).
+    let bins = span > 0 ? Math.ceil(span / width - 1e-9) : 1;
+    bins = Math.max(1, bins);
+    const counts = new Array(bins).fill(0);
+    const edges = Array.from({ length: bins + 1 }, (_, i) => start + width * i);
+    let under = 0;
+    let over = 0;
+    for (const v of numeric) {
+        if (underflow !== null && v < underflow) {
+            under++;
+            continue;
+        }
+        if (overflow !== null && v > overflow) {
+            over++;
+            continue;
+        }
+        let idx;
+        if (rightClosed) {
+            // (lo, hi]: a value on a boundary belongs to the bin below it; the
+            // first bin also takes its own lower bound.
+            idx = Math.ceil((v - start) / width - 1e-9) - 1;
+            if (idx < 0)
+                idx = 0;
+        }
+        else {
+            idx = Math.floor((v - start) / width + 1e-9);
+        }
+        if (idx >= bins)
+            idx = bins - 1;
+        counts[idx]++;
+    }
+    const labels = edges.slice(0, -1).map((lo, i) => {
+        const hi = edges[i + 1];
+        if (rightClosed) {
+            const opening = i === 0 ? "[" : "(";
+            return `${opening}${formatBinBound(lo)}, ${formatBinBound(hi)}]`;
+        }
+        const closing = i === bins - 1 ? "]" : ")";
+        return `[${formatBinBound(lo)}, ${formatBinBound(hi)}${closing}`;
+    });
+    if (underflow !== null) {
+        labels.unshift(`< ${formatBinBound(underflow)}`);
+        counts.unshift(under);
+    }
+    if (overflow !== null) {
+        labels.push(`> ${formatBinBound(overflow)}`);
+        counts.push(over);
+    }
+    return { labels, counts };
+};
+/**
+ * Excel's histogram "By Category" / Pareto over categories
+ * (`<cx:aggregation/>`, #1087): one column per distinct category in order
+ * of first appearance, its value the aggregate (sum by default) of the
+ * series values of that category — instead of binning the values.
+ */
+export const aggregateByCategory = (categories, values, aggregateType = "SUM") => {
+    const groups = new Map();
+    const order = [];
+    const count = Math.max(categories.length, values.length);
+    for (let i = 0; i < count; i++) {
+        const raw = categories[i];
+        const label = raw === null || raw === undefined ? "" : `${raw}`.trim();
+        if (label === "")
+            continue;
+        if (!groups.has(label)) {
+            groups.set(label, []);
+            order.push(label);
+        }
+        const v = values[i];
+        if (isFinite_(v))
+            groups.get(label).push(v);
+    }
+    const reduce = (nums) => {
+        if (nums.length === 0)
+            return 0;
+        switch (aggregateType ?? "SUM") {
+            case "COUNT":
+                return nums.length;
+            case "AVERAGE":
+                return nums.reduce((a, b) => a + b, 0) / nums.length;
+            case "MAX":
+                return Math.max(...nums);
+            case "MIN":
+                return Math.min(...nums);
+            case "MEDIAN": {
+                const sorted = [...nums].sort((a, b) => a - b);
+                const mid = Math.floor(sorted.length / 2);
+                return sorted.length % 2
+                    ? sorted[mid]
+                    : (sorted[mid - 1] + sorted[mid]) / 2;
+            }
+            default:
+                return nums.reduce((a, b) => a + b, 0);
+        }
+    };
+    return {
+        labels: order,
+        counts: order.map((label) => reduce(groups.get(label) ?? [])),
+    };
+};

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

@@ -8,7 +8,7 @@ export declare const applyLegendOverrides: (legend: LegendComponentOption, opts:
  * becomes the tick-label formatter.
  */
 export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string) => any;
-export declare const dataLabelFormatter: (opts: any, locale?: string) => (params: any) => string;
+export declare const dataLabelFormatter: (opts: any, locale?: string, joiner?: string) => (params: any) => string;
 /**
  * The data-label options one series renders with: its own
  * `ChartData.dataLabels` when it has them (OOXML's `<c:ser><c:dLbls>`

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,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"}
+{"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,GAC7B,MAAM,GAAG,EACT,SAAS,MAAM,EAEf,eAAa,MACT,QAAQ,GAAG,WAoDhB,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;;;iCAlGH,GAAG;aA+GhB,CAAC"}