scichart 3.0.284 → 3.0.301

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/LabelProvider/LabelProviderBase2D.js

@@ -197,6 +197,7 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
                     }
                     else {
                         if (cachedLabelText) {
+                            text = cachedLabelText;
                             cachedLabel = LabelCache_1.labelCache.getLabel(cachedLabelText, this.styleId);
                             if (cachedLabel) {
                                 labels.push(cachedLabelText);

package/Charting/Visuals/RenderableSeries/HitTest/BandSeriesHitTestProvider.js

@@ -60,6 +60,7 @@ var BandSeriesHitTestProvider = /** @class */ (function (_super) {
                 hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
                 hitTestInfo.point2y1Value = y1NativeValues.get(hitRes.secondPointIndex);
                 hitTestInfo.point2y1Coord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2y1Value);
+                hitTestInfo.point2metadata = dataSeries.getMetadataAt(hitRes.secondPointIndex);
             }
         }
         else {
@@ -140,6 +141,7 @@ var BandSeriesHitTestProvider = /** @class */ (function (_super) {
                     hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
                     hitTestInfo.point2y1Value = y1NativeValues.get(hitRes.secondPointIndex);
                     hitTestInfo.point2y1Coord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2y1Value);
+                    hitTestInfo.point2metadata = dataSeries.getMetadataAt(hitRes.secondPointIndex);
                 }
             }
         }

package/Charting/Visuals/RenderableSeries/HitTest/BaseHitTestProvider.js

@@ -94,6 +94,7 @@ var BaseHitTestProvider = /** @class */ (function () {
                 hitTestInfo.point2xCoord = xCoordinateCalculator.getCoordinate(hitTestInfo.point2xValue);
                 hitTestInfo.point2yValue = yNativeValues.get(hitRes.secondPointIndex);
                 hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
+                hitTestInfo.point2metadata = dataSeries.getMetadataAt(hitRes.secondPointIndex);
             }
         }
         return hitTestInfo;

package/Charting/Visuals/RenderableSeries/HitTest/HitTestInfo.d.ts

@@ -158,5 +158,9 @@ export declare class HitTestInfo {
      * displaying tooltips with additional information specific for the data point
      */
     metadata: IPointMetadata;
+    /**
+     * The point metadata for the second data point
+     */
+    point2metadata: IPointMetadata;
     constructor(renderableSeries: IRenderableSeries, isEmpty?: boolean);
 }

package/Charting/Visuals/RenderableSeries/HitTest/LineSeriesHitTestProvider.js

@@ -74,6 +74,7 @@ var LineSeriesHitTestProvider = /** @class */ (function (_super) {
                 hitTestInfo.point2xCoord = xCoordinateCalculator.getCoordinate(hitTestInfo.point2xValue);
                 hitTestInfo.point2yValue = yNativeValues.get(hitRes.secondPointIndex);
                 hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
+                hitTestInfo.point2metadata = dataSeries.getMetadataAt(hitRes.secondPointIndex);
             }
         }
         else {
@@ -152,6 +153,7 @@ var LineSeriesHitTestProvider = /** @class */ (function (_super) {
                 hitTestInfo.point2yValue = yNativeValues.get(minDistanceIndex + 1);
                 hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
                 hitTestInfo.isHit = minDistance <= hitTestRadius;
+                hitTestInfo.point2metadata = dataSeries.getMetadataAt(minDistanceIndex + 1);
                 return hitTestInfo;
             }
         }

package/Charting/Visuals/RenderableSeries/HitTest/MountainSeriesHitTestProvider.js

@@ -56,6 +56,7 @@ var MountainSeriesHitTestProvider = /** @class */ (function (_super) {
                 hitTestInfo.point2xCoord = xCoordinateCalculator.getCoordinate(hitTestInfo.point2xValue);
                 hitTestInfo.point2yValue = yNativeValues.get(res.secondPointIndex);
                 hitTestInfo.point2yCoord = yCoordinateCalculator.getCoordinate(hitTestInfo.point2yValue);
+                hitTestInfo.point2metadata = dataSeries.getMetadataAt(res.secondPointIndex);
             }
         }
         else {

package/Charting/Visuals/RenderableSeries/RolloverModifier/RolloverModifierRenderableSeriesProps.js

@@ -124,9 +124,12 @@ var RolloverModifierRenderableSeriesProps = /** @class */ (function () {
     RolloverModifierRenderableSeriesProps.prototype.getRenderableSeriesStroke = function () {
         if (this.isY1) {
             var bandRS = this.renderableSeries;
-            return bandRS.strokeY1;
+            // @ts-ignore
+            return bandRS.strokeY1Property;
         }
-        return this.renderableSeries.stroke;
+        // Get property here to retain Auto_Color prefix
+        // @ts-ignore
+        return this.renderableSeries.strokeProperty;
     };
     return RolloverModifierRenderableSeriesProps;
 }());

package/Charting/Visuals/SciChartDefaults.d.ts

@@ -1,3 +1,4 @@
+import { EWatermarkPosition } from "../../types/WatermarkPosition";
 export declare class SciChartDefaults {
     /**
      * Experimental - set true to enable async label texture creation
@@ -24,4 +25,10 @@ export declare class SciChartDefaults {
      * Time in ms to retry loading a native font.  If you need to load a large font over a potentially slow connection await sciChartSurface.registerFont
      */
     static nativeFontTimeout: number;
+    /**
+     * The default position of the watermark for trials
+     */
+    static watermarkPosition: EWatermarkPosition;
+    /** For 2D charts the watermark is normally positioned within the series area.  Set this true to place it relative to the overall canvas.   */
+    static watermarkRelativeToCanvas: boolean;
 }

package/Charting/Visuals/SciChartDefaults.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SciChartDefaults = void 0;
+var WatermarkPosition_1 = require("../../types/WatermarkPosition");
 var SciChartDefaults = /** @class */ (function () {
     function SciChartDefaults() {
     }
@@ -29,6 +30,12 @@ var SciChartDefaults = /** @class */ (function () {
      * Time in ms to retry loading a native font.  If you need to load a large font over a potentially slow connection await sciChartSurface.registerFont
      */
     SciChartDefaults.nativeFontTimeout = 2000;
+    /**
+     * The default position of the watermark for trials
+     */
+    SciChartDefaults.watermarkPosition = WatermarkPosition_1.EWatermarkPosition.BottomLeft;
+    /** For 2D charts the watermark is normally positioned within the series area.  Set this true to place it relative to the overall canvas.   */
+    SciChartDefaults.watermarkRelativeToCanvas = false;
     return SciChartDefaults;
 }());
 exports.SciChartDefaults = SciChartDefaults;

package/Charting/Visuals/SciChartSurface.d.ts

@@ -28,6 +28,7 @@ import { IRenderableSeries } from "./RenderableSeries/IRenderableSeries";
 import { ESurfaceType, SciChartSurfaceBase, TSciChartConfig } from "./SciChartSurfaceBase";
 import { TDpiChangedEventArgs } from "./TextureManager/DpiHelper";
 import { Point } from "../../Core/Point";
+import { EWatermarkPosition } from "../../types/WatermarkPosition";
 export declare type TSciChart = TWasmContext;
 export declare type TWebAssemblyChart = {
     wasmContext: TSciChart;
@@ -212,6 +213,10 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
      * access to our WebGL2 Engine and WebAssembly numerical methods
      */
     readonly webAssemblyContext2D: TSciChart;
+    /** The position of the watermark for trials and community licenses */
+    watermarkPosition: EWatermarkPosition;
+    /** Set true to position the watermark relative to the overall canvas, rather than the series area.   */
+    watermarkRelativeToCanvas: boolean;
     protected animationList: IGenericAnimation[];
     protected paddingProperty: Thickness;
     private readonly sciChartRenderer;

package/Charting/Visuals/SciChartSurface.js

@@ -108,6 +108,7 @@ var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
 var DpiHelper_1 = require("./TextureManager/DpiHelper");
 var UpdateSuspender_1 = require("./UpdateSuspender");
 var Point_1 = require("../../Core/Point");
+var SciChartDefaults_1 = require("./SciChartDefaults");
 exports.sciChartConfig = {};
 // To force the worker to be created before it is needed, so we know if it alive or not
 var t = TextureWorker_1.textureWorker;
@@ -164,6 +165,10 @@ var SciChartSurface = /** @class */ (function (_super) {
          * In circumstances where you want to draw over the labels, eg with a subchart, set this true to have them drawn earlier.
          */
         _this.renderNativeAxisLabelsImmediately = false;
+        /** The position of the watermark for trials and community licenses */
+        _this.watermarkPosition = SciChartDefaults_1.SciChartDefaults.watermarkPosition;
+        /** Set true to position the watermark relative to the overall canvas, rather than the series area.   */
+        _this.watermarkRelativeToCanvas = false;
         _this.animationList = [];
         _this.paddingProperty = Thickness_1.Thickness.fromNumber(10);
         _this.zoomStateProperty = ZoomState_1.EZoomState.AtExtents;

package/Charting/Visuals/licenseManager2D.js

@@ -167,7 +167,8 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
         switch (_b.label) {
             case 0:
                 _b.trys.push([0, 5, , 6]);
-                if (checkStatus !== licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard &&
+                if (checkStatus !== licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard &&
+                    checkStatus !== licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard)
                     return [2 /*return*/];
                 debug("Trying to get license from local license wizard");
@@ -203,6 +204,7 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
             case 4: return [3 /*break*/, 6];
             case 5:
                 err_3 = _b.sent();
+                checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
                 // Failed to connect.  Retry
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
@@ -355,7 +357,7 @@ var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __a
                     licenseContext.SCRTCredentials.ResetRuntimeLicense();
                     isRuntimeKey = false;
                     licenseManager2dState_1.licenseManager2dState.setIsDev(true);
-                    checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
+                    checkStatus = licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard;
                     getlicenseFromWizard(licenseContext, sciChartSurface);
                     if (licenseContext2D !== undefined) {
                         (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
@@ -429,6 +431,7 @@ var applyLicense = function (licenseContext, sciChartSurface) {
     var runtimelicense = getRuntimeLicenseKey();
     if ((checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense ||
         checkStatus === licensingClasses_1.LicenseCheckStatus.LicenseOK ||
+        checkStatus === licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard ||
         checkStatus === licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard) &&
         lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE &&
         runtimelicense) {
@@ -541,7 +544,7 @@ var applyLicense = function (licenseContext, sciChartSurface) {
     debug("checkstatus: " + licensingClasses_1.LicenseCheckStatus[checkStatus]);
     if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense && useLicenseWizard) {
         if (wizardTimer === undefined) {
-            checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
+            checkStatus = licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard;
             licenseManager2dState_1.licenseManager2dState.setIsDev(true);
             getlicenseFromWizard(licenseContext, sciChartSurface);
         }
@@ -798,6 +801,9 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         debug("".concat(is2D ? "2D" : "3D", " license status changed"));
         sciChartSurface.invalidateElement();
         sciChartSurface.otherSurfaces.map(function (s) { return s.invalidateElement(); });
+        if (checkStatus === licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard) {
+            return;
+        }
         // Update license message text
         var licensingLink = "<a href=\"https://www.scichart.com/licensing-scichart\"  target=\"_blank\" style=\"color: white\">www.scichart.com/licensing-scichart</a>";
         var contactSupportLink = "<a href=\"https://www.scichart.com/contact-us/\"  target=\"_blank\" style=\"color: orange\">contact support</a>";
@@ -909,7 +915,7 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
                 else {
                     licenseMessageDivChild.innerHTML =
                         premsg +
-                            "<br><a href=\"https://github.com/ABTSoftware/SciChart.JS.Examples/blob/master/README-BetaTesters.md\"  target=\"_blank\" style=\"color: white\">Click here for a beta trial key and instructions</a>";
+                            "<br><a href=\"https://www.scichart.com/licensing-scichart-js/\"  target=\"_blank\" style=\"color: white\">Click here for licensing information</a>";
                 }
             }
         }

package/Charting3D/ChartModifiers/ChartModifierBase3D.d.ts

@@ -1,12 +1,26 @@
 import { ChartModifierBase, EModifierType } from "../../Charting/ChartModifiers/ChartModifierBase";
+import { EChart3DModifierType } from "../../types/ChartModifierType";
+import { EExecuteOn } from "../../types/ExecuteOn";
 import { SciChart3DSurface } from "../Visuals/SciChart3DSurface";
 export interface IChartModifierBase3DOptions {
+    /**
+     * A unique Id for the {@link ChartModifierBase3D}
+     */
+    id?: string;
+    /**
+     * Defines the operation that modifier should respond to
+     */
+    executeOn?: EExecuteOn;
 }
 /**
  * Defines a base class to a ChartModifier3D - a class which provides Zoom, Pan, Tooltip or interaction behavior
  * to SciChart - High Performance Realtime {@link https://www.scichart.com/javascript-chart-features | JavaScript 3D Charts}
  */
 export declare abstract class ChartModifierBase3D extends ChartModifierBase<SciChart3DSurface> {
+    /**
+     * The type of chartmodifier. See {@link EChart3DModifierType} for available options
+     */
+    abstract readonly type: EChart3DModifierType | string;
     /**
      * Creates an instance of a {@link ChartModifierBase3D}
      * @param options Optional parameters of type {@link IChartModifierBase3DOptions} used to configure the modifier
@@ -16,4 +30,8 @@ export declare abstract class ChartModifierBase3D extends ChartModifierBase<SciC
      * @inheritDoc
      */
     get modifierType(): EModifierType;
+    toJSON(): {
+        type: string;
+        options: Required<Omit<IChartModifierBase3DOptions, never>>;
+    };
 }

package/Charting3D/ChartModifiers/ChartModifierBase3D.js

@@ -28,7 +28,7 @@ var ChartModifierBase3D = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IChartModifierBase3DOptions} used to configure the modifier
      */
     function ChartModifierBase3D(options) {
-        return _super.call(this) || this;
+        return _super.call(this, options) || this;
     }
     Object.defineProperty(ChartModifierBase3D.prototype, "modifierType", {
         /**
@@ -40,6 +40,13 @@ var ChartModifierBase3D = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    ChartModifierBase3D.prototype.toJSON = function () {
+        var options = {
+            id: this.id,
+            executeOn: this.executeOn
+        };
+        return { type: this.type, options: options };
+    };
     return ChartModifierBase3D;
 }(ChartModifierBase_1.ChartModifierBase));
 exports.ChartModifierBase3D = ChartModifierBase3D;

package/Charting3D/ChartModifiers/CustomChartModifier3D.d.ts

@@ -0,0 +1,16 @@
+import { EChart3DModifierType } from "../../types/ChartModifierType";
+import { ChartModifierBase3D, IChartModifierBase3DOptions } from "./ChartModifierBase3D";
+/**
+ * Base class for custom Chart Modifiers (allows custom zooming, panning, interaction behaviour) on 2D Charts
+ */
+export declare class CustomChartModifier3D extends ChartModifierBase3D {
+    /**
+     * @inheritDoc
+     */
+    readonly type: EChart3DModifierType;
+    /**
+     * @inheritDoc
+     * @param options
+     */
+    constructor(options?: IChartModifierBase3DOptions);
+}

package/Charting3D/ChartModifiers/CustomChartModifier3D.js

@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomChartModifier3D = void 0;
+var ChartModifierType_1 = require("../../types/ChartModifierType");
+var ChartModifierBase3D_1 = require("./ChartModifierBase3D");
+/**
+ * Base class for custom Chart Modifiers (allows custom zooming, panning, interaction behaviour) on 2D Charts
+ */
+var CustomChartModifier3D = /** @class */ (function (_super) {
+    __extends(CustomChartModifier3D, _super);
+    /**
+     * @inheritDoc
+     * @param options
+     */
+    function CustomChartModifier3D(options) {
+        var _this = _super.call(this, options) || this;
+        /**
+         * @inheritDoc
+         */
+        _this.type = ChartModifierType_1.EChart3DModifierType.Custom;
+        return _this;
+    }
+    return CustomChartModifier3D;
+}(ChartModifierBase3D_1.ChartModifierBase3D));
+exports.CustomChartModifier3D = CustomChartModifier3D;

package/Charting3D/ChartModifiers/MouseWheelZoomModifier3D.d.ts

@@ -27,6 +27,7 @@ export interface IMouseWheelZoomModifier3DOptions extends IChartModifierBase3DOp
  * @remarks The speed of mouse-wheel zoom can be modified via the {@link MouseWheelZoomModifier3D.mouseWheelSensitivity} property.
  */
 export declare class MouseWheelZoomModifier3D extends ChartModifierBase3D {
+    readonly type = EChart3DModifierType.MouseWheelZoom;
     /**
      * The mouse wheel sensitifivity is a factor that determines how much the camera zooms when the mouse wheel scrolls.
      * Default value is 0.1
@@ -41,10 +42,11 @@ export declare class MouseWheelZoomModifier3D extends ChartModifierBase3D {
      * @inheritDoc
      */
     modifierMouseWheel(args: ModifierMouseArgs): void;
-    toJSON?(): {
-        type: EChart3DModifierType;
-        options: {
-            mouseWheelSensitivity: number;
-        };
+    /**
+     * @inheritDoc
+     */
+    toJSON(): {
+        type: string;
+        options: Required<Omit<IChartModifierBase3DOptions, never>>;
     };
 }

package/Charting3D/ChartModifiers/MouseWheelZoomModifier3D.js

@@ -42,6 +42,7 @@ var MouseWheelZoomModifier3D = /** @class */ (function (_super) {
      */
     function MouseWheelZoomModifier3D(options) {
         var _this = _super.call(this, options) || this;
+        _this.type = ChartModifierType_1.EChart3DModifierType.MouseWheelZoom;
         _this.mouseWheelSensitivity = (options === null || options === void 0 ? void 0 : options.mouseWheelSensitivity) || 0.1;
         return _this;
     }
@@ -70,12 +71,16 @@ var MouseWheelZoomModifier3D = /** @class */ (function (_super) {
         }
         args.handled = true;
     };
-    //@ts-ignore
+    /**
+     * @inheritDoc
+     */
     MouseWheelZoomModifier3D.prototype.toJSON = function () {
-        return {
-            type: ChartModifierType_1.EChart3DModifierType.MouseWheelZoom,
-            options: { mouseWheelSensitivity: this.mouseWheelSensitivity }
+        var json = _super.prototype.toJSON.call(this);
+        var options = {
+            mouseWheelSensitivity: this.mouseWheelSensitivity
         };
+        Object.assign(json.options, options);
+        return json;
     };
     return MouseWheelZoomModifier3D;
 }(ChartModifierBase3D_1.ChartModifierBase3D));

package/Charting3D/ChartModifiers/OrbitModifier3D.d.ts

@@ -1,6 +1,11 @@
 import { ModifierMouseArgs } from "../../Charting/ChartModifiers/ModifierMouseArgs";
 import { EChart3DModifierType } from "../../types/ChartModifierType";
-import { ChartModifierBase3D } from "./ChartModifierBase3D";
+import { ChartModifierBase3D, IChartModifierBase3DOptions } from "./ChartModifierBase3D";
+/**
+ * Optional parameters passed to the constructor of {@link OrbitModifier3D} to configure it
+ */
+export interface IOrbitModifier3DOptions extends IChartModifierBase3DOptions {
+}
 /**
  * @summary The {@link OrbitModifier3D} provides behavior to orbit around a target point on a 3D {@link SciChart3DSurface}
  * within SciChart - High Performance {@link https://www.scichart.com/javascript-chart-features | JavaScript 3D Charts}
@@ -15,9 +20,13 @@ import { ChartModifierBase3D } from "./ChartModifierBase3D";
  * ```
  */
 export declare class OrbitModifier3D extends ChartModifierBase3D {
+    /**
+     * @inheritDoc
+     */
+    readonly type = EChart3DModifierType.Orbit;
     private pointStart;
     private isDragging;
-    constructor();
+    constructor(options?: IOrbitModifier3DOptions);
     /**
      * @inheritDoc
      */
@@ -30,7 +39,4 @@ export declare class OrbitModifier3D extends ChartModifierBase3D {
      * @inheritDoc
      */
     modifierMouseUp(args: ModifierMouseArgs): void;
-    toJSON(): {
-        type: EChart3DModifierType;
-    };
 }

package/Charting3D/ChartModifiers/OrbitModifier3D.js

@@ -34,8 +34,13 @@ var ChartModifierBase3D_1 = require("./ChartModifierBase3D");
  */
 var OrbitModifier3D = /** @class */ (function (_super) {
     __extends(OrbitModifier3D, _super);
-    function OrbitModifier3D() {
-        return _super.call(this) || this;
+    function OrbitModifier3D(options) {
+        var _this = _super.call(this, options) || this;
+        /**
+         * @inheritDoc
+         */
+        _this.type = ChartModifierType_1.EChart3DModifierType.Orbit;
+        return _this;
     }
     /**
      * @inheritDoc
@@ -80,9 +85,6 @@ var OrbitModifier3D = /** @class */ (function (_super) {
         this.isDragging = false;
         this.pointStart = undefined;
     };
-    OrbitModifier3D.prototype.toJSON = function () {
-        return { type: ChartModifierType_1.EChart3DModifierType.Orbit };
-    };
     return OrbitModifier3D;
 }(ChartModifierBase3D_1.ChartModifierBase3D));
 exports.OrbitModifier3D = OrbitModifier3D;

package/Charting3D/ChartModifiers/ResetCamera3DModifier.d.ts

@@ -17,7 +17,7 @@ export interface IResetCamera3DOptions extends IChartModifierBase3DOptions {
     /**
      * Defines the easing function for animation. See {@link TEasingFn} for a range of functions
      */
-    easingFunction?: TEasingFn;
+    easingFunction?: TEasingFn | string;
     /**
      * The camera settings to reset to.  Defaults to the camera state when the modifier was attached to the chart.
      */
@@ -45,6 +45,10 @@ export declare type TCameraState = {
  *
  */
 export declare class ResetCamera3DModifier extends ChartModifierBase3D {
+    /**
+     * @inheritDoc
+     */
+    readonly type = EChart3DModifierType.ZoomExtents;
     /**
      * When true, the Zoom operations are animated. See also {@link animationDuration} and {@link easingFunction}
      */
@@ -68,12 +72,11 @@ export declare class ResetCamera3DModifier extends ChartModifierBase3D {
      * @inheritDoc
      */
     modifierDoubleClick(args: ModifierMouseArgs): void;
-    toJSON?(): {
-        type: EChart3DModifierType;
-        options: {
-            animationDuration: number;
-            easingFunction: string;
-            isAnimated: boolean;
-        };
+    /**
+     * @inheritDoc
+     */
+    toJSON(): {
+        type: string;
+        options: Required<Omit<IChartModifierBase3DOptions, never>>;
     };
 }