scichart 2.0.2146 → 2.0.2194

package/Charting/ChartModifiers/DataPointSelectionModifier.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -79,7 +81,7 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
             if (typeof options.onSelectionChanged === "string") {
                 _this.typeMap.set("onSelectionChanged", options.onSelectionChanged);
                 // @ts-ignore
-                _this.selectionChanged.subscribe(classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onSelectionChanged));
+                _this.selectionChanged.subscribe((0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onSelectionChanged));
             }
             else {
                 // @ts-ignore
@@ -90,7 +92,7 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
             if (typeof options.getSelectionMode === "string") {
                 _this.typeMap.set("getSelectionMode", options.getSelectionMode);
                 // @ts-ignore
-                _this.getSelectionMode = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.getSelectionMode);
+                _this.getSelectionMode = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.getSelectionMode);
             }
             else {
                 // @ts-ignore
@@ -192,11 +194,11 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
             throw new Error("Should not call DataPointSelectionModifier.modifierMouseDown if not attached");
         }
         // Point coordinates relative to series view rectangle.
-        var translatedPoint = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect);
+        var translatedPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
         if (!translatedPoint) {
             return;
         }
-        var pointFromTrans = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect);
+        var pointFromTrans = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
         if (pointFromTrans) {
             this.startPoint = pointFromTrans;
             this.isClicked = true;
@@ -213,13 +215,13 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
         _super.prototype.modifierMouseMove.call(this, args);
         var seriesViewRect = this.parentSurface.seriesViewRect;
         if (this.isClicked) {
-            this.endPoint = translate_1.translateFromCanvasToSeriesViewRect(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
-            var _a = RubberBandXyZoomModifier_1.getRubberBandRect(this.startPoint, this.endPoint, this.xyDirection, this.parentSurface.seriesViewRect), x = _a.x, right = _a.right, y = _a.y, bottom = _a.bottom;
+            this.endPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
+            var _a = (0, RubberBandXyZoomModifier_1.getRubberBandRect)(this.startPoint, this.endPoint, this.xyDirection, this.parentSurface.seriesViewRect), x = _a.x, right = _a.right, y = _a.y, bottom = _a.bottom;
             this.selectionRect.isHidden = !this.allowDragSelect;
-            this.selectionRect.x1 = translate_1.translateToNotScaled(x);
-            this.selectionRect.x2 = translate_1.translateToNotScaled(right);
-            this.selectionRect.y1 = translate_1.translateToNotScaled(y);
-            this.selectionRect.y2 = translate_1.translateToNotScaled(bottom);
+            this.selectionRect.x1 = (0, translate_1.translateToNotScaled)(x);
+            this.selectionRect.x2 = (0, translate_1.translateToNotScaled)(right);
+            this.selectionRect.y1 = (0, translate_1.translateToNotScaled)(y);
+            this.selectionRect.y2 = (0, translate_1.translateToNotScaled)(bottom);
         }
     };
     /**
@@ -235,8 +237,8 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
         }
         if (this.isClicked) {
             var seriesViewRect = this.parentSurface.seriesViewRect;
-            this.endPoint = translate_1.translateFromCanvasToSeriesViewRect(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
-            var rect = RubberBandXyZoomModifier_1.getRubberBandRect(this.startPoint, this.endPoint, this.xyDirection, this.parentSurface.seriesViewRect);
+            this.endPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
+            var rect = (0, RubberBandXyZoomModifier_1.getRubberBandRect)(this.startPoint, this.endPoint, this.xyDirection, this.parentSurface.seriesViewRect);
             var isAreaSelection = rect.width >= 3 && rect.height >= 3 && this.allowDragSelect;
             var selectionMode = this.getSelectionMode(args, isAreaSelection);
             // Process selection
@@ -416,7 +418,7 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
                     for (var i = 0; i < baseDataSeries.count(); i++) {
                         var x = baseDataSeries.getNativeXValues().get(i);
                         var y = baseDataSeries.getNativeYValues().get(i);
-                        if (pointUtil_1.testIsInBounds(x, y, leftXData, topYData, rightXData, bottomYData)) {
+                        if ((0, pointUtil_1.testIsInBounds)(x, y, leftXData, topYData, rightXData, bottomYData)) {
                             var metadata = baseDataSeries.getMetadataAt(i);
                             if (selectionMode !== ESelectionMode.Inverse) {
                                 metadata.isSelected = true;
@@ -467,7 +469,7 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
                 }
                 // Metadata can't be auto-created if the renderableSeries is added to the surface without a dataSeries
                 if (!ht.metadata) {
-                    console.warn("Cannot select datapoint for series " + ht.dataSeriesName + " as it does not have metadata. To solve this either:\nConfigure metadata when you create the series or when you add data eg renderableSeries.dataSeries = new XyDataSeries(wasmContext, { metadata: { isSelected: false }}), or:\nAdd the DataPointSelectionModifier after all series have had their dataSeries set.");
+                    console.warn("Cannot select datapoint for series ".concat(ht.dataSeriesName, " as it does not have metadata. To solve this either:\nConfigure metadata when you create the series or when you add data eg renderableSeries.dataSeries = new XyDataSeries(wasmContext, { metadata: { isSelected: false }}), or:\nAdd the DataPointSelectionModifier after all series have had their dataSeries set."));
                     return;
                 }
                 if (selectionMode === ESelectionMode.Union) {
@@ -544,4 +546,4 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
     return DataPointSelectionModifier;
 }(ChartModifierBase2D_1.ChartModifierBase2D));
 exports.DataPointSelectionModifier = DataPointSelectionModifier;
-var getKey = function (rs, index) { return rs.id + "_" + index; };
+var getKey = function (rs, index) { return "".concat(rs.id, "_").concat(index); };

package/Charting/ChartModifiers/LegendModifier.d.ts

@@ -82,7 +82,7 @@ export declare class LegendModifier extends ChartModifierBase2D implements IIncl
     /** @inheritDoc */
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     /** @inheritDoc */
     delete(): void;

package/Charting/ChartModifiers/LegendModifier.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/Charting/ChartModifiers/ModifierMouseArgs.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -121,8 +123,7 @@ var ModifierMouseArgs = /** @class */ (function (_super) {
             var scaleY = slaveViewport.height / masterViewport.height;
             mousePoint = new Point_1.Point(args.mousePoint.x * scaleX, args.mousePoint.y * scaleY);
         }
-        return __assign(__assign({}, args), { isMaster: false, handled: false, modifierGroup: modifierGroup,
-            mousePoint: mousePoint });
+        return __assign(__assign({}, args), { isMaster: false, handled: false, modifierGroup: modifierGroup, mousePoint: mousePoint });
     };
     return ModifierMouseArgs;
 }(ModifierArgsBase_1.ModifierArgsBase));

