scichart 3.2.464 → 3.2.476

package/Builder/buildDataSeries.d.ts

@@ -7,7 +7,7 @@ import { IXyScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyScaleOf
 import { IXyyScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyyScaleOffsetFilter";
 import { IXyzScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyzScaleOffsetFilter";
 import { IHlcDataSeriesOptions } from "../Charting/Model/HlcDataSeries";
-import { IDataSeries } from "../Charting/Model/IDataSeries";
+import { EDataSeriesType, IDataSeries } from "../Charting/Model/IDataSeries";
 import { INonUniformHeatmapSeriesOptions } from "../Charting/Model/NonUniformHeatmapDataSeries";
 import { IOhlcDataSeriesOptions } from "../Charting/Model/OhlcDataSeries";
 import { IUniformHeatmapSeriesOptions } from "../Charting/Model/UniformHeatmapDataSeries";
@@ -17,7 +17,6 @@ import { IXyyDataSeriesOptions } from "../Charting/Model/XyyDataSeries";
 import { IXyzDataSeriesOptions } from "../Charting/Model/XyzDataSeries";
 import { EDataFilterType } from "../types/DataFilterType";
 import { TSciChart } from "../types/TSciChart";
-import { TSeriesDefinition } from "./buildSeries";
 /**
  * Shared data that can be used in {@link ISciChart2DDefinition}
  * or directly in {@link chartBuilder.buildSeries} or {@link chartBuilder.buildDataSeries}
@@ -135,12 +134,17 @@ export declare type TXyTextSeriesData = {
 };
 /** Definition of series data, which can take various shapes */
 export declare type TSeriesDataDefinition = TXySeriesData | TXyySeriesData | TXyzSeriesData | THlcSeriesData | TOhlcSeriesData | TXyTextSeriesData | IUniformHeatmapSeriesOptions | INonUniformHeatmapSeriesOptions;
+export declare type TDataSeriesDefinition = {
+    type: EDataSeriesType;
+    options: TSeriesDataDefinition;
+};
 /**
  * Build a data series from a definition that can be pure data.
  * @param wasmContext A {@link TSciChart | SciChart 2D WebAssembly Context} or {@link TSciChart | SciChart 3D WebAssembly Context}
  * @param definition A {@link TSeriesDefinition}
  * @param sharedData Optional {@link TSharedDataDefinition} to define shared data which can be referenced by the data series
+ * @param originalDataSeries Optional {@Link IDataSeries} to define original data for filter
  * @returns An {@link IDataSeries}
  */
-export declare const buildDataSeries: (wasmContext: TSciChart, seriesDefinition: TSeriesDefinition, sharedData?: TSharedDataDefinition) => IDataSeries;
+export declare const buildDataSeries: (wasmContext: TSciChart, dataSeriesDefinition: TDataSeriesDefinition, sharedData?: TSharedDataDefinition, originalDataSeries?: IDataSeries) => IDataSeries;
 export {};

package/Builder/buildDataSeries.js

@@ -21,6 +21,7 @@ var XyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyScaleOffsetFilt
 var XyyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyyScaleOffsetFilter");
 var XyzScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyzScaleOffsetFilter");
 var HlcDataSeries_1 = require("../Charting/Model/HlcDataSeries");
+var IDataSeries_1 = require("../Charting/Model/IDataSeries");
 var NonUniformHeatmapDataSeries_1 = require("../Charting/Model/NonUniformHeatmapDataSeries");
 var OhlcDataSeries_1 = require("../Charting/Model/OhlcDataSeries");
 var UniformHeatmapDataSeries_1 = require("../Charting/Model/UniformHeatmapDataSeries");
@@ -29,133 +30,33 @@ var XyTextDataSeries_1 = require("../Charting/Model/XyTextDataSeries");
 var XyyDataSeries_1 = require("../Charting/Model/XyyDataSeries");
 var XyzDataSeries_1 = require("../Charting/Model/XyzDataSeries");
 var DataFilterType_1 = require("../types/DataFilterType");
-var SeriesType_1 = require("../types/SeriesType");
 var chartBuilder_1 = require("./chartBuilder");
-function hasOwnProperty(obj, prop) {
-    return obj.hasOwnProperty(prop);
-}
 /**
  * Build a data series from a definition that can be pure data.
  * @param wasmContext A {@link TSciChart | SciChart 2D WebAssembly Context} or {@link TSciChart | SciChart 3D WebAssembly Context}
  * @param definition A {@link TSeriesDefinition}
  * @param sharedData Optional {@link TSharedDataDefinition} to define shared data which can be referenced by the data series
+ * @param originalDataSeries Optional {@Link IDataSeries} to define original data for filter
  * @returns An {@link IDataSeries}
  */
-var buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
-    if (typeof seriesDefinition === "string") {
-        seriesDefinition = JSON.parse(seriesDefinition, chartBuilder_1.chartReviver);
+var buildDataSeries = function (wasmContext, dataSeriesDefinition, sharedData, originalDataSeries) {
+    if (!dataSeriesDefinition) {
+        return undefined;
+    }
+    if (typeof dataSeriesDefinition === "string") {
+        dataSeriesDefinition = JSON.parse(dataSeriesDefinition, chartBuilder_1.chartReviver);
     }
     if (typeof sharedData === "string") {
         sharedData = JSON.parse(sharedData, chartBuilder_1.chartReviver);
     }
     var dataSeries;
     var filterDef;
-    if (hasOwnProperty(seriesDefinition, "xyData")) {
-        var data = seriesDefinition.xyData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var yValues = sharedData[data.yDataId];
-            dataSeries = new XyDataSeries_1.XyDataSeries(wasmContext, __assign({ xValues: xValues, yValues: yValues }, data));
-        }
-        else {
-            dataSeries = new XyDataSeries_1.XyDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "xyyData")) {
-        var data = seriesDefinition.xyyData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var yValues = sharedData[data.yDataId];
-            var y1Values = sharedData[data.y1DataId];
-            dataSeries = new XyyDataSeries_1.XyyDataSeries(wasmContext, __assign({ xValues: xValues, yValues: yValues, y1Values: y1Values }, data));
-        }
-        else {
-            dataSeries = new XyyDataSeries_1.XyyDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "xyzData")) {
-        var data = seriesDefinition.xyzData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var yValues = sharedData[data.yDataId];
-            var zValues = sharedData[data.zDataId];
-            dataSeries = new XyzDataSeries_1.XyzDataSeries(wasmContext, __assign({ xValues: xValues, yValues: yValues, zValues: zValues }, data));
-        }
-        else {
-            dataSeries = new XyzDataSeries_1.XyzDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "xyTextData")) {
-        var data = seriesDefinition.xyTextData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var yValues = sharedData[data.yDataId];
-            dataSeries = new XyTextDataSeries_1.XyTextDataSeries(wasmContext, __assign({ xValues: xValues, yValues: yValues }, data));
-        }
-        else {
-            dataSeries = new XyTextDataSeries_1.XyTextDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "hlcData")) {
-        var data = seriesDefinition.hlcData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var highValues = sharedData[data.highDataId];
-            var lowValues = sharedData[data.lowDataId];
-            var yValues = sharedData[data.closeDataId];
-            dataSeries = new HlcDataSeries_1.HlcDataSeries(wasmContext, __assign({ xValues: xValues, highValues: highValues, lowValues: lowValues, yValues: yValues }, data));
-        }
-        else {
-            dataSeries = new HlcDataSeries_1.HlcDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "ohlcData")) {
-        var data = seriesDefinition.ohlcData;
-        if (sharedData && data.xDataId) {
-            var xValues = sharedData[data.xDataId];
-            var openValues = sharedData[data.openDataId];
-            var highValues = sharedData[data.highDataId];
-            var lowValues = sharedData[data.lowDataId];
-            var closeValues = sharedData[data.closeDataId];
-            dataSeries = new OhlcDataSeries_1.OhlcDataSeries(wasmContext, __assign({ xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues }, data));
-        }
-        else {
-            dataSeries = new OhlcDataSeries_1.OhlcDataSeries(wasmContext, data);
-        }
-        if (hasOwnProperty(data, "filter")) {
-            filterDef = data.filter;
-        }
-    }
-    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
-        (seriesDefinition.type === SeriesType_1.ESeriesType.UniformHeatmapSeries ||
-            seriesDefinition.type === SeriesType_1.ESeriesType.UniformContoursSeries)) {
-        dataSeries = new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(wasmContext, seriesDefinition.heatmapData);
-    }
-    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
-        seriesDefinition.type === SeriesType_1.ESeriesType.NonUniformHeatmapSeries) {
-        dataSeries = new NonUniformHeatmapDataSeries_1.NonUniformHeatmapDataSeries(wasmContext, seriesDefinition.heatmapData);
-    }
-    if (filterDef) {
-        if ("dataSeries" in seriesDefinition.options) {
-            dataSeries = seriesDefinition.options.dataSeries;
-        }
+    dataSeries = createDataSeries(wasmContext, dataSeriesDefinition, sharedData);
+    if (filterDef &&
+        dataSeriesDefinition.type !== IDataSeries_1.EDataSeriesType.HeatmapUniform &&
+        dataSeriesDefinition.type !== IDataSeries_1.EDataSeriesType.HeatmapNonUniform) {
         if (dataSeries) {
-            var filter = buildFilter(dataSeries, filterDef);
+            var filter = buildFilter((originalDataSeries !== null && originalDataSeries !== void 0 ? originalDataSeries : dataSeries), filterDef);
             if (filter) {
                 dataSeries = filter;
             }
@@ -201,3 +102,77 @@ var buildFilter = function (dataSeries, definition) {
         return undefined;
     }
 };
+var createDataSeries = function (wasmContext, dataSeriesDefinition, sharedData) {
+    var rawOptions = __assign({}, dataSeriesDefinition.options);
+    switch (dataSeriesDefinition.type) {
+        case IDataSeries_1.EDataSeriesType.Xy: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.yValues = sharedData[data.yDataId];
+            }
+            return new XyDataSeries_1.XyDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.Xyy: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.yValues = sharedData[data.yDataId];
+                data.y1Values = sharedData[data.y1DataId];
+            }
+            return new XyyDataSeries_1.XyyDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.Xyz: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.yValues = sharedData[data.yDataId];
+                data.zValues = sharedData[data.zDataId];
+            }
+            return new XyzDataSeries_1.XyzDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.XyText: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.yValues = sharedData[data.yDataId];
+            }
+            return new XyTextDataSeries_1.XyTextDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.Hlc: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.highValues = sharedData[data.highDataId];
+                data.lowValues = sharedData[data.lowDataId];
+                data.yValues = sharedData[data.closeDataId];
+            }
+            return new HlcDataSeries_1.HlcDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.Ohlc: {
+            var data = rawOptions;
+            if (sharedData && data.xDataId) {
+                data.xValues = sharedData[data.xDataId];
+                data.openValues = sharedData[data.openDataId];
+                data.highValues = sharedData[data.highDataId];
+                data.lowValues = sharedData[data.lowDataId];
+                data.closeValues = sharedData[data.closeDataId];
+            }
+            return new OhlcDataSeries_1.OhlcDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.HeatmapUniform: {
+            var data = rawOptions;
+            return new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(wasmContext, data);
+        }
+        case IDataSeries_1.EDataSeriesType.HeatmapNonUniform: {
+            var data = rawOptions;
+            return new NonUniformHeatmapDataSeries_1.NonUniformHeatmapDataSeries(wasmContext, data);
+        }
+        default: {
+            var handleInvalidDataSeriesType = function (type) {
+                throw new Error("Invalid Data Series Type value: \"".concat(type, "\"!"));
+            };
+            return handleInvalidDataSeriesType(dataSeriesDefinition.type);
+        }
+    }
+};

