scichart 3.1.348 → 3.2.434

package/Charting/ChartModifiers/PinchZoomModifier.d.ts

@@ -1,5 +1,6 @@
 import { Point } from "../../Core/Point";
 import { EChart2DModifierType } from "../../types/ChartModifierType";
+import { AxisBase2D } from "../Visuals/Axis/AxisBase2D";
 import { ChartModifierBase2D, IChartModifierBaseOptions } from "./ChartModifierBase2D";
 import { ModifierMouseArgs } from "./ModifierMouseArgs";
 /**
@@ -14,6 +15,26 @@ export interface IPinchZoomModifierOptions extends IChartModifierBaseOptions {
      * Defines the sensitivity of zooming in vertical direction
      */
     verticalGrowFactor?: number;
+    /**
+     * A list of Ids for X axis to exclude from this modifier
+     * @remarks Also see {@link ZoomPanModifier.includeXAxis} function which allows you to include or exclude an axis by instance
+     */
+    excludedXAxisIds?: string[];
+    /**
+     * A list of Ids for Y axis to exclude from this modifier
+     * @remarks Also see {@link ZoomPanModifier.includeYAxis} function which allows you to include or exclude an axis by instance
+     */
+    excludedYAxisIds?: string[];
+    /**
+     * A list of Ids for X axis to include to this modifier
+     * @remarks Also see {@link ZoomPanModifier.includeXAxis} function which allows you to include or exclude an axis by instance
+     */
+    includedXAxisIds?: string[];
+    /**
+     * A list of Ids for Y axis to include this modifier
+     * @remarks Also see {@link ZoomPanModifier.includeYAxis} function which allows you to include or exclude an axis by instance
+     */
+    includedYAxisIds?: string[];
 }
 /**
  * The PinchZoomModifier provides ability to zoom by pinch gesture on a 2D {@link SciChartSurface}
@@ -31,7 +52,7 @@ export interface IPinchZoomModifierOptions extends IChartModifierBaseOptions {
  * It is also necessary to set “touch-action: none” on the chart div element.
  */
 export declare class PinchZoomModifier extends ChartModifierBase2D {
-    readonly type = EChart2DModifierType.PinchZoom;
+    readonly type: EChart2DModifierType;
     /**
      * Defines the sensitivity of zooming in horizontal direction
      */
@@ -40,10 +61,8 @@ export declare class PinchZoomModifier extends ChartModifierBase2D {
      * Defines the sensitivity of zooming in vertical direction
      */
     verticalGrowFactor: number;
-    /**
-     * Stores info about active pointerdown events
-     */
-    private activeTouchEvents;
+    protected includedXAxisMap: Map<string, boolean>;
+    protected includedYAxisMap: Map<string, boolean>;
     /**
      * touch points X coordinates difference
      */
@@ -77,19 +96,30 @@ export declare class PinchZoomModifier extends ChartModifierBase2D {
         type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
+    /** @inheritDoc */
+    includeXAxis(axis: AxisBase2D, isIncluded: boolean): void;
+    /** @inheritDoc */
+    includeYAxis(axis: AxisBase2D, isIncluded: boolean): void;
+    /** @inheritDoc */
+    includeAllAxes(): void;
+    /** @inheritDoc */
+    getIncludedXAxis(): AxisBase2D[];
+    /** @inheritDoc */
+    getIncludedYAxis(): AxisBase2D[];
     /**
      * Performs the zoom operation around the mouse point
      * @param mousePoint The X,Y location of the mouse at the time of the zoom
      * @param horizontalPinchDelta horizontal pinch delta
      * @param verticalPinchDelta vertical pinch delta
      */
-    protected performZoom(mousePoint: Point, horizontalPinchDelta: number, verticalPinchDelta: number): void;
-    protected notifyPropertyChanged(propertyName: string): void;
+    protected performZoom(mousePoint: Point, horizontalPinchDelta: number, verticalPinchDelta: number, horizontalGrowFactor: number, verticalGrowFactor: number): void;
     /**
      * Handles pointer event becoming inactive
      * @param args pointer event properties
      */
-    private removeFromActiveTouchEvents;
+    protected removeFromActiveTouchEvents(args: ModifierMouseArgs): void;
+    protected performModifierAction(args: ModifierMouseArgs): void;
+    protected getIsActionAllowed(args: ModifierMouseArgs): boolean;
     /**
      * returns a point equidistant to the provided ones
      * @param firstPoint the X,Y location of the first active pointer

package/Charting/ChartModifiers/PinchZoomModifier.js

@@ -20,6 +20,7 @@ var Point_1 = require("../../Core/Point");
 var ChartModifierType_1 = require("../../types/ChartModifierType");
 var XyDirection_1 = require("../../types/XyDirection");
 var ZoomState_1 = require("../../types/ZoomState");
+var includedAxis_1 = require("../../utils/includedAxis");
 var translate_1 = require("../../utils/translate");
 var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
 /**
@@ -45,9 +46,8 @@ var PinchZoomModifier = /** @class */ (function (_super) {
      */
     function PinchZoomModifier(options) {
         var _this = this;
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         _this = _super.call(this, options) || this;
-        _this.type = ChartModifierType_1.EChart2DModifierType.PinchZoom;
         /**
          * Defines the sensitivity of zooming in horizontal direction
          */
@@ -56,10 +56,8 @@ var PinchZoomModifier = /** @class */ (function (_super) {
          * Defines the sensitivity of zooming in vertical direction
          */
         _this.verticalGrowFactor = 0.005;
-        /**
-         * Stores info about active pointerdown events
-         */
-        _this.activeTouchEvents = new Map();
+        _this.includedXAxisMap = new Map();
+        _this.includedYAxisMap = new Map();
         /**
          * returns a point equidistant to the provided ones
          * @param firstPoint the X,Y location of the first active pointer
@@ -68,8 +66,27 @@ var PinchZoomModifier = /** @class */ (function (_super) {
         _this.getMiddlePoint = function (firstPoint, secondPoint) {
             return new Point_1.Point((firstPoint.x + secondPoint.x) / 2, (firstPoint.y + secondPoint.y) / 2);
         };
-        _this.horizontalGrowFactor = (_a = options === null || options === void 0 ? void 0 : options.horizontalGrowFactor) !== null && _a !== void 0 ? _a : _this.horizontalGrowFactor;
-        _this.verticalGrowFactor = (_b = options === null || options === void 0 ? void 0 : options.verticalGrowFactor) !== null && _b !== void 0 ? _b : _this.verticalGrowFactor;
+        _this.type = ChartModifierType_1.EChart2DModifierType.PinchZoom;
+        if (((_a = options === null || options === void 0 ? void 0 : options.includedXAxisIds) === null || _a === void 0 ? void 0 : _a.length) > 0 && ((_b = options === null || options === void 0 ? void 0 : options.excludedXAxisIds) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+            throw new Error("You either should use includedXAxisIds or excludedXAxisIds");
+        }
+        if (((_c = options === null || options === void 0 ? void 0 : options.includedYAxisIds) === null || _c === void 0 ? void 0 : _c.length) > 0 && ((_d = options === null || options === void 0 ? void 0 : options.excludedYAxisIds) === null || _d === void 0 ? void 0 : _d.length) > 0) {
+            throw new Error("You either should use includedYAxisIds or excludedYAxisIds");
+        }
+        (_e = options === null || options === void 0 ? void 0 : options.includedXAxisIds) === null || _e === void 0 ? void 0 : _e.forEach(function (id) {
+            _this.includedXAxisMap.set(id, true);
+        });
+        (_f = options === null || options === void 0 ? void 0 : options.includedYAxisIds) === null || _f === void 0 ? void 0 : _f.forEach(function (id) {
+            _this.includedYAxisMap.set(id, true);
+        });
+        (_g = options === null || options === void 0 ? void 0 : options.excludedXAxisIds) === null || _g === void 0 ? void 0 : _g.forEach(function (id) {
+            _this.includedXAxisMap.set(id, false);
+        });
+        (_h = options === null || options === void 0 ? void 0 : options.excludedYAxisIds) === null || _h === void 0 ? void 0 : _h.forEach(function (id) {
+            _this.includedYAxisMap.set(id, false);
+        });
+        _this.horizontalGrowFactor = (_j = options === null || options === void 0 ? void 0 : options.horizontalGrowFactor) !== null && _j !== void 0 ? _j : _this.horizontalGrowFactor;
+        _this.verticalGrowFactor = (_k = options === null || options === void 0 ? void 0 : options.verticalGrowFactor) !== null && _k !== void 0 ? _k : _this.verticalGrowFactor;
         return _this;
     }
     /**
@@ -80,34 +97,24 @@ var PinchZoomModifier = /** @class */ (function (_super) {
         if (!this.isAttached) {
             throw new Error("Should not call PinchZoomModifier.modifierMouseDown if not attached");
         }
-        this.activeTouchEvents.set(args.pointerId, args);
-        args.handled = true;
+        var translatedPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
+        if (!translatedPoint) {
+            return;
+        }
+        var isTouchEvent = args.pointerType === "touch" || args.pointerType === "pen";
+        if (isTouchEvent) {
+            this.activePointerEvents.set(args.pointerId, args);
+        }
     };
     /**
      * @inheritDoc
      */
     PinchZoomModifier.prototype.modifierMouseMove = function (args) {
         _super.prototype.modifierMouseMove.call(this, args);
-        this.activeTouchEvents.set(args.pointerId, args);
-        // check for pinch gestures if there are multiple active pointers
-        if (this.activeTouchEvents.size >= 2) {
-            var _a = Array.from(this.activeTouchEvents.values()), firstTouchPoint = _a[0].mousePoint, secondTouchPoint = _a[1].mousePoint;
-            // Calculate projections of distance between the touch points
-            var currentHorizontalTouchPointsDistance = Math.abs(firstTouchPoint.x - secondTouchPoint.x);
-            var currentVerticalTouchPointsDistance = Math.abs(firstTouchPoint.y - secondTouchPoint.y);
+        var isActionAllowed = this.getIsActionAllowed(args);
+        if (isActionAllowed) {
             this.parentSurface.setZoomState(ZoomState_1.EZoomState.UserZooming);
-            var zoomCenterMousePoint = this.getMiddlePoint(firstTouchPoint, secondTouchPoint);
-            var zoomPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(zoomCenterMousePoint, this.parentSurface.seriesViewRect);
-            if (zoomPoint &&
-                this.previousHorizontalTouchPointsDistance !== undefined &&
-                this.previousVerticalTouchPointsDistance !== undefined) {
-                var horizontalDistanceDiff = this.previousHorizontalTouchPointsDistance - currentHorizontalTouchPointsDistance;
-                var verticalDistanceDiff = this.previousVerticalTouchPointsDistance - currentVerticalTouchPointsDistance;
-                this.performZoom(zoomPoint, horizontalDistanceDiff, verticalDistanceDiff);
-            }
-            // Cache the distance for the next move event
-            this.previousHorizontalTouchPointsDistance = currentHorizontalTouchPointsDistance;
-            this.previousVerticalTouchPointsDistance = currentVerticalTouchPointsDistance;
+            this.performModifierAction(args);
         }
     };
     /**
@@ -128,48 +135,104 @@ var PinchZoomModifier = /** @class */ (function (_super) {
         var json = _super.prototype.toJSON.call(this);
         var options = {
             horizontalGrowFactor: this.horizontalGrowFactor,
-            verticalGrowFactor: this.verticalGrowFactor
+            verticalGrowFactor: this.verticalGrowFactor,
+            includedXAxisIds: Array.from(this.includedXAxisMap.entries())
+                .filter(function (a) { return a[1]; })
+                .map(function (a) { return a[0]; }),
+            includedYAxisIds: Array.from(this.includedYAxisMap.entries())
+                .filter(function (a) { return a[1]; })
+                .map(function (a) { return a[0]; }),
+            excludedXAxisIds: Array.from(this.includedXAxisMap.entries())
+                .filter(function (a) { return !a[1]; })
+                .map(function (a) { return a[0]; }),
+            excludedYAxisIds: Array.from(this.includedYAxisMap.entries())
+                .filter(function (a) { return !a[1]; })
+                .map(function (a) { return a[0]; })
         };
         Object.assign(json.options, options);
         return json;
     };
+    /** @inheritDoc */
+    PinchZoomModifier.prototype.includeXAxis = function (axis, isIncluded) {
+        this.includedXAxisMap.set(axis.id, isIncluded);
+    };
+    /** @inheritDoc */
+    PinchZoomModifier.prototype.includeYAxis = function (axis, isIncluded) {
+        this.includedYAxisMap.set(axis.id, isIncluded);
+    };
+    /** @inheritDoc */
+    PinchZoomModifier.prototype.includeAllAxes = function () {
+        this.includedXAxisMap.clear();
+    };
+    /** @inheritDoc */
+    PinchZoomModifier.prototype.getIncludedXAxis = function () {
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.xAxes.asArray(), this.includedXAxisMap);
+    };
+    /** @inheritDoc */
+    PinchZoomModifier.prototype.getIncludedYAxis = function () {
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.yAxes.asArray(), this.includedYAxisMap);
+    };
     /**
      * Performs the zoom operation around the mouse point
      * @param mousePoint The X,Y location of the mouse at the time of the zoom
      * @param horizontalPinchDelta horizontal pinch delta
      * @param verticalPinchDelta vertical pinch delta
      */
-    PinchZoomModifier.prototype.performZoom = function (mousePoint, horizontalPinchDelta, verticalPinchDelta) {
+    PinchZoomModifier.prototype.performZoom = function (mousePoint, horizontalPinchDelta, verticalPinchDelta, horizontalGrowFactor, verticalGrowFactor) {
         var _this = this;
-        var horizontalFraction = this.horizontalGrowFactor * horizontalPinchDelta;
-        var verticalFraction = this.verticalGrowFactor * verticalPinchDelta;
+        var horizontalFraction = horizontalGrowFactor * horizontalPinchDelta;
+        var verticalFraction = verticalGrowFactor * verticalPinchDelta;
         if ([XyDirection_1.EXyDirection.XDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
-            this.parentSurface.xAxes.asArray().forEach(function (axis) {
+            this.getIncludedXAxis().forEach(function (axis) {
                 _this.growBy(mousePoint, axis, horizontalFraction);
             });
         }
         if ([XyDirection_1.EXyDirection.YDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
-            this.parentSurface.yAxes.asArray().forEach(function (axis) {
+            this.getIncludedYAxis().forEach(function (axis) {
                 _this.growBy(mousePoint, axis, verticalFraction);
             });
         }
     };
-    PinchZoomModifier.prototype.notifyPropertyChanged = function (propertyName) {
-        _super.prototype.notifyPropertyChanged.call(this, propertyName);
-    };
     /**
      * Handles pointer event becoming inactive
      * @param args pointer event properties
      */
     PinchZoomModifier.prototype.removeFromActiveTouchEvents = function (args) {
         // Remove this event from the target's cache
-        this.activeTouchEvents.delete(args.pointerId);
+        this.activePointerEvents.delete(args.pointerId);
         // reset distance values
-        if (this.activeTouchEvents.size < 2) {
+        if (this.activePointerEvents.size < 2) {
             this.previousHorizontalTouchPointsDistance = undefined;
             this.previousVerticalTouchPointsDistance = undefined;
         }
     };
+    PinchZoomModifier.prototype.performModifierAction = function (args) {
+        var _a = Array.from(this.activePointerEvents.values()), firstTouchPoint = _a[0].mousePoint, secondTouchPoint = _a[1].mousePoint;
+        // Calculate projections of distance between the touch points
+        var currentHorizontalTouchPointsDistance = Math.abs(firstTouchPoint.x - secondTouchPoint.x);
+        var currentVerticalTouchPointsDistance = Math.abs(firstTouchPoint.y - secondTouchPoint.y);
+        var zoomCenterMousePoint = this.getMiddlePoint(firstTouchPoint, secondTouchPoint);
+        var zoomPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(zoomCenterMousePoint, this.parentSurface.seriesViewRect);
+        if (zoomPoint &&
+            this.previousHorizontalTouchPointsDistance !== undefined &&
+            this.previousVerticalTouchPointsDistance !== undefined) {
+            var horizontalDistanceDiff = this.previousHorizontalTouchPointsDistance - currentHorizontalTouchPointsDistance;
+            var verticalDistanceDiff = this.previousVerticalTouchPointsDistance - currentVerticalTouchPointsDistance;
+            // TODO add limits in distance between pointers
+            // const minHorizontalDiff = 10;
+            // if (horizontalDistanceDiff > minHorizontalDiff && verticalDistanceDiff > minHorizontalDiff) {
+            // }
+            this.performZoom(zoomPoint, horizontalDistanceDiff, verticalDistanceDiff, this.horizontalGrowFactor, this.verticalGrowFactor);
+        }
+        // Cache the distance for the next move event
+        this.previousHorizontalTouchPointsDistance = currentHorizontalTouchPointsDistance;
+        this.previousVerticalTouchPointsDistance = currentVerticalTouchPointsDistance;
+    };
+    PinchZoomModifier.prototype.getIsActionAllowed = function (args) {
+        var isTouchEvent = args.pointerType === "touch" || args.pointerType === "pen";
+        // check for pinch gestures if there are multiple active touches
+        return isTouchEvent && this.activePointerEvents.size >= 2;
+    };
     return PinchZoomModifier;
 }(ChartModifierBase2D_1.ChartModifierBase2D));
 exports.PinchZoomModifier = PinchZoomModifier;

package/Charting/ChartModifiers/RolloverModifier.js

@@ -270,6 +270,7 @@ var RolloverModifier = /** @class */ (function (_super) {
      * @inheritDoc
      */
     RolloverModifier.prototype.modifierMouseMove = function (args) {
+        this.activePointerEvents.set(args.pointerId, args);
         _super.prototype.modifierMouseMove.call(this, args);
         var translatedMousePoint;
         if (!this.mousePoint) {
@@ -284,7 +285,10 @@ var RolloverModifier = /** @class */ (function (_super) {
                 this.mousePosition = MousePosition_1.EMousePosition.SeriesArea;
             }
         }
-        this.update();
+        var isActionAllowed = this.getIsActionAllowed(args);
+        if (isActionAllowed) {
+            this.update();
+        }
     };
     /**
      * @inheritDoc
@@ -559,11 +563,14 @@ var RolloverModifier = /** @class */ (function (_super) {
             return;
         }
         var tooltipArray = [];
+        var height = this.isVerticalChart()
+            ? this.parentSurface.seriesViewRect.width
+            : this.parentSurface.seriesViewRect.height;
         rsList.forEach(function (rs, index) {
             var hitTestInfo = _this.hitTestRenderableSeries(rs, _this.mousePoint);
             if (hitTestInfo) {
                 if (rs.type !== SeriesType_1.ESeriesType.StackedColumnSeries || hitTestInfo.isHit) {
-                    var isVisible = 0 <= hitTestInfo.yCoord && hitTestInfo.yCoord <= _this.parentSurface.seriesViewRect.height;
+                    var isVisible = 0 <= hitTestInfo.yCoord && hitTestInfo.yCoord <= height;
                     if (isVisible) {
                         var absoluteXCoord = _this.isVerticalChart() ? hitTestInfo.yCoord : hitTestInfo.xCoord;
                         var absoluteYCoord = _this.isVerticalChart() ? hitTestInfo.xCoord : hitTestInfo.yCoord;
@@ -573,7 +580,7 @@ var RolloverModifier = /** @class */ (function (_super) {
                     }
                 }
                 if (rs.type === SeriesType_1.ESeriesType.BandSeries) {
-                    var isVisibleY1 = 0 <= hitTestInfo.y1Coord && hitTestInfo.y1Coord <= _this.parentSurface.seriesViewRect.height;
+                    var isVisibleY1 = 0 <= hitTestInfo.y1Coord && hitTestInfo.y1Coord <= height;
                     if (isVisibleY1) {
                         var absoluteXCoord = _this.isVerticalChart() ? hitTestInfo.y1Coord : hitTestInfo.xCoord;
                         var absoluteYCoord = _this.isVerticalChart() ? hitTestInfo.xCoord : hitTestInfo.y1Coord;

package/Charting/ChartModifiers/RubberBandXyZoomModifier.d.ts

@@ -68,9 +68,9 @@ export declare class RubberBandXyZoomModifier extends ChartModifierBase2D {
      * Defines the easing function for animation. See {@link TEasingFn} for a range of functions
      */
     easingFunction: TEasingFn;
-    protected rubberBandRect: RubberBandSvgRect;
-    protected pointFrom: Point;
-    protected pointTo: Point;
+    rubberBandRect: RubberBandSvgRect | undefined;
+    protected pointFrom: Point | undefined;
+    protected pointTo: Point | undefined;
     protected isClicked: boolean;
     private fillProperty;
     private strokeProperty;
@@ -84,10 +84,6 @@ export declare class RubberBandXyZoomModifier extends ChartModifierBase2D {
      * @inheritDoc
      */
     applyTheme(themeProvider: IThemeProvider): void;
-    /**
-     * @inheritDoc
-     */
-    onAttach(): void;
     /**
      * @inheritDoc
      */
@@ -132,6 +128,7 @@ export declare class RubberBandXyZoomModifier extends ChartModifierBase2D {
         type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
+    delete(): void;
     /**
      * Performs the zoom operation on the parent Surface, using the mouse points from & to, which
      * define the corners of the rectangle to zoom

package/Charting/ChartModifiers/RubberBandXyZoomModifier.js

@@ -92,19 +92,12 @@ var RubberBandXyZoomModifier = /** @class */ (function (_super) {
             this.stroke = themeProvider.rubberBandStrokeBrush;
         }
     };
-    /**
-     * @inheritDoc
-     */
-    RubberBandXyZoomModifier.prototype.onAttach = function () {
-        _super.prototype.onAttach.call(this);
-        this.rubberBandRect = new RubberBandSvgRect_1.RubberBandSvgRect(this.parentSurface.domSvgContainer, this.fill, this.stroke, this.strokeThickness);
-    };
     /**
      * @inheritDoc
      */
     RubberBandXyZoomModifier.prototype.onDetach = function () {
         _super.prototype.onDetach.call(this);
-        this.rubberBandRect = undefined;
+        this.rubberBandRect = (0, Deleter_1.deleteSafe)(this.rubberBandRect);
     };
     /**
      * @inheritDoc
@@ -225,6 +218,11 @@ var RubberBandXyZoomModifier = /** @class */ (function (_super) {
         Object.assign(json.options, options);
         return json;
     };
+    RubberBandXyZoomModifier.prototype.delete = function () {
+        this.parentSurfaceProperty = undefined;
+        this.rubberBandRect = (0, Deleter_1.deleteSafe)(this.rubberBandRect);
+        _super.prototype.delete.call(this);
+    };
     /**
      * Performs the zoom operation on the parent Surface, using the mouse points from & to, which
      * define the corners of the rectangle to zoom

package/Charting/ChartModifiers/SeriesSelectionModifier.js

@@ -14,6 +14,15 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeriesSelectionModifier = void 0;
 var classFactory_1 = require("../../Builder/classFactory");
@@ -171,45 +180,44 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
         }
         // Perform a hit-test on the renderable series
         var allSeries = this.getAllSeries();
-        // const hitTestInfos: HitTestInfo[] =
-        //     allSeries.map((rs, index) => {
-        //         return rs.hitTestProvider.hitTestOld(args.mousePoint,
-        //             ENearestPointLogic.NearestPoint2D,
-        //             this.hitTestRadius,
-        //             true);
-        //     });
         var hitTestInfos = allSeries.map(function (rs) {
             return rs.hitTestProvider.hitTest(args.mousePoint.x, args.mousePoint.y, _this.hitTestRadius);
         });
         try {
             // Set a flag to prevent re-entrancy
             this.preventReentrancy = true;
+            var prevHovered = __spreadArray([], this.hoveredSeries, true);
             // Deselect all series
             this.hoveredSeries = [];
+            var nearestHitTestInfo_1;
             if ((hitTestInfos === null || hitTestInfos === void 0 ? void 0 : hitTestInfos.length) > 0) {
-                // Any series been hit-tested?
-                // 1. Set the isHovered flag and add to hovered array
-                hitTestInfos
+                // Any series been hit-tested? Get the nearest
+                nearestHitTestInfo_1 = hitTestInfos
                     .filter(function (ht) { return ht.isHit; })
-                    .forEach(function (hoveredSeries) {
-                    // Setting isHovered true will cause series to raise the hoveredChanged event
-                    // This then feeds back into this.hover
-                    hoveredSeries.associatedSeries.isHovered = true;
-                    _this.hoveredSeries.push(hoveredSeries.associatedSeries);
-                });
+                    .sort(function (a, b) { return a.getEuclideanDistance() - b.getEuclideanDistance(); })[0];
+                // 1. Set the isHovered flag and add to hovered array for the nearest hitTestInfo
+                if (nearestHitTestInfo_1) {
+                    nearestHitTestInfo_1.associatedSeries.isHovered = true;
+                    this.hoveredSeries.push(nearestHitTestInfo_1.associatedSeries);
+                }
                 // 2. Series which were not hovered, set isHovered = false;
                 hitTestInfos
-                    .filter(function (ht) { return !ht.isHit && !ht.isEmpty; })
+                    .filter(function (ht) { return ht !== nearestHitTestInfo_1; })
                     .forEach(function (unhoveredSeries) {
-                    unhoveredSeries.associatedSeries.isHovered = false;
+                    if (unhoveredSeries === null || unhoveredSeries === void 0 ? void 0 : unhoveredSeries.associatedSeries) {
+                        unhoveredSeries.associatedSeries.isHovered = false;
+                    }
                 });
             }
             else {
                 // No series hit-tested, set all as un-hovered
                 allSeries.forEach(function (s) { return (s.isHovered = false); });
             }
-            // Raise the selectionChanged event
-            (_a = this.hoverChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, allSeries));
+            // Raise the hoverChanged event if something has changed
+            if (prevHovered.length !== this.hoveredSeries.length ||
+                prevHovered.some(function (s) { return !_this.hoveredSeries.includes(s); })) {
+                (_a = this.hoverChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, allSeries, nearestHitTestInfo_1));
+            }
         }
         finally {
             this.preventReentrancy = false;
@@ -242,18 +250,20 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
             // Deselect all series
             this.selectedSeries = [];
             allSeries.forEach(function (rs) { return (rs.isSelected = false); });
+            var nearestHitTestInfo = void 0;
             // Select the first series that has HitTestInfo.isHit = true
             if ((hitTestInfos === null || hitTestInfos === void 0 ? void 0 : hitTestInfos.length) > 0) {
-                var selected = hitTestInfos.find(function (ht) { return ht.isHit; });
-                if (selected) {
+                // Any series been hit-tested? Get the nearest
+                nearestHitTestInfo = hitTestInfos.sort(function (a, b) { return a.getEuclideanDistance() - b.getEuclideanDistance(); })[0];
+                if (nearestHitTestInfo.isHit) {
                     // Setting isSelected true will cause series to raise the selectionChanged event
                     // This then feeds back into this.select
-                    selected.associatedSeries.isSelected = true;
-                    this.selectedSeries.push(selected.associatedSeries);
+                    nearestHitTestInfo.associatedSeries.isSelected = true;
+                    this.selectedSeries.push(nearestHitTestInfo.associatedSeries);
                 }
             }
             // Raise the selectionChanged event
-            (_a = this.selectionChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, allSeries));
+            (_a = this.selectionChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, allSeries, nearestHitTestInfo));
         }
         finally {
             this.preventReentrancy = false;
@@ -287,12 +297,12 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
         if (arg.isSelected) {
             this.selectedSeries.push(arg.sourceSeries);
             // Raise the selectionChanged event
-            (_a = this.selectionChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, this.getAllSeries()));
+            (_a = this.selectionChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, this.getAllSeries(), undefined));
         }
         else {
             this.selectedSeries = (0, array_1.arrayRemove)(this.selectedSeries, arg.sourceSeries);
             // Raise the selectionChanged event after series deselected
-            (_b = this.selectionChanged) === null || _b === void 0 ? void 0 : _b.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, this.getAllSeries()));
+            (_b = this.selectionChanged) === null || _b === void 0 ? void 0 : _b.raiseEvent(new SelectionChangedArgs_1.SelectionChangedArgs(this, this.selectedSeries, this.getAllSeries(), undefined));
         }
     };
     SeriesSelectionModifier.prototype.updateSeriesHovered = function (arg) {
@@ -304,12 +314,12 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
         if (arg.hovered) {
             this.hoveredSeries.push(arg.sourceSeries);
             // Raise the selectionChanged event
-            (_a = this.hoverChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, this.getAllSeries()));
+            (_a = this.hoverChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, this.getAllSeries(), undefined));
         }
         else {
             this.hoveredSeries = (0, array_1.arrayRemove)(this.hoveredSeries, arg.sourceSeries);
             // Raise the selectionChanged event after series deselected
-            (_b = this.hoverChanged) === null || _b === void 0 ? void 0 : _b.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, this.getAllSeries()));
+            (_b = this.hoverChanged) === null || _b === void 0 ? void 0 : _b.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, this.getAllSeries(), undefined));
         }
     };
     return SeriesSelectionModifier;

package/Charting/ChartModifiers/XAxisDragModifier.d.ts

@@ -34,7 +34,7 @@ export declare class XAxisDragModifier extends ChartModifierBase2D {
     readonly type = EChart2DModifierType.XAxisDrag;
     dragMode: EDragMode;
     protected isClickedOverXAxis: boolean;
-    protected pointFrom: Point;
+    protected pointFrom: Point | undefined;
     protected activeAxes: AxisBase2D[];
     protected initialVisibleRanges: NumberRange[];
     protected isVerticalChart: boolean;

package/Charting/ChartModifiers/XAxisDragModifier.js

@@ -21,7 +21,6 @@ var DragMode_1 = require("../../types/DragMode");
 var translate_1 = require("../../utils/translate");
 var AxisBase2D_1 = require("../Visuals/Axis/AxisBase2D");
 var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
-var ChartModifierBase2D_2 = require("./ChartModifierBase2D");
 var Guard_1 = require("../../Core/Guard");
 var ChartModifierType_1 = require("../../types/ChartModifierType");
 /**
@@ -50,6 +49,7 @@ var XAxisDragModifier = /** @class */ (function (_super) {
         _this.dragMode = DragMode_1.EDragMode.Scaling;
         _this.isClickedOverXAxis = false;
         _this.isVerticalChart = false;
+        _this.cursorStyle = CursorStyle_1.ECursorStyle.Defalut;
         _this.includedSeriesMapProperty = new Map();
         _this.dragMode = (_a = options === null || options === void 0 ? void 0 : options.dragMode) !== null && _a !== void 0 ? _a : _this.dragMode;
         (_b = options === null || options === void 0 ? void 0 : options.excludedAxisIds) === null || _b === void 0 ? void 0 : _b.forEach(function (id) {
@@ -192,13 +192,13 @@ var XAxisDragModifier = /** @class */ (function (_super) {
             var yFromTrans = (0, translate_1.translateFromCanvasToSeriesViewRectY)(this.pointFrom.y, seriesViewRect);
             var isMoreThanHalf = yFromTrans >= seriesViewRect.height / 2;
             var yDelta = (pointTo.y - this.pointFrom.y) / seriesViewRect.width;
-            (0, ChartModifierBase2D_2.scaleAxes)(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_1.scaleAxes)(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
         }
         else {
             var xFromTrans = (0, translate_1.translateFromCanvasToSeriesViewRectX)(this.pointFrom.x, seriesViewRect);
             var isMoreThanHalf = xFromTrans >= seriesViewRect.width / 2;
             var xDelta = (pointTo.x - this.pointFrom.x) / seriesViewRect.width;
-            (0, ChartModifierBase2D_2.scaleAxes)(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_1.scaleAxes)(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
         }
     };
     XAxisDragModifier.prototype.getHorizontalXAxes = function () {

package/Charting/ChartModifiers/YAxisDragModifier.d.ts

@@ -35,7 +35,7 @@ export declare class YAxisDragModifier extends ChartModifierBase2D implements II
     readonly type = EChart2DModifierType.YAxisDrag;
     dragMode: EDragMode;
     protected isClickedOverYAxis: boolean;
-    protected pointFrom: Point;
+    protected pointFrom: Point | undefined;
     protected activeAxes: AxisBase2D[];
     protected initialVisibleRanges: NumberRange[];
     protected isVerticalChart: boolean;
@@ -72,9 +72,7 @@ export declare class YAxisDragModifier extends ChartModifierBase2D implements II
      */
     modifierMouseUp(args: ModifierMouseArgs): void;
     toJSON(): {
-        type: string; /**
-         * @inheritDoc
-         */
+        type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     protected updateCursor(mousePoint: Point): void;