scichart 3.1.348 → 3.2.0-beta

package/Charting/Visuals/TextureManager/TextureManager.d.ts

@@ -1,3 +1,4 @@
+import { DeletableEntity } from "../../../Core/DeletableEntity";
 import { IDeletable } from "../../../Core/IDeletable";
 import { EAxisAlignment } from "../../../types/AxisAlignment";
 import { TSciChart, TSRTexture } from "../../../types/TSciChart";
@@ -8,7 +9,7 @@ export declare type TTextureObject = {
     textureWidth: number;
     textureHeight: number;
 };
-export declare class TextureManager implements IDeletable {
+export declare class TextureManager extends DeletableEntity implements IDeletable {
     private webAssemblyContext;
     private canvas;
     private ctx;

package/Charting/Visuals/TextureManager/TextureManager.js

@@ -1,7 +1,23 @@
 "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.measureTextWidth = exports.measureTextHeight = exports.TextureManager = void 0;
 var app_1 = require("../../../constants/app");
+var DeletableEntity_1 = require("../../../Core/DeletableEntity");
 var AxisAlignment_1 = require("../../../types/AxisAlignment");
 var LabelAlignment_1 = require("../../../types/LabelAlignment");
 var font_1 = require("../../../utils/font");
@@ -16,15 +32,18 @@ var DEFAULT_WIDTH = 1920;
 var PT_TO_PX = 96 / 72;
 /** @ignore */
 var PX_TO_PT = 72 / 96;
-var TextureManager = /** @class */ (function () {
+var TextureManager = /** @class */ (function (_super) {
+    __extends(TextureManager, _super);
     function TextureManager(webAssemblyContext) {
-        this.webAssemblyContext = webAssemblyContext;
+        var _this = _super.call(this) || this;
+        _this.webAssemblyContext = webAssemblyContext;
         if (!app_1.IS_TEST_ENV) {
-            this.canvas = document.createElement("canvas");
-            this.canvas.width = DEFAULT_WIDTH;
-            this.canvas.height = DEFAULT_HEIGHT;
-            this.ctx = this.canvas.getContext("2d", { willReadFrequently: true });
+            _this.canvas = document.createElement("canvas");
+            _this.canvas.width = DEFAULT_WIDTH;
+            _this.canvas.height = DEFAULT_HEIGHT;
+            _this.ctx = _this.canvas.getContext("2d", { willReadFrequently: true });
         }
+        return _this;
     }
     TextureManager.prototype.createSimpleTextTexture = function (text, textStyle, backgroundColor, displayVertically, displayMirrored, opacity) {
         var rotation = 0;
@@ -268,6 +287,7 @@ var TextureManager = /** @class */ (function () {
     TextureManager.prototype.delete = function () {
         this.canvas = undefined;
         this.ctx = undefined;
+        this.webAssemblyContext = undefined;
     };
     TextureManager.prototype.createTextureFromCtx = function (textureWidth, textureHeight) {
         // TODO: Michael cache the canvas, UIntVector, bitmapTexture unless size changed
@@ -307,7 +327,7 @@ var TextureManager = /** @class */ (function () {
         };
     };
     return TextureManager;
-}());
+}(DeletableEntity_1.DeletableEntity));
 exports.TextureManager = TextureManager;
 var measureTextHeight = function (fontSizePx) { return fontSizePx; };
 exports.measureTextHeight = measureTextHeight;

package/Charting/Visuals/createMaster.d.ts

@@ -1,7 +1,9 @@
+import { TSciChart } from "../../types/TSciChart";
 import { I2DSurfaceOptions } from "./I2DSurfaceOptions";
 import { TWebAssemblyChart } from "./SciChartSurface";
-import { TSciChartDestination } from "./SciChartSurfaceBase";
 /** @ignore */
 export declare const createMultichart: (divElement: string | HTMLDivElement, options?: I2DSurfaceOptions) => Promise<TWebAssemblyChart>;
 /** @ignore */
-export declare const sciChartDestinations: TSciChartDestination[];
+export declare const disposeMultiChart: () => void;
+/** @ignore */
+export declare const monitorWebGL: (wasmContext: TSciChart) => void;

package/Charting/Visuals/createMaster.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sciChartDestinations = exports.createMultichart = void 0;
+exports.monitorWebGL = exports.disposeMultiChart = exports.createMultichart = void 0;
 // @ts-ignore
 var WasmModule2D = require("../../_wasm/scichart2d");
 var BuildStamp_1 = require("../../Core/BuildStamp");
@@ -44,9 +44,15 @@ var Guard_1 = require("../../Core/Guard");
 var WebGlRenderContext2D_1 = require("../Drawing/WebGlRenderContext2D");
 var licenseManager2D_1 = require("./licenseManager2D");
 var loader_1 = require("./loader");
+var SciChartDefaults_1 = require("./SciChartDefaults");
 var sciChartInitCommon_1 = require("./sciChartInitCommon");
 var SciChartSurface_1 = require("./SciChartSurface");
 var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
+var Globals_1 = require("../../Core/Globals");
+var DeletableEntity_1 = require("../../Core/DeletableEntity");
+var NativeObject_1 = require("./Helpers/NativeObject");
+var LabelCache_1 = require("./Axis/LabelProvider/LabelCache");
+var MemoryUsageHelper_1 = require("../../utils/MemoryUsageHelper");
 // Global variables
 /** @ignore */
 var sciChartMaster = {
@@ -64,7 +70,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, options === null || options === void 0 ? void 0 : options.disableAspect);
+                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, options === null || options === void 0 ? void 0 : options.touchAction);
                 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;
@@ -81,7 +87,7 @@ var createMultichart = function (divElement, options) { return __awaiter(void 0,
                 (0, BuildStamp_1.checkBuildStamp)(master.wasmContext);
                 sciChartMaster.createChildSurface = master.createChildSurface;
                 sciChartMaster.getChildSurfaces = master.getChildSurfaces;
-                monitorWebGL(sciChartMaster);
+                (0, exports.monitorWebGL)(master.wasmContext);
                 _d.label = 3;
             case 3:
                 createChildSurface = sciChartMaster.createChildSurface, wasmContext_1 = sciChartMaster.wasmContext;
@@ -90,6 +96,7 @@ var createMultichart = function (divElement, options) { return __awaiter(void 0,
                 return [2 /*return*/, new Promise(function (resolve) {
                         setTimeout(function () {
                             loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                            loaderDiv = undefined;
                             resolve({ wasmContext: wasmContext_1, sciChartSurface: sciChartSurface_1 });
                         }, 0);
                     })];
@@ -98,24 +105,33 @@ var createMultichart = function (divElement, options) { return __awaiter(void 0,
                 console.error(err_1);
                 // replace with div with error message
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                loaderDiv = undefined;
                 return [2 /*return*/, Promise.reject(err_1)];
             case 5: return [2 /*return*/];
         }
     });
 }); };
 exports.createMultichart = createMultichart;
+var cleanupWasmContext;
 /** @ignore */
-var monitorWebGL = function (master) {
-    var wasmContext = sciChartMaster.wasmContext, getChildSurfaces = sciChartMaster.getChildSurfaces;
+var disposeMultiChart = function () {
+    if (cleanupWasmContext) {
+        cleanupWasmContext();
+    }
+    sciChartMaster.createChildSurface = undefined;
+    sciChartMaster.getChildSurfaces = undefined;
+    sciChartMaster.wasmContext = undefined;
+    sciChartMasterPromise = undefined;
+    // TODO make sure it works properly in combination with createSingle & 3D
+    licenseManager2D_1.licenseManager.clear();
+};
+exports.disposeMultiChart = disposeMultiChart;
+/** @ignore */
+var monitorWebGL = function (wasmContext) {
     var restoreContext = function () {
         // restart the engine
         wasmContext.SCRTInitEngine2D();
         wasmContext.TSRSetDrawRequestsEnabled(true);
-        // request redraw
-        // I'd like to do this, but it results in the surface getting captured by the global context in a way that can't easily be deleted.
-        // for (const surface of getChildSurfaces()) {
-        //     surface.invalidateElement();
-        // }
     };
     var webGLLostContextEventHandler = function (event) {
         console.warn("WebGL context lost: ", event.statusMessage);
@@ -124,6 +140,10 @@ var monitorWebGL = function (master) {
         WebGlRenderContext2D_1.WebGlRenderContext2D.webGlResourcesRefs.forEach(function (penCache) {
             penCache.invalidateCache();
         });
+        // invalidate Labels Cache
+        LabelCache_1.labelCache.resetCache();
+        // invalidate native object cache
+        (0, NativeObject_1.deleteCache)(wasmContext);
         // stop the engine
         wasmContext.SCRTShutdownEngine2D();
     };
@@ -134,8 +154,7 @@ var monitorWebGL = function (master) {
     wasmContext.canvas.addEventListener("webglcontextlost", webGLLostContextEventHandler, false);
     wasmContext.canvas.addEventListener("webglcontextrestored", webGLRestoredContextHandler, false);
 };
-/** @ignore */
-exports.sciChartDestinations = [];
+exports.monitorWebGL = monitorWebGL;
 /** @ignore */
 var createMaster = function () {
     var createChildSurfaceInner = function (wasmContext, divElementId, canvases, theme) {
@@ -144,7 +163,7 @@ var createMaster = function () {
         sciChartSurface.applyTheme(theme);
         var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, sciChartSurface, canvases.disableAspect);
         sciChartSurface.addDeletable(unsub);
-        sciChartSurface.setDestinations(exports.sciChartDestinations);
+        sciChartSurface.setDestinations(Globals_1.sciChartDestinations);
         return sciChartSurface;
     };
     var addDestination = function (wasmContext, canvasElementId, sciChartSurface, width, height, chartInitObj) {
@@ -156,7 +175,7 @@ var createMaster = function () {
         var dest = wasmContext.SCRTSurfaceDestination.implement(newDestination);
         chartInitObj.AddDestination(dest);
         chartInitObj.SetFPSCounterEnabled(false);
-        exports.sciChartDestinations.push({ canvasElementId: canvasElementId, sciChartSurface: sciChartSurface, width: width, height: height });
+        Globals_1.sciChartDestinations.push({ canvasElementId: canvasElementId, sciChartSurface: sciChartSurface, width: width, height: height });
     };
     return new Promise(function (resolve, reject) {
         // make sure canvas has event listener for context creation error
@@ -164,23 +183,70 @@ var createMaster = function () {
         var locateFile = (0, SciChartSurfaceBase_1.getLocateFile)(SciChartSurface_1.sciChartConfig);
         // @ts-ignore
         new WasmModule2D({ locateFile: locateFile, noInitialRun: true })
-            .then(function (wasmContext) {
-            var getChildSurfaces = function () { return exports.sciChartDestinations.map(function (el) { return el.sciChartSurface; }); };
+            .then(function (originalWasmContext, anythingElse) {
+            var revocable = (0, DeletableEntity_1.createWasmContextRevocableProxy)(originalWasmContext);
+            var wasmContext = revocable.proxy;
+            cleanupWasmContext = function () {
+                LabelCache_1.labelCache.resetCache();
+                // Halt the engine
+                wasmContext.TSRRequestExit();
+                frameRenderer2D.delete();
+                // wasmContext.SCRTGetGlobalSampleChartInterface().GetFrameRenderer().delete();
+                wasmContext.SCRTGetGlobalSampleChartInterface().SetFrameRenderer(null);
+                wasmContext.SCRTGetGlobalSampleChartInterface().delete();
+                wasmContext.SCRTSetGlobalSampleChartInterface(null);
+                (0, NativeObject_1.deleteCache)(wasmContext);
+                canvasCopyObj.delete();
+                wasmContext.SCRTSetGlobalCopyToDestinationInterface(null);
+                revocable.revoke();
+                revocable = undefined;
+                cleanupWasmContext = undefined;
+            };
+            var frameRenderer2D = new wasmContext.SCRTFrameRenderer2D();
+            /// create an object that native side can trigger the copy to from...
+            var canvasCopyObj = wasmContext.SCRTCopyToDestinationInterface.implement({
+                CopyToDestination: (0, SciChartSurfaceBase_1.copyToCanvas)(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas, getDestinationById)
+            });
+            var getChildSurfaces = function () { return Globals_1.sciChartDestinations.map(function (el) { return el.sciChartSurface; }); };
             // Create of replace child surface
             var createChildSurface = function (divElementId, canvases, theme) {
                 Guard_1.Guard.notNull(theme, "theme");
                 var canvas2dId = sciChartInitCommon_1.default.getCanvas2dId(divElementId);
-                var sameIdDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId === canvas2dId; });
+                var sameIdDestinations = Globals_1.sciChartDestinations.filter(function (el) { return el.canvasElementId === canvas2dId; });
                 sameIdDestinations.forEach(function (el) { return el.sciChartSurface.delete(false); });
-                var otherDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId !== canvas2dId; });
+                var otherDestinations = Globals_1.sciChartDestinations.filter(function (el) { return el.canvasElementId !== canvas2dId; });
                 chartInitObj.ClearDestinations();
-                while (exports.sciChartDestinations.length > 0) {
-                    exports.sciChartDestinations.pop();
+                while (Globals_1.sciChartDestinations.length > 0) {
+                    Globals_1.sciChartDestinations.pop();
                 }
                 otherDestinations.forEach(function (el) {
                     return addDestination(wasmContext, el.canvasElementId, el.sciChartSurface, el.width, el.height, chartInitObj);
                 });
                 var sciChartSurface = createChildSurfaceInner(wasmContext, divElementId, canvases, theme);
+                sciChartSurface.addDeletable({
+                    delete: function () {
+                        if (SciChartSurface_1.SciChartSurface.autoDisposeWasmContext && sciChartSurface.otherSurfaces.length === 0) {
+                            if (SciChartSurface_1.SciChartSurface.wasmContextDisposeTimeout) {
+                                setTimeout(function () {
+                                    if (Globals_1.sciChartDestinations.length === 0) {
+                                        SciChartSurface_1.SciChartSurface.disposeSharedWasmContext();
+                                    }
+                                }, SciChartSurface_1.SciChartSurface.wasmContextDisposeTimeout);
+                            }
+                            else {
+                                SciChartSurface_1.SciChartSurface.disposeSharedWasmContext();
+                            }
+                        }
+                        else {
+                            if (process.env.NODE_ENV !== "production") {
+                                if (MemoryUsageHelper_1.MemoryUsageHelper.isMemoryUsageDebugEnabled &&
+                                    sciChartSurface.otherSurfaces.length === 0) {
+                                    console.warn("SciChartSurface.autoDisposeWasmContext is disabled, thus wasmContext should be disposed explicitly using \"SciChartSurface.disposeSharedWasmContext()\".");
+                                }
+                            }
+                        }
+                    }
+                });
                 addDestination(wasmContext, canvas2dId, sciChartSurface, canvases.domCanvas2D.width, canvases.domCanvas2D.height, chartInitObj);
                 licenseManager2D_1.licenseManager.applyLicense2D(wasmContext, sciChartSurface, false);
                 return sciChartSurface;
@@ -191,7 +257,7 @@ var createMaster = function () {
                     resolve({ getChildSurfaces: getChildSurfaces, createChildSurface: createChildSurface, wasmContext: wasmContext });
                 },
                 Draw: function (canvasId) {
-                    var dest = exports.sciChartDestinations.find(function (d) { return d.canvasElementId === canvasId; });
+                    var dest = Globals_1.sciChartDestinations.find(function (d) { return d.canvasElementId === canvasId; });
                     if (dest) {
                         dest.sciChartSurface.renderSurface.onRenderTimeElapsed();
                     }
@@ -204,19 +270,17 @@ var createMaster = function () {
                 }
             };
             var chartInitObj = wasmContext.SCRTSampleChartInterface.implement(chartInitializer);
-            var frameRenderer2D = new wasmContext.SCRTFrameRenderer2D();
             chartInitObj.SetFrameRenderer(frameRenderer2D);
+            // Note: in case of createMaster this property must be set before the first chart created.
+            // It will be shared buffer size across all charts
+            chartInitObj.SetWasmBufferSizesKb(SciChartDefaults_1.SciChartDefaults.wasmBufferSizesKb);
             wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
-            /// create an object that native side can trigger the copy to from...
-            var canvasCopyObj = wasmContext.SCRTCopyToDestinationInterface.implement({
-                CopyToDestination: (0, SciChartSurfaceBase_1.copyToCanvas)(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas, getDestinationById)
-            });
             wasmContext.SCRTSetGlobalCopyToDestinationInterface(canvasCopyObj);
             wasmContext.TSRSetDrawRequestsEnabled(true);
             // SCJS-1321 fixes cutting 3d chart issue. 3D wasm and vice versa doesn't know about domMasterCanvas width/height
             // when creating one 3d chart and one 2d chart on the same screen. So we tell the other wasm about existing master canvas size
             if (SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas) {
-                wasmContext.TSRSetMainWindowSize(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.width, SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.height);
+                wasmContext.SCRTSetMainWindowSize(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.width, SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.height);
             }
             // @ts-ignore
             wasmContext.callMain();
@@ -229,5 +293,5 @@ var createMaster = function () {
 };
 /** @ignore */
 var getDestinationById = function (destinationId) {
-    return exports.sciChartDestinations.find(function (dest) { return dest.canvasElementId === destinationId; });
+    return Globals_1.sciChartDestinations.find(function (dest) { return dest.canvasElementId === destinationId; });
 };

package/Charting/Visuals/createSingle.d.ts

@@ -3,8 +3,6 @@ import { TSciChartSurfaceCanvases } from "../../types/TSciChartSurfaceCanvases";
 import { IThemeProvider } from "../Themes/IThemeProvider";
 import { I2DSurfaceOptions } from "./I2DSurfaceOptions";
 import { TWebAssemblyChart } from "./SciChartSurface";
-import { TSciChartDestination } from "./SciChartSurfaceBase";
-export declare const sciChartSingleDestinations: TSciChartDestination[];
 /** @ignore */
 export declare const createSingleInternal: (divElement: string | HTMLDivElement, options?: I2DSurfaceOptions) => Promise<TWebAssemblyChart>;
 /** @ignore */

package/Charting/Visuals/createSingle.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDrawEngineSingleChart = exports.createSingleInternal = exports.sciChartSingleDestinations = void 0;
+exports.initDrawEngineSingleChart = exports.createSingleInternal = void 0;
 // @ts-ignore
 var WasmModule2D = require("../../_wasm/scichart2d");
 var BuildStamp_1 = require("../../Core/BuildStamp");
@@ -9,17 +9,21 @@ var WebGlHelper_1 = require("../../Core/WebGlHelper");
 var logger_1 = require("../../utils/logger");
 var licenseManager2D_1 = require("./licenseManager2D");
 var loader_1 = require("./loader");
+var SciChartDefaults_1 = require("./SciChartDefaults");
 var sciChartInitCommon_1 = require("./sciChartInitCommon");
 var SciChartSurface_1 = require("./SciChartSurface");
 var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
 var NativeObject_1 = require("./Helpers/NativeObject");
+var DeletableEntity_1 = require("../../Core/DeletableEntity");
+var Globals_1 = require("../../Core/Globals");
+var LabelCache_1 = require("./Axis/LabelProvider/LabelCache");
+var createMaster_1 = require("./createMaster");
 // 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, undefined, options === null || options === void 0 ? void 0 : options.disableAspect);
+        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, options === null || options === void 0 ? void 0 : options.touchAction);
         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();
@@ -32,10 +36,28 @@ var createSingleInternal = function (divElement, options) {
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
                 // @ts-ignore
                 wasmContext.doNotCaptureKeyboard = true;
-                (0, exports.initDrawEngineSingleChart)(wasmContext, canvases, resolve, options === null || options === void 0 ? void 0 : options.theme);
+                // TODO replace workaround with proper wasmContext references cleanup
+                // TODO use revocable only for memory debug
+                // if (process.env.NODE_ENV !== "production") {
+                var revocable = (0, DeletableEntity_1.createWasmContextRevocableProxy)(wasmContext);
+                var customResolve = function (res) {
+                    res.sciChartSurface.addDeletable({
+                        delete: function () {
+                            revocable.revoke();
+                            revocable = undefined;
+                        }
+                    });
+                    resolve(res);
+                };
+                (0, exports.initDrawEngineSingleChart)(revocable.proxy, canvases, customResolve, options === null || options === void 0 ? void 0 : options.theme);
+                // return;
+                // }
+                // initDrawEngineSingleChart(wasmContext, canvases, resolve, options?.theme as IThemeProvider);
                 (0, BuildStamp_1.checkBuildStamp)(wasmContext);
+                (0, createMaster_1.monitorWebGL)(wasmContext);
             })
-                .catch(function () {
+                .catch(function (err) {
+                logger_1.Logger.debug(err);
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
                 reject("Could not load SciChart WebAssembly module.\n                    Check your build process and ensure that your scichart2d.wasm, scichart2d.data and scichart2d.js files are from the same version");
             });
@@ -55,17 +77,30 @@ var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme)
     wasmContext.preRun.push(function () { return (ENV.SDL_EMSCRIPTEN_KEYBOARD_ELEMENT = "#chart_WebGL"); });
     var scs;
     wasmContext.canvas = canvases.domCanvasWebGL;
+    var frameRenderer2D = new wasmContext.SCRTFrameRenderer2D();
+    var webGlCanvasId = canvases.domCanvasWebGL.id;
     var chartInitializer = {
         InitializeChart: function () {
             scs = new SciChartSurface_1.SciChartSurface(wasmContext, { canvases: canvases });
             scs.applyTheme(theme);
-            exports.sciChartSingleDestinations.push({
-                canvasElementId: canvases.domCanvasWebGL.id,
+            Globals_1.sciChartSingleDestinations.push({
+                canvasElementId: webGlCanvasId,
                 sciChartSurface: scs,
                 width: width,
                 height: height
             });
-            scs.setDestinations(exports.sciChartSingleDestinations);
+            scs.setDestinations(Globals_1.sciChartSingleDestinations);
+            scs.addDeletable({
+                delete: function () {
+                    // Halt the engine
+                    wasmContext.TSRRequestExit();
+                    frameRenderer2D.delete();
+                    wasmContext.SCRTGetGlobalSampleChartInterface().SetFrameRenderer(null);
+                    wasmContext.SCRTGetGlobalSampleChartInterface().delete();
+                    wasmContext.SCRTSetGlobalSampleChartInterface(null);
+                    LabelCache_1.labelCache.resetCache();
+                }
+            });
             setTimeout(function () {
                 scs.invalidateElement();
                 licenseManager2D_1.licenseManager.applyLicense2D(wasmContext, scs, true);
@@ -86,9 +121,9 @@ var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme)
         }
     };
     var chartInitObj = wasmContext.SCRTSampleChartInterface.implement(chartInitializer);
-    var frameRenderer2D = new wasmContext.SCRTFrameRenderer2D();
     chartInitObj.SetFrameRenderer(frameRenderer2D);
     chartInitObj.SetFPSCounterEnabled(false);
+    chartInitObj.SetWasmBufferSizesKb(SciChartDefaults_1.SciChartDefaults.wasmBufferSizesKb);
     wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
     // @ts-ignore
     wasmContext.callMain();

package/Charting/Visuals/licenseManager2D.d.ts

@@ -1,12 +1,12 @@
 import { ILicenseInfo } from "../../types/licensingClasses";
 import { SCRTLicenseType } from "../../types/TSciChart";
-import { SciChartSurfaceBase } from "./SciChartSurfaceBase";
+import { ISciChartSurfaceBase } from "./SciChartSurfaceBase";
 export declare type TLicenseDependencies = {
     fetchFromWizard: (url: string) => Promise<Response>;
     setCookie: (name: string, val: string, validDays: number) => void;
     getCookie: (name: string) => string;
     fetchForChallenge: (url: string) => Promise<Response>;
-    updateLicenseDisplay: (licenseInfo: ILicenseInfo, sciChartSurface: SciChartSurfaceBase, is2D: boolean, applyToOther: boolean) => void;
+    updateLicenseDisplay: (licenseInfo: ILicenseInfo, sciChartSurface: ISciChartSurfaceBase, is2D: boolean, applyToOther: boolean) => void;
     debug: (message: string) => void;
 };
 export declare const setDependencies: (dependencies: TLicenseDependencies) => TLicenseDependencies;
@@ -34,7 +34,7 @@ interface ILicenseCookie {
     lastValidated: Date;
 }
 export declare const getLicenseCookie: () => ILicenseCookie;
-export declare const applyLicense: (licenseContext: TLicenseContext, sciChartSurface: SciChartSurfaceBase) => void;
+export declare const applyLicense: (licenseContext: TLicenseContext, sciChartSurface: ISciChartSurfaceBase) => void;
 export declare type TLicenseContext = {
     SCRTCredentials: {
         GetLicenseType: () => SCRTLicenseType;
@@ -56,6 +56,7 @@ export declare type TLicenseContext = {
     SCRTLicenseType: {
         LICENSE_TYPE_NO_LICENSE: SCRTLicenseType;
         LICENSE_TYPE_TRIAL: SCRTLicenseType;
+        LICENSE_TYPE_COMMUNITY: SCRTLicenseType;
         LICENSE_TYPE_FULL: SCRTLicenseType;
         LICENSE_TYPE_FULL_EXPIRED: SCRTLicenseType;
         LICENSE_TYPE_TRIAL_EXPIRED: SCRTLicenseType;
@@ -66,12 +67,13 @@ export declare type TLicenseContext = {
     };
 };
 export declare const getLicenseInfo: (licenseContext: TLicenseContext) => ILicenseInfo;
-export declare const updateLicenseDisplay: (licenseInfo: ILicenseInfo, sciChartSurface: SciChartSurfaceBase, is2D: boolean, applyToOther: boolean) => void;
+export declare const updateLicenseDisplay: (licenseInfo: ILicenseInfo, sciChartSurface: ISciChartSurfaceBase, is2D: boolean, applyToOther: boolean) => void;
 export declare const licenseManager: {
+    clear: () => void;
     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;
+    applyLicense2D: (licenseContext: TLicenseContext, sciChartSurface: ISciChartSurfaceBase, isSingle: boolean) => void;
 };
 export {};