scichart 2.0.2132 → 2.0.2179

package/Builder/chartBuilder.js

@@ -46,6 +46,7 @@ var buildDataSeries_1 = require("./buildDataSeries");
 var buildModifiers_1 = require("./buildModifiers");
 var buildSeries_1 = require("./buildSeries");
 var buildSurface_1 = require("./buildSurface");
+// import { chartReviver } from "./chartReviver";
 var classFactory_1 = require("./classFactory");
 /**
  * The reviver function needed when parsing definitions to JSON
@@ -71,7 +72,7 @@ exports.chartReviver = chartReviver;
  * @param definition a {@link TSurfaceDefinition } or a string which will be parsed to it.
  * @returns
  */
-exports.buildChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
+var buildChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -83,26 +84,28 @@ exports.buildChart = function (divElementId, definition) { return __awaiter(void
                 }
                 if (!("type" in definition)) return [3 /*break*/, 6];
                 if (!(definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Default2D)) return [3 /*break*/, 2];
-                return [4 /*yield*/, buildSurface_1.build2DChart(divElementId, definition.options)];
+                return [4 /*yield*/, (0, buildSurface_1.build2DChart)(divElementId, definition.options)];
             case 1: return [2 /*return*/, _a.sent()];
             case 2:
                 if (!(definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Pie2D)) return [3 /*break*/, 4];
-                return [4 /*yield*/, buildSurface_1.buildPieChart(divElementId, definition.options)];
+                return [4 /*yield*/, (0, buildSurface_1.buildPieChart)(divElementId, definition.options)];
             case 3: return [2 /*return*/, _a.sent()];
             case 4: 
             // @ts-ignore
-            throw new Error("Surface type: " + definition.type + " is not yet supported by the builder api");
+            throw new Error("Surface type: ".concat(definition.type, " is not yet supported by the builder api"));
             case 5: return [3 /*break*/, 8];
-            case 6: return [4 /*yield*/, buildSurface_1.build2DChart(divElementId, definition)];
+            case 6: return [4 /*yield*/, (0, buildSurface_1.build2DChart)(divElementId, definition)];
             case 7: return [2 /*return*/, _a.sent()];
             case 8: return [2 /*return*/];
         }
     });
 }); };
+exports.buildChart = buildChart;
 /**
  * This is just something to call to ensure that all the registrations are run before a surface is created
  */
