@rowsncolumns/charts 28.1.7 → 28.1.10

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;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA02GjB,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"}