scichart 3.1.348 → 3.2.0-beta

package/Charting/Visuals/licenseManager2D.js

@@ -40,6 +40,7 @@ exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo =
 var app_1 = require("../../constants/app");
 var BuildStamp_1 = require("../../Core/BuildStamp");
 var Dictionary_1 = require("../../Core/Dictionary");
+var Globals_1 = require("../../Core/Globals");
 var localStorageApi_1 = require("../../Core/storage/localStorageApi");
 var Telemetry_1 = require("../../Core/Telemetry");
 var Color_1 = require("../../types/Color");
@@ -133,8 +134,10 @@ var setRuntimeLicenseKey = function (value) {
     var prev = runtimeLicenseKey;
     runtimeLicenseKey = value;
     if (runtimeLicenseKey !== prev && runtimeLicenseKey !== "") {
-        if (licenseContext2D !== undefined) {
-            (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
+        if (Globals_1.sciChartDestinations.length > 0) {
+            var sciChartSurface = Globals_1.sciChartDestinations[0].sciChartSurface;
+            // @ts-ignore
+            (0, exports.applyLicense)(sciChartSurface.sharedWasmContext, sciChartSurface);
         }
     }
 };
@@ -152,13 +155,16 @@ var setServerLicenseEndpoint = function (value) {
     serverLicenseEndpoint = value;
 };
 var getLicenseFailCounts = 0;
+// TODO cleanup on surface delete
 var wizardTimer;
-var callbacks3D = {
+var licenseChallengeTimeout;
+var callbacks3DInitialValue = {
     getLicenseChallenge3D: function () { return undefined; },
     setChallengeResponse3D: function (token) { return undefined; },
     setNewLicense3D: function (keyCode) { return undefined; },
     updateLicenseDisplay3D: function () { return undefined; }
 };
+var callbacks3D = callbacks3DInitialValue;
 var setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
 exports.setCallbacks3D = setCallbacks3D;
 var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return __awaiter(void 0, void 0, void 0, function () {
@@ -166,7 +172,12 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                _b.trys.push([0, 5, , 6]);
+                if (sciChartSurface.isDeleted) {
+                    return [2 /*return*/];
+                }
+                _b.label = 1;
+            case 1:
+                _b.trys.push([1, 6, , 7]);
                 if (checkStatus !== licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard)
@@ -174,11 +185,11 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
                 debug("Trying to get license from local license wizard");
                 response = void 0;
                 return [4 /*yield*/, licenseDependencies.fetchFromWizard("/license")];
-            case 1:
+            case 2:
                 response = _b.sent();
-                if (!response.ok) return [3 /*break*/, 3];
+                if (!response.ok) return [3 /*break*/, 4];
                 return [4 /*yield*/, response.text()];
-            case 2:
+            case 3:
                 keyCode = _b.sent();
                 _a = setNewLicense(keyCode, licenseContext, sciChartSurface), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
                 if (requiresValidation) {
@@ -195,21 +206,21 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
                     debug("Got a valid license from local license wizard.");
                     checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                 }
-                return [3 /*break*/, 4];
-            case 3:
+                return [3 /*break*/, 5];
+            case 4:
                 checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
                 debug("No license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                 wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
-                _b.label = 4;
-            case 4: return [3 /*break*/, 6];
-            case 5:
+                _b.label = 5;
+            case 5: return [3 /*break*/, 7];
+            case 6:
                 err_3 = _b.sent();
                 checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
                 // Failed to connect.  Retry
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
                     debug("Could not find licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                    setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
+                    wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     // give up.
@@ -217,12 +228,12 @@ var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return _
                     getLicenseFailCounts = 0;
                     checkStatus = licensingClasses_1.LicenseCheckStatus.FailedToFindLicenseWizard;
                 }
-                return [3 /*break*/, 6];
-            case 6:
-                if (licenseContext !== undefined) {
+                return [3 /*break*/, 7];
+            case 7:
+                if (licenseContext !== undefined && !sciChartSurface.isDeleted) {
                     (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
+                    callbacks3D.updateLicenseDisplay3D();
                 }
-                callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
         }
     });
@@ -247,10 +258,6 @@ var getLicenseCookie = function () {
         return { key: parts[0], token: null, expiry: null, lastValidated: null };
 };
 exports.getLicenseCookie = getLicenseCookie;
-var refreshLicense = function () {
-    (0, cookie_1.deleteCookie)("scLicense");
-    (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
-};
 var setChallengeResponse = function (token, licenseContext) {
     var expirySeconds = -1;
     if (licenseContext !== undefined) {
@@ -263,11 +270,14 @@ var setChallengeResponse = function (token, licenseContext) {
 };
 var challengeFailCounts = 0;
 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 server, challenge, orderId, response, queryString, url, url, token, expirySeconds, key, timeNow, timeToExpiry, err_4, sciChartSurface2D, expiry, msg;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
+                if (sciChartSurface.isDeleted) {
+                    return [2 /*return*/];
+                }
                 server = licenseManager2dState_1.licenseManager2dState.getIsDev() ? "license wizard" : "server";
                 _b.label = 1;
             case 1:
@@ -321,7 +331,7 @@ var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __a
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                         timeToExpiry = expirySeconds - timeNow;
                         challengeFailCounts = 0;
-                        setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
+                        licenseChallengeTimeout = setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
                     }
                     else {
                         // Something went wrong with the apply
@@ -359,17 +369,20 @@ var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __a
                     licenseManager2dState_1.licenseManager2dState.setIsDev(true);
                     checkStatus = licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard;
                     getlicenseFromWizard(licenseContext, sciChartSurface);
-                    if (licenseContext2D !== undefined) {
-                        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
+                    if (Globals_1.sciChartDestinations.length > 0 && !sciChartSurface.isDeleted) {
+                        sciChartSurface2D = Globals_1.sciChartDestinations[0].sciChartSurface;
+                        (0, exports.updateLicenseDisplay)(
+                        //@ts-ignore
+                        (0, exports.getLicenseInfo)(sciChartSurface2D.sharedWasmContext), sciChartSurface2D, true, false);
+                        callbacks3D.updateLicenseDisplay3D();
                     }
-                    callbacks3D.updateLicenseDisplay3D();
                     return [2 /*return*/];
                 }
                 // Failed to connect.  Retry
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
                     debug("Could not find ".concat(server, "/").concat(serverLicenseEndpoint, ". Trying again in ").concat(retryTime, " seconds"));
-                    setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, retryTime * 1000);
+                    licenseChallengeTimeout = setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     expiry = (0, exports.getLicenseCookie)().expiry;
@@ -384,56 +397,50 @@ var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __a
                 }
                 return [3 /*break*/, 12];
             case 12:
-                if (licenseContext !== undefined) {
+                if (licenseContext !== undefined && !sciChartSurface.isDeleted) {
                     (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
+                    callbacks3D.updateLicenseDisplay3D();
                 }
-                callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
         }
     });
 }); };
 var shouldApplyLicense2D = true;
 var checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
-var licenseContext2D;
-var sciChartSurface2D;
+// let licenseContext2D: TLicenseContext;
+// let sciChartSurface2D: SciChartSurfaceBase;
 var isRuntimeKey = false;
+var communityNotice = false;
 var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     debug("applyLicense 2D");
-    if (shouldApplyLicense2D) {
-        sciChartSurface2D = sciChartSurface;
-        licenseContext2D = licenseContext;
-    }
+    // if (shouldApplyLicense2D) {
+    //     sciChartSurface2D = sciChartSurface;
+    //     licenseContext2D = licenseContext;
+    // }
     if (isSingle || shouldApplyLicense2D) {
         (0, exports.applyLicense)(licenseContext, sciChartSurface);
     }
     else {
         if (checkStatus !== licensingClasses_1.LicenseCheckStatus.LicenseOK) {
-            (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
+            (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, false);
         }
     }
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
 var applyLicense = function (licenseContext, sciChartSurface) {
-    var _a;
+    var _a, _b;
     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 === "codesandbox.io" ||
-        window.location.hostname.includes(".codesandbox.io") ||
-        window.location.hostname.includes("fiddle.jshell.net") ||
-        window.location.hostname.includes("cdpn.io")) {
-        runtimeLicenseKey = "builtin";
-    }
     // Get from global store
     var runtimelicense = getRuntimeLicenseKey();
     if ((checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense ||
         checkStatus === licensingClasses_1.LicenseCheckStatus.LicenseOK ||
         checkStatus === licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard ||
         checkStatus === licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard) &&
-        lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE &&
+        lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY &&
         runtimelicense) {
         debug("Runtime license found");
         var sep = runtimelicense.indexOf(";");
@@ -449,6 +456,7 @@ var applyLicense = function (licenseContext, sciChartSurface) {
             debug("Runtime license status is " + licensingClasses_1.LicenseType[licenseType]);
             if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
                 lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL ||
+                lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY ||
                 lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_REQUIRES_VALIDATION) {
                 isRuntimeKey = true;
                 licenseKey = runtimelicense;
@@ -485,23 +493,30 @@ var applyLicense = function (licenseContext, sciChartSurface) {
             debug("License cookie is invalid. " + licenseContext.SCRTCredentials.GetLicenseErrors());
             (0, cookie_1.deleteCookie)("scLicense");
             licenseKey = "";
-            lt = licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE;
+            lt = licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY;
         }
     }
     else if (checkStatus === licensingClasses_1.LicenseCheckStatus.FetchingFromServer) {
         checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
     }
     if (licenseKey !== "") {
-        if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE) {
+        if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY) {
             // Set the license if we haven't already
             licenseContext.SCRTCredentials.SetRuntimeLicenseKeyW(licenseKey);
             lt = licenseContext.SCRTCredentials.GetLicenseType();
         }
         licenseManager2dState_1.licenseManager2dState.setIsDev(licenseContext.SCRTCredentials.GetAllowDebugging());
         if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
-            lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL) {
+            lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL ||
+            lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY) {
             checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
             debug("license ok");
+            if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY && isRuntimeKey && !communityNotice) {
+                console.log("Using SciChart Community Edition. To use a license from the License Wizard, remove the call to UseCommunityLicense");
+                var daysRemaining = licenseContext.SCRTCredentials.GetLicenseDaysRemaining();
+                console.log("The community license is valid for 6 months from the date the version in use was released.  This version ".concat(BuildStamp_1.libraryVersion, " has ").concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining"));
+                communityNotice = true;
+            }
         }
         else if (licenseContext.SCRTCredentials.RequiresValidation()) {
             debug("license requires validation");
@@ -542,8 +557,17 @@ var applyLicense = function (licenseContext, sciChartSurface) {
         }
     }
     debug("checkstatus: " + licensingClasses_1.LicenseCheckStatus[checkStatus]);
-    if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense && useLicenseWizard) {
-        if (wizardTimer === undefined) {
+    if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense) {
+        if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY && !communityNotice) {
+            console.log("Defaulting to SciChart Community Edition.  Usage constitutes acceptance of EULA at https://scichart.com/JSCommunityEULA. See https://store.scichart.com for commercial licensing options.");
+            var daysRemaining = licenseContext.SCRTCredentials.GetLicenseDaysRemaining();
+            console.log("The community license is valid for 6 months from the date the version in use was released.  This version ".concat(BuildStamp_1.libraryVersion, " has ").concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining"));
+            if (!app_1.IS_TEST_ENV && ((_b = document === null || document === void 0 ? void 0 : document.location) === null || _b === void 0 ? void 0 : _b.hostname.startsWith("localhost")) && useLicenseWizard) {
+                console.log("Looking for paid developer activation from licensing wizard... To disable this call SciChartSurface.UseCommunityLicense()");
+            }
+            communityNotice = true;
+        }
+        if (wizardTimer === undefined && useLicenseWizard) {
             checkStatus = licensingClasses_1.LicenseCheckStatus.StartLookingForLicenseWizard;
             licenseManager2dState_1.licenseManager2dState.setIsDev(true);
             getlicenseFromWizard(licenseContext, sciChartSurface);
@@ -551,8 +575,8 @@ var applyLicense = function (licenseContext, sciChartSurface) {
     }
     if (licenseContext !== undefined) {
         (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, false);
+        callbacks3D.updateLicenseDisplay3D();
     }
-    callbacks3D.updateLicenseDisplay3D();
 };
 exports.applyLicense = applyLicense;
 var licenseModal;
@@ -697,6 +721,9 @@ var LICENSE_MSG_CLASS_CHILD = "licenseMessageChild";
 var licenseMessageDiv = null;
 var licenseMessageDivChild = null;
 var updateLicenseMessageDOM = function (divContainer, licenseMsgDiv) {
+    if (!divContainer) {
+        return;
+    }
     var msgCloneOther = licenseMsgDiv.cloneNode(true);
     var lms = divContainer.getElementsByClassName(LICENSE_MSG_CLASS);
     if (lms.length > 0) {
@@ -720,6 +747,10 @@ var convertLicenseType = function (sclt, licenseContext) {
             licenseType = licensingClasses_1.LicenseType.Trial;
             break;
         }
+        case licenseContext.SCRTLicenseType.LICENSE_TYPE_COMMUNITY: {
+            licenseType = licensingClasses_1.LicenseType.Community;
+            break;
+        }
         case licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL: {
             licenseType = licensingClasses_1.LicenseType.Full;
             break;
@@ -756,7 +787,12 @@ var getLicenseInfo = function (licenseContext) {
     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());
+        if (licenseType === licensingClasses_1.LicenseType.Community) {
+            licenseManager2dState_1.licenseManager2dState.setOrderId("Community");
+        }
+        else {
+            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());
@@ -816,6 +852,8 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
                 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 if (error.startsWith("This version of SciChart can no longer be used for the community edition"))
+                premsg = "Sorry! This version of SciChart is too old to be used for the community edition.  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);
@@ -848,7 +886,11 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         else if (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining <= 7) {
             premsg = "You have ".concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining of the trial.");
         }
-        else if (licenseType === licensingClasses_1.LicenseType.Full || (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining > 7)) {
+        else if (licenseType === licensingClasses_1.LicenseType.Community && daysRemaining <= 7) {
+            premsg = "You have ".concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining on the community license for this version.  Please update to the latest version of SciChart");
+        }
+        else if (licenseType === licensingClasses_1.LicenseType.Full ||
+            ((licenseType === licensingClasses_1.LicenseType.Trial || licenseType === licensingClasses_1.LicenseType.Community) && daysRemaining > 7)) {
             licenseMessageDiv.style.display = "none";
             licenseMessageDivChild.innerHTML = "";
         }
@@ -930,9 +972,19 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         });
     }
 };
+var clear = function () {
+    if (!Globals_1.sciChartDestinations.length && !Globals_1.sciChartSingleDestinations.length && !Globals_1.sciChart3DDestinations.length) {
+        clearTimeout(wizardTimer);
+        clearTimeout(licenseChallengeTimeout);
+        (0, exports.setCallbacks3D)(callbacks3DInitialValue);
+        licenseMessageDivChild = null;
+        licenseMessageDiv = null;
+    }
+};
 var updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyToOther) { return licenseDependencies.updateLicenseDisplay(licenseInfo, sciChartSurface, is2D, applyToOther); };
 exports.updateLicenseDisplay = updateLicenseDisplay;
 exports.licenseManager = {
+    clear: clear,
     setRuntimeLicenseKey: function (value) { return (0, exports.setRuntimeLicenseKey)(value); },
     setIsDebugLicensing: function (value) { return (0, exports.setIsDebugLicensing)(value); },
     setLicenseCallback: function (callback) { return (0, exports.setLicenseCallback)(callback); },

package/Charting/Visuals/loader.js

@@ -43,7 +43,9 @@ var DefaultSciChartLoader = /** @class */ (function () {
         try {
             domChartRoot.removeChild(loaderElement);
         }
-        catch (_a) { }
+        catch (err) {
+            console.error(err);
+        }
     };
     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, disableAspect?: boolean) => TSciChartSurfaceCanvases;
+    initCanvas: (divElement: string | HTMLDivElement, aspectWidth: number, aspectHeight: number, activeCanvas?: ECanvasType, disableAspect?: boolean, touchAction?: string) => TSciChartSurfaceCanvases;
     subscribeToResize: (chartRoot: HTMLDivElement, aspect: number, sciChartSurface: ISciChartSurfaceBase, disableAspect?: boolean) => IDeletable;
 };
 export default sciChartInitCommon;

package/Charting/Visuals/sciChartInitCommon.js

@@ -69,7 +69,7 @@ var getMaxHeight = function (divElement) {
  * @param activeCanvas - ECanvasType.canvasWebGL for sciChartSurface.createSingle, ECanvasType.canvas2D for copy canvas,
  * ECanvasType.svg for SciChartPieSurface
  */
-var initCanvas = function (divElement, aspectWidth, aspectHeight, activeCanvas, disableAspect) {
+var initCanvas = function (divElement, aspectWidth, aspectHeight, activeCanvas, disableAspect, touchAction) {
     if (activeCanvas === void 0) { activeCanvas = ECanvasType.canvasWebGL; }
     WebGlHelper_1.WebGlHelper.initialize();
     DpiHelper_1.DpiHelper.initialize();
@@ -121,7 +121,11 @@ var initCanvas = function (divElement, aspectWidth, aspectHeight, activeCanvas,
         canvas2D.style.display = "block";
     }
     chartRoot.appendChild(canvas2D);
+    // used to prevent default browser behavior on touchscreen
+    canvas2D.style.touchAction = touchAction !== null && touchAction !== void 0 ? touchAction : "none";
     canvas2D.onselectstart = function () { return false; };
+    // prevents default browser behavior of dragging the selected elements
+    // canvas2D.ondragstart = () => false;
     // SVG Root Element
     var svgRootElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
     svgRootElement.id = "".concat(divElementId, "_SVG");

package/Charting3D/CameraController.d.ts

@@ -333,5 +333,5 @@ export declare class CameraController implements ICameraController {
     /**
      * @inheritDoc
      */
-    debugOutput(): void;
+    debugOutput(): string[];
 }

package/Charting3D/CameraController.js

@@ -31,6 +31,7 @@ var CameraController = /** @class */ (function () {
     function CameraController(webAssemblyContext, options) {
         var _a;
         this.aspectRatioProperty = 1.5;
+        this.idProperty = "Default";
         this.farClipProperty = 4000;
         this.fieldOfViewProperty = 60;
         this.nearClipProperty = 1;
@@ -508,13 +509,26 @@ var CameraController = /** @class */ (function () {
      * @inheritDoc
      */
     CameraController.prototype.debugOutput = function () {
-        console.log("Camera properties: ");
-        console.log("  projectionMode: ".concat(this.projectionMode));
-        console.log("  position: ".concat(this.position.toString()));
-        console.log("  target: ".concat(this.target.toString()));
-        console.log("  up: ".concat(this.up.toString()));
-        console.log("  pitch: ".concat(this.orbitalPitch.toFixed(2)));
-        console.log("  yaw: ".concat(this.orbitalYaw.toFixed(2)));
+        var debugOutput = [
+            "Camera id='".concat(this.id, "': "),
+            "  position: ".concat(this.position.toString()),
+            "  target: ".concat(this.target.toString()),
+            "  pitch: ".concat(this.orbitalPitch.toFixed(2), " degrees"),
+            "  yaw: ".concat(this.orbitalYaw.toFixed(2), " degrees"),
+            "  up Vector: ".concat(this.up.toString()),
+            "  forward Vector: ".concat(this.forward.toString()),
+            "  projectionMode: ".concat(this.projectionMode)
+        ];
+        if (this.projectionMode === ECameraProjectionMode.Orthogonal) {
+            debugOutput.push("  orthoWidth: ".concat(this.orthoWidth.toFixed(2)));
+            debugOutput.push("  orthoHeight: ".concat(this.orthoHeight.toFixed(2)));
+        }
+        else {
+            debugOutput.push("  radius: ".concat(this.radius.toFixed(2)));
+            debugOutput.push("  fieldOfView: ".concat(this.fieldOfView.toFixed(2), " degrees"));
+        }
+        debugOutput.forEach(function (line) { return console.log(line); });
+        return debugOutput;
     };
     return CameraController;
 }());

package/Charting3D/ChartModifiers/ChartModifierBase3D.d.ts

@@ -21,6 +21,7 @@ export declare abstract class ChartModifierBase3D extends ChartModifierBase<SciC
      * The type of chartmodifier. See {@link EChart3DModifierType} for available options
      */
     abstract readonly type: EChart3DModifierType | string;
+    protected typeMap: Map<string, string>;
     /**
      * Creates an instance of a {@link ChartModifierBase3D}
      * @param options Optional parameters of type {@link IChartModifierBase3DOptions} used to configure the modifier

package/Charting3D/ChartModifiers/ChartModifierBase3D.js

@@ -28,7 +28,10 @@ var ChartModifierBase3D = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IChartModifierBase3DOptions} used to configure the modifier
      */
     function ChartModifierBase3D(options) {
-        return _super.call(this, options) || this;
+        var _this = _super.call(this, options) || this;
+        // used to track if registered types were used for function properties, so they can be serialized
+        _this.typeMap = new Map();
+        return _this;
     }
     Object.defineProperty(ChartModifierBase3D.prototype, "modifierType", {
         /**

package/Charting3D/ChartModifiers/OrbitModifier3D.d.ts

@@ -1,10 +1,14 @@
 import { ModifierMouseArgs } from "../../Charting/ChartModifiers/ModifierMouseArgs";
 import { EChart3DModifierType } from "../../types/ChartModifierType";
-import { ChartModifierBase3D, IChartModifierBase3DOptions } from "./ChartModifierBase3D";
+import { IPinchZoomModifier3DOptions, PinchZoomModifier3D } from "./PinchZoomModifier3D";
 /**
  * Optional parameters passed to the constructor of {@link OrbitModifier3D} to configure it
  */
-export interface IOrbitModifier3DOptions extends IChartModifierBase3DOptions {
+export interface IOrbitModifier3DOptions extends IPinchZoomModifier3DOptions {
+    /**
+     * Sets whether to enable pinch zoom behavior of {@link SciChartSurface} on touchscreen devices
+     */
+    enableZoom?: boolean;
 }
 /**
  * @summary The {@link OrbitModifier3D} provides behavior to orbit around a target point on a 3D {@link SciChart3DSurface}
@@ -19,13 +23,15 @@ export interface IOrbitModifier3DOptions extends IChartModifierBase3DOptions {
  * sciChart3DSurface.chartModifiers.add(new OrbitModifier3D());
  * ```
  */
-export declare class OrbitModifier3D extends ChartModifierBase3D {
+export declare class OrbitModifier3D extends PinchZoomModifier3D {
     /**
      * @inheritDoc
      */
     readonly type = EChart3DModifierType.Orbit;
-    private pointStart;
-    private isDragging;
+    /**
+     * Sets whether to enable pinch zoom behavior of {@link SciChartSurface} on touchscreen devices
+     */
+    enableZoom: boolean;
     constructor(options?: IOrbitModifier3DOptions);
     /**
      * @inheritDoc
@@ -39,4 +45,10 @@ export declare class OrbitModifier3D extends ChartModifierBase3D {
      * @inheritDoc
      */
     modifierMouseUp(args: ModifierMouseArgs): void;
+    toJSON(): {
+        type: string;
+        options: Required<Omit<import("./ChartModifierBase3D").IChartModifierBase3DOptions, never>>;
+    };
+    protected performModifierAction(args: ModifierMouseArgs): void;
+    protected getIsActionAllowed(args: ModifierMouseArgs): boolean;
 }