@rowsncolumns/charts 28.1.4 → 28.1.6

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":"AA4DA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAwyGjB,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;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAwzGjB,CAAC"}

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

@@ -367,7 +367,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, xAxisConfig, tooltipFormatter, bubbleSeriesLabel_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, dataLabelOptions, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
+        var threeDRenderKind, canRender3D, willRender3D, isRegionMap, regionSpec, geoScope, geo, labels, seriesEntry, values, _a, data, unmatched, min, max, textColor, ramp, noDataColor, borderColor, regionSeriesLabel, seriesName, chartDomains, chartSeries, legend, chartType, position, showAxis, isBubble, isHierarchy, skipHeaders_1, labelValues, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _b, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _c, categories_1, preparedSeries, sizeValues, sizeScale_1, xAxisConfig, tooltipFormatter, bubbleSeriesLabel_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, seriesPalette, paletteColorAt, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, dataLabelOptions, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
         var e_1, _0, e_2, _1, e_4, _2, e_5, _3, e_3, _4, e_6, _5, e_7, _6, e_8, _7, e_9, _8;
         var _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138;
         return tslib_1.__generator(this, function (_139) {
@@ -958,7 +958,7 @@ var BasicChart = function (_a) {
                     ]);
                     seriesColorAt_1 = function (index) {
                         var _a, _b, _c;
-                        return (_c = (_b = (_a = spec.series) === null || _a === void 0 ? void 0 : _a[index]) === null || _b === void 0 ? void 0 : _b.color) !== null && _c !== void 0 ? _c : threeDPalette_1[index % threeDPalette_1.length];
+                        return (_c = (_b = (_a = spec.series) === null || _a === void 0 ? void 0 : _a[index]) === null || _b === void 0 ? void 0 : _b.color) !== null && _c !== void 0 ? _c : (0, utils_1.chartPaletteColorAt)(threeDPalette_1, index);
                     };
                     // Entering 3-D from a 2-D render: the cartesian option doesn't
                     // merge into a grid3D one, so re-initialize the echarts instance
@@ -1364,7 +1364,7 @@ var BasicChart = function (_a) {
                             grid: stockGrid,
                             tooltip: { trigger: "axis" },
                             axisPointer: stockAxisPointer,
-                            series: tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(lineSeries.map(function (s, i) { return (tslib_1.__assign(tslib_1.__assign({ type: "line", name: s.name, data: s.values, showSymbol: false, itemStyle: { color: stockColors_1[i % stockColors_1.length] }, lineStyle: { color: stockColors_1[i % stockColors_1.length] } }, (stockSeriesLabelFor_1(s.role)
+                            series: tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(lineSeries.map(function (s, i) { return (tslib_1.__assign(tslib_1.__assign({ type: "line", name: s.name, data: s.values, showSymbol: false, itemStyle: { color: (0, utils_1.chartPaletteColorAt)(stockColors_1, i) }, lineStyle: { color: (0, utils_1.chartPaletteColorAt)(stockColors_1, i) } }, (stockSeriesLabelFor_1(s.role)
                                 ? { label: stockSeriesLabelFor_1(s.role) }
                                 : {})), ((0, axis_number_format_1.tooltipValueFormatter)(stockFormatFor_1(s.role))
                                 ? {
@@ -1615,8 +1615,19 @@ var BasicChart = function (_a) {
                         seriesCount: sideBySideBarCount,
                         overlap: isStacked ? 0 : spec.overlap,
                     });
+                    seriesPalette = (0, chart_styles_1.getChartPalette)(spec, [
+                        theme.themeColors.accent1,
+                        theme.themeColors.accent2,
+                        theme.themeColors.accent3,
+                        theme.themeColors.accent4,
+                        theme.themeColors.accent5,
+                        theme.themeColors.accent6,
+                    ]);
+                    paletteColorAt = function (index) {
+                        return (0, utils_1.chartPaletteColorAt)(seriesPalette, index);
+                    };
                     _loop_1 = function (specSeriesIndex, series) {
-                        var dataLabel, _140, _141, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, isolated, marked, isolated_1, isolated_1_1, i, gradientArgs, gradient, overrides_2, _142, _143, dp, fallback_1, overrides_3, _144, _145, dp, slicePalette_1, positiveColor_1, negativeColor_1;
+                        var dataLabel, _140, _141, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, isolated, marked, isolated_1, isolated_1_1, i, gradientArgs, gradient, overrides_2, _142, _143, dp, fallback_1, overrides_3, _144, _145, dp, positiveColor_1, negativeColor_1;
                         var e_11, _146, e_12, _147, e_13, _148;
                         return tslib_1.__generator(this, function (_149) {
                             switch (_149.label) {
@@ -1762,7 +1773,7 @@ var BasicChart = function (_a) {
                                             }
                                             finally { if (e_12) throw e_12.error; }
                                         }
-                                        fallback_1 = (_85 = series.color) !== null && _85 !== void 0 ? _85 : theme.themeColors.accent1;
+                                        fallback_1 = (_85 = series.color) !== null && _85 !== void 0 ? _85 : paletteColorAt(specSeriesIndex);
                                         seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_86 = seriesEntry.itemStyle) !== null && _86 !== void 0 ? _86 : {})), { color: function (params) { var _a; return (_a = overrides_2.get(params.dataIndex)) !== null && _a !== void 0 ? _a : fallback_1; } });
                                     }
                                     else if (isCircularChart &&
@@ -1784,23 +1795,14 @@ var BasicChart = function (_a) {
                                             }
                                             finally { if (e_13) throw e_13.error; }
                                         }
-                                        slicePalette_1 = (0, chart_styles_1.getChartPalette)(spec, [
-                                            theme.themeColors.accent1,
-                                            theme.themeColors.accent2,
-                                            theme.themeColors.accent3,
-                                            theme.themeColors.accent4,
-                                            theme.themeColors.accent5,
-                                            theme.themeColors.accent6,
-                                        ]);
                                         seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_87 = seriesEntry.itemStyle) !== null && _87 !== void 0 ? _87 : {})), { 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 : slicePalette_1[params.dataIndex % slicePalette_1.length];
+                                                return (_b = (_a = overrides_3.get(params.dataIndex)) !== null && _a !== void 0 ? _a : series.color) !== null && _b !== void 0 ? _b : paletteColorAt(params.dataIndex);
                                             } });
                                     }
                                     else if (isBarOrColumn && series.invertIfNegative) {
-                                        positiveColor_1 = (_88 = series.color) !== null && _88 !== void 0 ? _88 : theme.themeColors.accent1;
+                                        positiveColor_1 = (_88 = series.color) !== null && _88 !== void 0 ? _88 : paletteColorAt(specSeriesIndex);
                                         negativeColor_1 = (_89 = series.negativeColor) !== null && _89 !== void 0 ? _89 : "#FF0000";
-                                        // Use a color function that returns different colors based on value
                                         seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_90 = seriesEntry.itemStyle) !== null && _90 !== void 0 ? _90 : {})), { color: function (params) {
                                                 var _a, _b;
                                                 var value = Array.isArray(params.data)
@@ -1902,7 +1904,7 @@ var BasicChart = function (_a) {
                             theme.themeColors.accent6,
                         ]);
                         paletteAt_1 = function (index) {
-                            return ofPiePalette_1[index % ofPiePalette_1.length];
+                            return (0, utils_1.chartPaletteColorAt)(ofPiePalette_1, index);
                         };
                         chartSeries.push({
                             type: "pie",
@@ -2661,14 +2663,17 @@ var BasicChart = function (_a) {
                         color: textColor,
                     },
                 },
-                color: (0, chart_styles_1.getChartPalette)(chart.spec, [
+                // Unrolled through Excel's luminance variations: echarts cycles this
+                // list over pie slices and over series, and the seventh must not
+                // repeat the first (rowsncolumns/spreadsheet#1045).
+                color: (0, utils_1.expandChartPalette)((0, chart_styles_1.getChartPalette)(chart.spec, [
                     theme.themeColors.accent1,
                     theme.themeColors.accent2,
                     theme.themeColors.accent3,
                     theme.themeColors.accent4,
                     theme.themeColors.accent5,
                     theme.themeColors.accent6,
-                ]),
+                ])),
                 // Excel's Format Chart Area fill; `transparent` (echarts' own
                 // default) so clearing the fill undoes an earlier setOption.
                 backgroundColor: (_f = chart.spec.backgroundColor) !== null && _f !== void 0 ? _f : "transparent",

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":"AA6BA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAGtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA+WxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAg0EjB,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;AAgXxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBA8zEjB,CAAC"}

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

@@ -8,7 +8,6 @@ var spreadsheet_state_1 = require("@rowsncolumns/spreadsheet-state");
 var ui_1 = require("@rowsncolumns/ui");
 var utils_1 = require("@rowsncolumns/utils");
 var react_1 = tslib_1.__importStar(require("react"));
-var react_plotly_js_1 = tslib_1.__importDefault(require("react-plotly.js"));
 var aggregation_1 = require("../../utils/aggregation");
 var axis_number_format_1 = require("../../utils/axis-number-format");
 var boxplot_1 = require("../../utils/boxplot");
@@ -34,6 +33,7 @@ var radar_1 = require("../../utils/radar");
 var region_map_1 = require("../../utils/region-map");
 var stock_1 = require("../../utils/stock");
 var trendline_1 = require("../../utils/trendline");
+var plot_1 = require("../plot");
 var helpers_1 = require("./helpers");
 var BASIC_CHART_TYPES = new Set([
     "bar",
@@ -374,7 +374,6 @@ var BasicChart = function (_a) {
     var hierarchyTitleRef = (0, react_1.useRef)(undefined);
     var explicitChartTitle = (_b = chart.spec.title) !== null && _b !== void 0 ? _b : undefined;
     var title = explicitChartTitle !== null && explicitChartTitle !== void 0 ? explicitChartTitle : hierarchyTitleRef.current;
-    var plotRef = (0, react_1.useRef)(null);
     // The plotted `<div>` plotly hands back on init — what `Plotly.toImage`
     // rasterises for Copy as Picture and the print preview.
     var graphDivRef = (0, react_1.useRef)(null);
@@ -553,7 +552,7 @@ var BasicChart = function (_a) {
                         });
                         var yValues = entry.points.map(function (point) { return point.value[1]; });
                         var labelValuesForSeries = entry.points.map(function (point) { return point.name; });
-                        var seriesColor = (_b = (_a = spec.series[index]) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : palette_1[index % palette_1.length];
+                        var seriesColor = (_b = (_a = spec.series[index]) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : (0, utils_1.chartPaletteColorAt)(palette_1, index);
                         var perSeriesMarker = (_d = (_c = spec.series[index]) === null || _c === void 0 ? void 0 : _c.marker) !== null && _d !== void 0 ? _d : undefined;
                         if (isScatter_1) {
                             // Per-series marker.symbol = "none" → pure line (no markers).
@@ -1114,7 +1113,7 @@ var BasicChart = function (_a) {
                         // then theme palette. Plotly cannot paint the real gradient, so the
                         // median stop stands in for the whole ramp.
                         var effectiveColor = (_g = (_f = options === null || options === void 0 ? void 0 : options.gradientColor) !== null && _f !== void 0 ? _f : seriesColor) !== null && _g !== void 0 ? _g : ((options === null || options === void 0 ? void 0 : options.seriesIndex) !== undefined
-                            ? themeColorPalette[options.seriesIndex % themeColorPalette.length]
+                            ? (0, utils_1.chartPaletteColorAt)(themeColorPalette, options.seriesIndex)
                             : undefined);
                         // Per-data-point color overrides — Gantt charts use `<c:dPt>` to
                         // give every task its own color. Build a per-point color array
@@ -1146,7 +1145,7 @@ var BasicChart = function (_a) {
                                 // with (or the series' own colour when one was authored).
                                 var existing_1 = Array.isArray((_h = target.marker) === null || _h === void 0 ? void 0 : _h.colors)
                                     ? target.marker.colors
-                                    : themeColorPalette;
+                                    : (0, utils_1.expandChartPalette)(themeColorPalette);
                                 var labelCount = Array.isArray(target.labels)
                                     ? target.labels.length
                                     : 0;
@@ -1515,7 +1514,7 @@ var BasicChart = function (_a) {
                                         secondScale = (0, of_pie_1.clampSecondPieSize)(spec.secondPieSize) / 100;
                                         halfAngle = (0, of_pie_1.otherSliceHalfAngle)(otherTotal, total);
                                         paletteAt_1 = function (index) {
-                                            return themeColorPalette[index % themeColorPalette.length];
+                                            return (0, utils_1.chartPaletteColorAt)(themeColorPalette, index);
                                         };
                                         MAIN_DOMAIN_X = [0, 0.55];
                                         CY = 0.5;
@@ -1633,7 +1632,9 @@ var BasicChart = function (_a) {
                                             labels: pieData.labels,
                                             name: dataLabel,
                                             marker: {
-                                                colors: themeColorPalette,
+                                                // Unrolled through Excel's luminance variations so slice 7 does
+                                                // not repeat slice 1 (rowsncolumns/spreadsheet#1045).
+                                                colors: (0, utils_1.expandChartPalette)(themeColorPalette),
                                             },
                                         };
                                         // Ties the trace back to spec.series for click selection and
@@ -2001,27 +2002,23 @@ var BasicChart = function (_a) {
                 onUpdateChart(tslib_1.__assign(tslib_1.__assign({}, chart), { spec: next }));
         }
         : undefined;
-    // Copy as Picture / print preview. `plotly.js/dist/plotly` is the module
-    // `react-plotly.js` itself is built on, loaded on demand so the render
-    // path stays as it was.
+    // Copy as Picture / print preview, through the plotly module the chart
+    // renders with.
     var exportChartPng = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var graphDiv, Plotly, url;
+        var graphDiv, url;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     graphDiv = graphDivRef.current;
                     if (!graphDiv)
                         return [2 /*return*/, undefined];
-                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require("plotly.js/dist/plotly")); })];
-                case 1:
-                    Plotly = (_a.sent()).default;
-                    return [4 /*yield*/, Plotly.toImage(graphDiv, {
+                    return [4 /*yield*/, plot_1.Plotly.toImage(graphDiv, {
                             format: "png",
                             width: graphDiv.clientWidth || width || 600,
                             height: graphDiv.clientHeight || height || 400,
                             scale: 2,
                         })];
-                case 2:
+                case 1:
                     url = _a.sent();
                     return [2 /*return*/, (0, chart_image_1.dataUrlToBlob)(url)];
             }
@@ -2054,7 +2051,7 @@ var BasicChart = function (_a) {
                             onDeleteChart === null || onDeleteChart === void 0 ? void 0 : onDeleteChart(chart.chartId);
                         } }, "Delete chart")))))) : null,
         react_1.default.createElement("div", { className: "flex-1 rnc-plotly-chart-container", onPointerDownCapture: handlePointerDownCapture },
-            react_1.default.createElement(react_plotly_js_1.default, { ref: plotRef, data: plotData, layout: plotLayout, config: config, onClick: handlePlotClick, onInitialized: function (_figure, graphDiv) {
+            react_1.default.createElement(plot_1.Plot, { data: plotData, layout: plotLayout, config: config, onClick: handlePlotClick, onInitialized: function (_figure, graphDiv) {
                     graphDivRef.current = graphDiv;
                 }, style: { width: "100%", height: "100%" } }))));
 };

package/dist/cjs/plotly/plot.d.ts

@@ -0,0 +1,12 @@
+import Plotly from "plotly.js-dist-min";
+/**
+ * The one plotly module the plotly charts render and export with:
+ * `plotly.js-dist-min`, the full bundle (every trace type) already minified.
+ * react-plotly.js's default entry would load the separate
+ * `plotly.js/dist/plotly` build instead, so a host that ships
+ * `plotly.js-dist-min` for its own charts would carry two copies of the same
+ * plotly release.
+ */
+export { Plotly };
+export declare const Plot: import("react").ComponentType<import("react-plotly.js").PlotParams>;
+//# sourceMappingURL=plot.d.ts.map

package/dist/cjs/plotly/plot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plot.d.ts","sourceRoot":"","sources":["../../../plotly/plot.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAGxC;;;;;;;GAOG;AACH,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAO,MAAM,IAAI,qEAAgC,CAAC"}

package/dist/cjs/plotly/plot.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Plot = exports.Plotly = void 0;
+var tslib_1 = require("tslib");
+var plotly_js_dist_min_1 = tslib_1.__importDefault(require("plotly.js-dist-min"));
+exports.Plotly = plotly_js_dist_min_1.default;
+var factory_1 = tslib_1.__importDefault(require("react-plotly.js/factory"));
+exports.Plot = (0, factory_1.default)(plotly_js_dist_min_1.default);

package/dist/cjs/tsconfig.cjs.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}
+{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/plot.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}

package/dist/cjs/utils/trendline.d.ts

@@ -7,12 +7,24 @@
  * so the regressions are hand-rolled here as pure least-squares math and
  * the renderers draw the returned points as an overlay line series.
  *
- * All fits operate on the index domain x = 0, 1, 2, … (one step per
- * category) which matches how a category-axis chart positions points.
- * The caller passes the raw y-values; gaps (null/NaN) are skipped during
- * fitting but the fitted curve is still emitted for every x in range.
+ * All fits operate on Excel's category domain x = 1, 2, …, n (one step per
+ * category, first category = 1) — the domain Excel fits and prints for a
+ * category-axis chart (line, column, bar, area). Linear, polynomial and
+ * exponential curves are invariant to where the domain starts (only the
+ * equation text moves), but logarithmic and power fits are not: fitting
+ * them on x = 0, 1, … dropped the first category from the fit and evaluated
+ * ln(x) at x → 0 for it, which drew the Jan point of a 12-month log trend
+ * at about −524 instead of Excel's ≈6.4 (rowsncolumns/spreadsheet#1028).
+ *
+ * The emitted points keep the renderer-facing 0-based CATEGORY INDEX in `x`
+ * (echarts plots `[x, y]` on the category axis, plotly maps `x` onto the
+ * category labels), so a forecast of k periods still extends to index
+ * n−1+k forward and −k backward. The caller passes the raw y-values; gaps
+ * (null/NaN) are skipped during fitting but the fitted curve is still
+ * emitted for every x in range.
  */
 export type TrendlineType = "linear" | "exp" | "log" | "poly" | "power" | "movingAvg";
+/** `x` is the 0-based category index (−k … n−1+k with forecasting), `y` the fitted value. */
 export type TrendlinePoint = {
     x: number;
     y: number;
@@ -28,7 +40,8 @@ export type TrendlineResult = {
 /**
  * Compute a trendline for a series of y-values.
  *
- * @param values  Raw y-values; the category index is used as x.
+ * @param values  Raw y-values; the 1-based category position is used as x
+ *                for the fit, the 0-based index is reported in the points.
  * @param spec    Trendline parameters (type/order/period/forecast).
  */
 export declare const computeTrendline: (values: (number | null | undefined)[], spec?: {

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

@@ -1 +1 @@
-{"version":3,"file":"trendline.d.ts","sourceRoot":"","sources":["../../../utils/trendline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,WAAW,CAAC;AAEhB,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG;IAC5B,sEAAsE;IACtE,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AA+IF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,OAAM;IACJ,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,KACL,eAAe,GAAG,IA6FpB,CAAC"}
+{"version":3,"file":"trendline.d.ts","sourceRoot":"","sources":["../../../utils/trendline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,WAAW,CAAC;AAEhB,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG;IAC5B,sEAAsE;IACtE,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAsJF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,OAAM;IACJ,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,KACL,eAAe,GAAG,IAiGpB,CAAC"}

package/dist/cjs/utils/trendline.js

@@ -8,10 +8,21 @@
  * so the regressions are hand-rolled here as pure least-squares math and
  * the renderers draw the returned points as an overlay line series.
  *
- * All fits operate on the index domain x = 0, 1, 2, … (one step per
- * category) which matches how a category-axis chart positions points.
- * The caller passes the raw y-values; gaps (null/NaN) are skipped during
- * fitting but the fitted curve is still emitted for every x in range.
+ * All fits operate on Excel's category domain x = 1, 2, …, n (one step per
+ * category, first category = 1) — the domain Excel fits and prints for a
+ * category-axis chart (line, column, bar, area). Linear, polynomial and
+ * exponential curves are invariant to where the domain starts (only the
+ * equation text moves), but logarithmic and power fits are not: fitting
+ * them on x = 0, 1, … dropped the first category from the fit and evaluated
+ * ln(x) at x → 0 for it, which drew the Jan point of a 12-month log trend
+ * at about −524 instead of Excel's ≈6.4 (rowsncolumns/spreadsheet#1028).
+ *
+ * The emitted points keep the renderer-facing 0-based CATEGORY INDEX in `x`
+ * (echarts plots `[x, y]` on the category axis, plotly maps `x` onto the
+ * category labels), so a forecast of k periods still extends to index
+ * n−1+k forward and −k backward. The caller passes the raw y-values; gaps
+ * (null/NaN) are skipped during fitting but the fitted curve is still
+ * emitted for every x in range.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeTrendline = void 0;
@@ -20,7 +31,8 @@ var isFiniteNum = function (v) {
     return typeof v === "number" && Number.isFinite(v);
 };
 /**
- * Build (x, y) pairs from raw y-values using the category index as x.
+ * Build (x, y) pairs from raw y-values using Excel's 1-based category
+ * position as x (the first category is x = 1, see the module comment).
  * Non-finite y-values are dropped (they cannot be fitted).
  */
 var toPairs = function (values) {
@@ -28,7 +40,7 @@ var toPairs = function (values) {
     for (var i = 0; i < values.length; i++) {
         var y = values[i];
         if (isFiniteNum(y))
-            pairs.push({ x: i, y: y });
+            pairs.push({ x: i + 1, y: y });
     }
     return pairs;
 };
@@ -66,6 +78,11 @@ var round = function (n, digits) {
     var f = Math.pow(10, digits);
     return Math.round(n * f) / f;
 };
+/** `+ 2` / `- 2` for an additive term, the way Excel prints an equation. */
+var signed = function (n) {
+    var r = round(n);
+    return r < 0 ? "- ".concat(Math.abs(r)) : "+ ".concat(r);
+};
 /** Solve a small linear system A·x = b via Gaussian elimination. */
 var solveLinearSystem = function (A, b) {
     var _a;
@@ -198,7 +215,8 @@ var fitPower = function (pairs) {
 /**
  * Compute a trendline for a series of y-values.
  *
- * @param values  Raw y-values; the category index is used as x.
+ * @param values  Raw y-values; the 1-based category position is used as x
+ *                for the fit, the 0-based index is reported in the points.
  * @param spec    Trendline parameters (type/order/period/forecast).
  */
 var computeTrendline = function (values, spec) {
@@ -230,9 +248,9 @@ var computeTrendline = function (values, spec) {
         }
         return { points: points_1, rSquared: null, equation: null };
     }
-    var lastX = values.length - 1;
-    var xStart = -backward;
-    var xEnd = lastX + forward;
+    // Fit domain is 1..n; a forecast of k periods extends it to 1−k / n+k.
+    var xStart = 1 - backward;
+    var xEnd = values.length + forward;
     var xs = [];
     for (var x = xStart; x <= xEnd; x++)
         xs.push(x);
@@ -244,7 +262,7 @@ var computeTrendline = function (values, spec) {
             if (!fit_1)
                 return null;
             predict = function (x) { return fit_1.m * x + fit_1.b; };
-            equation = "y = ".concat(round(fit_1.m), "x + ").concat(round(fit_1.b));
+            equation = "y = ".concat(round(fit_1.m), "x ").concat(signed(fit_1.b));
             break;
         }
         case "poly": {
@@ -257,8 +275,10 @@ var computeTrendline = function (values, spec) {
             equation =
                 "y = " +
                     coeffs_1
-                        .map(function (c, i) { return (i === 0 ? "".concat(round(c)) : "".concat(round(c), "x^").concat(i)); })
-                        .join(" + ");
+                        .map(function (c, i) {
+                        return i === 0 ? "".concat(round(c)) : "".concat(signed(c), "x").concat(i === 1 ? "" : "^".concat(i));
+                    })
+                        .join(" ");
             break;
         }
         case "exp": {
@@ -273,9 +293,10 @@ var computeTrendline = function (values, spec) {
             var fit_3 = fitLog(pairs);
             if (!fit_3)
                 return null;
-            // ln(0) and ln(negative) are undefined; clamp x to >0 for the curve.
+            // Only a backward forecast reaches x ≤ 0 (the fit domain starts at 1);
+            // ln(0) and ln(negative) are undefined, so clamp x to >0 for the curve.
             predict = function (x) { return fit_3.a + fit_3.b * Math.log(x <= 0 ? 1e-9 : x); };
-            equation = "y = ".concat(round(fit_3.a), " + ").concat(round(fit_3.b), "ln(x)");
+            equation = "y = ".concat(round(fit_3.b), "ln(x) ").concat(signed(fit_3.a));
             break;
         }
         case "power": {
@@ -289,8 +310,9 @@ var computeTrendline = function (values, spec) {
         default:
             return null;
     }
+    // Report the renderer-facing 0-based category index (see module comment).
     var points = xs
-        .map(function (x) { return ({ x: x, y: predict(x) }); })
+        .map(function (x) { return ({ x: x - 1, y: predict(x) }); })
         .filter(function (p) { return Number.isFinite(p.y); });
     if (points.length < 2)
         return null;

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":"AA4DA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAwyGjB,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;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAwzGjB,CAAC"}

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

@@ -3,7 +3,7 @@ import { getStringifiedColor, useFocusSheet, useRegisterChartActions, useSetSele
 import { useSubscribeToMultipleRanges } from "@rowsncolumns/spreadsheet-state";
 import { createDownloadableFile } from "@rowsncolumns/toolkit";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuPortal, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger, DropdownRightSlot, IconButton, useIsomorphicLayoutEffect, useOnVisibilityChange, } from "@rowsncolumns/ui";
-import { debug, isAFormula, isNil } from "@rowsncolumns/utils";
+import { chartPaletteColorAt, debug, expandChartPalette, isAFormula, isNil, } from "@rowsncolumns/utils";
 import { BarChart, BoxplotChart, CandlestickChart, CustomChart, FunnelChart, HeatmapChart, LineChart, PieChart, RadarChart as EchartsRadarChart, ScatterChart, SunburstChart, TreemapChart as EchartsTreemapChart, } from "echarts/charts";
 import { DatasetComponent, GridComponent, LegendComponent, RadarComponent, TitleComponent, TooltipComponent, VisualMapComponent, } from "echarts/components";
 import * as echarts from "echarts/core";
@@ -942,7 +942,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 theme.themeColors.accent6,
             ]);
             const seriesColorAt = (index) => spec.series?.[index]?.color ??
-                threeDPalette[index % threeDPalette.length];
+                chartPaletteColorAt(threeDPalette, index);
             // Entering 3-D from a 2-D render: the cartesian option doesn't
             // merge into a grid3D one, so re-initialize the echarts instance
             // from scratch (theme options are re-applied after setOption).
@@ -1402,8 +1402,8 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         name: s.name,
                         data: s.values,
                         showSymbol: false,
-                        itemStyle: { color: stockColors[i % stockColors.length] },
-                        lineStyle: { color: stockColors[i % stockColors.length] },
+                        itemStyle: { color: chartPaletteColorAt(stockColors, i) },
+                        lineStyle: { color: chartPaletteColorAt(stockColors, i) },
                         ...(stockSeriesLabelFor(s.role)
                             ? { label: stockSeriesLabelFor(s.role) }
                             : {}),
@@ -1675,6 +1675,20 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             seriesCount: sideBySideBarCount,
             overlap: isStacked ? 0 : spec.overlap,
         });
+        // The colour a series without its own fill gets: the chart palette entry
+        // for its position, the same cycle the option-level `color` gives echarts'
+        // default path. Excel keeps that colour whatever else is authored on the
+        // series — `<c:dPt>` overrides recolour only their points and
+        // `invertIfNegative` only the negative bars (rowsncolumns/spreadsheet#1030).
+        const seriesPalette = getChartPalette(spec, [
+            theme.themeColors.accent1,
+            theme.themeColors.accent2,
+            theme.themeColors.accent3,
+            theme.themeColors.accent4,
+            theme.themeColors.accent5,
+            theme.themeColors.accent6,
+        ]);
+        const paletteColorAt = (index) => chartPaletteColorAt(seriesPalette, index);
         for (const [specSeriesIndex, series] of (spec.series ?? []).entries()) {
             const dataLabel = !isNil(series.dataLabel) && isAFormula(series.dataLabel)
                 ? coerceCalculatedLabel(await onRequestCalculate(series.dataLabel, position.sheetId ?? sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex))
@@ -1822,14 +1836,16 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 // Per-data-point color overrides — Gantt-style charts colour
                 // each task differently via `<c:dPt>`. Echarts accepts an
                 // `itemStyle.color` function that receives the data index;
-                // we look up the override or fall back to the series color.
+                // we look up the override or fall back to the series colour —
+                // its own, else its palette slot (never a fixed accent1, which
+                // painted every such series alike).
                 const overrides = new Map();
                 for (const dp of seriesAny.dataPointColors) {
                     if (typeof dp.idx === "number" && typeof dp.color === "string") {
                         overrides.set(dp.idx, dp.color);
                     }
                 }
-                const fallback = series.color ?? theme.themeColors.accent1;
+                const fallback = series.color ?? paletteColorAt(specSeriesIndex);
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => overrides.get(params.dataIndex) ?? fallback,
@@ -1847,25 +1863,18 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         overrides.set(dp.idx, dp.color);
                     }
                 }
-                const slicePalette = getChartPalette(spec, [
-                    theme.themeColors.accent1,
-                    theme.themeColors.accent2,
-                    theme.themeColors.accent3,
-                    theme.themeColors.accent4,
-                    theme.themeColors.accent5,
-                    theme.themeColors.accent6,
-                ]);
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => overrides.get(params.dataIndex) ??
                         series.color ??
-                        slicePalette[params.dataIndex % slicePalette.length],
+                        paletteColorAt(params.dataIndex),
                 };
             }
             else if (isBarOrColumn && series.invertIfNegative) {
-                const positiveColor = series.color ?? theme.themeColors.accent1;
+                // Positive bars keep the series colour (own, else palette slot);
+                // only negative bars take the inverted colour.
+                const positiveColor = series.color ?? paletteColorAt(specSeriesIndex);
                 const negativeColor = series.negativeColor ?? "#FF0000";
-                // Use a color function that returns different colors based on value
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => {
@@ -1960,7 +1969,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 theme.themeColors.accent5,
                 theme.themeColors.accent6,
             ]);
-            const paletteAt = (index) => ofPiePalette[index % ofPiePalette.length];
+            const paletteAt = (index) => chartPaletteColorAt(ofPiePalette, index);
             chartSeries.push({
                 type: "pie",
                 name: seriesEntry?.dataLabel ?? "",
@@ -2773,14 +2782,17 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         color: textColor,
                     },
                 },
-                color: getChartPalette(chart.spec, [
+                // Unrolled through Excel's luminance variations: echarts cycles this
+                // list over pie slices and over series, and the seventh must not
+                // repeat the first (rowsncolumns/spreadsheet#1045).
+                color: expandChartPalette(getChartPalette(chart.spec, [
                     theme.themeColors.accent1,
                     theme.themeColors.accent2,
                     theme.themeColors.accent3,
                     theme.themeColors.accent4,
                     theme.themeColors.accent5,
                     theme.themeColors.accent6,
-                ]),
+                ])),
                 // Excel's Format Chart Area fill; `transparent` (echarts' own
                 // default) so clearing the fill undoes an earlier setOption.
                 backgroundColor: chart.spec.backgroundColor ?? "transparent",

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":"AA6BA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAGtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA+WxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAg0EjB,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;AAgXxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBA8zEjB,CAAC"}

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

@@ -2,9 +2,8 @@ import { DotsVerticalIcon } from "@rowsncolumns/icons";
 import { getStringifiedColor, useFocusSheet, useRegisterChartActions, useSetSelectedChartSeries, } from "@rowsncolumns/spreadsheet";
 import { useSubscribeToSheet } from "@rowsncolumns/spreadsheet-state";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuPortal, DropdownMenuTrigger, IconButton, useIsomorphicLayoutEffect, useOnVisibilityChange, } from "@rowsncolumns/ui";
-import { debug, isAFormula, isNil, ssfFormat } from "@rowsncolumns/utils";
+import { chartPaletteColorAt, debug, expandChartPalette, isAFormula, isNil, ssfFormat, } from "@rowsncolumns/utils";
 import React, { useCallback, useMemo, useRef, useState } from "react";
-import Plot from "react-plotly.js";
 import { aggregateSeriesByDomain, getDomainValuesForAxis, sanitizeDomainValues, shouldAggregateSeries, } from "../../utils/aggregation";
 import { formatAxisValue, numberFormatToPlotlyTicks, resolveSeriesNumberFormats, resolveValueAxisNumberFormat, valueAxisNameGap, } from "../../utils/axis-number-format";
 import { computeBoxplotSummary } from "../../utils/boxplot";
@@ -30,6 +29,7 @@ import { buildRadarIndicators } from "../../utils/radar";
 import { buildSequentialColorRamp, isRegionMapSpec, resolveGeoScope, WORLD_GEO_SCOPE, } from "../../utils/region-map";
 import { assignStockRoles, toLineSeries, toVolumeSeries, } from "../../utils/stock";
 import { computeTrendline } from "../../utils/trendline";
+import { Plot, Plotly } from "../plot";
 import { chartTypeToPlotlyType, getPlotlyTraceStyle, mapMarkerSymbolToPlotly, showXAxis, } from "./helpers";
 const BASIC_CHART_TYPES = new Set([
     "bar",
@@ -350,7 +350,6 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
     const hierarchyTitleRef = useRef(undefined);
     const explicitChartTitle = chart.spec.title ?? undefined;
     const title = explicitChartTitle ?? hierarchyTitleRef.current;
-    const plotRef = useRef(null);
     // The plotted `<div>` plotly hands back on init — what `Plotly.toImage`
     // rasterises for Copy as Picture and the print preview.
     const graphDivRef = useRef(null);
@@ -526,7 +525,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     : point.value[0]);
                 const yValues = entry.points.map((point) => point.value[1]);
                 const labelValuesForSeries = entry.points.map((point) => point.name);
-                const seriesColor = spec.series[index]?.color ?? palette[index % palette.length];
+                const seriesColor = spec.series[index]?.color ?? chartPaletteColorAt(palette, index);
                 const perSeriesMarker = spec.series[index]?.marker ?? undefined;
                 if (isScatter) {
                     // Per-series marker.symbol = "none" → pure line (no markers).
@@ -1145,7 +1144,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             const effectiveColor = options?.gradientColor ??
                 seriesColor ??
                 (options?.seriesIndex !== undefined
-                    ? themeColorPalette[options.seriesIndex % themeColorPalette.length]
+                    ? chartPaletteColorAt(themeColorPalette, options.seriesIndex)
                     : undefined);
             // Per-data-point color overrides — Gantt charts use `<c:dPt>` to
             // give every task its own color. Build a per-point color array
@@ -1167,7 +1166,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     // with (or the series' own colour when one was authored).
                     const existing = Array.isArray(target.marker?.colors)
                         ? target.marker.colors
-                        : themeColorPalette;
+                        : expandChartPalette(themeColorPalette);
                     const labelCount = Array.isArray(target.labels)
                         ? target.labels.length
                         : 0;
@@ -1585,7 +1584,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 const ofPieType = resolveOfPieType(spec.ofPieType);
                 const secondScale = clampSecondPieSize(spec.secondPieSize) / 100;
                 const halfAngle = otherSliceHalfAngle(otherTotal, total);
-                const paletteAt = (index) => themeColorPalette[index % themeColorPalette.length];
+                const paletteAt = (index) => chartPaletteColorAt(themeColorPalette, index);
                 // Layout in paper coordinates (0-1 across the plot area
                 // inside the margins). Main pie on the left, secondary plot
                 // on the right.
@@ -1715,7 +1714,9 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     labels: pieData.labels,
                     name: dataLabel,
                     marker: {
-                        colors: themeColorPalette,
+                        // Unrolled through Excel's luminance variations so slice 7 does
+                        // not repeat slice 1 (rowsncolumns/spreadsheet#1045).
+                        colors: expandChartPalette(themeColorPalette),
                     },
                 };
                 // Ties the trace back to spec.series for click selection and
@@ -2158,14 +2159,12 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 onUpdateChart({ ...chart, spec: next });
         }
         : undefined;
-    // Copy as Picture / print preview. `plotly.js/dist/plotly` is the module
-    // `react-plotly.js` itself is built on, loaded on demand so the render
-    // path stays as it was.
+    // Copy as Picture / print preview, through the plotly module the chart
+    // renders with.
     const exportChartPng = async () => {
         const graphDiv = graphDivRef.current;
         if (!graphDiv)
             return undefined;
-        const { default: Plotly } = await import("plotly.js/dist/plotly");
         const url = await Plotly.toImage(graphDiv, {
             format: "png",
             width: graphDiv.clientWidth || width || 600,
@@ -2201,7 +2200,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                             onDeleteChart?.(chart.chartId);
                         } }, "Delete chart")))))) : null,
         React.createElement("div", { className: "flex-1 rnc-plotly-chart-container", onPointerDownCapture: handlePointerDownCapture },
-            React.createElement(Plot, { ref: plotRef, data: plotData, layout: plotLayout, config: config, onClick: handlePlotClick, onInitialized: (_figure, graphDiv) => {
+            React.createElement(Plot, { data: plotData, layout: plotLayout, config: config, onClick: handlePlotClick, onInitialized: (_figure, graphDiv) => {
                     graphDivRef.current = graphDiv;
                 }, style: { width: "100%", height: "100%" } }))));
 };

package/dist/esm/plotly/plot.d.ts

@@ -0,0 +1,12 @@
+import Plotly from "plotly.js-dist-min";
+/**
+ * The one plotly module the plotly charts render and export with:
+ * `plotly.js-dist-min`, the full bundle (every trace type) already minified.
+ * react-plotly.js's default entry would load the separate
+ * `plotly.js/dist/plotly` build instead, so a host that ships
+ * `plotly.js-dist-min` for its own charts would carry two copies of the same
+ * plotly release.
+ */
+export { Plotly };
+export declare const Plot: import("react").ComponentType<import("react-plotly.js").PlotParams>;
+//# sourceMappingURL=plot.d.ts.map

package/dist/esm/plotly/plot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plot.d.ts","sourceRoot":"","sources":["../../../plotly/plot.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAGxC;;;;;;;GAOG;AACH,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAO,MAAM,IAAI,qEAAgC,CAAC"}

package/dist/esm/plotly/plot.js

@@ -0,0 +1,12 @@
+import Plotly from "plotly.js-dist-min";
+import createPlotlyComponent from "react-plotly.js/factory";
+/**
+ * The one plotly module the plotly charts render and export with:
+ * `plotly.js-dist-min`, the full bundle (every trace type) already minified.
+ * react-plotly.js's default entry would load the separate
+ * `plotly.js/dist/plotly` build instead, so a host that ships
+ * `plotly.js-dist-min` for its own charts would carry two copies of the same
+ * plotly release.
+ */
+export { Plotly };
+export const Plot = createPlotlyComponent(Plotly);

package/dist/esm/tsconfig.esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}
+{"root":["../../config.ts","../../echarts-gl.d.ts","../../geo-modules.d.ts","../../index.ts","../../plotly-dist.d.ts","../../types.ts","../../vitest.config.ts","../../atoms/editing-chart.atom.ts","../../atoms/pivot-chart.atom.ts","../../basic-chart/basic-chart.tsx","../../basic-chart/helpers.ts","../../basic-chart/index.tsx","../../components/dialogs/chart-editor-dialog.tsx","../../components/dialogs/pivot-chart-dialog.tsx","../../components/editors/chart-editor.tsx","../../components/editors/chart-range-input.tsx","../../hooks/use-chart-editor.ts","../../hooks/use-charts.ts","../../hooks/use-on-create-chart.ts","../../hooks/use-on-delete-chart.ts","../../hooks/use-on-move-chart-to-sheet.ts","../../hooks/use-on-move-chart.ts","../../hooks/use-on-resize-chart.ts","../../hooks/use-on-update-chart.ts","../../interface/create-chart.ts","../../interface/delete-chart.ts","../../interface/move-chart-to-sheet.ts","../../interface/move-chart.ts","../../interface/resize-chart.ts","../../interface/shift-chart-ranges.ts","../../interface/update-chart.ts","../../plotly/plot.ts","../../plotly/basic-chart/basic-chart.tsx","../../plotly/basic-chart/helpers.ts","../../plotly/basic-chart/index.tsx","../../utils/aggregation.ts","../../utils/axis-number-format.ts","../../utils/bar-layout.ts","../../utils/boxplot.ts","../../utils/bubble.ts","../../utils/category-levels.ts","../../utils/chart-image.ts","../../utils/chart-orientation.ts","../../utils/chart-spec-utils.ts","../../utils/chart-styles.ts","../../utils/echarts-gl-loader.ts","../../utils/empty-cells.ts","../../utils/error-bars.ts","../../utils/gradient.ts","../../utils/hierarchy.ts","../../utils/histogram.ts","../../utils/legend-layout.ts","../../utils/of-pie.ts","../../utils/overrides.ts","../../utils/pie-explosion.ts","../../utils/plotly-click.ts","../../utils/plotly-surface.ts","../../utils/plotly-title.ts","../../utils/radar.ts","../../utils/region-map-loader.ts","../../utils/region-map.ts","../../utils/series-click.ts","../../utils/stock.ts","../../utils/three-d.ts","../../utils/trendline.ts","../../utils/waterfall.ts","../../utils/webgl.ts"],"version":"5.8.3"}

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

@@ -7,12 +7,24 @@
  * so the regressions are hand-rolled here as pure least-squares math and
  * the renderers draw the returned points as an overlay line series.
  *
- * All fits operate on the index domain x = 0, 1, 2, … (one step per
- * category) which matches how a category-axis chart positions points.
- * The caller passes the raw y-values; gaps (null/NaN) are skipped during
- * fitting but the fitted curve is still emitted for every x in range.
+ * All fits operate on Excel's category domain x = 1, 2, …, n (one step per
+ * category, first category = 1) — the domain Excel fits and prints for a
+ * category-axis chart (line, column, bar, area). Linear, polynomial and
+ * exponential curves are invariant to where the domain starts (only the
+ * equation text moves), but logarithmic and power fits are not: fitting
+ * them on x = 0, 1, … dropped the first category from the fit and evaluated
+ * ln(x) at x → 0 for it, which drew the Jan point of a 12-month log trend
+ * at about −524 instead of Excel's ≈6.4 (rowsncolumns/spreadsheet#1028).
+ *
+ * The emitted points keep the renderer-facing 0-based CATEGORY INDEX in `x`
+ * (echarts plots `[x, y]` on the category axis, plotly maps `x` onto the
+ * category labels), so a forecast of k periods still extends to index
+ * n−1+k forward and −k backward. The caller passes the raw y-values; gaps
+ * (null/NaN) are skipped during fitting but the fitted curve is still
+ * emitted for every x in range.
  */
 export type TrendlineType = "linear" | "exp" | "log" | "poly" | "power" | "movingAvg";
