@axdspub/axiom-charts 0.0.12 → 0.0.14

package/library/Libraries/axiom/index.js

@@ -1,5 +1,5 @@
 import { RequestItem } from '@axdspub/axiom-ui-data-services';
-import { extent, bisectCenter, sum } from 'd3-array';
+import { extent, bisector, sum } from 'd3-array';
 import { groupBy, debounce } from 'lodash';
 import { create } from 'd3-selection';
 import { scaleUtc, scaleLinear, scaleRadial } from 'd3-scale';
@@ -646,20 +646,44 @@ var AxiomLine = /** @class */ (function (_super) {
         });
     };
     AxiomLine.prototype.getScrubPosition = function (mouseX) {
-        if (this.xScale === undefined || this.yScale === undefined || this.parsedData === undefined || this.offset === undefined)
+        if (this.xScale === undefined || this.yScale === undefined || this.parsedData === undefined || this.offset === undefined) {
             return undefined;
-        var newDate = this.xScale.invert(mouseX - this.offset.x);
-        var i = bisectCenter(this.parsedData.map(function (row) { return row.time; }), newDate);
-        var lineX = this.xScale(this.parsedData[i].time) + this.offset.x;
-        var yValue = this.parsedData[i].value;
-        var yPx = this.yScale(yValue) + this.offset.y;
+        }
+        var xAccessor = this.getAccessorAtAxis('x');
+        var yAccessor = this.getAccessorAtAxis('y');
+        if (xAccessor === undefined || yAccessor === undefined) {
+            return undefined;
+        }
+        var scrubValue = this.xScale.invert(mouseX - this.offset.x);
+        var bisect = bisector(function (row) { return xAccessor(row); }).center;
+        var bisectIndex = bisect(this.parsedData, scrubValue);
+        var nearestRow = this.getNearestRow(bisectIndex, scrubValue, this.parsedData, xAccessor, yAccessor);
+        var bisected = nearestRow;
+        var xValue = xAccessor(bisected);
+        var xPosition = this.xScale(xValue) + this.offset.x;
+        var yValue = yAccessor(nearestRow);
+        var yPosition = this.yScale(yValue) + this.offset.y;
         return {
-            xPosition: lineX,
-            xValue: newDate,
-            yPosition: yPx,
+            xPosition: xPosition,
+            xValue: xValue,
+            yPosition: yPosition,
             yValue: yValue
         };
     };
+    AxiomLine.prototype.getNearestRow = function (bisectIndex, scrubValue, parsedData, xAccessor, yAccessor) {
+        var nonEmptyRows = parsedData.filter(function (row) { return yAccessor(row) !== null && yAccessor(row) !== undefined; });
+        var minDistance = Number.MAX_VALUE;
+        var nearestRow = parsedData[bisectIndex];
+        for (var i = 0; i < nonEmptyRows.length; i += 1) {
+            var current = xAccessor(nonEmptyRows[i]);
+            var distance = Math.abs(+current - +scrubValue);
+            if (distance < minDistance) {
+                minDistance = distance;
+                nearestRow = nonEmptyRows[i];
+            }
+        }
+        return nearestRow;
+    };
     AxiomLine.prototype.drawScrubbing = function (mouseX) {
         var chart = this.chart;
         var ctx = chart.getCanvasContext();
@@ -1217,7 +1241,9 @@ var AxiomChart = /** @class */ (function (_super) {
         var _this = this;
         if (this.plotImplementations === undefined)
             return;
-        var plotsWithScrubbingEnabled = this.plotImplementations.filter(function (plot) { var _a; return ((_a = plot.scrubbing) !== null && _a !== void 0 ? _a : false) && plot.type === EPlotTypes.line; });
+        var plotsWithScrubbingEnabled = this.plotImplementations.filter(function (plot) {
+            return plot.scrubbing !== undefined && plot.scrubbing && plot.type === EPlotTypes.line;
+        });
         var plotScrubPositions = this.getScrubPositions(cursorX, plotsWithScrubbingEnabled);
         // console.log(plotScrubPositions)
         if (this.onScrub !== undefined) {