scichart 3.0.266 → 3.0.269

package/Charting/Drawing/WebGlRenderContext2D.d.ts

@@ -124,8 +124,12 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
      */
     drawRect(rect: Rect, viewRect: Rect, strokePen?: IPen2D, fillBrush?: IBrush2D): void;
     printBlendMode(): void;
-    /** Get a native font.  Pass advanced: true if you are planning to rotate the text */
-    getFont(labelStyle: TTextStyle, advanced?: boolean, transformed?: boolean): SCRTFont;
+    /**
+     * Get a native font.  Fonts are cached and shared within webassembly so there is no need to cache them in JS.
+     * Set advanced: true if you are planning to rotate or scale the text.
+     * Set drawEarly: true if you are planning to call font.End() early.  Otherwise all native text will be drawn at the end of the render cycle.
+     */
+    getFont(labelStyle: TTextStyle, advanced?: boolean, drawEarly?: boolean): SCRTFont;
     /** End all fonts, causing text to be drawn */
     endFonts(force?: boolean): void;
 }

package/Charting/Drawing/WebGlRenderContext2D.js

@@ -291,12 +291,16 @@ var WebGlRenderContext2D = /** @class */ (function () {
                 throw new Error("Unhandled blendmode ");
         }
     };
-    /** Get a native font.  Pass advanced: true if you are planning to rotate the text */
-    WebGlRenderContext2D.prototype.getFont = function (labelStyle, advanced, transformed) {
-        var _a;
+    /**
+     * Get a native font.  Fonts are cached and shared within webassembly so there is no need to cache them in JS.
+     * Set advanced: true if you are planning to rotate or scale the text.
+     * Set drawEarly: true if you are planning to call font.End() early.  Otherwise all native text will be drawn at the end of the render cycle.
+     */
+    WebGlRenderContext2D.prototype.getFont = function (labelStyle, advanced, drawEarly) {
+        var _this = this;
         if (advanced === void 0) { advanced = false; }
-        if (transformed === void 0) { transformed = false; }
-        var fontKey = (0, NativeObject_1.getFontKey)(this.webAssemblyContext, labelStyle, advanced, transformed);
+        if (drawEarly === void 0) { drawEarly = false; }
+        var fontKey = (0, NativeObject_1.getFontKey)(this.webAssemblyContext, labelStyle, advanced, drawEarly);
         var nativeContext = this.getNativeContext();
         var nativeFont = nativeContext.AquireFont(fontKey);
         if (!nativeFont) {
@@ -309,10 +313,15 @@ var WebGlRenderContext2D = /** @class */ (function () {
         }
         var currentFontName = nativeFont.GetFaceName();
         if (currentFontName === "SCRT_Loading") {
-            this.webAssemblyContext.TSRRequestCanvasDraw((_a = this.canvasId) !== null && _a !== void 0 ? _a : "undefinedCanvasId");
+            setTimeout(function () { var _a; return _this.webAssemblyContext.TSRRequestCanvasDraw((_a = _this.canvasId) !== null && _a !== void 0 ? _a : "undefinedCanvasId"); }, 100);
         }
         else if (currentFontName !== fontKey.m_strName) {
-            console.warn("Font ".concat(fontKey.m_strName, " could not be found on the server. Falling back to Arial"));
+            // @ts-ignore
+            if (!fontKey.warned) {
+                console.warn("Font ".concat(fontKey.m_strName, " could not be found on the server and has not been registered. Falling back to Arial.\n                Use await scichartSurface.registerFont if you need to load the font from a remote url"));
+                // @ts-ignore
+                fontKey.warned = true;
+            }
         }
         return nativeFont;
     };

package/Charting/LayoutManager/BottomAlignedInnerAxisLayoutStrategy.js

@@ -41,6 +41,8 @@ var BottomAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.bottomInnerAreaSize = Math.max(chartLayoutState.bottomInnerAreaSize, requiredSize);
     };
     BottomAlignedInnerAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.width
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         if (axes.length === 0) {
             return;
         }

package/Charting/LayoutManager/BottomAlignedOuterAxisLayoutStrategy.js

@@ -43,6 +43,8 @@ var BottomAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.bottomOuterAreaSize = Math.max(chartLayoutState.bottomOuterAreaSize, requiredSize);
     };
     BottomAlignedOuterAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.width
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         this.layoutAxesFromTopToBottom(left, top, right, bottom, axes);
     };
     return BottomAlignedOuterAxisLayoutStrategy;

package/Charting/LayoutManager/LayoutManager.js

