scichart 2.2.2416 → 3.0.0-beta.224

package/Charting/Model/ChartData/XyySeriesInfo.js

@@ -23,7 +23,9 @@ var XyySeriesInfo = /** @class */ (function (_super) {
         var _this = _super.call(this, renderableSeries, hitTestInfo) || this;
         _this.isFirstSeries = true;
         _this.y1Value = hitTestInfo.y1Value;
+        _this.point2y1Value = hitTestInfo.point2y1Value;
         _this.y1Coordinate = hitTestInfo.y1Coord;
+        _this.point2y1Coordinate = hitTestInfo.point2y1Coord;
         return _this;
     }
     Object.defineProperty(XyySeriesInfo.prototype, "formattedY1Value", {

package/Charting/Model/DataDistributionCalculator/DataDistributionCalculator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataDistributionCalculator = void 0;
 var performanceWarnings_1 = require("../../../constants/performanceWarnings");
 var array_1 = require("../../../utils/array");
+var number_1 = require("../../../utils/number");
 var DataDistributionCalculator = /** @class */ (function () {
     function DataDistributionCalculator() {
         this.containsNanProperty = false;
@@ -31,7 +32,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
                 if (this.containsNanProperty === false)
                     performanceWarnings_1.performanceWarnings.dataDistributionFlagNaN.warn();
             }
@@ -57,7 +58,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
                 if (this.containsNanProperty === false)
                     performanceWarnings_1.performanceWarnings.dataDistributionFlagNaN.warn();
             }
@@ -85,7 +86,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
             }
         }
         if (isSorted !== undefined) {

package/Charting/Model/Filters/HlcCustomFilter.js

@@ -21,8 +21,9 @@ var HlcFilterBase_1 = require("./HlcFilterBase");
 var HlcCustomFilter = /** @class */ (function (_super) {
     __extends(HlcCustomFilter, _super);
     function HlcCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Hlc) {
             throw new Error("HlcCustomFilter only supports Hlc original series");
         }
@@ -78,24 +79,24 @@ var HlcCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     HlcCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filterOnUpdate = function (index) {
         var hlcSeries = this.originalSeries;
-        this.update(index, this.highfilterFunction(index, hlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, hlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, hlcSeries.getNativeYValues().get(index)));
+        this.update(index, this.highfilterFunction(index, hlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, hlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, hlcSeries.getNativeYValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     HlcCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.insertRange(startIndex, xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     HlcCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -106,13 +107,15 @@ 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));
         }
-        return { xValues: xValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues };
+        return { xValues: xValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };
     return HlcCustomFilter;
 }(HlcFilterBase_1.HlcFilterBase));

package/Charting/Model/Filters/HlcFilterBase.js

@@ -22,8 +22,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var HlcFilterBase = /** @class */ (function (_super) {
     __extends(HlcFilterBase, _super);
     function HlcFilterBase(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
+        _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
         _this.closefield = XyFilterBase_1.EDataSeriesField.Close;
         _this.highfield = XyFilterBase_1.EDataSeriesField.High;
         _this.lowfield = XyFilterBase_1.EDataSeriesField.Low;

package/Charting/Model/Filters/HlcScaleOffsetFilter.js

@@ -33,8 +33,9 @@ var HlcCustomFilter_1 = require("./HlcCustomFilter");
 var HlcScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(HlcScaleOffsetFilter, _super);
     function HlcScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Hlc) {

package/Charting/Model/Filters/OhlcCustomFilter.js

@@ -21,8 +21,9 @@ var OhlcFilterBase_1 = require("./OhlcFilterBase");
 var OhlcCustomFilter = /** @class */ (function (_super) {
     __extends(OhlcCustomFilter, _super);
     function OhlcCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b, _c, _d;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Ohlc) {
             throw new Error("OhlcCustomFilter only supports Ohlc original series");
         }
@@ -96,24 +97,24 @@ var OhlcCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     OhlcCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filterOnUpdate = function (index) {
         var ohlcSeries = this.originalSeries;
-        this.update(index, this.openfilterFunction(index, ohlcSeries.getNativeOpenValues().get(index)), this.highfilterFunction(index, ohlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, ohlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, ohlcSeries.getNativeCloseValues().get(index)));
+        this.update(index, this.openfilterFunction(index, ohlcSeries.getNativeOpenValues().get(index)), this.highfilterFunction(index, ohlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, ohlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, ohlcSeries.getNativeCloseValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     OhlcCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.insertRange(startIndex, xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     OhlcCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -123,14 +124,16 @@ 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));
         }
-        return { xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues };
+        return { xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };
     return OhlcCustomFilter;
 }(OhlcFilterBase_1.OhlcFilterBase));

package/Charting/Model/Filters/OhlcScaleOffsetFilter.js

@@ -33,8 +33,9 @@ var OhlcCustomFilter_1 = require("./OhlcCustomFilter");
 var OhlcScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(OhlcScaleOffsetFilter, _super);
     function OhlcScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Ohlc) {

package/Charting/Model/Filters/XyCustomFilter.js

@@ -32,8 +32,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyCustomFilter = /** @class */ (function (_super) {
     __extends(XyCustomFilter, _super);
     function XyCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.filterFunctionProperty = (_a = options === null || options === void 0 ? void 0 : options.filterFunction) !== null && _a !== void 0 ? _a : _this.filterFunctionProperty;
         if (_this.getOriginalCount() > 0 && (options === null || options === void 0 ? void 0 : options.filterFunction)) {
             _this.filterAll();
@@ -57,34 +58,36 @@ var XyCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     XyCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues;
-        this.appendRange(xValues, yValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filterOnUpdate = function (index) {
-        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)));
+        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     XyCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues;
-        this.insertRange(startIndex, xValues, yValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     XyCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues;
-        this.appendRange(xValues, yValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
         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));
         }
-        return { xValues: xValues, yValues: yValues };
+        return { xValues: xValues, yValues: yValues, metadata: metadata };
     };
     return XyCustomFilter;
 }(XyFilterBase_1.XyFilterBase));

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

@@ -7,6 +7,7 @@ import { IXyDataSeriesOptions, XyDataSeries } from "../XyDataSeries";
 import { XyyDataSeries } from "../XyyDataSeries";
 import { XyzDataSeries } from "../XyzDataSeries";
 export declare enum EDataSeriesField {
+    X = "x",
     Open = "open",
     High = "high",
     Low = "low",
@@ -23,6 +24,10 @@ export interface IXyFilterOptions extends IXyDataSeriesOptions {
      * The field that will be returned by getOriginalYValues.
      */
     field?: EDataSeriesField;
+    /**
+     * The field that will be returned by getOriginalXValues.
+     */
+    xField?: EDataSeriesField;
 }
 /**
  * Base class for a filter that produces an {@link XyDataSeries}.
@@ -42,6 +47,10 @@ export declare abstract class XyFilterBase extends XyDataSeries {
      * The field that will be returned by getOriginalYValues.
      */
     readonly field: EDataSeriesField;
+    /**
+     * The field that will be returned by getOriginalYValues.
+     */
+    readonly xField: EDataSeriesField;
     /**
      * Creates an instance of {@link XyFilterBase}
      * @param originalSeries the {@link BaseDataSeries} to be filtered
@@ -96,9 +105,9 @@ export declare abstract class XyFilterBase extends XyDataSeries {
      */
     protected onClear(): void;
     protected onBaseDataChanged(args: IDataChangeArgs): void;
-    protected getYValuesFromOHLC(ohlcSeries: OhlcDataSeries): any;
-    protected getYValuesFromXyy(xyySeries: XyyDataSeries): any;
-    protected getYValuesFromXyz(xyzSeries: XyzDataSeries): any;
-    protected getYValuesFromHlc(hlcSeries: HlcDataSeries): any;
+    protected getValuesFromOHLC(field: EDataSeriesField, ohlcSeries: OhlcDataSeries): any;
+    protected getValuesFromXyy(field: EDataSeriesField, xyySeries: XyyDataSeries): any;
+    protected getValuesFromXyz(field: EDataSeriesField, xyzSeries: XyzDataSeries): any;
+    protected getValuesFromHlc(field: EDataSeriesField, hlcSeries: HlcDataSeries): any;
 }
-export declare const switchData: (field: EDataSeriesField, closey: any, openy1z?: any, high?: any, low?: any) => any;
+export declare const switchData: (field: EDataSeriesField, x: any, closey: any, openy1z?: any, high?: any, low?: any) => any;

package/Charting/Model/Filters/XyFilterBase.js

@@ -20,6 +20,7 @@ var IDataSeries_1 = require("../IDataSeries");
 var XyDataSeries_1 = require("../XyDataSeries");
 var EDataSeriesField;
 (function (EDataSeriesField) {
+    EDataSeriesField["X"] = "x";
     EDataSeriesField["Open"] = "open";
     EDataSeriesField["High"] = "high";
     EDataSeriesField["Low"] = "low";
@@ -45,28 +46,56 @@ var XyFilterBase = /** @class */ (function (_super) {
      * @param options the {@link IXyFilterOptions} which can be passed to configure the Filter at construct time
      */
     function XyFilterBase(originalSeries, options) {
-        var _a;
-        var _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
+        var _this = this;
+        var _a, _b;
+        _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
         /**
          * The field that will be returned by getOriginalYValues.
          */
         _this.field = EDataSeriesField.Y;
+        /**
+         * The field that will be returned by getOriginalYValues.
+         */
+        _this.xField = EDataSeriesField.X;
         _this.originalSeries = originalSeries;
         _this.field = (_a = options === null || options === void 0 ? void 0 : options.field) !== null && _a !== void 0 ? _a : _this.field;
+        _this.xField = (_b = options === null || options === void 0 ? void 0 : options.xField) !== null && _b !== void 0 ? _b : _this.xField;
         _this.onBaseDataChanged = _this.onBaseDataChanged.bind(_this);
         originalSeries.dataChanged.subscribe(_this.onBaseDataChanged);
         switch (_this.originalSeries.type) {
+            case IDataSeries_1.EDataSeriesType.Xy:
+                if (_this.xField === EDataSeriesField.Y) {
+                    _this.getOriginalXValues = function () { return _this.originalSeries.getNativeYValues(); };
+                }
+                if (_this.field === EDataSeriesField.X) {
+                    _this.getOriginalYValues = function () { return _this.originalSeries.getNativeXValues(); };
+                }
+                break;
             case IDataSeries_1.EDataSeriesType.Ohlc:
-                _this.getOriginalYValues = function () { return _this.getYValuesFromOHLC(_this.originalSeries); };
+                _this.getOriginalXValues = function () {
+                    return _this.getValuesFromOHLC(_this.xField, _this.originalSeries);
+                };
+                _this.getOriginalYValues = function () {
+                    return _this.getValuesFromOHLC(_this.field, _this.originalSeries);
+                };
                 break;
             case IDataSeries_1.EDataSeriesType.Xyy:
-                _this.getOriginalYValues = function () { return _this.getYValuesFromXyy(_this.originalSeries); };
+                _this.getOriginalXValues = function () {
+                    return _this.getValuesFromXyy(_this.xField, _this.originalSeries);
+                };
+                _this.getOriginalYValues = function () { return _this.getValuesFromXyy(_this.field, _this.originalSeries); };
                 break;
             case IDataSeries_1.EDataSeriesType.Xyz:
-                _this.getOriginalYValues = function () { return _this.getYValuesFromXyz(_this.originalSeries); };
+                _this.getOriginalXValues = function () {
+                    return _this.getValuesFromXyz(_this.xField, _this.originalSeries);
+                };
+                _this.getOriginalYValues = function () { return _this.getValuesFromXyz(_this.field, _this.originalSeries); };
                 break;
             case IDataSeries_1.EDataSeriesType.Hlc:
-                _this.getOriginalYValues = function () { return _this.getYValuesFromHlc(_this.originalSeries); };
+                _this.getOriginalXValues = function () {
+                    return _this.getValuesFromHlc(_this.xField, _this.originalSeries);
+                };
+                _this.getOriginalYValues = function () { return _this.getValuesFromHlc(_this.field, _this.originalSeries); };
                 break;
             default:
                 break;
@@ -157,24 +186,27 @@ var XyFilterBase = /** @class */ (function (_super) {
                 break;
         }
     };
-    XyFilterBase.prototype.getYValuesFromOHLC = function (ohlcSeries) {
-        return (0, exports.switchData)(this.field, ohlcSeries.getNativeYValues(), ohlcSeries.getNativeOpenValues(), ohlcSeries.getNativeHighValues(), ohlcSeries.getNativeLowValues());
+    XyFilterBase.prototype.getValuesFromOHLC = function (field, ohlcSeries) {
+        return (0, exports.switchData)(field, ohlcSeries.getNativeXValues(), ohlcSeries.getNativeYValues(), ohlcSeries.getNativeOpenValues(), ohlcSeries.getNativeHighValues(), ohlcSeries.getNativeLowValues());
     };
-    XyFilterBase.prototype.getYValuesFromXyy = function (xyySeries) {
-        return (0, exports.switchData)(this.field, xyySeries.getNativeYValues(), xyySeries.getNativeY1Values());
+    XyFilterBase.prototype.getValuesFromXyy = function (field, xyySeries) {
+        return (0, exports.switchData)(field, xyySeries.getNativeXValues(), xyySeries.getNativeYValues(), xyySeries.getNativeY1Values());
     };
-    XyFilterBase.prototype.getYValuesFromXyz = function (xyzSeries) {
-        return (0, exports.switchData)(this.field, xyzSeries.getNativeYValues(), xyzSeries.getNativeZValues());
+    XyFilterBase.prototype.getValuesFromXyz = function (field, xyzSeries) {
+        return (0, exports.switchData)(field, xyzSeries.getNativeXValues(), xyzSeries.getNativeYValues(), xyzSeries.getNativeZValues());
     };
-    XyFilterBase.prototype.getYValuesFromHlc = function (hlcSeries) {
-        return (0, exports.switchData)(this.field, hlcSeries.getNativeYValues(), undefined, hlcSeries.getNativeHighValues(), hlcSeries.getNativeLowValues());
+    XyFilterBase.prototype.getValuesFromHlc = function (field, hlcSeries) {
+        return (0, exports.switchData)(field, hlcSeries.getNativeXValues(), hlcSeries.getNativeYValues(), undefined, hlcSeries.getNativeHighValues(), hlcSeries.getNativeLowValues());
     };
     return XyFilterBase;
 }(XyDataSeries_1.XyDataSeries));
 exports.XyFilterBase = XyFilterBase;
-var switchData = function (field, closey, openy1z, high, low) {
+var switchData = function (field, x, closey, openy1z, high, low) {
     var data;
     switch (field) {
+        case EDataSeriesField.X:
+            data = x;
+            break;
         case EDataSeriesField.Close:
         case EDataSeriesField.Y:
             data = closey;

package/Charting/Model/Filters/XyMovingAverageFilter.js

@@ -35,8 +35,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyMovingAverageFilter = /** @class */ (function (_super) {
     __extends(XyMovingAverageFilter, _super);
     function XyMovingAverageFilter(originalSeries, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.lengthProperty = 30;
         // Buffer to store the data for the latest average
         _this.buffer = [];

package/Charting/Model/Filters/XyRatioFilter.js

@@ -37,8 +37,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyRatioFilter = /** @class */ (function (_super) {
     __extends(XyRatioFilter, _super);
     function XyRatioFilter(originalSeries, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.divisorField = XyFilterBase_1.EDataSeriesField.Y;
         Guard_1.Guard.notNull(options.divisorSeries, "divisorSeries");
         _this.divisorSeries = options.divisorSeries;

package/Charting/Model/Filters/XyScaleOffsetFilter.js

@@ -36,8 +36,9 @@ var XyCustomFilter_1 = require("./XyCustomFilter");
 var XyScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(XyScaleOffsetFilter, _super);
     function XyScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         _this.scaleProperty = (_a = options === null || options === void 0 ? void 0 : options.scale) !== null && _a !== void 0 ? _a : _this.scaleProperty;

package/Charting/Model/Filters/XyyCustomFilter.js

@@ -20,8 +20,9 @@ var XyyFilterBase_1 = require("./XyyFilterBase");
 var XyyCustomFilter = /** @class */ (function (_super) {
     __extends(XyyCustomFilter, _super);
     function XyyCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.filterFunctionProperty = (_a = options === null || options === void 0 ? void 0 : options.filterFunction) !== null && _a !== void 0 ? _a : _this.filterFunctionProperty;
         _this.y1filterFunctionProperty = (_b = options === null || options === void 0 ? void 0 : options.y1filterFunction) !== null && _b !== void 0 ? _b : _this.filterFunctionProperty;
         if (_this.getOriginalCount() > 0 && ((options === null || options === void 0 ? void 0 : options.filterFunction) || (options === null || options === void 0 ? void 0 : options.y1filterFunction))) {
@@ -62,23 +63,23 @@ var XyyCustomFilter = /** @class */ (function (_super) {
         return y1;
     };
     XyyCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values;
-        this.appendRange(xValues, yValues, y1Values);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, y1Values, metadata);
     };
     XyyCustomFilter.prototype.filterOnUpdate = function (index) {
-        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.y1filterFunction(index, this.getOriginalY1Values().get(index)));
+        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.y1filterFunction(index, this.getOriginalY1Values().get(index)), this.originalSeries.getMetadataAt(index));
     };
     XyyCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values;
-        this.insertRange(startIndex, xValues, yValues, y1Values);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, yValues, y1Values, metadata);
     };
     XyyCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     XyyCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values;
-        this.appendRange(xValues, yValues, y1Values);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, y1Values = _a.y1Values, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, y1Values, metadata);
     };
     XyyCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -87,12 +88,14 @@ 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));
         }
-        return { xValues: xValues, yValues: yValues, y1Values: y1Values };
+        return { xValues: xValues, yValues: yValues, y1Values: y1Values, metadata: metadata };
     };
     return XyyCustomFilter;
 }(XyyFilterBase_1.XyyFilterBase));

package/Charting/Model/Filters/XyyFilterBase.js

@@ -22,8 +22,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyyFilterBase = /** @class */ (function (_super) {
     __extends(XyyFilterBase, _super);
     function XyyFilterBase(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
+        _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
         _this.yfield = XyFilterBase_1.EDataSeriesField.Y;
         _this.y1field = XyFilterBase_1.EDataSeriesField.Y1;
         _this.originalSeries = originalSeries;

package/Charting/Model/Filters/XyyScaleOffsetFilter.js

@@ -32,8 +32,9 @@ var XyyCustomFilter_1 = require("./XyyCustomFilter");
 var XyyScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(XyyScaleOffsetFilter, _super);
     function XyyScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         _this.scaleProperty = (_a = options === null || options === void 0 ? void 0 : options.scale) !== null && _a !== void 0 ? _a : _this.scaleProperty;

package/Charting/Model/Filters/XyzCustomFilter.js

@@ -20,8 +20,9 @@ var XyzFilterBase_1 = require("./XyzFilterBase");
 var XyzCustomFilter = /** @class */ (function (_super) {
     __extends(XyzCustomFilter, _super);
     function XyzCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.filterFunctionProperty = (_a = options === null || options === void 0 ? void 0 : options.filterFunction) !== null && _a !== void 0 ? _a : _this.filterFunctionProperty;
         _this.zfilterFunctionProperty = (_b = options === null || options === void 0 ? void 0 : options.zfilterFunction) !== null && _b !== void 0 ? _b : _this.filterFunctionProperty;
         if (_this.getOriginalCount() > 0 && ((options === null || options === void 0 ? void 0 : options.filterFunction) || (options === null || options === void 0 ? void 0 : options.zfilterFunction))) {
@@ -58,23 +59,23 @@ var XyzCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     XyzCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues;
-        this.appendRange(xValues, yValues, zValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, zValues, metadata);
     };
     XyzCustomFilter.prototype.filterOnUpdate = function (index) {
-        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.zfilterFunction(index, this.getOriginalZValues().get(index)));
+        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.zfilterFunction(index, this.getOriginalZValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     XyzCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues;
-        this.insertRange(startIndex, xValues, yValues, zValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, yValues, zValues, metadata);
     };
     XyzCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     XyzCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues;
-        this.appendRange(xValues, yValues, zValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, zValues = _a.zValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, zValues, metadata);
     };
     XyzCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -83,12 +84,14 @@ 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));
         }
-        return { xValues: xValues, yValues: yValues, zValues: zValues };
+        return { xValues: xValues, yValues: yValues, zValues: zValues, metadata: metadata };
     };
     return XyzCustomFilter;
 }(XyzFilterBase_1.XyzFilterBase));

package/Charting/Model/Filters/XyzFilterBase.js

@@ -22,8 +22,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyzFilterBase = /** @class */ (function (_super) {
     __extends(XyzFilterBase, _super);
     function XyzFilterBase(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
+        _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
         _this.yfield = XyFilterBase_1.EDataSeriesField.Y;
         _this.zfield = XyFilterBase_1.EDataSeriesField.Z;
         _this.originalSeries = originalSeries;

package/Charting/Model/Filters/XyzScaleOffsetFilter.js

@@ -32,8 +32,9 @@ var XyzCustomFilter_1 = require("./XyzCustomFilter");
 var XyzScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(XyzScaleOffsetFilter, _super);
     function XyzScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         _this.scaleProperty = (_a = options === null || options === void 0 ? void 0 : options.scale) !== null && _a !== void 0 ? _a : _this.scaleProperty;