scichart 2.1.2301 → 2.2.2389

package/Charting/Visuals/SciChartPieSurface/constants.d.ts

@@ -2,5 +2,11 @@ export declare enum PROPERTY {
     HOLE_RADIUS = "HOLE_RADIUS",
     HOLE_RADIUS_SIZING_MODE = "HOLE_RADIUS_SIZING_MODE",
     PIE_TYPE = "PIE_TYPE",
-    SERIES_SPACING = "SERIES_SPACING"
+    SERIES_SPACING = "SERIES_SPACING",
+    PADDING = "PADDING",
+    CANVAS_BORDER = "CANVAS_BORDER",
+    LABEL_PROVIDER = "LABEL_PROVIDER",
+    VALUE_MODE = "VALUE_MODE",
+    LABEL_RADIUS = "LABEL_RADIUS",
+    TEXT_STYLE = "TEXT_STYLE"
 }

package/Charting/Visuals/SciChartPieSurface/constants.js

@@ -7,4 +7,10 @@ var PROPERTY;
     PROPERTY["HOLE_RADIUS_SIZING_MODE"] = "HOLE_RADIUS_SIZING_MODE";
     PROPERTY["PIE_TYPE"] = "PIE_TYPE";
     PROPERTY["SERIES_SPACING"] = "SERIES_SPACING";
+    PROPERTY["PADDING"] = "PADDING";
+    PROPERTY["CANVAS_BORDER"] = "CANVAS_BORDER";
+    PROPERTY["LABEL_PROVIDER"] = "LABEL_PROVIDER";
+    PROPERTY["VALUE_MODE"] = "VALUE_MODE";
+    PROPERTY["LABEL_RADIUS"] = "LABEL_RADIUS";
+    PROPERTY["TEXT_STYLE"] = "TEXT_STYLE";
 })(PROPERTY = exports.PROPERTY || (exports.PROPERTY = {}));

package/Charting/Visuals/SciChartSurface.d.ts

@@ -69,9 +69,11 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
      * To use the default CDN, just call SciChart.SciChartSurface.useWasmFromCDN();
      * @example
      * ```ts
+     * import { libraryVersion } from "scichart/Core/BuildStamp";
+     *
      * SciChart.SciChartSurface.configure({
-     *  dataUrl: "https://cdn.jsdelivr.net/npm/scichart@1.3.1500/_wasm/scichart2d.data",
-     *  wasmUrl: "https://cdn.jsdelivr.net/npm/scichart@1.3.1500/_wasm/scichart2d.wasm"
+     *  dataUrl: `https://cdn.jsdelivr.net/npm/scichart@${libraryVersion}/_wasm/scichart2d.data`,
+     *  wasmUrl: `https://cdn.jsdelivr.net/npm/scichart@${libraryVersion}/_wasm/scichart2d.wasm`
      * });
      * ```
      * @param config
@@ -192,6 +194,7 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
     private solidBrushCacheCanvasBorder;
     private viewportBorderProperty;
     private canvasBorderProperty;
+    private drawSeriesBehindAxisProperty;
     /**
      * Creates an instance of the {@link SciChartSurface}
      * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
@@ -419,4 +422,12 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
     private attachAxis;
     private detachAnnotation;
     private attachAnnotation;
+    /**
+     * Gets or sets the boolean flag for switching behaviour of Axises rendering
+     */
+    get drawSeriesBehindAxis(): boolean;
+    /**
+     * Gets or sets the boolean flag for switching behaviour of Axises rendering
+     */
+    set drawSeriesBehindAxis(value: boolean);
 }

package/Charting/Visuals/SciChartSurface.js

@@ -114,6 +114,7 @@ var SciChartSurface = /** @class */ (function (_super) {
             color: "#00000000",
             border: undefined
         };
+        _this.drawSeriesBehindAxisProperty = false;
         var canvasWidth = (_b = (_a = _this.domCanvas2D) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : app_1.DEFAULT_WIDTH;
         var canvasHeight = (_d = (_c = _this.domCanvas2D) === null || _c === void 0 ? void 0 : _c.height) !== null && _d !== void 0 ? _d : app_1.DEFAULT_HEIGHT;
         _this.webAssemblyContext2D = webAssemblyContext;
@@ -236,9 +237,11 @@ var SciChartSurface = /** @class */ (function (_super) {
      * To use the default CDN, just call SciChart.SciChartSurface.useWasmFromCDN();
      * @example
      * ```ts
