scichart 2.0.2146 → 2.0.2179

package/Charting/ChartModifiers/XAxisDragModifier.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 __());
@@ -93,12 +95,12 @@ var XAxisDragModifier = /** @class */ (function (_super) {
         if (!this.isAttached) {
             throw new Error("Should not call XAxisDragModifier.modifierMouseDown if not attached");
         }
-        if (ChartModifierBase2D_1.testIsOverAxes(this.getHorizontalXAxes(), args.mousePoint)) {
+        if ((0, ChartModifierBase2D_1.testIsOverAxes)(this.getHorizontalXAxes(), args.mousePoint)) {
             // Horizontal chart
             this.isVerticalChart = false;
             this.startDragging(this.getHorizontalXAxes(), args);
         }
-        else if (ChartModifierBase2D_1.testIsOverAxes(this.getVerticalXAxes(), args.mousePoint)) {
+        else if ((0, ChartModifierBase2D_1.testIsOverAxes)(this.getVerticalXAxes(), args.mousePoint)) {
             // Vertical chart
             this.isVerticalChart = true;
             this.startDragging(this.getVerticalXAxes(), args);
@@ -147,13 +149,13 @@ var XAxisDragModifier = /** @class */ (function (_super) {
     };
     XAxisDragModifier.prototype.updateCursor = function (mousePoint) {
         var canvas = this.parentSurface.getMainCanvas();
-        if (ChartModifierBase2D_1.testIsOverAxes(this.getHorizontalXAxes(), mousePoint)) {
+        if ((0, ChartModifierBase2D_1.testIsOverAxes)(this.getHorizontalXAxes(), mousePoint)) {
             if (this.cursorStyle !== CursorStyle_1.ECursorStyle.EW) {
                 canvas.style.cursor = CursorStyle_1.ECursorStyle.EW;
                 this.cursorStyle = CursorStyle_1.ECursorStyle.EW;
             }
         }
-        else if (ChartModifierBase2D_1.testIsOverAxes(this.getVerticalXAxes(), mousePoint)) {
+        else if ((0, ChartModifierBase2D_1.testIsOverAxes)(this.getVerticalXAxes(), mousePoint)) {
             if (this.cursorStyle !== CursorStyle_1.ECursorStyle.NS) {
                 canvas.style.cursor = CursorStyle_1.ECursorStyle.NS;
                 this.cursorStyle = CursorStyle_1.ECursorStyle.NS;
@@ -187,16 +189,16 @@ var XAxisDragModifier = /** @class */ (function (_super) {
     XAxisDragModifier.prototype.doScaling = function (pointTo) {
         var seriesViewRect = this.parentSurface.seriesViewRect;
         if (this.isVerticalChart) {
-            var yFromTrans = translate_1.translateFromCanvasToSeriesViewRectY(this.pointFrom.y, seriesViewRect);
+            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;
-            ChartModifierBase2D_2.scaleAxes(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_2.scaleAxes)(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
         }
         else {
-            var xFromTrans = translate_1.translateFromCanvasToSeriesViewRectX(this.pointFrom.x, seriesViewRect);
+            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;
-            ChartModifierBase2D_2.scaleAxes(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_2.scaleAxes)(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
         }
     };
     XAxisDragModifier.prototype.getHorizontalXAxes = function () {
@@ -207,7 +209,7 @@ var XAxisDragModifier = /** @class */ (function (_super) {
     };
     XAxisDragModifier.prototype.startDragging = function (axes, args) {
         this.isClickedOverXAxis = true;
-        var activeAxes = ChartModifierBase2D_1.getActiveAxes(axes, args.mousePoint);
+        var activeAxes = (0, ChartModifierBase2D_1.getActiveAxes)(axes, args.mousePoint);
         var initialVisibleRanges = [];
         activeAxes.forEach(function (el) {
             initialVisibleRanges.push(el.visibleRange);

package/Charting/ChartModifiers/YAxisDragModifier.d.ts

@@ -70,7 +70,7 @@ export declare class YAxisDragModifier extends ChartModifierBase2D implements II
     modifierMouseUp(args: ModifierMouseArgs): void;
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     private updateCursor;
     private doPanning;

package/Charting/ChartModifiers/YAxisDragModifier.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,12 +94,12 @@ var YAxisDragModifier = /** @class */ (function (_super) {
         if (!this.isAttached) {
             throw new Error("Should not call YAxisDragModifier.modifierMouseDown if not attached");
         }
-        if (ChartModifierBase2D_2.testIsOverAxes(this.getVerticalYAxes(), args.mousePoint)) {
+        if ((0, ChartModifierBase2D_2.testIsOverAxes)(this.getVerticalYAxes(), args.mousePoint)) {
             // Horizontal chart
             this.isVerticalChart = false;
             this.startDragging(this.getVerticalYAxes(), args);
         }
-        else if (ChartModifierBase2D_2.testIsOverAxes(this.getHorizontalYAxes(), args.mousePoint)) {
+        else if ((0, ChartModifierBase2D_2.testIsOverAxes)(this.getHorizontalYAxes(), args.mousePoint)) {
             // Vertical chart
             this.isVerticalChart = true;
             this.startDragging(this.getHorizontalYAxes(), args);
@@ -146,13 +148,13 @@ var YAxisDragModifier = /** @class */ (function (_super) {
     };
     YAxisDragModifier.prototype.updateCursor = function (mousePoint) {
         var canvas = this.parentSurface.getMainCanvas();
-        if (ChartModifierBase2D_2.testIsOverAxes(this.getVerticalYAxes(), mousePoint)) {
+        if ((0, ChartModifierBase2D_2.testIsOverAxes)(this.getVerticalYAxes(), mousePoint)) {
             if (this.cursorStyle !== CursorStyle_1.ECursorStyle.NS) {
                 canvas.style.cursor = CursorStyle_1.ECursorStyle.NS;
                 this.cursorStyle = CursorStyle_1.ECursorStyle.NS;
             }
         }
-        else if (ChartModifierBase2D_2.testIsOverAxes(this.getHorizontalYAxes(), mousePoint)) {
+        else if ((0, ChartModifierBase2D_2.testIsOverAxes)(this.getHorizontalYAxes(), mousePoint)) {
             if (this.cursorStyle !== CursorStyle_1.ECursorStyle.EW) {
                 canvas.style.cursor = CursorStyle_1.ECursorStyle.EW;
                 this.cursorStyle = CursorStyle_1.ECursorStyle.EW;
@@ -186,16 +188,16 @@ var YAxisDragModifier = /** @class */ (function (_super) {
     YAxisDragModifier.prototype.doScaling = function (pointTo) {
         var seriesViewRect = this.parentSurface.seriesViewRect;
         if (this.isVerticalChart) {
-            var xFromTrans = translate_1.translateFromCanvasToSeriesViewRectX(this.pointFrom.x, seriesViewRect);
+            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;
-            ChartModifierBase2D_3.scaleAxes(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_3.scaleAxes)(this.activeAxes, this.initialVisibleRanges, xDelta, isMoreThanHalf);
         }
         else {
-            var yFromTrans = translate_1.translateFromCanvasToSeriesViewRectY(this.pointFrom.y, seriesViewRect);
+            var yFromTrans = (0, translate_1.translateFromCanvasToSeriesViewRectY)(this.pointFrom.y, seriesViewRect);
             var isMoreThanHalf = yFromTrans <= seriesViewRect.height / 2;
             var yDelta = -(pointTo.y - this.pointFrom.y) / seriesViewRect.height;
-            ChartModifierBase2D_3.scaleAxes(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
+            (0, ChartModifierBase2D_3.scaleAxes)(this.activeAxes, this.initialVisibleRanges, yDelta, isMoreThanHalf);
         }
     };
     YAxisDragModifier.prototype.getVerticalYAxes = function () {
@@ -206,7 +208,7 @@ var YAxisDragModifier = /** @class */ (function (_super) {
     };
     YAxisDragModifier.prototype.startDragging = function (axes, args) {
         this.isClickedOverYAxis = true;
-        var activeAxes = ChartModifierBase2D_1.getActiveAxes(axes, args.mousePoint);
+        var activeAxes = (0, ChartModifierBase2D_1.getActiveAxes)(axes, args.mousePoint);
         var initialVisibleRanges = [];
         activeAxes.forEach(function (el) {
             initialVisibleRanges.push(el.visibleRange);

package/Charting/ChartModifiers/ZoomExtentsModifier.d.ts

@@ -27,6 +27,14 @@ export interface IZoomExtentsModifierOptions extends IChartModifierBaseOptions {
      * A function to execute when zoomExtents is activated.  If this exists and returns false, the builtin behaviour is ignored;
      */
     onZoomExtents?: TZoomExtentsCallback | string;
+    /**
+     * 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;
 }
 /**
  * The ZoomExtentsModifier provides double-tap or double-click to zoom-to-fit (Zoom Extents) behavior
@@ -62,6 +70,14 @@ export declare class ZoomExtentsModifier extends ChartModifierBase2D {
      * A function to execute when zoomExtents is activated.  If this exists and returns false, the builtin behaviour is ignored;
      */
     onZoomExtents?: (sciChartSurface: SciChartSurface) => boolean;
+    /**
+     * 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;
     constructor(options?: IZoomExtentsModifierOptions);
     /**
      * @inheritDoc
@@ -69,6 +85,6 @@ export declare class ZoomExtentsModifier extends ChartModifierBase2D {
     modifierDoubleClick(args: ModifierMouseArgs): void;
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
 }

package/Charting/ChartModifiers/ZoomExtentsModifier.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 __());
@@ -18,7 +20,9 @@ var classFactory_1 = require("../../Builder/classFactory");
 var EasingFunctions_1 = require("../../Core/Animations/EasingFunctions");
 var BaseType_1 = require("../../types/BaseType");
 var ChartModifierType_1 = require("../../types/ChartModifierType");
+var XyDirection_1 = require("../../types/XyDirection");
 var ZoomState_1 = require("../../types/ZoomState");
+var translate_1 = require("../../utils/translate");
 var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
 /**
  * The ZoomExtentsModifier provides double-tap or double-click to zoom-to-fit (Zoom Extents) behavior
@@ -39,7 +43,7 @@ var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
 var ZoomExtentsModifier = /** @class */ (function (_super) {
     __extends(ZoomExtentsModifier, _super);
     function ZoomExtentsModifier(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         var _this = _super.call(this, options) || this;
         _this.type = ChartModifierType_1.EChart2DModifierType.ZoomExtents;
         /**
@@ -54,16 +58,26 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
          * Defines the easing function for animation. See {@link TEasingFn} for a range of functions
          */
         _this.easingFunction = EasingFunctions_1.easing.outExpo;
-        _this.isAnimated = (_a = options === null || options === void 0 ? void 0 : options.isAnimated) !== null && _a !== void 0 ? _a : true;
-        _this.animationDuration = (_b = options === null || options === void 0 ? void 0 : options.animationDuration) !== null && _b !== void 0 ? _b : 400;
+        /**
+         * 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.isAnimated = (_a = options === null || options === void 0 ? void 0 : options.isAnimated) !== null && _a !== void 0 ? _a : _this.isAnimated;
+        _this.animationDuration = (_b = options === null || options === void 0 ? void 0 : options.animationDuration) !== null && _b !== void 0 ? _b : _this.animationDuration;
+        _this.applyToSeriesViewRect = (_c = options === null || options === void 0 ? void 0 : options.applyToSeriesViewRect) !== null && _c !== void 0 ? _c : _this.applyToSeriesViewRect;
+        _this.applyToAxes = (_d = options === null || options === void 0 ? void 0 : options.applyToAxes) !== null && _d !== void 0 ? _d : _this.applyToAxes;
         if ((options === null || options === void 0 ? void 0 : options.easingFunction) && typeof options.easingFunction === "string") {
             options.easingFunction = EasingFunctions_1.easing[options.easingFunction];
         }
-        _this.easingFunction = (_c = options === null || options === void 0 ? void 0 : options.easingFunction) !== null && _c !== void 0 ? _c : EasingFunctions_1.easing.outExpo;
+        _this.easingFunction = (_e = options === null || options === void 0 ? void 0 : options.easingFunction) !== null && _e !== void 0 ? _e : EasingFunctions_1.easing.outExpo;
         if (options === null || options === void 0 ? void 0 : options.onZoomExtents) {
             if (typeof options.onZoomExtents === "string") {
                 _this.typeMap.set("onZoomExtents", options.onZoomExtents);
-                options.onZoomExtents = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onZoomExtents);
+                options.onZoomExtents = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.onZoomExtents);
             }
         }
         _this.onZoomExtents = options === null || options === void 0 ? void 0 : options.onZoomExtents;
@@ -73,12 +87,51 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
      * @inheritDoc
      */
     ZoomExtentsModifier.prototype.modifierDoubleClick = function (args) {
+        var _this = this;
         var scs = this.parentSurface;
+        var animationDuration = this.isAnimated ? this.animationDuration : 0;
         if (scs !== undefined) {
-            if (!this.onZoomExtents || this.onZoomExtents(scs)) {
-                var animationDuration = this.isAnimated ? this.animationDuration : 0;
-                scs.zoomExtents(animationDuration, this.easingFunction, function () { return scs.setZoomState(ZoomState_1.EZoomState.AtExtents); });
-                args.handled = true;
+            var zoomPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
+            if (zoomPoint && this.applyToSeriesViewRect) {
+                if (!this.onZoomExtents || this.onZoomExtents(scs)) {
+                    switch (this.xyDirection) {
+                        case XyDirection_1.EXyDirection.XyDirection:
+                            scs.zoomExtents(animationDuration, this.easingFunction, function () {
+                                return scs.setZoomState(ZoomState_1.EZoomState.AtExtents);
+                            });
+                            break;
+                        case XyDirection_1.EXyDirection.XDirection:
+                            scs.zoomExtentsX(animationDuration, this.easingFunction);
+                            break;
+                        case XyDirection_1.EXyDirection.YDirection:
+                            scs.zoomExtentsY(animationDuration, this.easingFunction);
+                            break;
+                    }
+                    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.parentSurface.xAxes.asArray());
+                }
+                if ([XyDirection_1.EXyDirection.YDirection, XyDirection_1.EXyDirection.XyDirection].includes(this.xyDirection)) {
+                    targetAxes.push.apply(targetAxes, this.parentSurface.yAxes.asArray());
+                }
+                var activeAxes = (0, ChartModifierBase2D_1.getActiveAxes)(targetAxes, args.mousePoint);
+                if (activeAxes.length > 0) {
+                    args.handled = true;
+                    activeAxes.forEach(function (axis) {
+                        if (axis.isXAxis) {
+                            var maxXRange = axis.getMaximumRange();
+                            scs.addAnimation(axis.animateVisibleRange(maxXRange, animationDuration, _this.easingFunction));
+                        }
+                        else {
+                            var yRange = axis.getWindowedYRange(undefined);
+                            scs.addAnimation(axis.animateVisibleRange(yRange, animationDuration, _this.easingFunction));
+                        }
+                    });
+                }
             }
         }
     };
@@ -88,6 +141,8 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
             animationDuration: this.animationDuration,
             easingFunction: this.easingFunction.name,
             isAnimated: this.isAnimated,
+            applyToSeriesViewRect: this.applyToSeriesViewRect,
+            applyToAxes: this.applyToAxes,
             onZoomExtents: this.typeMap.get("onZoomExtents")
         };
         Object.assign(json.options, options);

package/Charting/ChartModifiers/ZoomPanModifier.d.ts

@@ -74,6 +74,8 @@ export declare class ZoomPanModifier extends ChartModifierBase2D implements IInc
     getIncludedXAxis(): AxisBase2D[];
     /** @inheritDoc */
     getIncludedYAxis(): AxisBase2D[];
-    private getIncludedAxis;
-    private testHasExcluded;
+    toJSON(): {
+        type: string;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
+    };
 }

package/Charting/ChartModifiers/ZoomPanModifier.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 __());
@@ -17,6 +19,7 @@ exports.ZoomPanModifier = void 0;
 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 AxisBase2D_1 = require("../Visuals/Axis/AxisBase2D");
 var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
@@ -78,7 +81,7 @@ var ZoomPanModifier = /** @class */ (function (_super) {
         if (!this.isAttached) {
             throw new Error("Should not call ZoomPanModifier.modifierMouseDown if not attached");
         }
-        var translatedPoint = translate_1.translateFromCanvasToSeriesViewRect(args.mousePoint, this.parentSurface.seriesViewRect);
+        var translatedPoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(args.mousePoint, this.parentSurface.seriesViewRect);
         if (!translatedPoint) {
             return;
         }
@@ -158,29 +161,30 @@ var ZoomPanModifier = /** @class */ (function (_super) {
     };
     /** @inheritDoc */
     ZoomPanModifier.prototype.getIncludedXAxis = function () {
-        return this.getIncludedAxis(this.parentSurface.xAxes.asArray(), this.includedXAxisMap);
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.xAxes.asArray(), this.includedXAxisMap);
     };
     /** @inheritDoc */
     ZoomPanModifier.prototype.getIncludedYAxis = function () {
-        return this.getIncludedAxis(this.parentSurface.yAxes.asArray(), this.includedYAxisMap);
+        return (0, includedAxis_1.getIncludedAxis)(this.parentSurface.yAxes.asArray(), this.includedYAxisMap);
     };
-    ZoomPanModifier.prototype.getIncludedAxis = function (allAxes, axisMap) {
-        if (axisMap.size === 0) {
-            return allAxes;
-        }
-        if (this.testHasExcluded(axisMap)) {
-            return allAxes.filter(function (axis) { return axisMap.get(axis.id) !== false; });
-        }
-        return allAxes.filter(function (axis) { return axisMap.get(axis.id) === true; });
-    };
-    ZoomPanModifier.prototype.testHasExcluded = function (axisMap) {
-        var hasExcluded = false;
-        axisMap.forEach(function (value) {
-            if (value === false) {
-                hasExcluded = true;
-            }
-        });
-        return hasExcluded;
+    ZoomPanModifier.prototype.toJSON = function () {
+        var json = _super.prototype.toJSON.call(this);
+        var options = {
+            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;
     };
     return ZoomPanModifier;
 }(ChartModifierBase2D_1.ChartModifierBase2D));

package/Charting/Drawing/BaseCache.js

@@ -33,7 +33,7 @@ var BaseCache = /** @class */ (function () {
      * @inheritDoc
      */
     BaseCache.prototype.invalidateCache = function () {
-        this.cachedEntity = Deleter_1.deleteSafe(this.cachedEntity);
+        this.cachedEntity = (0, Deleter_1.deleteSafe)(this.cachedEntity);
     };
     /**
      * @inheritDoc
@@ -45,7 +45,7 @@ var BaseCache = /** @class */ (function () {
      * @inheritDoc
      */
     BaseCache.prototype.delete = function () {
-        this.cachedEntity = Deleter_1.deleteSafe(this.cachedEntity);
+        this.cachedEntity = (0, Deleter_1.deleteSafe)(this.cachedEntity);
         if (this.webAssemblyContext) {
             // remove reference of the current instance to global collection of cached resources
             WebGlRenderContext2D_1.WebGlRenderContext2D.webGlResourcesRefs.delete(this);

package/Charting/Drawing/BrushCache.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 __());
@@ -62,7 +64,7 @@ var BrushCache = /** @class */ (function (_super) {
     };
     BrushCache.prototype.invalidateCache = function () {
         _super.prototype.invalidateCache.call(this);
-        this.canvasTexture = Deleter_1.deleteSafe(this.canvasTexture);
+        this.canvasTexture = (0, Deleter_1.deleteSafe)(this.canvasTexture);
     };
     BrushCache.prototype.reset = function () {
         this.invalidateCache();
@@ -74,7 +76,7 @@ var BrushCache = /** @class */ (function (_super) {
         this.invalidateCache();
     };
     BrushCache.prototype.createSolidBrush = function (htmlColorCode, opacity) {
-        return createSolidBrush_1.createSolidBrush(this.webAssemblyContext, htmlColorCode, opacity);
+        return (0, createSolidBrush_1.createSolidBrush)(this.webAssemblyContext, htmlColorCode, opacity);
     };
     BrushCache.prototype.createGradientBrush = function () {
         var gradientTexture = this.createGradientTexture().getTexture();
@@ -109,10 +111,11 @@ exports.BrushCache = BrushCache;
  * @param BrushCache The object that stores a brush
  * @returns new or existing instance of {@link WebGlPen}}
  */
-exports.getWebGlBrushFromCache = function (cache) {
+var getWebGlBrushFromCache = function (cache) {
     Guard_1.Guard.notNull(cache, "cache");
     return cache.value;
 };
+exports.getWebGlBrushFromCache = getWebGlBrushFromCache;
 // TODO: probably we should consider some approach to be consistent in using one of SCRTBrush or WebGlBrush
 /**
  * Retrieves a native {@link SCRTBrush} Brush from the provided {@link BrushCache} cache object.
@@ -120,10 +123,11 @@ exports.getWebGlBrushFromCache = function (cache) {
  * @param cache The object that stores a brush
  * @returns new or existing instance of {@link SCRTBrush}}
  */
-exports.getScrtBrushFromCache = function (cache) {
-    var webGlBrush = exports.getWebGlBrushFromCache(cache);
+var getScrtBrushFromCache = function (cache) {
+    var webGlBrush = (0, exports.getWebGlBrushFromCache)(cache);
     return webGlBrush === null || webGlBrush === void 0 ? void 0 : webGlBrush.scrtBrush;
 };
+exports.getScrtBrushFromCache = getScrtBrushFromCache;
 /**
  * Creates a native {@link SCRTBrush} brush from html color code string passed in and caches it
  * @param cache The object that will store a brush
@@ -132,11 +136,12 @@ exports.getScrtBrushFromCache = function (cache) {
  * @param fillGradientLinear The gradient params.
  * @returns new or existing instance of {@link SCRTBrush}}
  */
-exports.createBrushInCache = function (cache, fill, opacity, fillGradientLinear) {
+var createBrushInCache = function (cache, fill, opacity, fillGradientLinear) {
     Guard_1.Guard.notNull(cache, "brushCache");
     var brush = cache.create(fill, opacity, fillGradientLinear);
     return brush.scrtBrush;
 };
+exports.createBrushInCache = createBrushInCache;
 /** @ignore */
 var convertRelativeToAbsolute = function (relativeValue, size) {
     return relativeValue * size;

package/Charting/Drawing/PaletteCache.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 __());
@@ -42,7 +44,7 @@ var PaletteCache = /** @class */ (function (_super) {
         if (this.cachedEntity && fillColors === this.fillColors) {
             return this.cachedEntity;
         }
-        Deleter_1.deleteSafe(this.cachedEntity);
+        (0, Deleter_1.deleteSafe)(this.cachedEntity);
         this.fillColors = fillColors;
         // @ts-ignore
         return this.cachedEntity = new this.webAssemblyContext.SCRTCreatePalette(fillColors);

package/Charting/Drawing/Pen2DCache.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 __());
@@ -60,7 +62,7 @@ var Pen2DCache = /** @class */ (function (_super) {
             stroke === this.stroke &&
             adjustedStrokeThickness === this.adjustedStrokeThickness &&
             antiAliased === this.antiAliased &&
-            array_1.areArraysEqual(adjustedStrokeDashArray, this.adjustedStrokeDashArray)) {
+            (0, array_1.areArraysEqual)(adjustedStrokeDashArray, this.adjustedStrokeDashArray)) {
             // optimization for opacity updates
             if (opacity !== this.opacity) {
                 this.opacity = opacity;
@@ -72,7 +74,7 @@ var Pen2DCache = /** @class */ (function (_super) {
             return this.cachedEntity;
         }
         // Create new pen
-        Deleter_1.deleteSafe(this.cachedEntity);
+        (0, Deleter_1.deleteSafe)(this.cachedEntity);
         this.stroke = stroke;
         this.opacity = opacity;
         this.antiAliased = antiAliased;
@@ -80,8 +82,8 @@ var Pen2DCache = /** @class */ (function (_super) {
         this.adjustedStrokeThickness = adjustedStrokeThickness;
         this.strokeDashArray = strokeDashArray;
         this.adjustedStrokeDashArray = adjustedStrokeDashArray;
-        var scrtPen = createPen_1.createSCRTPen(this.webAssemblyContext, stroke, adjustedStrokeThickness, opacity, adjustedStrokeDashArray, antiAliased);
-        return (this.cachedEntity = new WebGlPen_1.WebGlPen(scrtPen, parseColor_1.parseColorToUIntArgb(stroke)));
+        var scrtPen = (0, createPen_1.createSCRTPen)(this.webAssemblyContext, stroke, adjustedStrokeThickness, opacity, adjustedStrokeDashArray, antiAliased);
+        return (this.cachedEntity = new WebGlPen_1.WebGlPen(scrtPen, (0, parseColor_1.parseColorToUIntArgb)(stroke)));
     };
     return Pen2DCache;
 }(BaseCache_1.BaseCache));
@@ -93,19 +95,21 @@ exports.Pen2DCache = Pen2DCache;
  * @param penCache The object that stores a pen
  * @returns the new or existing instance of {@link WebGlPen}}
  */
-exports.getWebGlPenFromCache = function (penCache) {
+var getWebGlPenFromCache = function (penCache) {
     Guard_1.Guard.notNull(penCache, "penCache");
     return penCache.value;
 };
+exports.getWebGlPenFromCache = getWebGlPenFromCache;
 /**
  * Retrieves a native {@link SCRTPen} Pen from the provided {@link Pen2DCache} cache object
  * @param penCache The object that stores a pen
  * @returns the new or existing instance of {@link SCRTPen}}
  */
-exports.getScrtPenFromCache = function (penCache) {
-    var webGlPen = exports.getWebGlPenFromCache(penCache);
+var getScrtPenFromCache = function (penCache) {
+    var webGlPen = (0, exports.getWebGlPenFromCache)(penCache);
     return webGlPen === null || webGlPen === void 0 ? void 0 : webGlPen.scrtPen;
 };
+exports.getScrtPenFromCache = getScrtPenFromCache;
 /**
  * Creates a native {@link SCRTPen} Pen from html color code string passed in and caches it
  * @param penCache The object that will store a pen
@@ -115,7 +119,7 @@ exports.getScrtPenFromCache = function (penCache) {
  * @param strokeDashArray the StrokeDashArray which defines any dash e.g. [2,2] means dash for 2pts, gap for 2pts (or undefined = solid line).
  * @returns the new or existing instance of {@link SCRTPen}}
  */
-exports.createPenInCache = function (penCache, stroke, strokeThickness, opacity, strokeDashArray) {
+var createPenInCache = function (penCache, stroke, strokeThickness, opacity, strokeDashArray) {
     Guard_1.Guard.notNull(penCache, "penCache");
     var cachedPen = penCache.create({
         stroke: stroke,
@@ -125,3 +129,4 @@ exports.createPenInCache = function (penCache, stroke, strokeThickness, opacity,
     });
     return cachedPen.scrtPen;
 };
+exports.createPenInCache = createPenInCache;

package/Charting/Drawing/SolidBrushCache.js

@@ -28,14 +28,14 @@ var SolidBrushCache = /** @class */ (function () {
         }
         this.color = color;
         this.transparent = transparent;
-        this.brush = new this.webAssemblyContext.SCRTSolidBrush(parseColor_1.parseColorToUIntArgb(color), transparent);
+        this.brush = new this.webAssemblyContext.SCRTSolidBrush((0, parseColor_1.parseColorToUIntArgb)(color), transparent);
         return this.brush;
     };
     /**
      * @inheritDoc
      */
     SolidBrushCache.prototype.delete = function () {
-        this.brush = Deleter_1.deleteSafe(this.brush);
+        this.brush = (0, Deleter_1.deleteSafe)(this.brush);
     };
     return SolidBrushCache;
 }());