@rowsncolumns/charts 28.1.8 → 28.1.10

package/dist/cjs/utils/hierarchy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPlotlyHierarchy = exports.buildHierarchyTree = exports.extractHierarchyRows = exports.getHierarchyHeaderTitle = void 0;
+exports.hierarchyNodeColors = exports.toPlotlyHierarchy = exports.buildHierarchyTree = exports.extractHierarchyRows = exports.getHierarchyHeaderTitle = void 0;
 var tslib_1 = require("tslib");
 var flattenChartData = function (chartData, extractor, hiddenStrategy, skipFirstRow) {
     if (skipFirstRow === void 0) { skipFirstRow = false; }
@@ -22,10 +22,6 @@ var toLabelString = function (value) {
         return "";
     return "".concat(value).trim();
 };
-var toParentLabel = function (value) {
-    var label = toLabelString(value);
-    return label === "" ? null : label;
-};
 var toNumericValue = function (value) {
     if (typeof value === "number" && Number.isFinite(value)) {
         return value;
@@ -79,75 +75,186 @@ var getHierarchyHeaderTitle = function (spec, options) {
     return undefined;
 };
 exports.getHierarchyHeaderTitle = getHierarchyHeaderTitle;
+/**
+ * Lay the rows out as Excel does: one column per level (`parentLabels`
+ * entries, top level first) and the label column as the innermost level.
+ * Returns, per row, the filled level cells up to the row's leaf.
+ *
+ * A blank level cell BEFORE the row's first filled cell means "same as the
+ * row above" (Excel writes a parent only on the first row of its group).
+ * A blank AFTER the last filled cell ends the branch there — that cell is
+ * the row's leaf, so a shorter branch (`Services | Training | <blank>`)
+ * is a leaf of the second level, not `Services > Training > <previous
+ * item>` as plain per-column fill-down would make it.
+ */
+var layoutHierarchyLevels = function (levelColumns, rowCount) {
+    var filled = [];
+    var above = levelColumns.map(function () { return ""; });
+    var _loop_1 = function (row) {
+        var cells = levelColumns.map(function (column) { var _a; return (_a = column[row]) !== null && _a !== void 0 ? _a : ""; });
+        var firstFilled = cells.findIndex(function (cell) { return cell !== ""; });
+        if (firstFilled === -1) {
+            // An entirely blank row defines nothing (and inherits nothing).
+            filled.push([]);
+            return "continue";
+        }
+        var effective = cells.map(function (cell, level) { var _a; return level < firstFilled ? (_a = above[level]) !== null && _a !== void 0 ? _a : "" : cell; });
+        var lastFilled = effective.length - 1;
+        while (lastFilled >= 0 && effective[lastFilled] === "")
+            lastFilled--;
+        // The row's own levels end at its last filled cell; the cells past it
+        // stay blank for the rows below (they inherit up to the leaf only).
+        above = effective.map(function (cell, level) { return (level <= lastFilled ? cell : ""); });
+        filled.push(effective.slice(0, lastFilled + 1).filter(function (cell) { return cell !== ""; }));
+    };
+    for (var row = 0; row < rowCount; row++) {
+        _loop_1(row);
+    }
+    return filled;
+};
 var extractHierarchyRows = function (spec, options) {
+    var _a, _b;
     var getDomainValuesFromRange = options.getDomainValuesFromRange, getSeriesValuesFromRange = options.getSeriesValuesFromRange;
     var hiddenStrategy = options.hiddenDimensionStrategy;
     var skipHeaders = spec.useFirstRowAsHeaders !== false;
     var labels = flattenChartData(spec.labels, getDomainValuesFromRange, hiddenStrategy, skipHeaders).map(toLabelString);
-    var parents = flattenChartData(spec.parentLabels, getDomainValuesFromRange, hiddenStrategy, skipHeaders);
+    // Each `parentLabels` entry is one hierarchy level (top level first).
+    var parentLevels = ((_a = spec.parentLabels) !== null && _a !== void 0 ? _a : []).map(function (entry) {
+        return flattenChartData([entry], getDomainValuesFromRange, hiddenStrategy, skipHeaders).map(toLabelString);
+    });
     var sizes = flattenChartData(spec.sizeData, getSeriesValuesFromRange, hiddenStrategy, skipHeaders);
+    // A single parent column whose values name other rows' labels is a flat
+    // adjacency list (Google Sheets' label / parent-label model): every row
+    // is its own node and a blank parent means a root. Excel's level layout
+    // never lists a level name in the label column.
+    var labelSet = new Set(labels.filter(function (label) { return label !== ""; }));
+    var isAdjacencyList = parentLevels.length === 1 &&
+        parentLevels[0].some(function (parent) { return parent !== "" && labelSet.has(parent); });
     var rows = [];
-    var seenLabels = new Set();
-    for (var i = 0; i < labels.length; i++) {
-        var label = labels[i];
-        if (!label)
+    var seenPaths = new Set();
+    if (isAdjacencyList) {
+        var parents = parentLevels[0];
+        for (var i = 0; i < labels.length; i++) {
+            var label = labels[i];
+            if (!label)
+                continue;
+            if (seenPaths.has(label)) {
+                throw new Error("Duplicate hierarchy label detected: ".concat(label));
+            }
+            seenPaths.add(label);
+            var parent_1 = (_b = parents[i]) !== null && _b !== void 0 ? _b : "";
+            rows.push({
+                label: label,
+                parent: parent_1 === "" ? null : parent_1,
+                value: toNumericValue(sizes[i]),
+            });
+        }
+        return rows;
+    }
+    var rowCount = Math.max.apply(Math, tslib_1.__spreadArray([labels.length], tslib_1.__read(parentLevels.map(function (level) { return level.length; })), false));
+    var levels = layoutHierarchyLevels(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(parentLevels), false), [labels], false), rowCount);
+    for (var i = 0; i < rowCount; i++) {
+        var cells = levels[i];
+        if (!cells || cells.length === 0)
             continue;
-        if (seenLabels.has(label)) {
+        var label = cells[cells.length - 1];
+        var path = cells.slice(0, -1);
+        var key = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(path), false), [label], false).join("\u0000");
+        if (seenPaths.has(key)) {
             throw new Error("Duplicate hierarchy label detected: ".concat(label));
         }
-        seenLabels.add(label);
+        seenPaths.add(key);
         rows.push({
             label: label,
-            parent: toParentLabel(parents[i]),
+            parent: path.length ? path[path.length - 1] : null,
             value: toNumericValue(sizes[i]),
+            path: path,
         });
     }
     return rows;
 };
 exports.extractHierarchyRows = extractHierarchyRows;
-var getOrCreateNode = function (nodes, name) {
-    var existing = nodes.get(name);
-    if (existing)
-        return existing;
-    var node = {
-        name: name,
-        value: 0,
-        parent: null,
-        children: new Set(),
+var PATH_SEPARATOR = "/";
+/**
+ * The full path of every row, top level first, ending with the row's own
+ * label. A row carrying `path` (Excel's level layout) is placed under it;
+ * a legacy adjacency row names its parent, which is another row's label,
+ * so its path is that row's path plus itself (chained up to a root).
+ */
+var resolveRowPaths = function (rows) {
+    var byLabel = new Map();
+    rows.forEach(function (row) {
+        if (row.label && !row.path && !byLabel.has(row.label)) {
+            byLabel.set(row.label, row);
+        }
+    });
+    var memo = new Map();
+    var resolve = function (row, visiting) {
+        var cached = memo.get(row);
+        if (cached)
+            return cached;
+        var path;
+        if (row.path) {
+            path = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(row.path), false), [row.label], false);
+        }
+        else {
+            var parentName = row.parent && row.parent !== row.label ? row.parent : null;
+            var parentRow = parentName ? byLabel.get(parentName) : undefined;
+            if (parentRow && parentRow !== row && !visiting.has(parentRow)) {
+                visiting.add(row);
+                path = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(resolve(parentRow, visiting)), false), [row.label], false);
+                visiting.delete(row);
+            }
+            else {
+                path = parentName ? [parentName, row.label] : [row.label];
+            }
+        }
+        memo.set(row, path);
+        return path;
     };
