scichart 2.2.2393 → 2.2.2401

package/Charting/ChartModifiers/SeriesSelectionModifier.d.ts

@@ -124,6 +124,7 @@ export declare class SeriesSelectionModifier extends ChartModifierBase2D {
         type: string;
         options: Required<Omit<IChartModifierBaseOptions, never>>;
     };
+    getAllSeries(): IRenderableSeries[];
     /**
      * This function called when the user sets series.isSelected = true elsewhere in code and we want to sync the modifier
      */

package/Charting/ChartModifiers/SeriesSelectionModifier.js

@@ -270,6 +270,10 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
         Object.assign(json.options, options);
         return json;
     };
+    SeriesSelectionModifier.prototype.getAllSeries = function () {
+        // Series Selection should only operate on visible series
+        return _super.prototype.getAllSeries.call(this).filter(function (rs) { return rs.isVisible; });
+    };
     /**
      * This function called when the user sets series.isSelected = true elsewhere in code and we want to sync the modifier
      */

package/Charting/Services/SciChartRenderer.js

@@ -102,6 +102,7 @@ var SciChartRenderer = /** @class */ (function () {
         if (this.sciChartSurface.isDeleted) {
             return;
         }
+        // console.log("render");
         var nativeContext = renderContext.getNativeContext();
         var wasmContext = this.sciChartSurface.webAssemblyContext2D;
         var oldBlendMode = nativeContext.GetBlendMode();
@@ -110,7 +111,6 @@ var SciChartRenderer = /** @class */ (function () {
         this.validate();
         // Animation Step
         var timeElapsed = this.previousTime ? Date.now() - this.previousTime : undefined;
-        // console.log("draw ", timeElapsed);
         this.previousTime = Date.now();
         this.sciChartSurface.onAnimate(timeElapsed);
         this.sciChartSurface.updateBackground();

package/Charting/Visuals/Annotations/AnnotationBase.js

@@ -665,7 +665,7 @@ var AnnotationBase = /** @class */ (function () {
     AnnotationBase.prototype.getXYCoordinatesFromValues = function (xyDataPoint) {
         var viewRect = this.parentSurface.seriesViewRect;
         var pointWithAbsoluteCoordinates = this.getAbsoluteCoordinates(xyDataPoint);
-        var translatedPoint = (0, translate_1.translateFromSeriesViewRectToCanvas)(pointWithAbsoluteCoordinates, viewRect);
+        var translatedPoint = (0, translate_1.translateFromSeriesViewRectToCanvas)(pointWithAbsoluteCoordinates, viewRect, true);
         if (!translatedPoint) {
             return undefined;
         }

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

@@ -44,6 +44,7 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     private strokeThicknessProperty;
     private strokeProperty;
     private fillProperty;
+    private nativeDrawingProvider;
     private strokePenCache;
     private fillBrushCache;
     /**
@@ -83,6 +84,7 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     delete(): void;
     /** @inheritDoc */
     drawWithContext(renderContext: IRenderContext2D, xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase, viewRect: Rect): void;
+    private drawWithProvider;
     /** @inheritDoc */
     onAttach(scs: SciChartSurface): void;
     onDragStarted(args: ModifierMouseArgs): boolean;

package/Charting/Visuals/Annotations/BoxAnnotation.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BoxAnnotation = void 0;
+var app_1 = require("../../../constants/app");
 var Deleter_1 = require("../../../Core/Deleter");
 var Guard_1 = require("../../../Core/Guard");
 var Point_1 = require("../../../Core/Point");
@@ -119,6 +120,7 @@ var BoxAnnotation = /** @class */ (function (_super) {
     BoxAnnotation.prototype.delete = function () {
         this.strokePenCache = (0, Deleter_1.deleteSafe)(this.strokePenCache);
         this.fillBrushCache = (0, Deleter_1.deleteSafe)(this.fillBrushCache);
+        this.nativeDrawingProvider = (0, Deleter_1.deleteSafe)(this.nativeDrawingProvider);
     };
     /** @inheritDoc */
     BoxAnnotation.prototype.drawWithContext = function (renderContext, xCalc, yCalc, viewRect) {
@@ -135,12 +137,58 @@ var BoxAnnotation = /** @class */ (function (_super) {
         var y2 = this.getY2Coordinate(xCalc, yCalc);
         this.setAnnotationBorders(x1, x2, y1, y2);
         var rect = Rect_1.Rect.createWithPoints(new Point_1.Point(x1, y1), new Point_1.Point(x2, y2));
-        renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
+        // Temporary HAX! drawRect is rubbish with large strokeThickness, whereas the columnDrawingProvider does a nice
+        // outlined rectangle, but the code is ugly.  In 2.3 we will improve the native drawRect to do the outline properly.
+        if (!app_1.IS_TEST_ENV) {
+            this.drawWithProvider(renderContext, strokePen.scrtPen, fillBrush.scrtBrush, xCalc, yCalc, rect, viewRect);
+        }
+        //renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
         this.updateAdornerInner();
     };
+    BoxAnnotation.prototype.drawWithProvider = function (renderContext, linesPen, fillBrush, xCalc, yCalc, rect, viewRect) {
+        var webAssemblyContext = this.parentSurface.webAssemblyContext2D;
+        var args = new webAssemblyContext.SCRTColumnDrawingParams();
+        args.forceShaderMethod = true;
+        args.verticalChart = this.isVerticalChart;
+        args.zeroLineY = this.isVerticalChart ? yCalc.getDataValue(rect.left) : yCalc.getDataValue(rect.bottom);
+        args.columnWidth = this.isVerticalChart ? rect.height : rect.width;
+        // ISSUE: If the strokeThickness property is not provided,
+        // the fill will be disappeared with large zoom (when the column width will be small or zero)
+        // if (args.columnWidth === 0 && this.strokeThickness === 0) {
+        //     strokePenCache = this.strokePenFillColoredCache;
+        // }
+        if (linesPen) {
+            args.SetLinesPen(linesPen);
+        }
+        if (fillBrush) {
+            args.SetFillBrush(fillBrush);
+        }
+        args.viewportWidth = viewRect.width;
+        args.viewportHeight = viewRect.height;
+        var xMid = this.isVerticalChart ? (rect.top + rect.bottom) / 2 : (rect.left + rect.right) / 2;
+        var xVal = xCalc.getDataValue(xMid);
+        var xValues = new webAssemblyContext.SCRTDoubleVector();
+        xValues.push_back(xVal);
+        var yVal = this.isVerticalChart ? yCalc.getDataValue(rect.right) : yCalc.getDataValue(rect.top);
+        var yValues = new webAssemblyContext.SCRTDoubleVector();
+        yValues.push_back(yVal);
+        args.count = yValues.size();
+        var nativeContext = renderContext.getNativeContext();
+        nativeContext.PushMatrix();
+        nativeContext.PushState();
+        nativeContext.Translate(viewRect.x, viewRect.y);
+        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+        this.nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, xCalc.nativeCalculator, yCalc.nativeCalculator, args);
+        nativeContext.PopMatrix();
+        nativeContext.PopState();
+        xValues.delete();
+        yValues.delete();
+        args.delete();
+    };
     /** @inheritDoc */
     BoxAnnotation.prototype.onAttach = function (scs) {
         _super.prototype.onAttach.call(this, scs);
+        this.nativeDrawingProvider = new scs.webAssemblyContext2D.SCRTColumnSeriesDrawingProvider();
         if (!this.strokePenCache) {
             this.strokePenCache = new Pen2DCache_1.Pen2DCache(scs.webAssemblyContext2D);
         }

package/Charting/Visuals/Axis/DateTimeNumericAxis.js

@@ -25,7 +25,7 @@ var DateTimeNumericAxis = /** @class */ (function (_super) {
         var _a;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.labelProvider = (_a = options === null || options === void 0 ? void 0 : options.labelProvider) !== null && _a !== void 0 ? _a : new SmartDateLabelProvider_1.SmartDateLabelProvider();
-        _this.deltaCalculator = new DateTimeDeltaCalculator_1.DateTimeDeltaCalculator({
+        _this.deltaCalculator = new DateTimeDeltaCalculator_1.DateTimeDeltaCalculator(webAssemblyContext, {
             possibleDeltas: options === null || options === void 0 ? void 0 : options.possibleDeltas,
             minTicks: options === null || options === void 0 ? void 0 : options.minTicks
         });

package/Charting/Visuals/Axis/DeltaCalculator/DateTimeDeltaCalculator.d.ts

@@ -1,5 +1,7 @@
 import { NumberRange } from "../../../../Core/NumberRange";
-import { DeltaCalculator } from "./DeltaCalculator";
+import { TSciChart } from "../../../../types/TSciChart";
+import { TSciChart3D } from "../../../../types/TSciChart3D";
+import { NumericDeltaCalculator } from "./NumericDeltaCalculator";
 export interface IDeltaCalculatorOptions {
     possibleDeltas?: number[];
     minTicks?: number;
@@ -8,12 +10,12 @@ export interface IDeltaCalculatorOptions {
  * The DateTimeDeltaCalculator is respinsible for calculating {@link AxisCore.minorDelta} and {@link AxisCore.majorDelta} on
  * {@link NumericAxis} types.
  */
-export declare class DateTimeDeltaCalculator extends DeltaCalculator {
+export declare class DateTimeDeltaCalculator extends NumericDeltaCalculator {
     private possibleDeltasProperty;
     private minTicksProperty;
     private prevIndex;
     private currIndex;
-    constructor(options?: IDeltaCalculatorOptions);
+    constructor(webAssemblyContext: TSciChart | TSciChart3D, options?: IDeltaCalculatorOptions);
     /**
      * Gets or sets deltas array
      */

package/Charting/Visuals/Axis/DeltaCalculator/DateTimeDeltaCalculator.js

@@ -17,16 +17,16 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateTimeDeltaCalculator = void 0;
 var NumberRange_1 = require("../../../../Core/NumberRange");
-var DeltaCalculator_1 = require("./DeltaCalculator");
+var NumericDeltaCalculator_1 = require("./NumericDeltaCalculator");
 /**
  * The DateTimeDeltaCalculator is respinsible for calculating {@link AxisCore.minorDelta} and {@link AxisCore.majorDelta} on
  * {@link NumericAxis} types.
  */
 var DateTimeDeltaCalculator = /** @class */ (function (_super) {
     __extends(DateTimeDeltaCalculator, _super);
-    function DateTimeDeltaCalculator(options) {
+    function DateTimeDeltaCalculator(webAssemblyContext, options) {
         var _a;
-        var _this = _super.call(this) || this;
+        var _this = _super.call(this, webAssemblyContext) || this;
         _this.possibleDeltasProperty = [
             1,
             2,
@@ -55,7 +55,8 @@ var DateTimeDeltaCalculator = /** @class */ (function (_super) {
             2 * 30 * 24 * 60 * 60,
             4 * 30 * 24 * 60 * 60,
             6 * 30 * 24 * 60 * 60,
-            12 * 30 * 24 * 60 * 60
+            365.25 * 24 * 60 * 60
+            // Years also need special handling
         ];
         _this.currIndex = 12;
         _this.possibleDeltasProperty = (_a = options === null || options === void 0 ? void 0 : options.possibleDeltas) !== null && _a !== void 0 ? _a : _this.possibleDeltasProperty;
@@ -105,11 +106,15 @@ var DateTimeDeltaCalculator = /** @class */ (function (_super) {
                     _this.prevIndex = index;
                 return calculateDelta(deltas, index - 1);
             }
-            if (ticksCount > maxTicks && index < deltas.length && index !== _this.prevIndex) {
+            if (ticksCount > maxTicks && index < deltas.length - 1 && index !== _this.prevIndex) {
                 if (!_this.prevIndex)
                     _this.prevIndex = index;
                 return calculateDelta(deltas, index + 1);
             }
+            else if (ticksCount > maxTicks && index === deltas.length - 1) {
+                var yearDelta = _super.prototype.getDeltaFromRange.call(_this, min / delta, max / delta, minorsPerMajor, maxTicks);
+                return yearDelta.max * delta;
+            }
             else {
                 if (_this.currIndex !== index) {
                     _this.currIndex = index;
@@ -121,5 +126,5 @@ var DateTimeDeltaCalculator = /** @class */ (function (_super) {
         return new NumberRange_1.NumberRange(delta / minorsPerMajor, delta);
     };
     return DateTimeDeltaCalculator;
-}(DeltaCalculator_1.DeltaCalculator));
+}(NumericDeltaCalculator_1.NumericDeltaCalculator));
 exports.DateTimeDeltaCalculator = DateTimeDeltaCalculator;

package/Charting/Visuals/SciChartSurface.d.ts

@@ -259,7 +259,7 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
     /**
      * @inheritDoc
      */
-    delete(): void;
+    delete(clearHtml?: boolean): void;
     /**
      * @inheritDoc
      */

package/Charting/Visuals/SciChartSurface.js

@@ -397,7 +397,7 @@ var SciChartSurface = /** @class */ (function (_super) {
             // Logger.log("SciChartSurface.isSuspended = true. Ignoring invalidateElement() call");
             return;
         }
-        // console.log("Invalidating ", this.domChartRoot.id);
+        // console.trace("Invalidating ", this.domChartRoot.id);
         var canvasId = this.domCanvas2D ? this.domCanvas2D.id : "undefinedCanvasId";
         this.renderSurface.invalidateElement(canvasId);
     };
@@ -415,7 +415,8 @@ var SciChartSurface = /** @class */ (function (_super) {
     /**
      * @inheritDoc
      */
-    SciChartSurface.prototype.delete = function () {
+    SciChartSurface.prototype.delete = function (clearHtml) {
+        if (clearHtml === void 0) { clearHtml = true; }
         _super.prototype.delete.call(this);
         this.renderableSeries.asArray().forEach(function (rs) { return rs.delete(); });
         this.renderableSeries.clear();
@@ -428,7 +429,7 @@ 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) {
+        if (clearHtml && this.domChartRoot) {
             var style = this.domChartRoot.style;
             if (style) {
                 style.background = "";

package/Charting/Visuals/SciChartSurfaceBase.d.ts

@@ -259,7 +259,7 @@ export declare abstract class SciChartSurfaceBase implements ISciChartSurfaceBas
     /**
      * @inheritDoc
      */
-    delete(): void;
+    delete(clearHtml?: boolean): void;
     addDeletable(deletable: IDeletable): void;
     /**
      * Call invalidateElement() to trigger a redraw of the {@link SciChartSurfaceBase}. SciChart's WebGL WebAssembly rendering

package/Charting/Visuals/SciChartSurfaceBase.js

@@ -286,9 +286,10 @@ var SciChartSurfaceBase = /** @class */ (function () {
     /**
      * @inheritDoc
      */
-    SciChartSurfaceBase.prototype.delete = function () {
+    SciChartSurfaceBase.prototype.delete = function (clearHtml) {
         var _this = this;
         var _a;
+        if (clearHtml === void 0) { clearHtml = true; }
         this.isDeletedProperty = true;
         var currentSurfaceIndex = (_a = this.destinations) === null || _a === void 0 ? void 0 : _a.findIndex(function (dest) { return dest.sciChartSurface === _this; });
         if (currentSurfaceIndex >= 0) {

package/Charting/Visuals/createMaster.js

@@ -171,7 +171,7 @@ var createMaster = function () {
                 Guard_1.Guard.notNull(theme, "theme");
                 var canvas2dId = sciChartInitCommon_1.default.getCanvas2dId(divElementId);
                 var sameIdDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId === canvas2dId; });
-                sameIdDestinations.forEach(function (el) { return el.sciChartSurface.delete(); });
+                sameIdDestinations.forEach(function (el) { return el.sciChartSurface.delete(false); });
                 var otherDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId !== canvas2dId; });
                 chartInitObj.ClearDestinations();
                 while (exports.sciChartDestinations.length > 0) {

package/Charting/Visuals/licenseManager2D.d.ts

@@ -34,7 +34,7 @@ interface ILicenseCookie {
     lastValidated: Date;
 }
 export declare const getLicenseCookie: () => ILicenseCookie;
-export declare const applyLicense: (licenseContext: TLicenseContext) => void;
+export declare const applyLicense: (licenseContext: TLicenseContext, sciChartSurface: SciChartSurfaceBase) => void;
 export declare type TLicenseContext = {
     SCRTCredentials: {
         GetLicenseType: () => SCRTLicenseType;

package/Charting/Visuals/licenseManager2D.js

@@ -134,7 +134,7 @@ var setRuntimeLicenseKey = function (value) {
     runtimeLicenseKey = value;
     if (runtimeLicenseKey !== prev && runtimeLicenseKey !== "") {
         if (licenseContext2D !== undefined) {
-            (0, exports.applyLicense)(licenseContext2D);
+            (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
         }
     }
 };
@@ -161,7 +161,7 @@ var callbacks3D = {
 };
 var setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
 exports.setCallbacks3D = setCallbacks3D;
-var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0, function () {
+var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return __awaiter(void 0, void 0, void 0, function () {
     var response, keyCode, _a, requiresValidation, trialExpired, err_3;
     return __generator(this, function (_b) {
         switch (_b.label) {
@@ -179,16 +179,16 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [4 /*yield*/, response.text()];
             case 2:
                 keyCode = _b.sent();
-                _a = setNewLicense(keyCode), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
+                _a = setNewLicense(keyCode, licenseContext, sciChartSurface), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
                 if (requiresValidation) {
                     debug("Got a developer license from local license wizard.  Validating...");
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                    dolicenseChallenge();
+                    dolicenseChallenge(licenseContext, sciChartSurface);
                 }
                 else if (trialExpired) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
                     debug("No valid license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                    wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                    wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     debug("Got a valid license from local license wizard.");
@@ -198,7 +198,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
             case 3:
                 checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
                 debug("No license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 _b.label = 4;
             case 4: return [3 /*break*/, 6];
             case 5:
@@ -207,7 +207,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
                     debug("Could not find licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                    setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                    setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     // give up.
@@ -217,8 +217,8 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 }
                 return [3 /*break*/, 6];
             case 6:
-                if (licenseContext2D !== undefined) {
-                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+                if (licenseContext !== undefined) {
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -247,12 +247,12 @@ var getLicenseCookie = function () {
 exports.getLicenseCookie = getLicenseCookie;
 var refreshLicense = function () {
     (0, cookie_1.deleteCookie)("scLicense");
-    (0, exports.applyLicense)(licenseContext2D);
+    (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
 };
-var setChallengeResponse = function (token) {
+var setChallengeResponse = function (token, licenseContext) {
     var expirySeconds = -1;
-    if (licenseContext2D !== undefined) {
-        expirySeconds = licenseContext2D.SCRTCredentials.ApplyLicenseResponse(token);
+    if (licenseContext !== undefined) {
+        expirySeconds = licenseContext.SCRTCredentials.ApplyLicenseResponse(token);
     }
     var expirySeconds3D = callbacks3D.setChallengeResponse3D(token);
     if (expirySeconds3D !== undefined)
@@ -260,7 +260,7 @@ var setChallengeResponse = function (token) {
     return expirySeconds;
 };
 var challengeFailCounts = 0;
-var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0, function () {
+var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __awaiter(void 0, void 0, void 0, function () {
     var server, challenge, orderId, response, queryString, url, url, token, expirySeconds, key, timeNow, timeToExpiry, err_4, expiry, msg;
     var _a;
     return __generator(this, function (_b) {
@@ -275,9 +275,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 debug("Attempting to validate license with ".concat(server));
                 challenge = void 0;
                 orderId = void 0;
-                if (licenseContext2D !== undefined) {
-                    challenge = licenseContext2D.SCRTCredentials.GetLicenseChallenge();
-                    orderId = licenseContext2D.SCRTCredentials.GetOrderId();
+                if (licenseContext !== undefined) {
+                    challenge = licenseContext.SCRTCredentials.GetLicenseChallenge();
+                    orderId = licenseContext.SCRTCredentials.GetOrderId();
                 }
                 else {
                     (_a = callbacks3D.getLicenseChallenge3D(), challenge = _a.challenge, orderId = _a.orderId);
@@ -308,7 +308,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
             case 8:
                 token = _b.sent();
                 if (!token.startsWith("Error")) {
-                    expirySeconds = setChallengeResponse(token);
+                    expirySeconds = setChallengeResponse(token, licenseContext);
                     if (expirySeconds > 0) {
                         key = (0, exports.getLicenseCookie)().key;
                         timeNow = Math.floor(new Date().getTime() / 1000);
@@ -317,7 +317,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                         timeToExpiry = expirySeconds - timeNow;
                         challengeFailCounts = 0;
-                        setTimeout(function () { return dolicenseChallenge(); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
+                        setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
                     }
                     else {
                         // Something went wrong with the apply
@@ -350,9 +350,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                     console.warn("Server license validation failed.  Looking for local developer license");
                     runtimeLicenseKey = "";
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
-                    licenseContext2D.SCRTCredentials.ResetRuntimeLicense();
+                    licenseContext.SCRTCredentials.ResetRuntimeLicense();
                     isRuntimeKey = false;
-                    (0, exports.applyLicense)(licenseContext2D);
+                    (0, exports.applyLicense)(licenseContext, sciChartSurface);
                     // licenseManager2dState.setIsDev(true);
                     // checkStatus = LicenseCheckStatus.LookingForLicenseWizard;
                     // getlicenseFromWizard();
@@ -366,7 +366,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
                     debug("Could not find ".concat(server, "/").concat(serverLicenseEndpoint, ". Trying again in ").concat(retryTime, " seconds"));
-                    setTimeout(function () { return dolicenseChallenge(); }, retryTime * 1000);
+                    setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     expiry = (0, exports.getLicenseCookie)().expiry;
@@ -381,8 +381,8 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 }
                 return [3 /*break*/, 12];
             case 12:
-                if (licenseContext2D !== undefined) {
-                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+                if (licenseContext !== undefined) {
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -396,10 +396,12 @@ var sciChartSurface2D;
 var isRuntimeKey = false;
 var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     debug("applyLicense 2D");
-    sciChartSurface2D = sciChartSurface;
-    if (isSingle || shouldApplyLicense2D) {
+    if (shouldApplyLicense2D) {
+        sciChartSurface2D = sciChartSurface;
         licenseContext2D = licenseContext;
-        (0, exports.applyLicense)(licenseContext);
+    }
+    if (isSingle || shouldApplyLicense2D) {
+        (0, exports.applyLicense)(licenseContext, sciChartSurface);
     }
     else {
         if (checkStatus !== licensingClasses_1.LicenseCheckStatus.LicenseOK) {
@@ -409,13 +411,15 @@ var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
-var applyLicense = function (licenseContext) {
+var applyLicense = function (licenseContext, sciChartSurface) {
     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")) {
+    if (window.location.hostname.includes(".csb.app") ||
+        window.location.hostname === "codesandbox.io" ||
+        window.location.hostname.includes(".codesandbox.io")) {
         runtimeLicenseKey = "csb";
     }
     // Get from global store
@@ -503,7 +507,7 @@ var applyLicense = function (licenseContext) {
             }
             else if (licenseCookie.expiry > new Date() && licenseCookie.key === licenseKey) {
                 debug("current token in cookie");
-                var expirySeconds = setChallengeResponse(licenseCookie.token);
+                var expirySeconds = setChallengeResponse(licenseCookie.token, licenseContext);
                 lt = licenseContext.SCRTCredentials.GetLicenseType();
                 if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
                     lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL) {
@@ -519,12 +523,13 @@ var applyLicense = function (licenseContext) {
                 if (secondsSinceValidated > validationInterval &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                    dolicenseChallenge();
+                    dolicenseChallenge(licenseContext, sciChartSurface);
                 }
             }
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense) {
                 checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                dolicenseChallenge();
+                setLicenseCookie(licenseKey, "", 0, 0);
+                dolicenseChallenge(licenseContext, sciChartSurface);
             }
         }
         else {
@@ -536,11 +541,11 @@ var applyLicense = function (licenseContext) {
         if (wizardTimer === undefined) {
             checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
             licenseManager2dState_1.licenseManager2dState.setIsDev(true);
-            getlicenseFromWizard();
+            getlicenseFromWizard(licenseContext, sciChartSurface);
         }
     }
-    if (licenseContext2D !== undefined) {
-        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
+    if (licenseContext !== undefined) {
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, false);
     }
     callbacks3D.updateLicenseDisplay3D();
 };
@@ -549,7 +554,7 @@ var licenseModal;
 var openLicenseModal = function () {
     console.error("Modal not initialized");
 };
-var setNewLicense = function (keyCode) {
+var setNewLicense = function (keyCode, licenseContext, sciChartSurface) {
     var requiresValidation = false;
     var trialExpired;
     if (licenseModal) {
@@ -557,13 +562,13 @@ var setNewLicense = function (keyCode) {
     }
     isRuntimeKey = false;
     setLicenseCookie(keyCode, null, null, null);
-    if (licenseContext2D !== undefined) {
-        licenseContext2D.SCRTCredentials.SetRuntimeLicenseKeyW(keyCode);
-        requiresValidation = licenseContext2D.SCRTCredentials.RequiresValidation();
+    if (licenseContext !== undefined) {
+        licenseContext.SCRTCredentials.SetRuntimeLicenseKeyW(keyCode);
+        requiresValidation = licenseContext.SCRTCredentials.RequiresValidation();
         trialExpired =
-            licenseContext2D.SCRTCredentials.GetLicenseType() ===
-                licenseContext2D.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
-        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+            licenseContext.SCRTCredentials.GetLicenseType() ===
+                licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
     }
     var result3D = callbacks3D.setNewLicense3D(keyCode);
     if (result3D !== undefined) {

package/Charting3D/Visuals/licenseManager3D.js

@@ -32,7 +32,7 @@ var applyLicense3D = function (licenseContext, sciChartSurface, isSingle) {
         sciChartSurface3D = sciChartSurface;
         // set up callbacks
         (0, licenseManager2D_1.setCallbacks3D)(callbacks3D);
-        (0, licenseManager2D_1.applyLicense)(licenseContext);
+        (0, licenseManager2D_1.applyLicense)(licenseContext, sciChartSurface3D);
     }
     else {
         (0, licenseManager2D_1.updateLicenseDisplay)((0, licenseManager2D_1.getLicenseInfo)(licenseContext), sciChartSurface, false, false);

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.2.2393";
+export declare const libraryVersion = "2.2.2401";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-06-10T00:00:00";
+var buildStamp = "2022-07-07T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2393";
+exports.libraryVersion = "2.2.2401";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;