+/** `x` is the 0-based category index (−k … n−1+k with forecasting), `y` the fitted value. */
 export type TrendlinePoint = {
     x: number;
     y: number;
@@ -28,7 +40,8 @@ export type TrendlineResult = {
 /**
  * Compute a trendline for a series of y-values.
  *
- * @param values  Raw y-values; the category index is used as x.
+ * @param values  Raw y-values; the 1-based category position is used as x
+ *                for the fit, the 0-based index is reported in the points.
  * @param spec    Trendline parameters (type/order/period/forecast).
  */
 export declare const computeTrendline: (values: (number | null | undefined)[], spec?: {

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

@@ -1 +1 @@
-{"version":3,"file":"trendline.d.ts","sourceRoot":"","sources":["../../../utils/trendline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,WAAW,CAAC;AAEhB,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG;IAC5B,sEAAsE;IACtE,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AA+IF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,OAAM;IACJ,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,KACL,eAAe,GAAG,IA6FpB,CAAC"}
+{"version":3,"file":"trendline.d.ts","sourceRoot":"","sources":["../../../utils/trendline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,WAAW,CAAC;AAEhB,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG;IAC5B,sEAAsE;IACtE,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAsJF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACrC,OAAM;IACJ,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,KACL,eAAe,GAAG,IAiGpB,CAAC"}

package/dist/esm/utils/trendline.js

@@ -7,14 +7,26 @@
  * so the regressions are hand-rolled here as pure least-squares math and
  * the renderers draw the returned points as an overlay line series.
  *
- * All fits operate on the index domain x = 0, 1, 2, … (one step per
- * category) which matches how a category-axis chart positions points.
- * The caller passes the raw y-values; gaps (null/NaN) are skipped during
- * fitting but the fitted curve is still emitted for every x in range.
+ * All fits operate on Excel's category domain x = 1, 2, …, n (one step per
+ * category, first category = 1) — the domain Excel fits and prints for a
+ * category-axis chart (line, column, bar, area). Linear, polynomial and
+ * exponential curves are invariant to where the domain starts (only the
+ * equation text moves), but logarithmic and power fits are not: fitting
+ * them on x = 0, 1, … dropped the first category from the fit and evaluated
+ * ln(x) at x → 0 for it, which drew the Jan point of a 12-month log trend
+ * at about −524 instead of Excel's ≈6.4 (rowsncolumns/spreadsheet#1028).
+ *
+ * The emitted points keep the renderer-facing 0-based CATEGORY INDEX in `x`
+ * (echarts plots `[x, y]` on the category axis, plotly maps `x` onto the
+ * category labels), so a forecast of k periods still extends to index
+ * n−1+k forward and −k backward. The caller passes the raw y-values; gaps
+ * (null/NaN) are skipped during fitting but the fitted curve is still
+ * emitted for every x in range.
  */
 const isFiniteNum = (v) => typeof v === "number" && Number.isFinite(v);
 /**
- * Build (x, y) pairs from raw y-values using the category index as x.
+ * Build (x, y) pairs from raw y-values using Excel's 1-based category
+ * position as x (the first category is x = 1, see the module comment).
  * Non-finite y-values are dropped (they cannot be fitted).
  */
 const toPairs = (values) => {
@@ -22,7 +34,7 @@ const toPairs = (values) => {
     for (let i = 0; i < values.length; i++) {
         const y = values[i];
         if (isFiniteNum(y))
-            pairs.push({ x: i, y });
+            pairs.push({ x: i + 1, y });
     }
     return pairs;
 };
@@ -48,6 +60,11 @@ const round = (n, digits = 4) => {
     const f = 10 ** digits;
     return Math.round(n * f) / f;
 };
+/** `+ 2` / `- 2` for an additive term, the way Excel prints an equation. */
+const signed = (n) => {
+    const r = round(n);
+    return r < 0 ? `- ${Math.abs(r)}` : `+ ${r}`;
+};
 /** Solve a small linear system A·x = b via Gaussian elimination. */
 const solveLinearSystem = (A, b) => {
     const n = b.length;
@@ -157,7 +174,8 @@ const fitPower = (pairs) => {
 /**
  * Compute a trendline for a series of y-values.
  *
- * @param values  Raw y-values; the category index is used as x.
+ * @param values  Raw y-values; the 1-based category position is used as x
+ *                for the fit, the 0-based index is reported in the points.
  * @param spec    Trendline parameters (type/order/period/forecast).
  */
 export const computeTrendline = (values, spec = {}) => {
@@ -187,9 +205,9 @@ export const computeTrendline = (values, spec = {}) => {
         }
         return { points, rSquared: null, equation: null };
     }
-    const lastX = values.length - 1;
-    const xStart = -backward;
-    const xEnd = lastX + forward;
+    // Fit domain is 1..n; a forecast of k periods extends it to 1−k / n+k.
+    const xStart = 1 - backward;
+    const xEnd = values.length + forward;
     const xs = [];
     for (let x = xStart; x <= xEnd; x++)
         xs.push(x);
@@ -201,7 +219,7 @@ export const computeTrendline = (values, spec = {}) => {
             if (!fit)
                 return null;
             predict = (x) => fit.m * x + fit.b;
-            equation = `y = ${round(fit.m)}x + ${round(fit.b)}`;
+            equation = `y = ${round(fit.m)}x ${signed(fit.b)}`;
             break;
         }
         case "poly": {
@@ -212,8 +230,8 @@ export const computeTrendline = (values, spec = {}) => {
             equation =
                 "y = " +
                     coeffs
-                        .map((c, i) => (i === 0 ? `${round(c)}` : `${round(c)}x^${i}`))
-                        .join(" + ");
+                        .map((c, i) => i === 0 ? `${round(c)}` : `${signed(c)}x${i === 1 ? "" : `^${i}`}`)
+                        .join(" ");
             break;
         }
         case "exp": {
@@ -228,9 +246,10 @@ export const computeTrendline = (values, spec = {}) => {
             const fit = fitLog(pairs);
             if (!fit)
                 return null;
-            // ln(0) and ln(negative) are undefined; clamp x to >0 for the curve.
+            // Only a backward forecast reaches x ≤ 0 (the fit domain starts at 1);
+            // ln(0) and ln(negative) are undefined, so clamp x to >0 for the curve.
             predict = (x) => fit.a + fit.b * Math.log(x <= 0 ? 1e-9 : x);
-            equation = `y = ${round(fit.a)} + ${round(fit.b)}ln(x)`;
+            equation = `y = ${round(fit.b)}ln(x) ${signed(fit.a)}`;
             break;
         }
         case "power": {
@@ -244,8 +263,9 @@ export const computeTrendline = (values, spec = {}) => {
         default:
             return null;
     }
+    // Report the renderer-facing 0-based category index (see module comment).
     const points = xs
-        .map((x) => ({ x, y: predict(x) }))
+        .map((x) => ({ x: x - 1, y: predict(x) }))
         .filter((p) => Number.isFinite(p.y));
     if (points.length < 2)
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "28.1.4",
+  "version": "28.1.6",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -70,16 +70,16 @@
     "@rowsncolumns/common-types": ">=5.3.2",
     "@rowsncolumns/grid": ">=13.2.35",
     "@rowsncolumns/icons": ">=7.2.33",
-    "@rowsncolumns/spreadsheet": ">=10.4.4",
-    "@rowsncolumns/spreadsheet-state": ">=29.1.6",
-    "@rowsncolumns/toolkit": ">=24.5.5",
+    "@rowsncolumns/spreadsheet": ">=10.4.5",
+    "@rowsncolumns/spreadsheet-state": ">=29.1.7",
+    "@rowsncolumns/toolkit": ">=24.5.7",
     "@rowsncolumns/ui": ">=16.0.4",
-    "@rowsncolumns/utils": ">=9.5.3",
+    "@rowsncolumns/utils": ">=9.5.5",
     "@types/react-plotly.js": "^2.6.3",
     "echarts": "^5.6.0",
     "formik": "^2.4.6",
     "immer": "^10.1.1",
-    "plotly.js": "^3.1.1",
+    "plotly.js-dist-min": "^3.1.1",
     "react-plotly.js": "^2.6.0"
   },
   "peerDependencies": {
@@ -94,7 +94,7 @@
     "@rowsncolumns/utils": ">=9.3.0",
     "immer": ">10.0.0",
     "jotai": ">=2.10.3",
-    "plotly.js": ">=3",
+    "plotly.js-dist-min": ">=3",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-plotly.js": ">=2"