package/Charting/ChartModifiers/MouseWheelZoomModifier.d.ts

@@ -1,3 +1,5 @@
+import { IIncludeXAxis } from "../../Core/IIncludeXAxis";
+import { IIncludeYAxis } from "../../Core/IIncludeYAxis";
 import { Point } from "../../Core/Point";
 import { EChart2DModifierType } from "../../types/ChartModifierType";
 import { AxisBase2D } from "../Visuals/Axis/AxisBase2D";
@@ -16,6 +18,34 @@ export interface IMouseWheelZoomModifierOptions extends IChartModifierBaseOption
      * Defines whether the Mouse Wheel zooms or pans. See {@link EActionType} for options
      */
     actionType?: EActionType;
+    /**
+     * Whether the modifier applies when the mouse is over the chart area (ie not over the axes).  Default true.
+     */
+    applyToSeriesViewRect?: boolean;
+    /**
+     * Whether the modifier applies when the mouse is over the axes. Default true.
+     */
+    applyToAxes?: boolean;
+    /**
+     * A list of Ids for X axis to exclude from this modifier
+     * @remarks Also see {@link MouseWheelZoomModifier.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 MouseWheelZoomModifier.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 MouseWheelZoomModifier.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 MouseWheelZoomModifier.includeYAxis} function which allows you to include or exclude an axis by instance
+     */
+    includedYAxisIds?: string[];
 }
 /**
  * Defines enumeration constants for the zoom or pan action on {@link MouseWheelZoomModifier}
@@ -45,7 +75,7 @@ export declare enum EActionType {
  *
  * The speed of mouse-wheel zoom can be modified via the {@link MouseWheelZoomModifier.growFactor} property.
  */
