@axdspub/axiom-charts 0.0.13 → 0.0.15

package/library/Libraries/axiom/index.js

@@ -268,6 +268,7 @@ var ChartRoot = /** @class */ (function () {
         this.settings = props.settings;
         this.element = props.element;
         this.onScrub = props.onScrub;
+        this.onScrubEnd = props.onScrubEnd;
         this.runtime = {
             prevWidth: 0,
             prevHeight: 0
@@ -656,11 +657,12 @@ var AxiomLine = /** @class */ (function (_super) {
         }
         var scrubValue = this.xScale.invert(mouseX - this.offset.x);
         var bisect = bisector(function (row) { return xAccessor(row); }).center;
-        var i = bisect(this.parsedData, scrubValue);
-        var bisected = this.parsedData[i];
+        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 = this.parsedData[i].value;
+        var yValue = yAccessor(nearestRow);
         var yPosition = this.yScale(yValue) + this.offset.y;
         return {
             xPosition: xPosition,
@@ -669,6 +671,20 @@ var AxiomLine = /** @class */ (function (_super) {
             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();
@@ -1220,7 +1236,9 @@ var AxiomChart = /** @class */ (function (_super) {
             var touchOffset = 20; // TODO: figure out why touch.clientX is always off to the right
             _this.onScrubTriggered(touch.clientX - touchOffset);
         });
+        ctx.canvas.addEventListener('touchend', function (event) { _this.onScrubEndTriggered(); });
         ctx.canvas.addEventListener('mousemove', function (event) { _this.onScrubTriggered(event.offsetX); });
+        ctx.canvas.addEventListener('mouseleave', function (event) { _this.onScrubEndTriggered(); });
     };
     AxiomChart.prototype.onScrubTriggered = function (cursorX) {
         var _this = this;
@@ -1230,7 +1248,6 @@ var AxiomChart = /** @class */ (function (_super) {
             return plot.scrubbing !== undefined && plot.scrubbing && plot.type === EPlotTypes.line;
         });
         var plotScrubPositions = this.getScrubPositions(cursorX, plotsWithScrubbingEnabled);
-        // console.log(plotScrubPositions)
         if (this.onScrub !== undefined) {
             this.onScrub(plotScrubPositions);
         }
@@ -1254,6 +1271,28 @@ var AxiomChart = /** @class */ (function (_super) {
             console.error(error);
         });
     };
+    AxiomChart.prototype.onScrubEndTriggered = function () {
+        this.removeScrubbers();
+        if (this.onScrubEnd !== undefined) {
+            this.onScrubEnd();
+        }
+    };
+    AxiomChart.prototype.removeScrubbers = function () {
+        var _this = this;
+        if (this.plotImplementations === undefined)
+            return;
+        this.runtime.busy = true;
+        this.clearCanvas();
+        var drawPromises = this.plotImplementations.map(function (plot) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, plot.draw()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        }); }); });
+        void Promise.all(drawPromises);
+    };
     AxiomChart.prototype.getScrubPositions = function (mouseX, plots) {
         var plotScrubPositions = {};
         plots.forEach(function (plot) {