@@ -170,37 +170,39 @@ var LayoutManager = /** @class */ (function () {
         var _a = this.axesGroupedByLayoutStrategy, topInnerAxes = _a.topInnerAxes, bottomInnerAxes = _a.bottomInnerAxes, leftInnerAxes = _a.leftInnerAxes, rightInnerAxes = _a.rightInnerAxes, topOuterAxes = _a.topOuterAxes, bottomOuterAxes = _a.bottomOuterAxes, leftOuterAxes = _a.leftOuterAxes, rightOuterAxes = _a.rightOuterAxes;
         var groupAxes = function (axes) {
             axes.forEach(function (axis) {
-                var axisAlignment = axis.axisAlignment, isInnerAxis = axis.isInnerAxis;
-                if (isInnerAxis) {
-                    switch (axisAlignment) {
-                        case AxisAlignment_1.EAxisAlignment.Top:
-                            topInnerAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Bottom:
-                            bottomInnerAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Left:
-                            leftInnerAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Right:
-                            rightInnerAxes.push(axis);
-                            break;
+                var axisAlignment = axis.axisAlignment, isInnerAxis = axis.isInnerAxis, isVisible = axis.isVisible;
+                if (isVisible) {
+                    if (isInnerAxis) {
+                        switch (axisAlignment) {
+                            case AxisAlignment_1.EAxisAlignment.Top:
+                                topInnerAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Bottom:
+                                bottomInnerAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Left:
+                                leftInnerAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Right:
+                                rightInnerAxes.push(axis);
+                                break;
+                        }
                     }
-                }
-                else {
-                    switch (axisAlignment) {
-                        case AxisAlignment_1.EAxisAlignment.Top:
-                            topOuterAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Bottom:
-                            bottomOuterAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Left:
-                            leftOuterAxes.push(axis);
-                            break;
-                        case AxisAlignment_1.EAxisAlignment.Right:
-                            rightOuterAxes.push(axis);
-                            break;
+                    else {
+                        switch (axisAlignment) {
+                            case AxisAlignment_1.EAxisAlignment.Top:
+                                topOuterAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Bottom:
+                                bottomOuterAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Left:
+                                leftOuterAxes.push(axis);
+                                break;
+                            case AxisAlignment_1.EAxisAlignment.Right:
+                                rightOuterAxes.push(axis);
+                                break;
+                        }
                     }
                 }
             });

package/Charting/LayoutManager/LeftAlignedInnerAxisLayoutStrategy.js

@@ -41,6 +41,8 @@ var LeftAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.leftInnerAreaSize = Math.max(chartLayoutState.leftInnerAreaSize, requiredSize);
     };
     LeftAlignedInnerAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.height
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         if (axes.length === 0) {
             return;
         }

package/Charting/LayoutManager/LeftAlignedOuterAxisLayoutStrategy.js

@@ -43,6 +43,8 @@ var LeftAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.leftOuterAreaSize = Math.max(chartLayoutState.leftOuterAreaSize, requiredSize);
     };
     LeftAlignedOuterAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.height
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         this.layoutAxesFromRightToLeft(left, top, right, bottom, axes);
     };
     return LeftAlignedOuterAxisLayoutStrategy;

package/Charting/LayoutManager/RightAlignedInnerAxisLayoutStrategy.js

@@ -41,6 +41,8 @@ var RightAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.rightInnerAreaSize = Math.max(chartLayoutState.rightInnerAreaSize, requiredSize);
     };
     RightAlignedInnerAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.height
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         if (axes.length === 0) {
             return;
         }

package/Charting/LayoutManager/RightAlignedOuterAxisLayoutStrategy.js

@@ -43,6 +43,8 @@ var RightAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.rightOuterAreaSize = Math.max(chartLayoutState.rightOuterAreaSize, requiredSize);
     };
     RightAlignedOuterAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.height
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         this.layoutAxesFromLeftToRight(left, top, right, bottom, axes);
     };
     return RightAlignedOuterAxisLayoutStrategy;

package/Charting/LayoutManager/TopAlignedInnerAxisLayoutStrategy.js

@@ -41,6 +41,8 @@ var TopAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.topInnerAreaSize = Math.max(chartLayoutState.topInnerAreaSize, requiredSize);
     };
     TopAlignedInnerAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.width
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         if (axes.length === 0) {
             return;
         }

package/Charting/LayoutManager/TopAlignedOuterAxisLayoutStrategy.js

@@ -43,6 +43,8 @@ var TopAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
         chartLayoutState.topOuterAreaSize = Math.max(chartLayoutState.topOuterAreaSize, requiredSize);
     };
     TopAlignedOuterAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
+        // Set axisLength to default value which is seriesViewRect.width
+        axes.forEach(function (axis) { return (axis.axisLength = undefined); });
         this.layoutAxesFromBottomToTop(left, top, right, bottom, axes);
     };
     return TopAlignedOuterAxisLayoutStrategy;

package/Charting/Visuals/Helpers/NativeObject.d.ts

@@ -1,6 +1,12 @@
 import { IDeletable } from "../../../Core/IDeletable";
 import { SCRTColorVertex, SCRTFontKey, SCRTRectVertex, TSciChart, TSRTextBounds, TSRVector4, VectorColorVertex, VectorRectVertex } from "../../../types/TSciChart";
 import { TTextStyle } from "../Axis/AxisCore";
