scichart 3.0.280 → 3.0.300

package/Builder/chartBuilder.d.ts

@@ -50,19 +50,19 @@ export declare const chartBuilder: {
     /** @inheritdoc */
     configureChart: (sciChartSurface: SciChartSurfaceBase, wasmContext: TSciChart, definition: string | TSurfaceDefinition) => void;
     /** @inheritdoc */
-    buildSeries: (wasmContext: TSciChart, definition: import("./buildSeries").TSeriesDefinition | import("./buildSeries").TSeriesDefinition[], sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("../Charting/Visuals/RenderableSeries/IRenderableSeries").IRenderableSeries[];
+    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("../Charting/Model/IDataSeries").IDataSeries;
+    buildDataSeries: (wasmContext: TSciChart, seriesDefinition: import("./buildSeries").TSeriesDefinition, sharedData?: import("./buildDataSeries").TSharedDataDefinition) => import("..").IDataSeries;
     /** @inheritdoc */
-    buildModifiers: (definition: import("./buildModifiers").TModifierDefinition | import("./buildModifiers").TModifierDefinition[]) => import("../Charting/ChartModifiers/ChartModifierBase2D").ChartModifierBase2D[];
+    buildModifiers: (definition: import("./buildModifiers").TModifierDefinition | import("./buildModifiers").TModifierDefinition[]) => import("..").ChartModifierBase2D[];
     /** @inheritdoc */
-    buildAxes: (wasmContext: TSciChart, definition: import("./buildAxis").TAxisDefinition | import("./buildAxis").TAxisDefinition[]) => import("../Charting/Visuals/Axis/AxisBase2D").AxisBase2D[];
+    buildAxes: (wasmContext: TSciChart, definition: import("./buildAxis").TAxisDefinition | import("./buildAxis").TAxisDefinition[]) => import("..").AxisBase2D[];
     /** @inheritdoc */
     buildAnnotations: (definition: import("./buildAnnotations").TAnnotationDefinition | import("./buildAnnotations").TAnnotationDefinition[]) => any[];
     /** @inheritdoc */
-    registerType: <T extends object>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: (options?: any) => T, overWrite?: boolean) => void;
+    registerType: <T extends object>(baseType: import("..").EBaseType, type: string, constructor: (options?: any) => T, overWrite?: boolean) => void;
     /** @inheritdoc */
-    registerWasmType: <T_1 extends object>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: (wasmContext: TSciChart | TSciChart3D, options?: any) => T_1, overWrite?: boolean) => void;
+    registerWasmType: <T_1 extends object>(baseType: import("..").EBaseType, type: string, constructor: (wasmContext: TSciChart | TSciChart3D, options?: any) => T_1, overWrite?: boolean) => void;
     /** @inheritdoc */
-    registerFunction: <T_2 extends Function>(baseType: import("../types/BaseType").EBaseType, type: string, constructor: T_2, overWrite?: boolean) => void;
+    registerFunction: <T_2 extends Function>(baseType: import("..").EBaseType, type: string, constructor: T_2, overWrite?: boolean) => void;
 };

package/Charting/ChartModifiers/ChartModifierBase.d.ts

@@ -164,7 +164,7 @@ export declare abstract class ChartModifierBase<TSurfaceType extends SciChartSur
     protected isAttachedProperty: boolean;
     protected receiveHandledEventsProperty: boolean;
     protected mousePoint: Point;