-exports.ensureRegistrations = function () { };
+var ensureRegistrations = function () { };
+exports.ensureRegistrations = ensureRegistrations;
 exports.chartBuilder = {
     /** @inheritdoc */
     buildChart: exports.buildChart,

package/Builder/classFactory.js

@@ -11,7 +11,7 @@ var constructorMap = new Map();
  * @param constructor A function that takes an optional options argument and returns an instance of the desired type.
  * @param overWrite Whether to override an existing registration for the type.  Default false.
  */
-exports.registerType = function (baseType, type, constructor, overWrite) {
+var registerType = function (baseType, type, constructor, overWrite) {
     if (overWrite === void 0) { overWrite = false; }
     var typeName = baseType + ":" + type;
     if (constructorMap.has(typeName) && !overWrite) {
@@ -19,6 +19,7 @@ exports.registerType = function (baseType, type, constructor, overWrite) {
     }
     constructorMap.set(typeName, { func: constructor });
 };
+exports.registerType = registerType;
 /**
  * Register a function that requires a webAssemblyContext to return an object of the specified type.
  * @param baseType The {@link EBaseType} of the object that is being registered.
@@ -28,7 +29,7 @@ exports.registerType = function (baseType, type, constructor, overWrite) {
  * and an optional options argument and returns an instance of the desired type.
  * @param overWrite Whether to override an existing registration for the type.  Default false.
  */
-exports.registerWasmType = function (baseType, type, constructor, overWrite) {
+var registerWasmType = function (baseType, type, constructor, overWrite) {
     if (overWrite === void 0) { overWrite = false; }
     var typeName = baseType + ":" + type;
     if (constructorMap.has(typeName) && !overWrite) {
@@ -36,6 +37,7 @@ exports.registerWasmType = function (baseType, type, constructor, overWrite) {
     }
     constructorMap.set(typeName, { wasm: true, func: constructor });
 };
+exports.registerWasmType = registerWasmType;
 /**
  * Register a pure function
  * @param baseType The base type for, which indicates where the function will be used, Either OptionFunction or OnCreated
@@ -43,7 +45,7 @@ exports.registerWasmType = function (baseType, type, constructor, overWrite) {
  * @param constructor the function to register
  * @param overWrite Whether to override an existing registration for the type name.  Default false.
  */
-exports.registerFunction = function (baseType, type, constructor, overWrite) {
+var registerFunction = function (baseType, type, constructor, overWrite) {
     if (overWrite === void 0) { overWrite = false; }
     var typeName = baseType + ":" + type;
     if (constructorMap.has(typeName) && !overWrite) {
@@ -51,7 +53,8 @@ exports.registerFunction = function (baseType, type, constructor, overWrite) {
     }
     constructorMap.set(typeName, { func: constructor });
 };
-exports.getFunction = function (baseType, type) {
+exports.registerFunction = registerFunction;
+var getFunction = function (baseType, type) {
     var typeName = baseType + ":" + type;
     var elem = constructorMap.get(typeName);
     if (elem) {
@@ -61,7 +64,8 @@ exports.getFunction = function (baseType, type) {
         throw new Error("Nothing registered for " + typeName);
     }
 };
-exports.createType = function (baseType, type, wasmContext, options) {
+exports.getFunction = getFunction;
+var createType = function (baseType, type, wasmContext, options) {
     var typeName = baseType + ":" + type;
     var elem = constructorMap.get(typeName);
     if (elem) {
@@ -77,10 +81,12 @@ exports.createType = function (baseType, type, wasmContext, options) {
         throw new Error("Nothing registered for " + typeName);
     }
 };
-exports.getSubTypes = function (baseType) {
+exports.createType = createType;
+var getSubTypes = function (baseType) {
     var keys = Array.from(constructorMap.keys());
     return keys
         .map(function (k) { return k.split(":"); })
         .filter(function (a) { return a[0] === baseType; })
         .map(function (a) { return a[1]; });
 };
+exports.getSubTypes = getSubTypes;

package/Charting/ChartModifiers/ChartModifierBase.js

@@ -20,7 +20,7 @@ var ChartModifierBase = /** @class */ (function () {
         var _a;
         this.isEnabledProperty = true;
         this.executeOnProperty = ExecuteOn_1.EExecuteOn.MouseLeftButton;
-        this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : guid_1.generateGuid();
+        this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : (0, guid_1.generateGuid)();
     }
     /** @inheritDoc */
     ChartModifierBase.prototype.applyTheme = function (themeProvider) {

package/Charting/ChartModifiers/ChartModifierBase2D.d.ts

@@ -76,7 +76,7 @@ export declare abstract class ChartModifierBase2D extends ChartModifierBase<SciC
     getAllSeries(): IRenderableSeries[];
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     protected testPropertyChanged(propertyName: string): boolean;
     protected notifyPropertyChanged(propertyName: string): void;

package/Charting/ChartModifiers/ChartModifierBase2D.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 __());
@@ -138,33 +140,36 @@ var ChartModifierBase2D = /** @class */ (function (_super) {
     return ChartModifierBase2D;
 }(ChartModifierBase_1.ChartModifierBase));
 exports.ChartModifierBase2D = ChartModifierBase2D;
-exports.testIsOverAxes = function (xAxisArr, mousePoint) {
+var testIsOverAxes = function (xAxisArr, mousePoint) {
     var result = false;
     xAxisArr.forEach(function (x) {
         if (x.viewRect) {
             var _a = x.viewRect, left = _a.left, right = _a.right, top_1 = _a.top, bottom = _a.bottom;
-            if (pointUtil_1.testIsInBounds(mousePoint.x, mousePoint.y, left, bottom, right, top_1)) {
+            if ((0, pointUtil_1.testIsInBounds)(mousePoint.x, mousePoint.y, left, bottom, right, top_1)) {
                 result = true;
             }
         }
     });
     return result;
 };
-exports.getActiveAxes = function (xAxisArr, mousePoint) {
+exports.testIsOverAxes = testIsOverAxes;
+var getActiveAxes = function (xAxisArr, mousePoint) {
     var result = [];
     xAxisArr.forEach(function (x) {
         if (x.viewRect) {
             var _a = x.viewRect, left = _a.left, right = _a.right, top_2 = _a.top, bottom = _a.bottom;
-            if (pointUtil_1.testIsInBounds(mousePoint.x, mousePoint.y, left, bottom, right, top_2)) {
+            if ((0, pointUtil_1.testIsInBounds)(mousePoint.x, mousePoint.y, left, bottom, right, top_2)) {
                 result.push(x);
             }
         }
     });
     return result;
 };
-exports.scaleAxes = function (axes, initialVisibleRanges, delta, isMoreThanHalf) {
+exports.getActiveAxes = getActiveAxes;
+var scaleAxes = function (axes, initialVisibleRanges, delta, isMoreThanHalf) {
     axes.forEach(function (currentAxis, index) {
         var initialRange = initialVisibleRanges[index];
         currentAxis.scale(initialRange, delta, isMoreThanHalf);
     });
 };
+exports.scaleAxes = scaleAxes;

package/Charting/ChartModifiers/CursorModifier.d.ts

@@ -163,7 +163,7 @@ export declare class CursorModifier extends ChartModifierBase2D implements IIncl
     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 getSeriesInfos;

package/Charting/ChartModifiers/CursorModifier.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 __());
@@ -97,7 +99,7 @@ var CursorModifier = /** @class */ (function (_super) {
             if (typeof options.tooltipSvgTemplate === "string") {
                 _this.typeMap.set("tooltipSvgTemplate", options.tooltipSvgTemplate);
                 // @ts-ignore
-                options.tooltipSvgTemplate = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.tooltipSvgTemplate);
+                options.tooltipSvgTemplate = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipSvgTemplate);
             }
         }
         _this.tooltipSvgTemplate = (_a = options === null || options === void 0 ? void 0 : options.tooltipSvgTemplate) !== null && _a !== void 0 ? _a : _this.tooltipSvgTemplate;
@@ -114,20 +116,22 @@ var CursorModifier = /** @class */ (function (_super) {
             if (typeof options.tooltipLegendTemplate === "string") {
                 _this.typeMap.set("tooltipLegendTemplate", options.tooltipLegendTemplate);
                 // @ts-ignore
-                options.tooltipLegendTemplate = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.tooltipLegendTemplate);
+                options.tooltipLegendTemplate = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipLegendTemplate);
             }
         }
-        _this.tooltipLegendTemplate = (_l = options === null || options === void 0 ? void 0 : options.tooltipLegendTemplate) !== null && _l !== void 0 ? _l : _this.tooltipLegendTemplate;
+        _this.tooltipLegendTemplate =
+            (_l = options === null || options === void 0 ? void 0 : options.tooltipLegendTemplate) !== null && _l !== void 0 ? _l : _this.tooltipLegendTemplate;
         _this.tooltipLegendOffsetX = (_m = options === null || options === void 0 ? void 0 : options.tooltipLegendOffsetX) !== null && _m !== void 0 ? _m : _this.tooltipLegendOffsetX;
         _this.tooltipLegendOffsetY = (_o = options === null || options === void 0 ? void 0 : options.tooltipLegendOffsetY) !== null && _o !== void 0 ? _o : _this.tooltipLegendOffsetY;
         if (options === null || options === void 0 ? void 0 : options.tooltipDataTemplate) {
             if (typeof options.tooltipDataTemplate === "string") {
                 _this.typeMap.set("tooltipDataTemplate", options.tooltipDataTemplate);
                 // @ts-ignore
-                options.tooltipDataTemplate = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.tooltipDataTemplate);
+                options.tooltipDataTemplate = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipDataTemplate);
             }
         }
-        _this.tooltipDataTemplateProperty = (_p = options === null || options === void 0 ? void 0 : options.tooltipDataTemplate) !== null && _p !== void 0 ? _p : _this.tooltipDataTemplateProperty;
+        _this.tooltipDataTemplateProperty =
+            (_p = options === null || options === void 0 ? void 0 : options.tooltipDataTemplate) !== null && _p !== void 0 ? _p : _this.tooltipDataTemplateProperty;
         return _this;
     }
     /**
@@ -195,7 +199,7 @@ var CursorModifier = /** @class */ (function (_super) {
             this.mousePosition = MousePosition_1.EMousePosition.OutOfCanvas;
         }
         else {
-            translatedMousePoint = translate_1.translateFromCanvasToSeriesViewRect(this.mousePoint, this.parentSurface.seriesViewRect);
+            translatedMousePoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(this.mousePoint, this.parentSurface.seriesViewRect);
             if (!translatedMousePoint) {
                 this.mousePosition = MousePosition_1.EMousePosition.AxisArea;
             }
@@ -343,15 +347,15 @@ var CursorModifier = /** @class */ (function (_super) {
             this.tooltipAnnotation.isHidden = true;
             return;
         }
-        var translatedMousePoint = translate_1.translateFromCanvasToSeriesViewRect(this.mousePoint, this.parentSurface.seriesViewRect);
+        var translatedMousePoint = (0, translate_1.translateFromCanvasToSeriesViewRect)(this.mousePoint, this.parentSurface.seriesViewRect);
         this.xLineAnnotation.isHidden = false;
         this.yLineAnnotation.isHidden = false;
         if (this.showTooltip) {
             this.tooltipAnnotation.isHidden = false;
         }
         if (translatedMousePoint) {
-            var x = translate_1.translateToNotScaled(translatedMousePoint.x);
-            var y = translate_1.translateToNotScaled(translatedMousePoint.y);
+            var x = (0, translate_1.translateToNotScaled)(translatedMousePoint.x);
+            var y = (0, translate_1.translateToNotScaled)(translatedMousePoint.y);
             this.xLineAnnotation.y1 = 0;
             this.yLineAnnotation.x1 = 0;
             if (this.isVerticalChart()) {
@@ -425,35 +429,35 @@ var defaultTooltipDataTemplate = function (seriesInfos, tooltipTitle) {
                 valuesWithLabels.push(si.seriesName);
             }
             else if (seriesInfos.length > 1) {
-                valuesWithLabels.push("Series #" + (index + 1));
+                valuesWithLabels.push("Series #".concat(index + 1));
             }
             if (si.dataSeriesType === IDataSeries_1.EDataSeriesType.Ohlc) {
                 var ohlcSeriesInfo = si;
-                valuesWithLabels.push("X: " + ohlcSeriesInfo.formattedXValue);
-                valuesWithLabels.push("Open: " + ohlcSeriesInfo.formattedOpenValue);
-                valuesWithLabels.push("Highest: " + ohlcSeriesInfo.formattedHighValue);
-                valuesWithLabels.push("Lowest: " + ohlcSeriesInfo.formattedLowValue);
-                valuesWithLabels.push("Close: " + ohlcSeriesInfo.formattedCloseValue);
+                valuesWithLabels.push("X: ".concat(ohlcSeriesInfo.formattedXValue));
+                valuesWithLabels.push("Open: ".concat(ohlcSeriesInfo.formattedOpenValue));
+                valuesWithLabels.push("Highest: ".concat(ohlcSeriesInfo.formattedHighValue));
+                valuesWithLabels.push("Lowest: ".concat(ohlcSeriesInfo.formattedLowValue));
+                valuesWithLabels.push("Close: ".concat(ohlcSeriesInfo.formattedCloseValue));
             }
             else if (si.dataSeriesType === IDataSeries_1.EDataSeriesType.Xyy) {
                 // Band Series
                 var xyySeriesInfo = si;
-                valuesWithLabels.push("X: " + xyySeriesInfo.formattedXValue);
-                valuesWithLabels.push("Y: " + xyySeriesInfo.formattedYValue);
-                valuesWithLabels.push("Y1: " + xyySeriesInfo.formattedY1Value);
+                valuesWithLabels.push("X: ".concat(xyySeriesInfo.formattedXValue));
+                valuesWithLabels.push("Y: ".concat(xyySeriesInfo.formattedYValue));
+                valuesWithLabels.push("Y1: ".concat(xyySeriesInfo.formattedY1Value));
             }
             else if (si.dataSeriesType === IDataSeries_1.EDataSeriesType.HeatmapUniform) {
                 // Heatmap Series
                 var heatmapSeriesInfo = si;
-                valuesWithLabels.push("X: " + heatmapSeriesInfo.formattedXValue);
-                valuesWithLabels.push("Y: " + heatmapSeriesInfo.formattedYValue);
+                valuesWithLabels.push("X: ".concat(heatmapSeriesInfo.formattedXValue));
+                valuesWithLabels.push("Y: ".concat(heatmapSeriesInfo.formattedYValue));
                 if (heatmapSeriesInfo.zValue !== null && heatmapSeriesInfo.zValue !== undefined) {
-                    valuesWithLabels.push("Z: " + heatmapSeriesInfo.formattedZValue);
+                    valuesWithLabels.push("Z: ".concat(heatmapSeriesInfo.formattedZValue));
                 }
             }
             else {
                 var xySeriesInfo = si;
-                valuesWithLabels.push("X: " + xySeriesInfo.formattedXValue + " Y: " + xySeriesInfo.formattedYValue);
+                valuesWithLabels.push("X: ".concat(xySeriesInfo.formattedXValue, " Y: ").concat(xySeriesInfo.formattedYValue));
             }
         }
     });
@@ -462,7 +466,7 @@ var defaultTooltipDataTemplate = function (seriesInfos, tooltipTitle) {
 /** @ignore */
 var defaultTooltipTemplate = function (seriesInfos, svgAnnotation) {
     var _a;
-    var id = "id_" + Date.now();
+    var id = "id_".concat(Date.now());
     var tooltipDataTemplate = (_a = svgAnnotation.cursorModifier.tooltipDataTemplate) !== null && _a !== void 0 ? _a : defaultTooltipDataTemplate;
     var valuesWithLabels = tooltipDataTemplate(seriesInfos, svgAnnotation.title);
     if (valuesWithLabels.length === 0) {
@@ -476,17 +480,17 @@ var defaultTooltipTemplate = function (seriesInfos, svgAnnotation) {
     var seriesViewRect = svgAnnotation.parentSurface.seriesViewRect;
     var xCoord = svgAnnotation.x1;
     var yCoord = svgAnnotation.y1;
-    var xCoordShift = translate_1.translateToNotScaled(seriesViewRect.width) - xCoord < width ? -width : 5;
-    var yCoordShift = translate_1.translateToNotScaled(seriesViewRect.height) - yCoord < height ? -height : 5;
+    var xCoordShift = (0, translate_1.translateToNotScaled)(seriesViewRect.width) - xCoord < width ? -width : 5;
+    var yCoordShift = (0, translate_1.translateToNotScaled)(seriesViewRect.height) - yCoord < height ? -height : 5;
     svgAnnotation.xCoordShift = xCoordShift;
     svgAnnotation.yCoordShift = yCoordShift;
     var valuesBlock = "";
     valuesWithLabels.forEach(function (val, index) {
-        valuesBlock += "<tspan x=\"8\" dy=\"1.2em\">" + val + "</tspan>";
+        valuesBlock += "<tspan x=\"8\" dy=\"1.2em\">".concat(val, "</tspan>");
     });
     var tooltipFill = svgAnnotation.containerBackground;
     var tooltipStroke = svgAnnotation.textStroke;
-    return "<svg class=\"scichart__cursor-tooltip\" width=\"" + width + "\" height=\"" + height + "\">\n        <defs>\n            <filter id=\"" + id + "\" x=\"0\" y=\"0\" width=\"200%\" height=\"200%\">\n                <feOffset result=\"offOut\" in=\"SourceAlpha\" dx=\"3\" dy=\"3\" />\n                <feGaussianBlur result=\"blurOut\" in=\"offOut\" stdDeviation=\"3\" />\n                <feBlend in=\"SourceGraphic\" in2=\"blurOut\" mode=\"normal\" />\n            </filter>\n        </defs>\n        <rect rx=\"4\" ry=\"4\" width=\"95%\" height=\"90%\" fill=\"" + tooltipFill + "\" filter=\"url(#" + id + ")\" />\n        <svg width=\"100%\">\n            <text x=\"8\" y=\"3\" font-size=\"13\" font-family=\"Verdana\" dy=\"0\" fill=\"" + tooltipStroke + "\">" + valuesBlock + "</text>\n        </svg>\n    </svg>";
+    return "<svg class=\"scichart__cursor-tooltip\" width=\"".concat(width, "\" height=\"").concat(height, "\">\n        <defs>\n            <filter id=\"").concat(id, "\" x=\"0\" y=\"0\" width=\"200%\" height=\"200%\">\n                <feOffset result=\"offOut\" in=\"SourceAlpha\" dx=\"3\" dy=\"3\" />\n                <feGaussianBlur result=\"blurOut\" in=\"offOut\" stdDeviation=\"3\" />\n                <feBlend in=\"SourceGraphic\" in2=\"blurOut\" mode=\"normal\" />\n            </filter>\n        </defs>\n        <rect rx=\"4\" ry=\"4\" width=\"95%\" height=\"90%\" fill=\"").concat(tooltipFill, "\" filter=\"url(#").concat(id, ")\" />\n        <svg width=\"100%\">\n            <text x=\"8\" y=\"3\" font-size=\"13\" font-family=\"Verdana\" dy=\"0\" fill=\"").concat(tooltipStroke, "\">").concat(valuesBlock, "</text>\n        </svg>\n    </svg>");
 };
 /** @ignore */
 var calcTooltipWidth = function (textLength, fontSize) {

package/Charting/ChartModifiers/DataPointSelectionModifier.d.ts

@@ -199,7 +199,7 @@ export declare class DataPointSelectionModifier extends ChartModifierBase2D impl
     getSelectionMode(modifierKeys: TModifierKeys, isAreaSelection: boolean): ESelectionMode;
     toJSON(): {
         type: string;
-        options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
+        options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
     /**
      * Selects all points inside the {@link Rect}, according to the {@link ESelectionMode} passed in

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 __());
@@ -84,6 +86,7 @@ var LegendModifier = /** @class */ (function (_super) {
     /** @inheritDoc */
     LegendModifier.prototype.onDetach = function () {
         _super.prototype.onDetach.call(this);
+        this.sciChartLegend.delete();
         this.sciChartLegend.setRootDiv(undefined);
         this.sciChartLegend.setRenderableSeriesArray([]);
         this.sciChartLegend.setInvalidateParentSurface(undefined);

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