-export declare class MouseWheelZoomModifier extends ChartModifierBase2D {
+export declare class MouseWheelZoomModifier extends ChartModifierBase2D implements IIncludeXAxis, IIncludeYAxis {
     readonly type = EChart2DModifierType.MouseWheelZoom;
     /**
      * Modifies the speed of mousewheel zoom, for example growFactor = 0.001 means each mousewheel 'click'
@@ -56,6 +86,16 @@ export declare class MouseWheelZoomModifier extends ChartModifierBase2D {
      * Defines whether the Mouse Wheel zooms or pans. See {@link EActionType} for options
      */
     actionType: EActionType;
+    /**
+     * Whether the modifier applies when the mouse is over the area where series are drawn (ie not over the axes).  Default true.
+     */
+    applyToSeriesViewRect: boolean;
+    /**
+     * Whether the modifier applies when the mouse is over the axes. Default true.
+     */
+    applyToAxes: boolean;
+    private includedXAxisMap;
+    private includedYAxisMap;
     /**
      * Creates an instance of MouseWheelZoomModifier
      * @param options Optional parameters to configure the modifier via {@link IMouseWheelZoomModifierOptions}
@@ -76,9 +116,19 @@ export declare class MouseWheelZoomModifier extends ChartModifierBase2D {
      * @param wheelDelta the MouseWheel delta
      */
     performPan(wheelDelta: number): void;
+    /** @inheritDoc */
+    includeXAxis(axis: AxisBase2D, isIncluded: boolean): void;
+    /** @inheritDoc */
+    includeYAxis(axis: AxisBase2D, isIncluded: boolean): void;
+    /** @inheritDoc */
+    includeAllAxes(): void;
+    /** @inheritDoc */
+    getIncludedXAxis(): AxisBase2D[];
+    /** @inheritDoc */
+    getIncludedYAxis(): AxisBase2D[];
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     /**
      * Gets the axis size for scroll calculations

package/Charting/ChartModifiers/MouseWheelZoomModifier.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -16,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MouseWheelZoomModifier = exports.EActionType = void 0;
 var ChartModifierType_1 = require("../../types/ChartModifierType");
 var XyDirection_1 = require("../../types/XyDirection");
+var includedAxis_1 = require("../../utils/includedAxis");
 var translate_1 = require("../../utils/translate");
 var AxisBase2D_1 = require("../Visuals/Axis/AxisBase2D");
 var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
@@ -55,31 +58,89 @@ var MouseWheelZoomModifier = /** @class */ (function (_super) {
      * @param options Optional parameters to configure the modifier via {@link IMouseWheelZoomModifierOptions}
      */
     function MouseWheelZoomModifier(options) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         var _this = _super.call(this, options) || this;
         _this.type = ChartModifierType_1.EChart2DModifierType.MouseWheelZoom;
+        /**
+         * Whether the modifier applies when the mouse is over the area where series are drawn (ie not over the axes).  Default true.
+         */
+        _this.applyToSeriesViewRect = true;
+        /**
+         * Whether the modifier applies when the mouse is over the axes. Default true.
+         */
+        _this.applyToAxes = true;
+        _this.includedXAxisMap = new Map();
+        _this.includedYAxisMap = new Map();
         _this.growFactor = (options === null || options === void 0 ? void 0 : options.growFactor) || 0.001;
         _this.actionType = (_a = options === null || options === void 0 ? void 0 : options.actionType) !== null && _a !== void 0 ? _a : EActionType.Zoom;
+        _this.applyToSeriesViewRect = (_b = options === null || options === void 0 ? void 0 : options.applyToSeriesViewRect) !== null && _b !== void 0 ? _b : _this.applyToSeriesViewRect;
+        _this.applyToAxes = (_c = options === null || options === void 0 ? void 0 : options.applyToAxes) !== null && _c !== void 0 ? _c : _this.applyToAxes;
         if (_this.actionType === EActionType.Pan && _this.xyDirection === XyDirection_1.EXyDirection.XyDirection) {
             console.warn("SciChart MouseWheelZoomModifier: actionType=Pan and xyDirection=Xy conflict. Auto setting XyDirection to X");
             _this.xyDirection = XyDirection_1.EXyDirection.XDirection;
         }
+        if ((options === null || options === void 0 ? void 0 : options.includedXAxisIds) && (options === null || options === void 0 ? void 0 : options.excludedXAxisIds)) {
+            throw new Error("You either should use includedXAxisIds or excludedXAxisIds");
+        }
+        if ((options === null || options === void 0 ? void 0 : options.includedYAxisIds) && (options === null || options === void 0 ? void 0 : options.excludedYAxisIds)) {
+            throw new Error("You either should use includedYAxisIds or excludedYAxisIds");
+        }
+        (_d = options === null || options === void 0 ? void 0 : options.includedXAxisIds) === null || _d === void 0 ? void 0 : _d.forEach(function (id) {
+            _this.includedXAxisMap.set(id, true);
+        });
+        (_e = options === null || options === void 0 ? void 0 : options.includedYAxisIds) === null || _e === void 0 ? void 0 : _e.forEach(function (id) {
+            _this.includedYAxisMap.set(id, true);
+        });
+        (_f = options === null || options === void 0 ? void 0 : options.excludedXAxisIds) === null || _f === void 0 ? void 0 : _f.forEach(function (id) {
+            _this.includedXAxisMap.set(id, false);
+        });
+        (_g = options === null || options === void 0 ? void 0 : options.excludedYAxisIds) === null || _g === void 0 ? void 0 : _g.forEach(function (id) {
+            _this.includedYAxisMap.set(id, false);
+        });
         return _this;
     }
     /**
      * @inheritDoc
      */
     MouseWheelZoomModifier.prototype.modifierMouseWheel = function (args) {
+        var _this = this;
         _super.prototype.modifierMouseWheel.call(this, args);
-        args.handled = true;
-        var zoomPoint = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect);
-        if (zoomPoint) {
+        var zoomPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
+        if (zoomPoint && this.applyToSeriesViewRect) {
             if (this.actionType === EActionType.Zoom) {
                 this.performZoom(zoomPoint, args.mouseWheelDelta);
             }
             else if (this.actionType === EActionType.Pan) {
                 this.performPan(args.mouseWheelDelta);
             }
+            args.handled = true;
+        }
+        else if (this.applyToAxes) {
+            var targetAxes = [];
+            if ([XyDirection_1.EXyDirection.XDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
+                targetAxes.push.apply(targetAxes, this.getIncludedXAxis());
+            }
+            if ([XyDirection_1.EXyDirection.YDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
+                targetAxes.push.apply(targetAxes, this.getIncludedYAxis());
+            }
+            var activeAxes = (0, ChartModifierBase2D_1.getActiveAxes)(targetAxes, args.mousePoint);
+            if (activeAxes.length > 0) {
+                args.handled = true;
+                if (this.actionType === EActionType.Zoom) {
+                    var fraction_1 = this.growFactor * args.mouseWheelDelta;
+                    var mousePoint_1 = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect, true);
+                    activeAxes.forEach(function (axis) {
+                        _this.growBy(mousePoint_1, axis, fraction_1);
+                    });
+                }
+                else if (this.actionType === EActionType.Pan) {
+                    activeAxes.forEach(function (axis) {
+                        var size = _this.getAxisSize(axis);
+                        var pixels = args.mouseWheelDelta * _this.growFactor * size;
+                        axis.scroll(pixels, AxisBase2D_1.EClipMode.None);
+                    });
+                }
+            }
         }
     };
     /**
@@ -91,12 +152,12 @@ var MouseWheelZoomModifier = /** @class */ (function (_super) {
         var _this = this;
         var fraction = this.growFactor * wheelDelta;
         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, fraction);
             });
         }
         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, fraction);
             });
         }