+export declare class FontKey implements IDeletable {
+    readonly firstLoadTime: number;
+    readonly nativeKey: SCRTFontKey;
+    constructor(nativeKey: SCRTFontKey);
+    delete(): void;
+}
 export declare const freeCache: (wasmContext: TSciChart) => IDeletable;
 /**
  * Returns an empty vector of Rectangles

package/Charting/Visuals/Helpers/NativeObject.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllFontKeys = exports.getFontKey = exports.getVector4 = exports.getNativeRect = exports.getTextBounds = exports.getVertex = exports.getVectorColorVertex = exports.getVectorRectVertex = exports.freeCache = void 0;
+exports.getAllFontKeys = exports.getFontKey = exports.getVector4 = exports.getNativeRect = exports.getTextBounds = exports.getVertex = exports.getVectorColorVertex = exports.getVectorRectVertex = exports.freeCache = exports.FontKey = void 0;
 var Deleter_1 = require("../../../Core/Deleter");
 var LabelCache_1 = require("../Axis/LabelProvider/LabelCache");
+var SciChartDefaults_1 = require("../SciChartDefaults");
+var FontKey = /** @class */ (function () {
+    function FontKey(nativeKey) {
+        this.firstLoadTime = Date.now();
+        this.nativeKey = nativeKey;
+    }
+    FontKey.prototype.delete = function () {
+        (0, Deleter_1.deleteSafe)(this.nativeKey);
+    };
+    return FontKey;
+}());
+exports.FontKey = FontKey;
 var objectCache = new Map();
 var getCache = function (wasmContext) {
     var _a, _b;
@@ -154,14 +166,19 @@ var getFontKey = function (webAssemblyContext, labelStyle, advanced, transformed
     };
     var styleId = LabelCache_1.labelCache.getStyleId(newStyle);
     if (!keyCache.has(styleId)) {
-        var fontKey = new webAssemblyContext.SCRTFontKey(labelStyle.fontFamily, labelStyle.fontSize, transformed, advanced);
+        var fontKey = new FontKey(new webAssemblyContext.SCRTFontKey(labelStyle.fontFamily, labelStyle.fontSize, transformed, advanced));
         keyCache.set(styleId, fontKey);
     }
-    return keyCache.get(styleId);
+    var key = keyCache.get(styleId);
+    var timeSinceLoad = Date.now() - key.firstLoadTime;
+    if (timeSinceLoad > SciChartDefaults_1.SciChartDefaults.nativeFontTimeout) {
+        key.nativeKey.m_reload = false;
+    }
+    return key.nativeKey;
 };
 exports.getFontKey = getFontKey;
 var getAllFontKeys = function (webAssemblyContext) {
     var cache = getCache(webAssemblyContext);
-    return Array.from(cache.keyCache.values());
+    return Array.from(cache.keyCache.values()).map(function (k) { return k.nativeKey; });
 };
 exports.getAllFontKeys = getAllFontKeys;

package/Charting/Visuals/SciChartDefaults.d.ts

@@ -20,4 +20,8 @@ export declare class SciChartDefaults {
      * Experimental - set true to use native text for axes.  Not all text features currently supported
      */
     static useNativeText: boolean;
+    /**
+     * Time in ms to retry loading a native font.  If you need to load a large font over a potentially slow connection await sciChartSurface.registerFont
+     */
+    static nativeFontTimeout: number;
 }

package/Charting/Visuals/SciChartDefaults.js

@@ -25,6 +25,10 @@ var SciChartDefaults = /** @class */ (function () {
      * Experimental - set true to use native text for axes.  Not all text features currently supported
      */
     SciChartDefaults.useNativeText = false;
+    /**
+     * Time in ms to retry loading a native font.  If you need to load a large font over a potentially slow connection await sciChartSurface.registerFont
+     */
+    SciChartDefaults.nativeFontTimeout = 2000;
     return SciChartDefaults;
 }());
 exports.SciChartDefaults = SciChartDefaults;

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "3.0.266";
+export declare const libraryVersion = "3.0.269";
 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 = "2023-01-16T00:00:00";
+var buildStamp = "2023-01-18T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "3.0.266";
+exports.libraryVersion = "3.0.269";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;

package/README.md

@@ -20,7 +20,7 @@ SciChart.JS v3 is released! Check out [what's new](https://www.scichart.com/scic
 > -   [Read about our **license terms** here](https://www.scichart.com/scichart-eula)
 > -   [**Start a trial** by following steps here](https://scichart.com/getting-started/scichart-javascript)
 > -   [**Purchase commercial licenses** here](https://store.scichart.com)
-> -   Academic usage, universities and schools qualify for a free for a free license. Read more about this [here](https://www.scichart.com/educational-discount-programme).
+> -   Academic usage, universities and schools qualify for a free license. Read more about this [here](https://www.scichart.com/educational-discount-programme).
 
 ## Demo Application