-    private executeOnProperty;
+    protected executeOnProperty: EExecuteOn;
     private parentSurfaceProperty;
     constructor(options?: {
         id?: string;

package/Charting/ChartModifiers/CursorModifier.d.ts

@@ -207,10 +207,6 @@ export declare class CursorModifier extends ChartModifierBase2D implements IIncl
      * @inheritDoc
      */
     modifierMouseLeave(args: ModifierMouseArgs): void;
-    /**
-     * @inheritDoc
-     */
-    modifierMouseEnter(args: ModifierMouseArgs): void;
     /**
      * @inheritDoc
      */

package/Charting/ChartModifiers/CursorModifier.js

@@ -275,12 +275,6 @@ var CursorModifier = /** @class */ (function (_super) {
         this.mousePosition = MousePosition_1.EMousePosition.OutOfCanvas;
         this.update();
     };
-    /**
-     * @inheritDoc
-     */
-    CursorModifier.prototype.modifierMouseEnter = function (args) {
-        _super.prototype.modifierMouseEnter.call(this, args);
-    };
     /**
      * @inheritDoc
      */
@@ -481,8 +475,12 @@ var CursorModifier = /** @class */ (function (_super) {
             crosshairStroke: this.crosshairStroke,
             crosshairStrokeDashArray: this.crosshairStrokeDashArray,
             crosshairStrokeThickness: this.crosshairStrokeThickness,
+            hitTestRadius: this.hitTestRadius,
+            placementDivId: this.placementDivId,
             showAxisLabels: this.showAxisLabels,
             showTooltip: this.showTooltip,
+            showXLine: this.showXLine,
+            showYLine: this.showYLine,
             tooltipContainerBackground: this.tooltipContainerBackground,
             tooltipDataTemplate: this.typeMap.get("tooltipDataTemplate"),
             tooltipLegendOffsetX: this.tooltipLegendOffsetX,

package/Charting/ChartModifiers/RolloverModifier.d.ts

@@ -125,12 +125,12 @@ export declare class RolloverModifier extends ChartModifierBase2D implements IIn
      * If this is set greater than the default of zero, the toolip will only show values for points in this radius, rather than all points on the vertical line
      */
     hitTestRadius: number;
+    protected showRolloverLineProperty: boolean;
+    protected showTooltipProperty: boolean;
     private readonly rolloverLineAnnotation;
     private readonly legendAnnotation;
     private mousePosition;
     private tooltipDataTemplateProperty?;
-    private showRolloverLineProperty;
-    private showTooltipProperty;
     private allowTooltipOverlappingProperty;
     private includedSeriesMap;
     private placementDivIdProperty;
@@ -195,10 +195,6 @@ export declare class RolloverModifier extends ChartModifierBase2D implements IIn
      * @inheritDoc
      */
     modifierMouseLeave(args: ModifierMouseArgs): void;
-    /**
-     * @inheritDoc
-     */
-    modifierMouseEnter(args: ModifierMouseArgs): void;
     /**
      * @inheritDoc
      */

package/Charting/ChartModifiers/RolloverModifier.js

@@ -23,6 +23,7 @@ var MousePosition_1 = require("../../types/MousePosition");
 var SeriesType_1 = require("../../types/SeriesType");
 var tooltip_1 = require("../../utils/tooltip");
 var translate_1 = require("../../utils/translate");
+var IThemeProvider_1 = require("../Themes/IThemeProvider");
 var AnnotationBase_1 = require("../Visuals/Annotations/AnnotationBase");
 var LineAnnotation_1 = require("../Visuals/Annotations/LineAnnotation");
 var RolloverLegendSvgAnnotation_1 = require("../Visuals/Annotations/RolloverLegendSvgAnnotation");
@@ -75,9 +76,9 @@ var RolloverModifier = /** @class */ (function (_super) {
          * If this is set greater than the default of zero, the toolip will only show values for points in this radius, rather than all points on the vertical line
          */
         _this.hitTestRadius = 0;
-        _this.mousePosition = MousePosition_1.EMousePosition.OutOfCanvas;
         _this.showRolloverLineProperty = true;
         _this.showTooltipProperty = true;
+        _this.mousePosition = MousePosition_1.EMousePosition.OutOfCanvas;
         _this.allowTooltipOverlappingProperty = false;
         _this.includedSeriesMap = new Map();
         _this.hitTestRenderableSeries = _this.hitTestRenderableSeries.bind(_this);
@@ -293,12 +294,6 @@ var RolloverModifier = /** @class */ (function (_super) {
         this.mousePosition = MousePosition_1.EMousePosition.OutOfCanvas;
         this.update();
     };
-    /**
-     * @inheritDoc
-     */
-    RolloverModifier.prototype.modifierMouseEnter = function (args) {
-        _super.prototype.modifierMouseEnter.call(this, args);
-    };
     /**
      * @inheritDoc
      */
@@ -377,6 +372,11 @@ var RolloverModifier = /** @class */ (function (_super) {
     RolloverModifier.prototype.toJSON = function () {
         var json = _super.prototype.toJSON.call(this);
         var options = {
+            snapToDataPoint: this.snapToDataPoint,
+            placementDivId: this.placementDivId,
+            hitTestRadius: this.hitTestRadius,
+            allowTooltipOverlapping: this.allowTooltipOverlapping,
+            rolloverLineStrokeDashArray: this.rolloverLineStrokeDashArray,
             rolloverLineStroke: this.rolloverLineStroke,
             rolloverLineStrokeThickness: this.rolloverLineStrokeThickness,
             showRolloverLine: this.showRolloverLine,
@@ -743,7 +743,7 @@ exports.calcTooltipPositions = calcTooltipPositions;
  * @param rs RenderableSeries
  */
 var createAnnotations = function (rs, placementDivId) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     if (!rs.rolloverModifierProps.marker) {
         rs.rolloverModifierProps.marker = new RolloverMarkerSvgAnnotation_1.RolloverMarkerSvgAnnotation(rs.rolloverModifierProps);
         // Rollover tooltips for multiple Y-Axes are not supported for stacked series
@@ -754,7 +754,7 @@ var createAnnotations = function (rs, placementDivId) {
     }
     if (!rs.rolloverModifierProps.tooltip) {
         rs.rolloverModifierProps.tooltipTitle = (_b = (_a = rs.rolloverModifierProps.tooltipTitle) !== null && _a !== void 0 ? _a : rs.getDataSeriesName()) !== null && _b !== void 0 ? _b : "";
-        rs.rolloverModifierProps.tooltipColor = (_c = rs.rolloverModifierProps.tooltipColor) !== null && _c !== void 0 ? _c : rs.stroke;
+        rs.rolloverModifierProps.tooltipColor = rs.rolloverModifierProps.tooltipColor;
         rs.rolloverModifierProps.tooltip = new RolloverTooltipSvgAnnotation_1.RolloverTooltipSvgAnnotation(rs.rolloverModifierProps, {
             seriesType: rs.type,
             placementDivId: placementDivId
@@ -774,8 +774,8 @@ var createAnnotations = function (rs, placementDivId) {
         }
         if (!bandRs.rolloverModifierProps1.tooltip) {
             bandRs.rolloverModifierProps1.tooltipTitle =
-                (_e = (_d = bandRs.rolloverModifierProps1.tooltipTitle) !== null && _d !== void 0 ? _d : bandRs.getDataSeriesName()) !== null && _e !== void 0 ? _e : "";
-            bandRs.rolloverModifierProps1.tooltipColor = (_f = bandRs.rolloverModifierProps1.tooltipColor) !== null && _f !== void 0 ? _f : bandRs.strokeY1;
+                (_d = (_c = bandRs.rolloverModifierProps1.tooltipTitle) !== null && _c !== void 0 ? _c : bandRs.getDataSeriesName()) !== null && _d !== void 0 ? _d : "";
+            bandRs.rolloverModifierProps1.tooltipColor = bandRs.rolloverModifierProps1.tooltipColor;
             bandRs.rolloverModifierProps1.tooltip = new RolloverTooltipSvgAnnotation_1.RolloverTooltipSvgAnnotation(bandRs.rolloverModifierProps1, {
                 placementDivId: placementDivId
             });
@@ -794,6 +794,9 @@ var updateRolloverModifierProps = function (rolloverRSProps, rs, tooltipProps, s
         rolloverRSProps.marker.isHidden = false;
         rolloverRSProps.marker.x1 = tooltipProps.xValue;
         rolloverRSProps.marker.y1 = tooltipProps.yValue;
+        if (rolloverRSProps.markerColor.startsWith(IThemeProvider_1.AUTO_COLOR)) {
+            rolloverRSProps.markerColor = tooltipProps.isY1 ? rs.strokeY1 : rs.stroke;
+        }
     }
     // Update tooltips
     if (showTooltip) {
@@ -802,6 +805,9 @@ var updateRolloverModifierProps = function (rolloverRSProps, rs, tooltipProps, s
         rolloverRSProps.tooltip.y1 = tooltipProps.yValue;
         rolloverRSProps.tooltip.xCoordShift = tooltipProps.xCoordShift;
         rolloverRSProps.tooltip.yCoordShift = tooltipProps.yCoordShift;
+        if (rolloverRSProps.tooltipColor.startsWith(IThemeProvider_1.AUTO_COLOR)) {
+            rolloverRSProps.tooltipColor = tooltipProps.isY1 ? rs.strokeY1 : rs.stroke;
+        }
     }
     else {
         if (placementDivId) {

package/Charting/LayoutManager/BaseCenteredAxisLayoutStrategy.d.ts

@@ -68,7 +68,7 @@ export declare abstract class BaseCenteredAxisLayoutStrategy extends BaseAxisLay
      */
     constructor(options?: IInnerAxisLayoutStrategyOptions);
     toJSON(): {
-        type: import("../../types/LayoutStrategyType").ELayoutStrategyType;
+        type: import("../..").ELayoutStrategyType;
         options: Required<Omit<IInnerAxisLayoutStrategyOptions, never>>;
     };
     /**

package/Charting/LayoutManager/CentralAxesLayoutManager.d.ts

@@ -65,7 +65,7 @@ export declare class CentralAxesLayoutManager extends LayoutManager {
      * @remarks The axisPosition obeys {@link coordinateMode} which defines whether it is a pixel, data-value or relative coordinate
      */
     set verticalAxisPosition(value: number);
-    toJSON(): import("../../Builder/buildSurface").TLayoutManagerDefinition;
+    toJSON(): import("../..").TLayoutManagerDefinition;
     /**
      * @summary Notifies subscribers that a property has changed and the chart requires redrawing
      * @description SciChart provides fully reactive components, changing any property or changing data will cause the {@link SciChartSurface} to

package/Charting/Model/BaseDataSeries.d.ts

@@ -162,7 +162,7 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     /** @inheritDoc */
     get hasValues(): boolean;
     /**
-     * Check if the series has an existing metadaGenerator
+     * Check if the series has an existing metadataGenerator
      */
     hasMetadataGenerator(): boolean;
     /**
@@ -179,6 +179,10 @@ export declare abstract class BaseDataSeries implements IDataSeries {
      * Gets the metadata array length
      */
     getMetadataLength(): number;
+    /**
+     * Check if the series has an existing metadata
+     */
+    get hasMetadata(): boolean;
     /**
      * Sets initial values for the data animation
      * @param dataSeries The {@link BaseDataSeries} to be used for initial values

package/Charting/Model/BaseDataSeries.js

@@ -10,15 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWindowedYRange = exports.getIndicesRange = exports.BaseDataSeries = void 0;
 var classFactory_1 = require("../../Builder/classFactory");
@@ -271,7 +262,7 @@ var BaseDataSeries = /** @class */ (function () {
         configurable: true
     });
     /**
-     * Check if the series has an existing metadaGenerator
+     * Check if the series has an existing metadataGenerator
      */
     BaseDataSeries.prototype.hasMetadataGenerator = function () {
         return typeof this.metadataGeneratorProperty !== "undefined";
@@ -311,6 +302,16 @@ var BaseDataSeries = /** @class */ (function () {
         }
         return this.metadataProperty.length;
     };
+    Object.defineProperty(BaseDataSeries.prototype, "hasMetadata", {
+        /**
+         * Check if the series has an existing metadata
+         */
+        get: function () {
+            return this.metadataProperty !== undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Sets initial values for the data animation
      * @param dataSeries The {@link BaseDataSeries} to be used for initial values
@@ -408,7 +409,6 @@ var BaseDataSeries = /** @class */ (function () {
         this.metadataProperty.push(metadata);
     };
     BaseDataSeries.prototype.appendMetadataRange = function (metadata, length) {
-        var _a;
         var _this = this;
         if (!metadata) {
             if (!this.metadataGeneratorProperty) {
@@ -421,7 +421,15 @@ var BaseDataSeries = /** @class */ (function () {
             }
         }
         this.fillMetadataIfUndefined();
-        (_a = this.metadataProperty).push.apply(_a, metadata);
+        var startIndex = this.metadataProperty.length;
+        // reserve space for new values
+        this.metadataProperty.length += length;
+        // merge new values into th collection
+        for (var i = 0; i < length; ++i) {
+            this.metadataProperty[startIndex + i] = metadata[i];
+        }
+        // Alternative approach
+        // this.metadataProperty = this.metadataProperty.concat(metadata);
     };
     BaseDataSeries.prototype.insertMetadata = function (startIndex, metadata) {
         if (!metadata) {
@@ -436,7 +444,6 @@ var BaseDataSeries = /** @class */ (function () {
         this.metadataProperty.splice(startIndex, 0, metadata);
     };
     BaseDataSeries.prototype.insertMetadataRange = function (startIndex, metadata) {
-        var _a;
         var _this = this;
         if (!metadata) {
             if (!this.metadataGeneratorProperty) {
@@ -449,7 +456,10 @@ var BaseDataSeries = /** @class */ (function () {
             }
         }
         this.fillMetadataIfUndefined();
-        (_a = this.metadataProperty).splice.apply(_a, __spreadArray([startIndex, 0], metadata, false));
+        // TODO probably this could be optimized
+        var previousValues = this.metadataProperty.slice(0, startIndex);
+        var nextValues = this.metadataProperty.slice(startIndex);
+        this.metadataProperty = previousValues.concat(metadata, nextValues);
     };
     BaseDataSeries.prototype.removeMetadataAt = function (index) {
         if (!this.metadataProperty) {

package/Charting/Model/ChartData/SeriesInfo.d.ts

@@ -24,6 +24,7 @@ export declare class SeriesInfo {
      */
     isWithinDataBounds: boolean;
     pointMetadata: unknown;
+    point2metadata: unknown;
     constructor(renderableSeries: IRenderableSeries, hitTestInfo: HitTestInfo);
     get isVisible(): boolean;
     get formattedYValue(): string;

package/Charting/Model/ChartData/SeriesInfo.js

@@ -22,6 +22,7 @@ var SeriesInfo = /** @class */ (function () {
         this.point2xCoordinate = hitTestInfo.point2xCoord;
         this.point2yCoordinate = hitTestInfo.point2yCoord;
         this.pointMetadata = hitTestInfo.metadata;
+        this.point2metadata = hitTestInfo.point2metadata;
         if (renderableSeries.type === SeriesType_1.ESeriesType.ColumnSeries) {
             this.fill = renderableSeries.fill;
         }

package/Charting/Model/Filters/HlcCustomFilter.js

@@ -107,13 +107,25 @@ var HlcCustomFilter = /** @class */ (function (_super) {
         var highValues = [];
         var lowValues = [];
         var closeValues = [];
-        var metadata = [];
-        for (var i = startIndex; i < startIndex + count; i++) {
-            xValues.push(rawX.get(i));
-            highValues.push(this.highfilterFunction(i, rawHigh.get(i)));
-            lowValues.push(this.lowfilterFunction(i, rawLow.get(i)));
-            closeValues.push(this.closefilterFunction(i, rawClose.get(i)));
-            metadata.push(this.originalSeries.getMetadataAt(i));
+        var metadata = undefined;
+        // leave metadata unset if if original series has no metadata
+        if (this.originalSeries.hasMetadata) {
+            metadata = [];
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                highValues.push(this.highfilterFunction(i, rawHigh.get(i)));
+                lowValues.push(this.lowfilterFunction(i, rawLow.get(i)));
+                closeValues.push(this.closefilterFunction(i, rawClose.get(i)));
+                metadata.push(this.originalSeries.getMetadataAt(i));
+            }
+        }
+        else {
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                highValues.push(this.highfilterFunction(i, rawHigh.get(i)));
+                lowValues.push(this.lowfilterFunction(i, rawLow.get(i)));
+                closeValues.push(this.closefilterFunction(i, rawClose.get(i)));
+            }
         }
         return { xValues: xValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };

package/Charting/Model/Filters/OhlcCustomFilter.js

@@ -124,14 +124,26 @@ var OhlcCustomFilter = /** @class */ (function (_super) {
         var highValues = [];
         var lowValues = [];
         var closeValues = [];
-        var metadata = [];
-        for (var i = startIndex; i < startIndex + count; i++) {
-            xValues.push(rawX.get(i));
-            openValues.push(this.openfilterFunction(i, ohlcSeries.getNativeOpenValues().get(i)));
-            highValues.push(this.highfilterFunction(i, ohlcSeries.getNativeHighValues().get(i)));
-            lowValues.push(this.lowfilterFunction(i, ohlcSeries.getNativeLowValues().get(i)));
-            closeValues.push(this.closefilterFunction(i, ohlcSeries.getNativeCloseValues().get(i)));
-            metadata.push(this.originalSeries.getMetadataAt(i));
+        var metadata = undefined;
+        if (this.originalSeries.hasMetadata) {
+            metadata = [];
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                openValues.push(this.openfilterFunction(i, ohlcSeries.getNativeOpenValues().get(i)));
+                highValues.push(this.highfilterFunction(i, ohlcSeries.getNativeHighValues().get(i)));
+                lowValues.push(this.lowfilterFunction(i, ohlcSeries.getNativeLowValues().get(i)));
+                closeValues.push(this.closefilterFunction(i, ohlcSeries.getNativeCloseValues().get(i)));
+                metadata.push(this.originalSeries.getMetadataAt(i));
+            }
+        }
+        else {
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                openValues.push(this.openfilterFunction(i, ohlcSeries.getNativeOpenValues().get(i)));
+                highValues.push(this.highfilterFunction(i, ohlcSeries.getNativeHighValues().get(i)));
+                lowValues.push(this.lowfilterFunction(i, ohlcSeries.getNativeLowValues().get(i)));
+                closeValues.push(this.closefilterFunction(i, ohlcSeries.getNativeCloseValues().get(i)));
+            }
         }
         return { xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };

package/Charting/Model/Filters/XyCustomFilter.js

@@ -81,11 +81,21 @@ var XyCustomFilter = /** @class */ (function (_super) {
         var rawY = this.getOriginalYValues();
         var xValues = [];
         var yValues = [];
-        var metadata = [];
-        for (var i = startIndex; i < startIndex + count; i++) {
-            xValues.push(rawX.get(i));
-            yValues.push(this.filterFunction(i, rawY.get(i)));
-            metadata.push(this.originalSeries.getMetadataAt(i));
+        var metadata = undefined;
+        // leave metadata unset if if original series has no metadata
+        if (this.originalSeries.hasMetadata) {
+            metadata = [];
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+                metadata.push(this.originalSeries.getMetadataAt(i));
+            }
+        }
+        else {
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+            }
         }
         return { xValues: xValues, yValues: yValues, metadata: metadata };
     };

package/Charting/Model/Filters/XyRatioFilter.js

@@ -102,6 +102,7 @@ var XyRatioFilter = /** @class */ (function (_super) {
         var rawY = this.getOriginalYValues();
         var xValues = [];
         var yValues = [];
+        // TODO check if metadata is needed here
         for (var i = startIndex; i < startIndex + count; i++) {
             xValues.push(rawX.get(i));
             yValues.push(rawY.get(i) / this.getDivisorYValues().get(i));

package/Charting/Model/Filters/XyyCustomFilter.js

@@ -88,12 +88,23 @@ var XyyCustomFilter = /** @class */ (function (_super) {
         var xValues = [];
         var yValues = [];
         var y1Values = [];
-        var metadata = [];
-        for (var i = startIndex; i < startIndex + count; i++) {
-            xValues.push(rawX.get(i));
-            yValues.push(this.filterFunction(i, rawY.get(i)));
-            y1Values.push(this.y1filterFunction(i, rawY1.get(i)));
-            metadata.push(this.originalSeries.getMetadataAt(i));
+        var metadata = undefined;
+        // leave metadata unset if if original series has no metadata
+        if (this.originalSeries.hasMetadata) {
+            metadata = [];
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+                y1Values.push(this.y1filterFunction(i, rawY1.get(i)));
+                metadata.push(this.originalSeries.getMetadataAt(i));
+            }
+        }
+        else {
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+                y1Values.push(this.y1filterFunction(i, rawY1.get(i)));
+            }
         }
         return { xValues: xValues, yValues: yValues, y1Values: y1Values, metadata: metadata };
     };

package/Charting/Model/Filters/XyzCustomFilter.js

@@ -84,12 +84,23 @@ var XyzCustomFilter = /** @class */ (function (_super) {
         var xValues = [];
         var yValues = [];
         var zValues = [];
-        var metadata = [];
-        for (var i = startIndex; i < startIndex + count; i++) {
-            xValues.push(rawX.get(i));
-            yValues.push(this.filterFunction(i, rawY.get(i)));
-            zValues.push(this.zfilterFunction(i, rawZ.get(i)));
-            metadata.push(this.originalSeries.getMetadataAt(i));
+        var metadata = undefined;
+        // leave metadata unset if if original series has no metadata
+        if (this.originalSeries.hasMetadata) {
+            metadata = [];
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+                zValues.push(this.zfilterFunction(i, rawZ.get(i)));
+                metadata.push(this.originalSeries.getMetadataAt(i));
+            }
+        }
+        else {
+            for (var i = startIndex; i < startIndex + count; i++) {
+                xValues.push(rawX.get(i));
+                yValues.push(this.filterFunction(i, rawY.get(i)));
+                zValues.push(this.zfilterFunction(i, rawZ.get(i)));
+            }
         }
         return { xValues: xValues, yValues: yValues, zValues: zValues, metadata: metadata };
     };

package/Charting/Services/SciChartRenderer.js

@@ -25,6 +25,7 @@ var DpiHelper_1 = require("../Visuals/TextureManager/DpiHelper");
 var RenderPassData_1 = require("./RenderPassData");
 var RenderPassInfo_1 = require("./RenderPassInfo");
 var SvgClippingMode_1 = require("../../types/SvgClippingMode");
+var WatermarkPosition_1 = require("../../types/WatermarkPosition");
 /**
  * A class used internally in SciChart to perform layout, arrangement, data-preparation and rendering on the Cartesian 2D {@link SciChartSurface}
  */
@@ -425,11 +426,50 @@ var SciChartRenderer = /** @class */ (function () {
         this.sciChartSurface.rendered.raiseEvent();
     };
     SciChartRenderer.prototype.updateWatermark = function (renderContext, seriesViewRect) {
-        var left = seriesViewRect.x + 5;
         var chartHeight = this.sciChartSurface.isCopyCanvasSurface
             ? SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.height
             : renderContext.viewportSize.height;
-        var bottom = chartHeight - (seriesViewRect.top + seriesViewRect.height) + 5;
+        var left = seriesViewRect.x + 5;
+        var bottom = chartHeight - (seriesViewRect.top + seriesViewRect.height) + 10;
+        var wmWidth = Math.max(72, Math.min(0.25 * renderContext.viewportSize.width, 256));
+        var wmHeight = (42 * wmWidth) / 256;
+        if (this.sciChartSurface.watermarkRelativeToCanvas) {
+            switch (this.sciChartSurface.watermarkPosition) {
+                case WatermarkPosition_1.EWatermarkPosition.BottomRight:
+                    left = renderContext.viewportSize.width - wmWidth - 5;
+                    bottom = chartHeight - renderContext.viewportSize.height + 12;
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.TopLeft:
+                    bottom = chartHeight - (5 + wmHeight);
+                    left = 5;
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.TopRight:
+                    left = renderContext.viewportSize.width - wmWidth - 5;
+                    bottom = chartHeight - (5 + wmHeight);
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.BottomLeft:
+                    left = 5;
+                    bottom = chartHeight - renderContext.viewportSize.height + 12;
+                    break;
+            }
+        }
+        else {
+            switch (this.sciChartSurface.watermarkPosition) {
+                case WatermarkPosition_1.EWatermarkPosition.BottomRight:
+                    left = seriesViewRect.left + seriesViewRect.width - wmWidth - 5;
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.TopLeft:
+                    bottom = chartHeight - (seriesViewRect.top + 5 + wmHeight);
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.TopRight:
+                    left = seriesViewRect.left + seriesViewRect.width - wmWidth - 5;
+                    bottom = chartHeight - (seriesViewRect.top + 5 + wmHeight);
+                    break;
+                case WatermarkPosition_1.EWatermarkPosition.BottomLeft:
+                default:
+                    break;
+            }
+        }
         this.sciChartSurface.updateWatermark(left, bottom);
     };
     SciChartRenderer.prototype.getViewportRect = function (viewportSize, seriesViewRect) {

package/Charting/Visuals/Annotations/AdornerLayer.d.ts

@@ -9,5 +9,6 @@ export declare class AdornerLayer {
     selectAnnotation(args: ModifierMouseArgs): boolean;
     deselectAnnotation(annotation: IAnnotation): void;
     get selectedAnnotation(): AnnotationBase;
+    set selectedAnnotation(value: AnnotationBase);
     get isAnnotationSelected(): boolean;
 }

package/Charting/Visuals/Annotations/AdornerLayer.js

@@ -9,14 +9,14 @@ var AdornerLayer = /** @class */ (function () {
         var scs = this.parentSurface;
         var selectedAnnotation;
         var selectAnnotationHelper = function (annotations) {
-            annotations.forEach(function (an) {
-                var anBase = an;
+            for (var i = annotations.length - 1; i >= 0; i--) {
+                var anBase = annotations[i];
                 /** Allow all annotations to be clicked.  Only select if editable */
                 var isAnnotationSelected = anBase.click(args, !selectedAnnotation && anBase.isEditable);
                 if (isAnnotationSelected) {
                     selectedAnnotation = anBase;
                 }
-            });
+            }
         };
         selectAnnotationHelper(scs.annotations.asArray());
         selectAnnotationHelper(scs.modifierAnnotations.asArray());
@@ -31,6 +31,9 @@ var AdornerLayer = /** @class */ (function () {
         get: function () {
             return this.selectedAnnotationProperty;
         },
+        set: function (value) {
+            this.selectedAnnotationProperty = value;
+        },
         enumerable: false,
         configurable: true
     });

package/Charting/Visuals/Annotations/AnnotationBase.js

@@ -505,6 +505,9 @@ var AnnotationBase = /** @class */ (function () {
     AnnotationBase.prototype.onAttach = function (scs) {
         this.svgAdornerRootProperty = scs.domSvgAdornerLayer;
         // Override in derived classes to be notified of attached
+        if (this.isSelected) {
+            this.parentSurface.adornerLayer.selectedAnnotation = this;
+        }
     };
     /** @inheritDoc */
     AnnotationBase.prototype.onDetach = function () {
@@ -514,6 +517,7 @@ var AnnotationBase = /** @class */ (function () {
         }
         this.selectedChanged.unsubscribeAll();
         this.deleteAdorner();
+        this.svgAdornerRootProperty = undefined;
     };
     Object.defineProperty(AnnotationBase.prototype, "dragPoints", {
         /** Get the dragging points that should be enabled for this annotation */

package/Charting/Visuals/Axis/AxisBase2D.d.ts

@@ -437,7 +437,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
     /**
      * @inheritDoc
      */
-    animateVisibleRange(visibleRange: NumberRange, durationMs: number, easingFunction?: TEasingFn, onCompleted?: () => void): import("../../../Core/Animations/GenericAnimation").IGenericAnimation;
+    animateVisibleRange(visibleRange: NumberRange, durationMs: number, easingFunction?: TEasingFn, onCompleted?: () => void): import("../../..").IGenericAnimation;
     /**
      * @inheritDoc
      */