package/Builder/buildSeries.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSeries = void 0;
 var DataPointSelectionPaletteProvider_1 = require("../Charting/Model/DataPointSelectionPaletteProvider");
+var IDataSeries_1 = require("../Charting/Model/IDataSeries");
 var IPointMetadata_1 = require("../Charting/Model/IPointMetadata");
 var PaletteFactory_1 = require("../Charting/Model/PaletteFactory");
 var CrossPointMarker_1 = require("../Charting/Visuals/PointMarkers/CrossPointMarker");
@@ -83,6 +84,41 @@ var classFactory_1 = require("./classFactory");
 // Default palette provider is not required as it is created automatically if none is provided.
 (0, classFactory_1.registerWasmType)(BaseType_1.EBaseType.PaletteProvider, PaletteProviderType_1.EPaletteProviderType.Gradient, function (wasmContext, gradientBrush) { return PaletteFactory_1.PaletteFactory.createGradient(wasmContext, gradientBrush); }, true);
 (0, classFactory_1.registerType)(BaseType_1.EBaseType.PaletteProvider, PaletteProviderType_1.EPaletteProviderType.DataPointSelection, function (selectedStyle) { return new DataPointSelectionPaletteProvider_1.DataPointSelectionPaletteProvider(selectedStyle); }, true);