+     * import { libraryVersion } from "scichart/Core/BuildStamp";
+     *
      * SciChart.SciChartSurface.configure({
-     *  dataUrl: "https://cdn.jsdelivr.net/npm/scichart@1.3.1500/_wasm/scichart2d.data",
-     *  wasmUrl: "https://cdn.jsdelivr.net/npm/scichart@1.3.1500/_wasm/scichart2d.wasm"
+     *  dataUrl: `https://cdn.jsdelivr.net/npm/scichart@${libraryVersion}/_wasm/scichart2d.data`,
+     *  wasmUrl: `https://cdn.jsdelivr.net/npm/scichart@${libraryVersion}/_wasm/scichart2d.wasm`
      * });
      * ```
      * @param config
@@ -425,6 +428,20 @@ var SciChartSurface = /** @class */ (function (_super) {
         this.watermarkProperties = (0, Deleter_1.deleteSafe)(this.watermarkProperties);
         this.watermarkPropertyPosition = (0, Deleter_1.deleteSafe)(this.watermarkPropertyPosition);
         this.chartModifiers.asArray().forEach(function (chm) { return chm.delete(); });
+        if (this.domChartRoot) {
+            var style = this.domChartRoot.style;
+            if (style) {
+                style.background = "";
+                style.position = "";
+            }
+            if (this.domChartRoot.hasOwnProperty("replaceChildren")) {
+                // @ts-ignore
+                this.domChartRoot.replaceChildren();
+            }
+            else {
+                this.domChartRoot.innerHTML = "";
+            }
+        }
     };
     /**
      * @inheritDoc
@@ -790,6 +807,9 @@ var SciChartSurface = /** @class */ (function (_super) {
             // @ts-ignore
             this.loaderJson = options.loader.toJSON();
         }
+        if (options === null || options === void 0 ? void 0 : options.drawSeriesBehindAxis) {
+            this.drawSeriesBehindAxisProperty = options.drawSeriesBehindAxis;
+        }
     };
     /**
      * @inheritDoc
@@ -894,7 +914,6 @@ var SciChartSurface = /** @class */ (function (_super) {
             }
             col.add(renderableSeries);
             this.renderableSeries.remove(renderableSeries);
-            return;
         }
         renderableSeries.onAttach(this);
         if (this.themeProviderProperty) {
@@ -943,6 +962,23 @@ var SciChartSurface = /** @class */ (function (_super) {
         annotation.onAttach(this);
         this.invalidateElement();
     };
+    Object.defineProperty(SciChartSurface.prototype, "drawSeriesBehindAxis", {
+        /**
+         * Gets or sets the boolean flag for switching behaviour of Axises rendering
+         */
+        get: function () {
+            return this.drawSeriesBehindAxisProperty;
+        },
+        /**
+         * Gets or sets the boolean flag for switching behaviour of Axises rendering
+         */
+        set: function (value) {
+            this.drawSeriesBehindAxisProperty = value;
+            this.invalidateElement();
+        },
+        enumerable: false,
+        configurable: true
+    });
     return SciChartSurface;
 }(SciChartSurfaceBase_1.SciChartSurfaceBase));
 exports.SciChartSurface = SciChartSurface;

package/Charting/Visuals/createMaster.js

@@ -64,7 +64,7 @@ var createMultichart = function (divElement, options) { return __awaiter(void 0,
         switch (_d.label) {
             case 0:
                 sciChartInitCommon_1.default.checkChartDivExists(divElement);
-                canvases = sciChartInitCommon_1.default.initCanvas(divElement, (_a = options === null || options === void 0 ? void 0 : options.widthAspect) !== null && _a !== void 0 ? _a : 0, (_b = options === null || options === void 0 ? void 0 : options.heightAspect) !== null && _b !== void 0 ? _b : 0, sciChartInitCommon_1.default.ECanvasType.canvas2D);
+                canvases = sciChartInitCommon_1.default.initCanvas(divElement, (_a = options === null || options === void 0 ? void 0 : options.widthAspect) !== null && _a !== void 0 ? _a : 0, (_b = options === null || options === void 0 ? void 0 : options.heightAspect) !== null && _b !== void 0 ? _b : 0, sciChartInitCommon_1.default.ECanvasType.canvas2D, options === null || options === void 0 ? void 0 : options.disableAspect);
                 loader = (_c = options === null || options === void 0 ? void 0 : options.loader) !== null && _c !== void 0 ? _c : new loader_1.DefaultSciChartLoader();
                 loaderDiv = loader.addChartLoader(canvases.domDivContainer, options === null || options === void 0 ? void 0 : options.theme);
                 _d.label = 1;
@@ -142,7 +142,7 @@ var createMaster = function () {
         Guard_1.Guard.notNull(theme, "theme");
         var sciChartSurface = new SciChartSurface_1.SciChartSurface(wasmContext, { canvases: canvases });
         sciChartSurface.applyTheme(theme);
-        var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, sciChartSurface);
+        var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, sciChartSurface, canvases.disableAspect);
         sciChartSurface.addDeletable(unsub);
         sciChartSurface.setDestinations(exports.sciChartDestinations);
         return sciChartSurface;
@@ -190,17 +190,21 @@ var createMaster = function () {
                 InitializeChart: function () {
                     resolve({ getChildSurfaces: getChildSurfaces, createChildSurface: createChildSurface, wasmContext: wasmContext });
                 },
-                Draw: function () {
-                    exports.sciChartDestinations.forEach(function (dest, index) {
-                        var canvasElementId = dest.canvasElementId, sciChartSurface = dest.sciChartSurface;
-                        var chart = wasmContext.SCRTGetGlobalSampleChartInterface();
-                        if (chart.GetCurrentDestination()) {
-                            var currDestID = chart.GetCurrentDestination().GetID();
-                            if (currDestID === canvasElementId) {
-                                sciChartSurface.renderSurface.onRenderTimeElapsed();
-                            }
-                        }
-                    });
+                Draw: function (canvasId) {
+                    var dest = exports.sciChartDestinations.find(function (d) { return d.canvasElementId === canvasId; });
+                    if (dest) {
+                        dest.sciChartSurface.renderSurface.onRenderTimeElapsed();
+                    }
+                    // sciChartDestinations.forEach((dest, index) => {
+                    //     const { canvasElementId, sciChartSurface } = dest;
+                    //     const chart = wasmContext.SCRTGetGlobalSampleChartInterface();
+                    //     if (chart.GetCurrentDestination()) {
+                    //         const currDestID = chart.GetCurrentDestination().GetID();
+                    //         if (currDestID === canvasElementId) {
+                    //             (sciChartSurface as SciChartSurface).renderSurface.onRenderTimeElapsed();
+                    //         }
+                    //     }
+                    // });
                 },
                 Update: function (deltaTime) {
                     // Logger.log("sciChartInitCommon.ts Update");

package/Charting/Visuals/createSingle.js

@@ -12,13 +12,14 @@ var loader_1 = require("./loader");
 var sciChartInitCommon_1 = require("./sciChartInitCommon");
 var SciChartSurface_1 = require("./SciChartSurface");
 var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
+var NativeObject_1 = require("./Helpers/NativeObject");
 // Global variables
 exports.sciChartSingleDestinations = [];
 /** @ignore */
 var createSingleInternal = function (divElement, options) {
     return new Promise(function (resolve, reject) {
         var _a;
-        var canvases = sciChartInitCommon_1.default.initCanvas(divElement, options === null || options === void 0 ? void 0 : options.widthAspect, options === null || options === void 0 ? void 0 : options.heightAspect);
+        var canvases = sciChartInitCommon_1.default.initCanvas(divElement, options === null || options === void 0 ? void 0 : options.widthAspect, options === null || options === void 0 ? void 0 : options.heightAspect, undefined, options === null || options === void 0 ? void 0 : options.disableAspect);
         var loader = (_a = options === null || options === void 0 ? void 0 : options.loader) !== null && _a !== void 0 ? _a : new loader_1.DefaultSciChartLoader();
         var loaderDiv = loader.addChartLoader(canvases.domDivContainer, options === null || options === void 0 ? void 0 : options.theme);
         var webGLSupport = WebGlHelper_1.WebGlHelper.getWebGlSupport();
@@ -68,12 +69,13 @@ var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme)
             setTimeout(function () {
                 scs.invalidateElement();
                 licenseManager2D_1.licenseManager.applyLicense2D(wasmContext, scs, true);
-                var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, scs);
+                var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, scs, canvases.disableAspect);
                 scs.addDeletable(unsub);
+                scs.addDeletable((0, NativeObject_1.freeCache)(wasmContext));
                 resolve({ wasmContext: wasmContext, sciChartSurface: scs });
             }, 0);
         },
-        Draw: function () {
+        Draw: function (canvasId) {
             scs.renderSurface.onRenderTimeElapsed();
         },
         Update: function (deltaTime) {

package/Charting/Visuals/licenseManager2D.d.ts

@@ -10,6 +10,7 @@ export declare type TLicenseDependencies = {
     debug: (message: string) => void;
 };
 export declare const setDependencies: (dependencies: TLicenseDependencies) => TLicenseDependencies;
+export declare const setIsDebugLicensing: (value: boolean, persist?: boolean) => void;
 export declare const setLicenseCallback: (callback: (queryString: string) => Promise<Response>) => void;
 export declare const setRuntimeLicenseKey: (value: string) => void;
 export declare const setUseLicenseWizard: (value: boolean) => void;
@@ -39,6 +40,7 @@ export declare type TLicenseContext = {
         GetLicenseType: () => SCRTLicenseType;
         GetLicenseDaysRemaining: () => number;
         Dump: () => string;
+        HasFeature: (feature: string) => SCRTLicenseType;
         GetLicenseErrors: () => string;
         GetAllowDebugging: () => boolean;
         SetRuntimeLicenseKeyW: (licenseKey: string) => void;
@@ -47,6 +49,9 @@ export declare type TLicenseContext = {
         ResetRuntimeLicense: () => void;
         GetLicenseChallenge: () => string;
         GetOrderId: () => string;
+        GetEncryptedOrderId: () => string;
+        GetProductCode: () => string;
+        GetDeveloperCount: () => number;
     };
     SCRTLicenseType: {
         LICENSE_TYPE_NO_LICENSE: SCRTLicenseType;
@@ -64,6 +69,7 @@ export declare const getLicenseInfo: (licenseContext: TLicenseContext) => ILicen
 export declare const updateLicenseDisplay: (licenseInfo: ILicenseInfo, sciChartSurface: SciChartSurfaceBase, is2D: boolean, applyToOther: boolean) => void;
 export declare const licenseManager: {
     setRuntimeLicenseKey: (value: string) => void;
+    setIsDebugLicensing: (value: boolean) => void;
     setLicenseCallback: (callback: (queryString: string) => Promise<Response>) => void;
     setServerLicenseEndpoint: (value: string) => void;
     applyLicense2D: (licenseContext: TLicenseContext, sciChartSurface: SciChartSurfaceBase, isSingle: boolean) => void;

package/Charting/Visuals/licenseManager2D.js

@@ -36,11 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo = exports.applyLicense = exports.getLicenseCookie = exports.setCallbacks3D = exports.setUseLicenseWizard = exports.setRuntimeLicenseKey = exports.setLicenseCallback = exports.setDependencies = void 0;
+exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo = exports.applyLicense = exports.getLicenseCookie = exports.setCallbacks3D = exports.setUseLicenseWizard = exports.setRuntimeLicenseKey = exports.setLicenseCallback = exports.setIsDebugLicensing = exports.setDependencies = void 0;
 var app_1 = require("../../constants/app");
 var BuildStamp_1 = require("../../Core/BuildStamp");
 var Dictionary_1 = require("../../Core/Dictionary");
 var localStorageApi_1 = require("../../Core/storage/localStorageApi");
+var Telemetry_1 = require("../../Core/Telemetry");
 var Color_1 = require("../../types/Color");
 var licensingClasses_1 = require("../../types/licensingClasses");
 var cookie_1 = require("../../utils/cookie");
@@ -103,6 +104,14 @@ var licenseDependencies = {
 var setDependencies = function (dependencies) { return (licenseDependencies = dependencies); };
 exports.setDependencies = setDependencies;
 var isDebug = null;
+var setIsDebugLicensing = function (value, persist) {
+    if (persist === void 0) { persist = false; }
+    isDebug = value;
+    if (persist || !value) {
+        localStorageApi_1.localStorageApi.setIsLicenseDebug(value);
+    }
+};
+exports.setIsDebugLicensing = setIsDebugLicensing;
 var debug = function (message) {
     if (isDebug === null) {
         isDebug = localStorageApi_1.localStorageApi.getIsLicenseDebug();
@@ -172,6 +181,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 keyCode = _b.sent();
                 _a = setNewLicense(keyCode), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
                 if (requiresValidation) {
+                    debug("Got a developer license from local license wizard.  Validating...");
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
                     dolicenseChallenge();
                 }
@@ -181,6 +191,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                     wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 }
                 else {
+                    debug("Got a valid license from local license wizard.");
                     checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                 }
                 return [3 /*break*/, 4];
@@ -302,6 +313,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                         key = (0, exports.getLicenseCookie)().key;
                         timeNow = Math.floor(new Date().getTime() / 1000);
                         setLicenseCookie(key, token, expirySeconds, timeNow);
+                        debug("License validated");
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                         timeToExpiry = expirySeconds - timeNow;
                         challengeFailCounts = 0;
@@ -309,24 +321,47 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                     }
                     else {
                         // Something went wrong with the apply
-                        console.log("license challenge response was invalid: " + token);
+                        debug("license challenge response was invalid: " + token);
                         checkStatus = licensingClasses_1.LicenseCheckStatus.FailedToValidateDeveloperLicense;
                     }
                 }
                 else {
                     // Challenge rejected by server
-                    console.log("Server rejected the license challenge: " + token);
+                    debug("Server rejected the license challenge: " + token);
                     checkStatus = licensingClasses_1.LicenseCheckStatus.FailedToValidateDeveloperLicense;
                 }
                 return [3 /*break*/, 10];
             case 9:
                 // Server error or network failure
-                console.log("Error during license validation: " + response.statusText);
-                checkStatus = licensingClasses_1.LicenseCheckStatus.FailedToValidateDeveloperLicense;
+                if (licenseManager2dState_1.licenseManager2dState.getIsDev()) {
+                    console.warn("Error during license validation: " + response.statusText);
+                    checkStatus = licensingClasses_1.LicenseCheckStatus.FailedToValidateDeveloperLicense;
+                }
+                else {
+                    // switch to license wizard
+                    throw new Error(response.statusText);
+                }
                 _b.label = 10;
             case 10: return [3 /*break*/, 12];
             case 11:
                 err_4 = _b.sent();
+                // switch to license wizard
+                if (!licenseManager2dState_1.licenseManager2dState.getIsDev()) {
+                    console.warn("Server license validation failed.  Looking for local developer license");
+                    runtimeLicenseKey = "";
+                    checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
+                    licenseContext2D.SCRTCredentials.ResetRuntimeLicense();
+                    isRuntimeKey = false;
+                    (0, exports.applyLicense)(licenseContext2D);
+                    // licenseManager2dState.setIsDev(true);
+                    // checkStatus = LicenseCheckStatus.LookingForLicenseWizard;
+                    // getlicenseFromWizard();
+                    // if (licenseContext2D !== undefined) {
+                    //     updateLicenseDisplay(getLicenseInfo(licenseContext2D), sciChartSurface2D, true, false);
+                    // }
+                    // callbacks3D.updateLicenseDisplay3D();
+                    return [2 /*return*/];
+                }
                 // Failed to connect.  Retry
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
@@ -361,19 +396,28 @@ var sciChartSurface2D;
 var isRuntimeKey = false;
 var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     debug("applyLicense 2D");
+    sciChartSurface2D = sciChartSurface;
     if (isSingle || shouldApplyLicense2D) {
         licenseContext2D = licenseContext;
-        sciChartSurface2D = sciChartSurface;
         (0, exports.applyLicense)(licenseContext);
     }
+    else {
+        if (checkStatus !== licensingClasses_1.LicenseCheckStatus.LicenseOK) {
+            (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
+        }
+    }
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
 var applyLicense = function (licenseContext) {
+    var _a;
     debug("applyLicense running");
     var licenseKey = "";
     var lt = licenseContext.SCRTCredentials.GetLicenseType();
     debug("Initial license status is " + licensingClasses_1.LicenseType[convertLicenseType(lt, licenseContext)]);
+    if (window.location.hostname.includes(".csb.app") || window.location.hostname.includes(".codesandbox.io")) {
+        runtimeLicenseKey = "csb";
+    }
     // Get from global store
     var runtimelicense = getRuntimeLicenseKey();
     if ((checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense ||
@@ -400,6 +444,19 @@ var applyLicense = function (licenseContext) {
                 licenseKey = runtimelicense;
             }
             else {
+                var errorMsg = licenseContext.SCRTCredentials.GetLicenseErrors();
+                if ((window && ((_a = window.location) === null || _a === void 0 ? void 0 : _a.hostname) && !window.location.hostname.includes("localhost")) ||
+                    !errorMsg.startsWith("License is not valid for this domain")) {
+                    if (isDebug) {
+                        debug("Runtime license is invalid: " + errorMsg);
+                    }
+                    else {
+                        console.warn("Runtime license is invalid.  Call setIsDebugLicensing(true) for details.");
+                    }
+                }
+                else {
+                    debug("Runtime license is invalid: " + errorMsg);
+                }
                 licenseKey = "";
             }
         }
@@ -415,7 +472,7 @@ var applyLicense = function (licenseContext) {
         if (!(lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL ||
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_REQUIRES_VALIDATION)) {
-            debug("License cookie is invalid. Removing");
+            debug("License cookie is invalid. " + licenseContext.SCRTCredentials.GetLicenseErrors());
             (0, cookie_1.deleteCookie)("scLicense");
             licenseKey = "";
             lt = licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE;
@@ -444,7 +501,7 @@ var applyLicense = function (licenseContext) {
                 (0, cookie_1.deleteCookie)("scLicense");
                 checkStatus = licensingClasses_1.LicenseCheckStatus.DevKeyInRuntimeKey;
             }
-            else if (licenseCookie.expiry > new Date()) {
+            else if (licenseCookie.expiry > new Date() && licenseCookie.key === licenseKey) {
                 debug("current token in cookie");
                 var expirySeconds = setChallengeResponse(licenseCookie.token);
                 lt = licenseContext.SCRTCredentials.GetLicenseType();
@@ -495,7 +552,9 @@ var openLicenseModal = function () {
 var setNewLicense = function (keyCode) {
     var requiresValidation = false;
     var trialExpired;
-    licenseModal.style.display = "none";
+    if (licenseModal) {
+        licenseModal.style.display = "none";
+    }
     isRuntimeKey = false;
     setLicenseCookie(keyCode, null, null, null);
     if (licenseContext2D !== undefined) {
@@ -585,7 +644,21 @@ var createLicenseModal = function (message, postFormMessage) {
     var modalInfo = document.createElement("div");
     modalInfo.style.padding = "10px 26px 10px 16px";
     modalInfo.innerHTML = "<ol><li>If you have not done so already, download the SciChart Cross Platform Licensing Wizard for\n    <a href=\"https://github.com/ABTSoftware/SciChart.LicenseWizard/releases/latest/download/SciChart-Licensing-Wizard.exe\" download> Windows</a> or\n    <a href=\"https://github.com/ABTSoftware/SciChart.LicenseWizard/releases/latest/download/SciChart-Licensing-Wizard.dmg\" download> macOS</a></li>\n    <li>Install it and sign in with your SciChart username and password</li>\n    <li>Start a trial for SciChart Web</li>\n    <li>This web page should pick up your license from the wizard in a few seconds, or refresh the page</li>";
+    var buttonLabel = document.createElement("div");
+    modalInfo.innerHTML = "To toggle License debug mode use button below and refresh the page.";
+    var toggleDebugModeButton = document.createElement("button");
+    toggleDebugModeButton.style.margin = "10px";
+    var setDebugModeSwitchLabel = function () {
+        toggleDebugModeButton.textContent = isDebug ? "Disable licensing debug mode" : "Enable licensing debug mode";
+    };
+    setDebugModeSwitchLabel();
+    toggleDebugModeButton.onclick = function () {
+        (0, exports.setIsDebugLicensing)(!isDebug, true);
+        setDebugModeSwitchLabel();
+    };
     modalContentForm.appendChild(modalInfo);
+    modalContentForm.appendChild(buttonLabel);
+    modalContentForm.appendChild(toggleDebugModeButton);
     var modalFooter = document.createElement("div");
     modalFooter.innerHTML = postFormMessage;
     modalFooter.style.padding = "8px 16px";
@@ -672,6 +745,16 @@ var getLicenseInfo = function (licenseContext) {
     var sclt = licenseContext.SCRTCredentials.GetLicenseType();
     var licenseType = convertLicenseType(sclt, licenseContext);
     var daysRemaining = licenseContext.SCRTCredentials.GetLicenseDaysRemaining();
+    if (checkStatus === licensingClasses_1.LicenseCheckStatus.LicenseOK && licenseManager2dState_1.licenseManager2dState.getLicenseType() !== licenseType) {
+        licenseManager2dState_1.licenseManager2dState.setOrderId(licenseContext.SCRTCredentials.GetEncryptedOrderId());
+        licenseManager2dState_1.licenseManager2dState.setProductCode(licenseContext.SCRTCredentials.GetProductCode());
+        licenseManager2dState_1.licenseManager2dState.setLicenseType(licenseType);
+        licenseManager2dState_1.licenseManager2dState.setDevCount(licenseContext.SCRTCredentials.GetDeveloperCount());
+        // Telemetry is enabled based on a license feature
+        var teFeature = licenseContext.SCRTCredentials.HasFeature("TE");
+        licenseManager2dState_1.licenseManager2dState.setTelemetry(teFeature === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
+            teFeature === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL);
+    }
     if (isDebug) {
         debug(licenseContext.SCRTCredentials.Dump());
     }
@@ -718,6 +801,8 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         else if (licenseType === licensingClasses_1.LicenseType.Invalid) {
             if (error.startsWith("License is not valid for this domain"))
                 premsg = "Sorry! Your license key is invalid for this domain</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
+            else if (error.startsWith("This version of SciChart can no longer be trialed"))
+                premsg = "Sorry! This version of SciChart is too old to be trialed.  Please update to the latest version";
             else
                 premsg = "Sorry! Your license key appears to be invalid</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
             postMsg = "Instructions can be seen at ".concat(licensingLink);
@@ -821,6 +906,9 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
                 }
             }
         }
+        else {
+            (0, Telemetry_1.sendTelemetry)();
+        }
     }
     updateLicenseMessageDOM(sciChartSurface.domDivContainer, licenseMessageDiv);
     if (applyToOther) {
@@ -833,6 +921,7 @@ var updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyTo
 exports.updateLicenseDisplay = updateLicenseDisplay;
 exports.licenseManager = {
     setRuntimeLicenseKey: function (value) { return (0, exports.setRuntimeLicenseKey)(value); },
+    setIsDebugLicensing: function (value) { return (0, exports.setIsDebugLicensing)(value); },
     setLicenseCallback: function (callback) { return (0, exports.setLicenseCallback)(callback); },
     setServerLicenseEndpoint: function (value) { return setServerLicenseEndpoint(value); },
     applyLicense2D: function (licenseContext, sciChartSurface, isSingle) {

package/Charting/Visuals/licenseManager2dState.d.ts

@@ -1,4 +1,15 @@
+import { LicenseType } from "../../types/licensingClasses";
 export declare const licenseManager2dState: {
     getIsDev: () => boolean;
     setIsDev: (value: boolean) => void;
+    getOrderId: () => string;
+    setOrderId: (value: string) => void;
+    getProductCode: () => string;
+    setProductCode: (value: string) => void;
+    getLicenseType: () => LicenseType;
+    setLicenseType: (value: LicenseType) => void;
+    getDevCount: () => number;
+    setDevCount: (value: number) => void;
+    getTelemetry: () => boolean;
+    setTelemetry: (value: boolean) => void;
 };

package/Charting/Visuals/licenseManager2dState.js

@@ -1,12 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.licenseManager2dState = void 0;
+var licensingClasses_1 = require("../../types/licensingClasses");
 var isDev = false;
 var getIsDev = function () { return isDev; };
 var setIsDev = function (value) {
     isDev = value;
 };
+var orderId = "";
+var getOrderId = function () { return orderId; };
+var setOrderId = function (value) {
+    orderId = value;
+};
+var productCode = "";
+var getProductCode = function () { return productCode; };
+var setProductCode = function (value) {
+    productCode = value;
+};
+var devCount = 1;
+var getDevCount = function () { return devCount; };
+var setDevCount = function (value) {
+    devCount = value;
+};
+var licenseType = licensingClasses_1.LicenseType.NoLicense;
+var getLicenseType = function () { return licenseType; };
+var setLicenseType = function (value) {
+    licenseType = value;
+};
+var telemetryEnabled = false;
+var getTelemetry = function () { return telemetryEnabled; };
+var setTelemetry = function (value) {
+    telemetryEnabled = value;
+};
 exports.licenseManager2dState = {
     getIsDev: getIsDev,
-    setIsDev: setIsDev
+    setIsDev: setIsDev,
+    getOrderId: getOrderId,
+    setOrderId: setOrderId,
+    getProductCode: getProductCode,
+    setProductCode: setProductCode,
+    getLicenseType: getLicenseType,
+    setLicenseType: setLicenseType,
+    getDevCount: getDevCount,
+    setDevCount: setDevCount,
+    getTelemetry: getTelemetry,
+    setTelemetry: setTelemetry
 };

package/Charting/Visuals/loader.js

@@ -40,7 +40,10 @@ var DefaultSciChartLoader = /** @class */ (function () {
      * @inheritDoc
      */
     DefaultSciChartLoader.prototype.removeChartLoader = function (domChartRoot, loaderElement) {
-        domChartRoot.removeChild(loaderElement);
+        try {
+            domChartRoot.removeChild(loaderElement);
+        }
+        catch (_a) { }
     };
     DefaultSciChartLoader.prototype.toJSON = function () {
         return { type: this.type };

package/Charting/Visuals/sciChartInitCommon.d.ts

@@ -10,7 +10,7 @@ declare const sciChartInitCommon: {
     checkChartDivExists: (divElement: string | HTMLDivElement) => void;
     ECanvasType: typeof ECanvasType;
     getCanvas2dId: (divElementId: string) => string;
-    initCanvas: (divElement: string | HTMLDivElement, aspectWidth: number, aspectHeight: number, activeCanvas?: ECanvasType) => TSciChartSurfaceCanvases;
-    subscribeToResize: (chartRoot: HTMLDivElement, aspect: number, sciChartSurface: ISciChartSurfaceBase) => IDeletable;
+    initCanvas: (divElement: string | HTMLDivElement, aspectWidth: number, aspectHeight: number, activeCanvas?: ECanvasType, disableAspect?: boolean) => TSciChartSurfaceCanvases;
+    subscribeToResize: (chartRoot: HTMLDivElement, aspect: number, sciChartSurface: ISciChartSurfaceBase, disableAspect?: boolean) => IDeletable;
 };
 export default sciChartInitCommon;