scichart 3.0.301 → 3.1.329

package/Charting/Visuals/TextureManager/TextureManager.js

@@ -75,12 +75,17 @@ var TextureManager = /** @class */ (function () {
      * @returns
      */
     TextureManager.prototype.createTextTexture = function (text, textStyle, rotation, lineSpacing, backgroundColor, opacity) {
+        var _a;
         if (app_1.IS_TEST_ENV) {
             return { bitmapTexture: undefined, textureWidth: 1, textureHeight: 1 };
         }
         var fontStyle = textStyle.fontStyle, fontWeight = textStyle.fontWeight, fontFamily = textStyle.fontFamily, fontSizePx = textStyle.fontSize, padding = textStyle.padding, alignment = textStyle.alignment, color = textStyle.color;
+        // Save state
+        this.ctx.save();
         this.ctx.globalAlpha = opacity !== null && opacity !== void 0 ? opacity : 1;
-        this.ctx.textBaseline = "top";
+        this.ctx.textBaseline = "alphabetic";
+        // Switched this back to alphabetic because...reasons
+        // https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-textbaseline-alphabetic
         this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
         if (backgroundColor) {
             this.ctx.fillStyle = backgroundColor;
@@ -90,28 +95,36 @@ var TextureManager = /** @class */ (function () {
         this.ctx.font = (0, font_1.getFontString)(fontStyle, fontWeight, fontSizePx, fontFamily);
         var textureWidth = 0;
         // const fontSizePt = Math.ceil(fontSizePx * PX_TO_PT);
-        var lineHeight = (0, exports.measureTextHeight)(fontSizePx);
-        var extraLineHeight = lineHeight * (lineSpacing !== null && lineSpacing !== void 0 ? lineSpacing : 1.1);
-        var textureHeight = lineHeight + padding.top + padding.bottom;
+        var textureHeight = padding.top + padding.bottom;
+        var maxLineHeight = 0;
+        var firstLineOffset = 0;
+        var lineHeights = [];
         for (var index = 0; index < text.length; index++) {
             var line = text[index];
-            var lineWidth = (0, exports.measureTextWidth)(this.ctx, line) + padding.left + padding.right;
+            var textMeasure = this.ctx.measureText(line);
+            var lineHeight = Math.round(textMeasure.actualBoundingBoxAscent + textMeasure.actualBoundingBoxDescent);
+            lineHeights.push(lineHeight);
+            if (lineHeight > maxLineHeight) {
+                maxLineHeight = lineHeight;
+            }
+            if (index === 0) {
+                firstLineOffset = textMeasure.actualBoundingBoxAscent;
+            }
+            var lineWidth = Math.round(textMeasure.width + padding.left + padding.right);
             if (lineWidth > textureWidth) {
                 textureWidth = lineWidth;
             }
-            if (index > 0) {
-                textureHeight += extraLineHeight;
-            }
+            textureHeight += lineHeight;
         }
-        var y = padding.top;
+        var lineSpacingPixels = Math.round(maxLineHeight * ((lineSpacing !== null && lineSpacing !== void 0 ? lineSpacing : 1.1) - 1));
+        textureHeight += (text.length - 1) * lineSpacingPixels;
+        var y = padding.top + firstLineOffset;
         var x = padding.left;
         if (!textureWidth || !textureHeight) {
             return { bitmapTexture: undefined, textureWidth: textureWidth, textureHeight: textureHeight };
         }
         var newTextureWidth = textureWidth;
         var newTextureHeight = textureHeight;
-        // Save state
-        this.ctx.save();
         if (rotation) {
             // convert to radians
             var rotationRad = (rotation * Math.PI) / 180;
@@ -124,17 +137,19 @@ var TextureManager = /** @class */ (function () {
             // translate to the new origin that is located in the left top center of the texture
             this.ctx.translate(-textureWidth / 2, -textureHeight / 2);
         }
-        for (var _i = 0, text_1 = text; _i < text_1.length; _i++) {
-            var line = text_1[_i];
-            if (alignment === LabelAlignment_1.ELabelAlignment.Center || alignment === LabelAlignment_1.ELabelAlignment.Right) {
+        var multilineAlignment = (_a = textStyle.multilineAlignment) !== null && _a !== void 0 ? _a : alignment;
+        var maxLineTextWidth = textureWidth - padding.right - padding.left;
+        for (var index = 0; index < text.length; index++) {
+            var line = text[index];
+            if (multilineAlignment === LabelAlignment_1.ELabelAlignment.Center || multilineAlignment === LabelAlignment_1.ELabelAlignment.Right) {
                 var lineWidth = (0, exports.measureTextWidth)(this.ctx, line);
                 x =
-                    alignment === LabelAlignment_1.ELabelAlignment.Right
+                    multilineAlignment === LabelAlignment_1.ELabelAlignment.Right
                         ? textureWidth - lineWidth - padding.right
-                        : (textureWidth - lineWidth) / 2;
+                        : (maxLineTextWidth - lineWidth) / 2 + padding.left;
             }
             this.ctx.fillText(line, Math.round(x), Math.round(y));
-            y += extraLineHeight;
+            y += lineHeights[index] + lineSpacingPixels;
         }
         this.ctx.strokeStyle = color;
         this.ctx.restore();

package/Charting3D/Visuals/SciChart3DSurface.js

@@ -512,7 +512,9 @@ var SciChart3DSurface = /** @class */ (function (_super) {
         this.webAssemblyContext3D.SCRT3DSetClearColor(0, 0, 0, 0);
     };
     SciChart3DSurface.prototype.detachSeries = function (renderableSeries) {
-        this.rootEntity.children.remove(renderableSeries.sceneEntity);
+        if (this.rootEntity) {
+            this.rootEntity.children.remove(renderableSeries.sceneEntity);
+        }
         renderableSeries.onDetach();
         this.invalidateElement();
     };
@@ -521,7 +523,9 @@ var SciChart3DSurface = /** @class */ (function (_super) {
         if (!renderableSeries.sceneEntity) {
             throw new Error("IRenderableSeries3D.sceneEntity must be set before attaching to SciChart3DSurface");
         }
-        this.rootEntity.children.add(renderableSeries.sceneEntity);
+        if (this.rootEntity) {
+            this.rootEntity.children.add(renderableSeries.sceneEntity);
+        }
         this.invalidateElement();
     };
     SciChart3DSurface.prototype.detachAxis = function (axis) {

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.301";
+export declare const libraryVersion = "3.1.329";
 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-02-27T00:00:00";
+var buildStamp = "2023-03-31T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "3.0.301";
+exports.libraryVersion = "3.1.329";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;