-    nodes.set(name, node);
-    return node;
+    return rows.map(function (row) { return resolve(row, new Set()); });
 };
 var buildHierarchyTree = function (rows) {
-    var nodes = new Map();
-    rows.forEach(function (row) {
+    var roots = new Map();
+    var nodeAt = function (path) {
+        var level = roots;
+        var node;
+        path.forEach(function (name, depth) {
+            var existing = level.get(name);
+            if (existing) {
+                node = existing;
+            }
+            else {
+                node = {
+                    name: name,
+                    id: path.slice(0, depth + 1).join(PATH_SEPARATOR),
+                    value: 0,
+                    children: new Map(),
+                };
+                level.set(name, node);
+            }
+            level = node.children;
+        });
+        return node;
+    };
+    var paths = resolveRowPaths(rows);
+    rows.forEach(function (row, index) {
         var _a;
         if (!row.label)
             return;
-        var labelNode = getOrCreateNode(nodes, row.label);
-        var numericValue = (_a = row.value) !== null && _a !== void 0 ? _a : 0;
-        labelNode.value += numericValue;
-        var parentName = row.parent && row.parent !== row.label ? row.parent : null;
-        if (parentName) {
-            var parentNode = getOrCreateNode(nodes, parentName);
-            parentNode.children.add(row.label);
-            if (labelNode.parent == null) {
-                labelNode.parent = parentName;
-            }
-        }
+        var node = nodeAt(paths[index]);
+        node.value += (_a = row.value) !== null && _a !== void 0 ? _a : 0;
     });
     var buildNode = function (internal) {
         var children = internal.children.size > 0
-            ? Array.from(internal.children).map(function (childName) {
-                return buildNode(getOrCreateNode(nodes, childName));
-            })
+            ? Array.from(internal.children.values()).map(buildNode)
             : undefined;
         var value = children && children.length > 0
             ? children.reduce(function (sum, child) { var _a; return sum + ((_a = child.value) !== null && _a !== void 0 ? _a : 0); }, 0)
             : internal.value;
         var node = {
             name: internal.name,
-            id: internal.name,
+            id: internal.id,
             value: value,
         };
         if (children && children.length > 0) {
@@ -155,32 +262,49 @@ var buildHierarchyTree = function (rows) {
         }
         return node;
     };
-    var roots = [];
-    nodes.forEach(function (internal) {
-        if (internal.parent == null) {
-            roots.push(buildNode(internal));
-        }
-    });
-    return roots;
+    return Array.from(roots.values()).map(buildNode);
 };
 exports.buildHierarchyTree = buildHierarchyTree;
 var toPlotlyHierarchy = function (rows) {
     var tree = (0, exports.buildHierarchyTree)(rows);
     var labels = [];
+    var ids = [];
     var parents = [];
     var values = [];
-    var traverse = function (nodes, parentName) {
+    var depths = [];
+    var traverse = function (nodes, parentId, depth) {
         nodes.forEach(function (node) {
-            var _a;
+            var _a, _b, _c;
             labels.push(node.name);
-            parents.push(parentName !== null && parentName !== void 0 ? parentName : "");
-            values.push((_a = node.value) !== null && _a !== void 0 ? _a : 0);
+            ids.push((_a = node.id) !== null && _a !== void 0 ? _a : node.name);
+            parents.push(parentId);
+            values.push((_b = node.value) !== null && _b !== void 0 ? _b : 0);
+            depths.push(depth);
             if (node.children) {
-                traverse(node.children, node.name);
+                traverse(node.children, (_c = node.id) !== null && _c !== void 0 ? _c : node.name, depth + 1);
             }
         });
     };
-    traverse(tree, null);
-    return { labels: labels, parents: parents, values: values };
+    traverse(tree, "", 0);
+    return { labels: labels, ids: ids, parents: parents, values: values, depths: depths };
 };
 exports.toPlotlyHierarchy = toPlotlyHierarchy;
+/**
+ * One solid colour per top-level category, inherited by every descendant
+ * (Excel colours a treemap / sunburst by its first level), in tree order.
+ * Returns the colour per node of `toPlotlyHierarchy`'s flat arrays.
+ */
+var hierarchyNodeColors = function (hierarchy, palette) {
+    var colorById = new Map();
+    var rootIndex = 0;
+    return hierarchy.ids.map(function (id, index) {
+        var _a, _b;
+        var parentId = hierarchy.parents[index];
+        var color = parentId === ""
+            ? (_a = palette[rootIndex++ % Math.max(1, palette.length)]) !== null && _a !== void 0 ? _a : ""
+            : (_b = colorById.get(parentId)) !== null && _b !== void 0 ? _b : "";
+        colorById.set(id, color);
+        return color;
+    });
+};
+exports.hierarchyNodeColors = hierarchyNodeColors;

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

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

package/dist/cjs/utils/overrides.js

@@ -141,7 +141,11 @@ var dataLabelFormatter = function (opts, locale) { return function (params) {
         !opts.showSeriesName
         ? true
         : !!opts.showValue;
-    if (showVal && params.value !== undefined) {
+    // A scatter / bubble point's value is its [x, y, size] tuple: the label's
+    // value is Y and the bubble size is the third entry (#1068).
+    var isPointTuple = Array.isArray(params.value);
+    var pointValue = isPointTuple ? params.value[1] : params.value;
+    if (showVal && pointValue !== undefined) {
         // PERCENT_STACKED stores the raw value on the data object so the
         // label can still surface the dollar amount instead of the
         // normalized percentage. Plain stacked / clustered have just a
@@ -149,7 +153,10 @@ var dataLabelFormatter = function (opts, locale) { return function (params) {
         var originalValue = typeof params.data === "object" && params.data
             ? params.data.originalValue
             : undefined;
-        parts.push(formatLabelValue(params.value, originalValue, opts.numberFormatPattern, locale));
+        parts.push(formatLabelValue(pointValue, originalValue, opts.numberFormatPattern, locale));
+    }
+    if (opts.showBubbleSize && isPointTuple && params.value.length > 2) {
+        parts.push(formatLabelValue(params.value[2], undefined, opts.numberFormatPattern, locale));
     }
     return parts.join(": ");
 }; };

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

@@ -43,6 +43,12 @@ export type TrendlineResult = {
  * @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).
+ * @param xValues Scatter / bubble only — the series' real X values, index-
+ *                aligned with `values`. The fit then runs on (x, y) pairs
+ *                (a regression of Y on X, what Excel draws on an XY chart;
+ *                the point index is wrong for unevenly spaced X), the
+ *                forecast extends the X range by that many X units, and the
+ *                points carry real X coordinates sampled across the range.
  */
 export declare const computeTrendline: (values: (number | null | undefined)[], spec?: {
     type?: TrendlineType | null;
@@ -50,5 +56,5 @@ export declare const computeTrendline: (values: (number | null | undefined)[], s
     period?: number | null;
     forecastForward?: number | null;
     forecastBackward?: number | null;
-}) => TrendlineResult | null;
+}, xValues?: (number | null | undefined)[] | null) => TrendlineResult | null;
 //# sourceMappingURL=trendline.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"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;AAkKF;;;;;;;;;;;;GAYG;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,EACN,UAAU,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,GAAG,IAAI,KAC7C,eAAe,GAAG,IA+HpB,CAAC"}

package/dist/cjs/utils/trendline.js

@@ -35,15 +35,25 @@ var isFiniteNum = function (v) {
  * 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) {
+var toPairs = function (values, xValues) {
     var pairs = [];
     for (var i = 0; i < values.length; i++) {
         var y = values[i];
-        if (isFiniteNum(y))
+        if (!isFiniteNum(y))
+            continue;
+        if (xValues) {
+            var x = xValues[i];
+            if (isFiniteNum(x))
+                pairs.push({ x: x, y: y });
+        }
+        else {
             pairs.push({ x: i + 1, y: y });
+        }
     }
     return pairs;
 };
+/** Samples along a scatter trendline's x range: enough for the curved fits to read as curves. */
+var XY_TRENDLINE_SAMPLES = 64;
 /** Compute R² between observed y and predicted f(x) over the fit pairs. */
 var rSquaredOf = function (pairs, predict) {
     var e_1, _a;
@@ -218,20 +228,29 @@ var fitPower = function (pairs) {
  * @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).
+ * @param xValues Scatter / bubble only — the series' real X values, index-
+ *                aligned with `values`. The fit then runs on (x, y) pairs
+ *                (a regression of Y on X, what Excel draws on an XY chart;
+ *                the point index is wrong for unevenly spaced X), the
+ *                forecast extends the X range by that many X units, and the
+ *                points carry real X coordinates sampled across the range.
  */
-var computeTrendline = function (values, spec) {
-    var _a, _b, _c, _d, _e;
+var computeTrendline = function (values, spec, xValues) {
+    var e_4, _a;
+    var _b, _c, _d, _e, _f;
     if (spec === void 0) { spec = {}; }
-    var pairs = toPairs(values);
+    var pairs = toPairs(values, xValues);
     if (pairs.length < 2)
         return null;
-    var type = (_a = spec.type) !== null && _a !== void 0 ? _a : "linear";
-    var forward = Math.max(0, Math.floor((_b = spec.forecastForward) !== null && _b !== void 0 ? _b : 0));
-    var backward = Math.max(0, Math.floor((_c = spec.forecastBackward) !== null && _c !== void 0 ? _c : 0));
+    var type = (_b = spec.type) !== null && _b !== void 0 ? _b : "linear";
+    var forwardRaw = Math.max(0, (_c = spec.forecastForward) !== null && _c !== void 0 ? _c : 0);
+    var backwardRaw = Math.max(0, (_d = spec.forecastBackward) !== null && _d !== void 0 ? _d : 0);
+    var forward = xValues ? forwardRaw : Math.floor(forwardRaw);
+    var backward = xValues ? backwardRaw : Math.floor(backwardRaw);
     // Moving average is a smoothing of the observed values, not a fitted
     // function, so it is handled separately and ignores forecasting.
     if (type === "movingAvg") {
-        var period = Math.max(2, Math.floor((_d = spec.period) !== null && _d !== void 0 ? _d : 2));
+        var period = Math.max(2, Math.floor((_e = spec.period) !== null && _e !== void 0 ? _e : 2));
         var points_1 = [];
         for (var i = period - 1; i < values.length; i++) {
             var sum = 0;
@@ -243,17 +262,61 @@ var computeTrendline = function (values, spec) {
                     count++;
                 }
             }
-            if (count > 0)
+            if (count === 0)
+                continue;
+            if (xValues) {
+                var x = xValues[i];
+                if (isFiniteNum(x))
+                    points_1.push({ x: x, y: sum / count });
+            }
+            else {
                 points_1.push({ x: i, y: sum / count });
+            }
         }
+        if (xValues)
+            points_1.sort(function (a, b) { return a.x - b.x; });
         return { points: points_1, rSquared: null, equation: null };
     }
-    // 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);
+    if (xValues) {
+        // Sample the fitted curve across the data's X range, extended by the
+        // forecast in X units.
+        var minX = Infinity;
+        var maxX = -Infinity;
+        try {
+            for (var pairs_4 = tslib_1.__values(pairs), pairs_4_1 = pairs_4.next(); !pairs_4_1.done; pairs_4_1 = pairs_4.next()) {
+                var p = pairs_4_1.value;
+                if (p.x < minX)
+                    minX = p.x;
+                if (p.x > maxX)
+                    maxX = p.x;
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (pairs_4_1 && !pairs_4_1.done && (_a = pairs_4.return)) _a.call(pairs_4);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+        var xStart = minX - backward;
+        var xEnd = maxX + forward;
+        if (xEnd > xStart) {
+            for (var i = 0; i <= XY_TRENDLINE_SAMPLES; i++) {
+                xs.push(xStart + ((xEnd - xStart) * i) / XY_TRENDLINE_SAMPLES);
+            }
+        }
+        else {
+            xs.push(xStart);
+        }
+    }
+    else {
+        // 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;
+        for (var x = xStart; x <= xEnd; x++)
+            xs.push(x);
+    }
     var predict = null;
     var equation = null;
     switch (type) {
@@ -266,7 +329,7 @@ var computeTrendline = function (values, spec) {
             break;
         }
         case "poly": {
-            var coeffs_1 = fitPoly(pairs, (_e = spec.order) !== null && _e !== void 0 ? _e : 2);
+            var coeffs_1 = fitPoly(pairs, (_f = spec.order) !== null && _f !== void 0 ? _f : 2);
             if (!coeffs_1)
                 return null;
             predict = function (x) {
@@ -310,9 +373,10 @@ var computeTrendline = function (values, spec) {
         default:
             return null;
     }
-    // Report the renderer-facing 0-based category index (see module comment).
+    // Report the renderer-facing 0-based category index (see module comment);
+    // an XY fit reports the real X it was sampled at.
     var points = xs
-        .map(function (x) { return ({ x: x - 1, y: predict(x) }); })
+        .map(function (x) { return ({ x: xValues ? 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":"AAkEA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAqQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBAq6GjB,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;AAmRrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAgFnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA4+GjB,CAAC"}