+function hasOwnProperty(obj, prop) {
+    return obj.hasOwnProperty(prop);
+}
+var getDataSeriesDefinition = function (seriesDefinition) {
+    if (hasOwnProperty(seriesDefinition, "xyData")) {
+        return { type: IDataSeries_1.EDataSeriesType.Xy, options: seriesDefinition.xyData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "xyyData")) {
+        return { type: IDataSeries_1.EDataSeriesType.Xyy, options: seriesDefinition.xyyData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "xyzData")) {
+        return { type: IDataSeries_1.EDataSeriesType.Xyz, options: seriesDefinition.xyzData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "xyTextData")) {
+        return { type: IDataSeries_1.EDataSeriesType.XyText, options: seriesDefinition.xyTextData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "hlcData")) {
+        return { type: IDataSeries_1.EDataSeriesType.Hlc, options: seriesDefinition.hlcData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "ohlcData")) {
+        return { type: IDataSeries_1.EDataSeriesType.Ohlc, options: seriesDefinition.ohlcData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
+        (seriesDefinition.type === SeriesType_1.ESeriesType.UniformHeatmapSeries ||
+            seriesDefinition.type === SeriesType_1.ESeriesType.UniformContoursSeries)) {
+        return { type: IDataSeries_1.EDataSeriesType.HeatmapUniform, options: seriesDefinition.heatmapData };
+    }
+    else if (hasOwnProperty(seriesDefinition, "heatmapData") &&
+        seriesDefinition.type === SeriesType_1.ESeriesType.NonUniformHeatmapSeries) {
+        return { type: IDataSeries_1.EDataSeriesType.HeatmapNonUniform, options: seriesDefinition.heatmapData };
+    }
+    else {
+        return undefined;
+    }
+};
 /**
  * Build one or more renderable series from a definition that can be pure data.
  * @param wasmContext A {@link TSciChart | SciChart 2D WebAssembly Context} or {@link TSciChart | SciChart 3D WebAssembly Context}
@@ -172,7 +208,7 @@ var buildSeries = function (wasmContext, definition, sharedData) {
             series = col;
         }
         if (series) {
-            var dataSeries = (0, buildDataSeries_1.buildDataSeries)(wasmContext, seriesDef, sharedData);
+            var dataSeries = getDataSeriesFromRenderableSeriesDefinition(wasmContext, seriesDef, sharedData);
             if (dataSeries) {
                 series.dataSeries = dataSeries;
             }
@@ -184,3 +220,18 @@ var buildSeries = function (wasmContext, definition, sharedData) {
     return result;
 };
 exports.buildSeries = buildSeries;
+var getDataSeriesFromRenderableSeriesDefinition = function (wasmContext, renderableSeriesDefinition, sharedData) {
+    var dataSeriesDefinition = getDataSeriesDefinition(renderableSeriesDefinition);
+    if (!dataSeriesDefinition) {
+        return undefined;
+    }
+    if (renderableSeriesDefinition.options &&
+        "dataSeries" in renderableSeriesDefinition.options &&
+        renderableSeriesDefinition.options.dataSeries &&
+        dataSeriesDefinition.options &&
+        "filter" in dataSeriesDefinition.options &&
+        dataSeriesDefinition.options.filter) {
+        return (0, buildDataSeries_1.buildDataSeries)(wasmContext, dataSeriesDefinition, sharedData, renderableSeriesDefinition.options.dataSeries);
+    }
+    return (0, buildDataSeries_1.buildDataSeries)(wasmContext, dataSeriesDefinition, sharedData);
+};

package/Builder/chartBuilder.d.ts

@@ -52,7 +52,7 @@ export declare const chartBuilder: {
     /** @inheritdoc */
     buildSeries: (wasmContext: TSciChart, definition: import("./buildSeries").TSeriesDefinition | import("./buildSeries").TSeriesDefinition[], sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("..").IRenderableSeries[];
     /** @inheritdoc */
-    buildDataSeries: (wasmContext: TSciChart, seriesDefinition: import("./buildSeries").TSeriesDefinition, sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("..").IDataSeries;
+    buildDataSeries: (wasmContext: TSciChart, dataSeriesDefinition: import("./buildDataSeries").TDataSeriesDefinition, sharedData?: import("./buildDataSeries").TSharedDataDefinition, originalDataSeries?: import("..").IDataSeries) => import("..").IDataSeries;
     /** @inheritdoc */
     buildModifiers: (definition: import("./buildModifiers").TModifierDefinition | import("./buildModifiers").TModifierDefinition[]) => import("..").ChartModifierBase2D[];
     /** @inheritdoc */

package/Charting/ChartModifiers/RolloverModifier.js

@@ -96,7 +96,6 @@ var RolloverModifier = /** @class */ (function (_super) {
         if (options === null || options === void 0 ? void 0 : options.tooltipLegendTemplate) {
             if (typeof options.tooltipLegendTemplate === "string") {
                 _this.typeMap.set("tooltipLegendTemplate", options.tooltipLegendTemplate);
-                // @ts-ignore
                 options.tooltipLegendTemplate = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipLegendTemplate);
             }
         }
@@ -107,8 +106,7 @@ var RolloverModifier = /** @class */ (function (_super) {
         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 = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipDataTemplate.type);
+                options.tooltipDataTemplate = (0, classFactory_1.getFunction)(BaseType_1.EBaseType.OptionFunction, options.tooltipDataTemplate);
             }
         }
         _this.tooltipDataTemplateProperty =
@@ -535,6 +533,9 @@ var RolloverModifier = /** @class */ (function (_super) {
         var _this = this;
         var rsList = this.getIncludedRenderableSeries();
         rsList.forEach(function (rs) {
+            if (!rs.rolloverModifierProps.marker) {
+                _this.addSeriesAnnotationsToParentSurface(rs);
+            }
             rs.rolloverModifierProps.marker.suspendInvalidate();
             rs.rolloverModifierProps.tooltip.suspendInvalidate();
             rs.rolloverModifierProps.marker.isHidden = true;

package/Charting/ChartModifiers/SeriesSelectionModifier.d.ts

@@ -116,6 +116,8 @@ export declare class SeriesSelectionModifier extends ChartModifierBase2D {
      * @inheritDoc
      */
     modifierMouseMove(args: ModifierMouseArgs): void;
+    modifierMouseLeave(args: ModifierMouseArgs): void;
+    modifierPointerCancel(args: ModifierMouseArgs): void;
     /**
      * @inheritDoc
      */

package/Charting/ChartModifiers/SeriesSelectionModifier.js

@@ -200,6 +200,10 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
                     nearestHitTestInfo_1.associatedSeries.isHovered = true;
                     this.hoveredSeries.push(nearestHitTestInfo_1.associatedSeries);
                 }
+                else {
+                    // No series hit-tested, set all as un-hovered
+                    allSeries.forEach(function (s) { return (s.isHovered = false); });
+                }
                 // 2. Series which were not hovered, set isHovered = false;
                 hitTestInfos
                     .filter(function (ht) { return ht !== nearestHitTestInfo_1; })
@@ -223,6 +227,23 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
             this.preventReentrancy = false;
         }
     };
+    SeriesSelectionModifier.prototype.modifierMouseLeave = function (args) {
+        var _a;
+        this.preventReentrancy = true;
+        // Pointer left the chart, set all as un-hovered
+        var allSeries = this.getAllSeries();
+        // Raise the hoverChanged event if something has changed
+        var prevHovered = __spreadArray([], this.hoveredSeries, true);
+        var nearestHitTestInfo = undefined;
+        if (prevHovered.length > 0) {
+            allSeries.forEach(function (s) { return (s.isHovered = false); });
+            (_a = this.hoverChanged) === null || _a === void 0 ? void 0 : _a.raiseEvent(new HoveredChangedArgs_1.HoveredChangedArgs(this, this.hoveredSeries, allSeries, nearestHitTestInfo));
+        }
+        this.preventReentrancy = false;
+    };
+    SeriesSelectionModifier.prototype.modifierPointerCancel = function (args) {
+        this.modifierMouseLeave(args);
+    };
     /**
      * @inheritDoc
      */

package/Charting/LayoutManager/SciChartVerticalGroup.d.ts

@@ -6,6 +6,7 @@ export declare class SciChartVerticalGroup {
     private leftOuterLayoutSizes;
     private rightOuterLayoutSizes;
     addSurfaceToGroup(sciChartSurface: SciChartSurface): void;
+    removeSurface(sciChartSurface: SciChartSurface): void;
     synchronizeAxisSizes(): void;
     onLeftSizeChanged(key: string, value: number): void;
     onRightSizeChanged(key: string, value: number): void;

package/Charting/LayoutManager/SciChartVerticalGroup.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SciChartVerticalGroup = void 0;
 var Size_1 = require("../../types/Size");
+var LayoutManager_1 = require("./LayoutManager");
 var SynchronizedLayoutManager_1 = require("./SynchronizedLayoutManager");
 var SciChartVerticalGroup = /** @class */ (function () {
     function SciChartVerticalGroup() {
@@ -19,6 +20,23 @@ var SciChartVerticalGroup = /** @class */ (function () {
         sciChartSurface.layoutManager.layoutChart(new Size_1.Size(width, height));
         this.synchronizeAxisSizes();
     };
+    SciChartVerticalGroup.prototype.removeSurface = function (sciChartSurface) {
+        var synchronizedLayoutManager = sciChartSurface.layoutManager;
+        var indexToRemove = this.layoutManagers.findIndex(function (manager) { return manager === synchronizedLayoutManager; });
+        if (indexToRemove < 0) {
+            throw new Error("Surface ".concat(sciChartSurface.id, " not found in Vertical Group!"));
+        }
+        this.layoutManagers.splice(indexToRemove, 1);
+        var defaultLayoutManager = new LayoutManager_1.LayoutManager();
+        sciChartSurface.layoutManager = defaultLayoutManager;
+        var _a = sciChartSurface.domCanvas2D, width = _a.width, height = _a.height;
+        sciChartSurface.layoutManager.layoutChart(new Size_1.Size(width, height));
+        this.onLeftSizeChanged(synchronizedLayoutManager.id, 0);
+        this.onRightSizeChanged(synchronizedLayoutManager.id, 0);
+        delete this.leftOuterLayoutSizes[synchronizedLayoutManager.id];
+        delete this.rightOuterLayoutSizes[synchronizedLayoutManager.id];
+        this.synchronizeAxisSizes();
+    };
     SciChartVerticalGroup.prototype.synchronizeAxisSizes = function () {
         this.layoutManagers.forEach(function (lm) {
             lm.trySynchronizeLayouts();

package/Charting/LayoutManager/SynchronizedLayoutManager.d.ts

@@ -9,7 +9,7 @@ import { SciChartVerticalGroup } from "./SciChartVerticalGroup";
 export declare class SynchronizedLayoutManager extends LayoutManager {
     type: ELayoutManagerType;
     readonly id: string;
-    private verticalGroup;
+    verticalGroup: SciChartVerticalGroup;
     private lastLeftOuterAreaSize;
     private lastRightOuterAreaSize;
     constructor(verticalGroup: SciChartVerticalGroup, options?: ILayoutManagerOptions);

package/Charting/Model/BaseDataSeries.d.ts

@@ -1,3 +1,4 @@
+import { TDataSeriesDefinition } from "../../Builder/buildDataSeries";
 import { DeletableEntity } from "../../Core/DeletableEntity";
 import { EventHandler } from "../../Core/EventHandler";
 import { NumberRange } from "../../Core/NumberRange";
@@ -266,9 +267,10 @@ export declare abstract class BaseDataSeries extends DeletableEntity implements
      */
     updateAnimationProperties(progress: number, animation: SeriesAnimation): void;
     /** @inheritDoc */
-    toJSON(excludeData?: boolean): any;
+    toJSON(excludeData?: boolean): TDataSeriesDefinition;
     /** @inheritDoc */
     get changeCount(): number;
+    protected getOptions(excludeData?: boolean): IBaseDataSeriesOptions;
     protected validateIndex(index: number, message?: string): void;
     protected setMetadataAt(index: number, metadata: IPointMetadata): void;
     protected appendMetadata(metadata: IPointMetadata): void;

package/Charting/Model/BaseDataSeries.js

@@ -480,14 +480,8 @@ var BaseDataSeries = /** @class */ (function (_super) {
     /** @inheritDoc */
     BaseDataSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
-        var options = __assign({ id: this.id, containsNaN: this.containsNaN, isSorted: this.isSorted, dataIsSortedInX: this.isSorted, dataEvenlySpacedInX: this.isEvenlySpaced, dataSeriesName: this.dataSeriesName, fifoCapacity: this.fifoCapacity, fifoSweeping: this.fifoSweeping, fifoSweepingGap: this.fifoSweepingGap, fifoStartIndex: this.fifoSweeping ? this.fifoStartIndex : 0, capacity: this.capacity, metadata: undefined, 
-            // values must be serialized in derived classes
-            xValues: undefined, yValues: undefined }, this.dataIds);
-        // @ts-ignore
-        options.metadata = this.metadataGeneratorProperty
-            ? this.metadataGeneratorProperty.toJSON()
-            : this.metadataProperty;
-        return options;
+        var options = this.getOptions(excludeData);
+        return { type: this.type, options: options };
     };
     Object.defineProperty(BaseDataSeries.prototype, "changeCount", {
         /** @inheritDoc */
@@ -497,6 +491,19 @@ var BaseDataSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    BaseDataSeries.prototype.getOptions = function (excludeData) {
+        if (excludeData === void 0) { excludeData = false; }
+        var options = __assign({ id: this.id, containsNaN: this.containsNaN, isSorted: this.isSorted, dataIsSortedInX: this.isSorted, dataEvenlySpacedInX: this.isEvenlySpaced, dataSeriesName: this.dataSeriesName, fifoCapacity: this.fifoCapacity, fifoSweeping: this.fifoSweeping, fifoSweepingGap: this.fifoSweepingGap, fifoStartIndex: this.fifoSweeping ? this.fifoStartIndex : 0, capacity: this.capacity, metadata: undefined, 
+            // values must be serialized in derived classes
+            xValues: undefined, yValues: undefined }, this.dataIds);
+        // @ts-ignore
+        options.metadata = this.metadataGeneratorProperty
+            ? this.metadataGeneratorProperty.toJSON()
+            : excludeData
+                ? undefined
+                : this.metadataProperty;
+        return options;
+    };
     BaseDataSeries.prototype.validateIndex = function (index, message) {
         if (Math.round(index) !== index) {
             throw Error("Index must be an integer");

package/Charting/Model/BaseHeatmapDataSeries.d.ts

@@ -1,3 +1,4 @@
+import { TDataSeriesDefinition } from "../../Builder/buildDataSeries";
 import { EventHandler } from "../../Core/EventHandler";
 import { NumberRange } from "../../Core/NumberRange";
 import { ESearchMode } from "../../types/SearchMode";
@@ -287,7 +288,7 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
      * Gets the metadata matrix width
      */
     getMetadataWidth(): number;
-    toJSON(excludeData?: boolean): any;
+    toJSON(excludeData?: boolean): TDataSeriesDefinition;
     /**
      * Gets the range in the X-direction for this DataSeries
      */
@@ -300,6 +301,7 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
     getIndicesRange(visibleRange: NumberRange, isCategoryData: boolean, downSearchMode?: ESearchMode, upSearchMode?: ESearchMode): NumberRange;
     /** @inheritDoc */
     get changeCount(): number;
+    protected getOptions(excludeData?: boolean): IBaseHeatmapSeriesOptions;
     /**
      * Computes the range in the Z-direction for this DataSeries
      * @remarks

package/Charting/Model/BaseHeatmapDataSeries.js

@@ -496,16 +496,8 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
     };
     BaseHeatmapDataSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
-        var options = {
-            id: this.id,
-            containsNaN: this.hasNaNs,
-            dataSeriesName: this.dataSeriesName,
-            zValues: excludeData ? undefined : this.zValuesProperty,
-            metadata: this.metadataGeneratorProperty
-                ? this.metadataGeneratorProperty.toJSON()
-                : this.metadataProperty
-        };
-        return options;
+        var options = this.getOptions(excludeData);
+        return { type: this.type, options: options };
     };
     /** @inheritDoc */
     BaseHeatmapDataSeries.prototype.getIndicesRange = function (visibleRange, isCategoryData, downSearchMode, upSearchMode) {
@@ -519,6 +511,21 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    BaseHeatmapDataSeries.prototype.getOptions = function (excludeData) {
+        if (excludeData === void 0) { excludeData = false; }
+        var options = {
+            id: this.id,
+            containsNaN: this.hasNaNs,
+            dataSeriesName: this.dataSeriesName,
+            zValues: excludeData ? undefined : this.zValuesProperty,
+            metadata: this.metadataGeneratorProperty
+                ? this.metadataGeneratorProperty.toJSON()
+                : excludeData
+                    ? undefined
+                    : this.metadataProperty
+        };
+        return options;
+    };
     /**
      * Computes the range in the Z-direction for this DataSeries
      * @remarks

package/Charting/Model/Filters/HlcScaleOffsetFilter.d.ts

@@ -1,4 +1,6 @@
+import { EDataFilterType } from "../../../types/DataFilterType";
 import { BaseDataSeries } from "../BaseDataSeries";
+import { EDataSeriesType } from "../IDataSeries";
 import { HlcCustomFilter } from "./HlcCustomFilter";
 import { IHlcFilterOptions } from "./HlcFilterBase";
 export interface IHlcScaleOffsetFilterOptions extends IHlcFilterOptions {
@@ -13,6 +15,16 @@ export declare class HlcScaleOffsetFilter extends HlcCustomFilter {
     get offset(): number;
     set offset(value: number);
     constructor(originalSeries: BaseDataSeries, options?: IHlcScaleOffsetFilterOptions);
-    toJSON(excludeData?: boolean): any;
+    toJSON(excludeData?: boolean): {
+        filter: {
+            type: EDataFilterType;
+            options: {
+                scale: number;
+                offset: number;
+            };
+        };
+        type: EDataSeriesType;
+        options: import("../../..").TSeriesDataDefinition;
+    };
     protected defaultFunction(index: number, y: number): number;
 }

package/Charting/Model/Filters/OhlcScaleOffsetFilter.d.ts

@@ -1,4 +1,6 @@
+import { EDataFilterType } from "../../../types/DataFilterType";
 import { BaseDataSeries } from "../BaseDataSeries";
+import { EDataSeriesType } from "../IDataSeries";
 import { OhlcCustomFilter } from "./OhlcCustomFilter";
 import { IOhlcFilterOptions } from "./OhlcFilterBase";
 export interface IOhlcScaleOffsetFilterOptions extends IOhlcFilterOptions {
@@ -13,6 +15,16 @@ export declare class OhlcScaleOffsetFilter extends OhlcCustomFilter {
     get offset(): number;
     set offset(value: number);
     constructor(originalSeries: BaseDataSeries, options?: IOhlcScaleOffsetFilterOptions);
-    toJSON(excludeData?: boolean): any;
+    toJSON(excludeData?: boolean): {
+        filter: {
+            type: EDataFilterType;
+            options: {
+                scale: number;
+                offset: number;
+            };
+        };
+        type: EDataSeriesType;
+        options: import("../../..").TSeriesDataDefinition;
+    };
     protected defaultFunction(index: number, y: number): number;
 }