@@ -108,25 +169,59 @@ var MouseWheelZoomModifier = /** @class */ (function (_super) {
     MouseWheelZoomModifier.prototype.performPan = function (wheelDelta) {
         var _this = this;
         if ([XyDirection_1.EXyDirection.XDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
-            this.parentSurface.xAxes.asArray().forEach(function (axis) {
+            this.getIncludedXAxis().forEach(function (axis) {
                 var size = _this.getAxisSize(axis);
                 var pixels = wheelDelta * _this.growFactor * size;
                 axis.scroll(pixels, AxisBase2D_1.EClipMode.None);
             });
         }
         if ([XyDirection_1.EXyDirection.YDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
-            this.parentSurface.yAxes.asArray().forEach(function (axis) {
+            this.getIncludedYAxis().forEach(function (axis) {
                 var size = _this.getAxisSize(axis);
                 var pixels = wheelDelta * _this.growFactor * size;
                 axis.scroll(pixels, AxisBase2D_1.EClipMode.None);
             });
         }
     };
+    /** @inheritDoc */
+    MouseWheelZoomModifier.prototype.includeXAxis = function (axis, isIncluded) {
+        this.includedXAxisMap.set(axis.id, isIncluded);
+    };
+    /** @inheritDoc */
+    MouseWheelZoomModifier.prototype.includeYAxis = function (axis, isIncluded) {
+        this.includedYAxisMap.set(axis.id, isIncluded);
+    };
+    /** @inheritDoc */
+    MouseWheelZoomModifier.prototype.includeAllAxes = function () {
+        this.includedXAxisMap.clear();
+    };
+    /** @inheritDoc */
+    MouseWheelZoomModifier.prototype.getIncludedXAxis = function () {
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.xAxes.asArray(), this.includedXAxisMap);
+    };
+    /** @inheritDoc */
+    MouseWheelZoomModifier.prototype.getIncludedYAxis = function () {
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.yAxes.asArray(), this.includedYAxisMap);
+    };
     MouseWheelZoomModifier.prototype.toJSON = function () {
         var json = _super.prototype.toJSON.call(this);
         var options = {
             actionType: this.actionType,
-            growFactor: this.growFactor
+            growFactor: this.growFactor,
+            applyToSeriesViewRect: this.applyToSeriesViewRect,
+            applyToAxes: this.applyToAxes,
+            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;

package/Charting/ChartModifiers/OverviewRangeSelectionModifier.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -92,7 +94,7 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
         if (!this.isAttached) {
             throw new Error("Should not call OverviewRangeSelectionModifier.modifierMouseDown if not attached");
         }
-        var pointFromTrans = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect);
+        var pointFromTrans = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
         if (pointFromTrans) {
             this.isClicked = true;
         }
@@ -114,7 +116,7 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
             args.handled = true;
             (_a = this.overviewPositionAnimation) === null || _a === void 0 ? void 0 : _a.cancel();
             var seriesViewRect = this.parentSurface.seriesViewRect;
-            this.pointTo = translate_1.translateFromCanvasToSeriesViewRect(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
+            this.pointTo = (0, translate_1.translateFromCanvasToSeriesViewRect)(Rect_1.Rect.clipPointToRect(args.mousePoint, seriesViewRect), seriesViewRect);
             this.isClicked = false;
             var xAxis = this.parentSurface.getXAxisById(this.xAxisId);
             var xCalc = xAxis.getCurrentCoordinateCalculator();
@@ -233,9 +235,9 @@ var OverviewRangeSelectionModifier = /** @class */ (function (_super) {
                 annotationBeforeSelectedArea.minHeight = 0;
                 annotationAfterSelectedArea.minHeight = 0;
             }
-            this.rangeSelectionAnnotationProperty = Deleter_1.deleteSafe(this.rangeSelectionAnnotation);
-            this.annotationBeforeSelectedAreaProperty = Deleter_1.deleteSafe(this.annotationBeforeSelectedAreaProperty);
-            this.annotationAfterSelectedAreaProperty = Deleter_1.deleteSafe(this.annotationAfterSelectedAreaProperty);
+            this.rangeSelectionAnnotationProperty = (0, Deleter_1.deleteSafe)(this.rangeSelectionAnnotation);
+            this.annotationBeforeSelectedAreaProperty = (0, Deleter_1.deleteSafe)(this.annotationBeforeSelectedAreaProperty);
+            this.annotationAfterSelectedAreaProperty = (0, Deleter_1.deleteSafe)(this.annotationAfterSelectedAreaProperty);
             this.parentSurface.modifierAnnotations.remove(this.rangeSelectionAnnotation);
             this.parentSurface.modifierAnnotations.remove(this.annotationBeforeSelectedAreaProperty);
             this.parentSurface.modifierAnnotations.remove(this.annotationAfterSelectedAreaProperty);
@@ -258,12 +260,12 @@ exports.OverviewRangeSelectionModifier = OverviewRangeSelectionModifier;
 /** @ignore */
 var horizontalAdornerSvgTemplate = function (x1, y1, x2, y2) {
     var colorLine = "black";
-    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"" + x1 + "\" y1=\"" + y1 + "\" x2=\"" + x2 + "\" y2=\"" + y1 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x2 + "\" y1=\"" + y1 + "\" x2=\"" + x2 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x1 + "\" y1=\"" + y2 + "\" x2=\"" + x2 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x1 + "\" y1=\"" + y1 + "\" x2=\"" + x1 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <rect x=\"" + (x1 - 3) + "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"" + colorLine + "\" />\n        <rect x=\"" + (x2 - 3) + "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"" + colorLine + "\" />\n        </svg>";
+    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"".concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y1, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x2, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y2, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x1, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"").concat(x1 - 3, "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"").concat(x2 - 3, "\" y=\"30%\" width=\"7\" height=\"40%\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
 };
 /** @ignore */
 var verticalAdornerSvgTemplate = function (x1, y1, x2, y2) {
     var colorLine = "black";
-    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"" + x1 + "\" y1=\"" + y1 + "\" x2=\"" + x2 + "\" y2=\"" + y1 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x2 + "\" y1=\"" + y1 + "\" x2=\"" + x2 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x1 + "\" y1=\"" + y2 + "\" x2=\"" + x2 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <line x1=\"" + x1 + "\" y1=\"" + y1 + "\" x2=\"" + x1 + "\" y2=\"" + y2 + "\" stroke=\"" + colorLine + "\" stroke-width=\"1\" />\n        <rect x=\"30%\" y=\"" + (y1 - 3) + "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"" + colorLine + "\" />\n        <rect x=\"30%\" y=\"" + (y2 - 3) + "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"" + colorLine + "\" />\n        </svg>";
+    return "<svg xmlns=\"http://www.w3.org/2000/svg\">\n        <line x1=\"".concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y1, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x2, "\" y1=\"").concat(y1, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y2, "\" x2=\"").concat(x2, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <line x1=\"").concat(x1, "\" y1=\"").concat(y1, "\" x2=\"").concat(x1, "\" y2=\"").concat(y2, "\" stroke=\"").concat(colorLine, "\" stroke-width=\"1\" />\n        <rect x=\"30%\" y=\"").concat(y1 - 3, "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        <rect x=\"30%\" y=\"").concat(y2 - 3, "\" width=\"40%\" height=\"7\" fill=\"#2e2e2e\" rx=\"5\" stroke=\"").concat(colorLine, "\" />\n        </svg>");
 };
 var defaultSelectionAnnotationSvgString = "<svg width=\"50\" height=\"50\" preserveAspectRatio=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n    <rect width=\"100%\" height=\"100%\" style=\"fill:transparent\">\n    </rect>\n</svg>";
 var defaultUnSelectedAnnotationSvgString = "<svg width=\"50\" height=\"50\" preserveAspectRatio=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n        <rect width=\"100%\" height=\"100%\" style=\"fill:black\">\n        </rect>\n    </svg>";

package/Charting/ChartModifiers/PinchZoomModifier.d.ts

@@ -75,7 +75,7 @@ export declare class PinchZoomModifier extends ChartModifierBase2D {
     modifierPointerCancel(args: ModifierMouseArgs): void;
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     /**
      * Performs the zoom operation around the mouse point

package/Charting/ChartModifiers/PinchZoomModifier.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -95,7 +97,7 @@ var PinchZoomModifier = /** @class */ (function (_super) {
             var currentVerticalTouchPointsDistance = Math.abs(firstTouchPoint.y - secondTouchPoint.y);
             this.parentSurface.setZoomState(ZoomState_1.EZoomState.UserZooming);
             var zoomCenterMousePoint = this.getMiddlePoint(firstTouchPoint, secondTouchPoint);
-            var zoomPoint = translate_1.translateFromCanvasToSeriesViewRect(zoomCenterMousePoint, this.parentSurface.seriesViewRect);
+            var zoomPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(zoomCenterMousePoint, this.parentSurface.seriesViewRect);
             if (zoomPoint &&
                 this.previousHorizontalTouchPointsDistance !== undefined &&
                 this.previousVerticalTouchPointsDistance !== undefined) {

package/Charting/ChartModifiers/RolloverModifier.d.ts

@@ -175,7 +175,7 @@ export declare class RolloverModifier extends ChartModifierBase2D implements IIn
     hitTestRenderableSeries(rs: IRenderableSeries, mousePoint: Point): HitTestInfo;
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     protected notifyPropertyChanged(propertyName: string): void;
     private isVerticalChart;