@galacean/effects-core 1.6.0-beta.1 → 1.6.0-beta.2

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.6.0-beta.1
+ * Version: v1.6.0-beta.2
  */
 
 'use strict';
@@ -20284,32 +20284,37 @@ var TextLayout = /** @class */ (function () {
         this.textAlign = textAlign;
         this.lineHeight = lineHeight;
     }
-    TextLayout.prototype.getOffsetY = function (style) {
-        var offsetY = 0;
-        var offset = (style.fontSize + style.outlineWidth) * style.fontScale;
+    TextLayout.prototype.getOffsetY = function (style, lineCount, lineHeight) {
+        var offsetResult = 0;
+        var fontSize = style.fontSize, outlineWidth = style.outlineWidth, fontScale = style.fontScale;
+        // 计算基础偏移量
+        var baseOffset = (fontSize + outlineWidth) * fontScale;
+        // /3 计算Y轴偏移量，以匹配编辑器行为
+        var offsetY = (lineHeight - fontSize) / 3;
+        var commonCalculation = lineHeight * (lineCount - 1);
         switch (this.textBaseline) {
-            case 0:
-                offsetY = offset;
+            case TextBaseline$1.top:
+                offsetResult = baseOffset + offsetY;
                 break;
-            case 1:
-                offsetY = (this.height + offset) / 2; // fonSize;
+            case TextBaseline$1.middle:
+                offsetResult = (this.height * fontScale - commonCalculation + baseOffset) / 2;
                 break;
-            case 2:
-                offsetY = this.height - offset / 2;
+            case TextBaseline$1.bottom:
+                offsetResult = (this.height * fontScale - commonCalculation) - offsetY;
                 break;
         }
-        return offsetY;
+        return offsetResult;
     };
     TextLayout.prototype.getOffsetX = function (style, maxWidth) {
         var offsetX = 0;
         switch (this.textAlign) {
-            case 0:
+            case TextAlignment$1.left:
                 offsetX = style.outlineWidth * style.fontScale;
                 break;
-            case 1:
+            case TextAlignment$1.middle:
                 offsetX = (this.width * style.fontScale - maxWidth) / 2;
                 break;
-            case 2:
+            case TextAlignment$1.right:
                 offsetX = (this.width * style.fontScale - maxWidth);
                 break;
         }
@@ -20543,7 +20548,7 @@ var TextItem = /** @class */ (function (_super) {
         var fontScale = style.fontScale;
         var width = (layout.width + style.fontOffset) * fontScale;
         var height = layout.height * fontScale;
-        var fontSize = style.fontSize * fontScale;
+        style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
         this.char = (this.text || '').split('');
         this.canvas.width = width;
@@ -20563,10 +20568,9 @@ var TextItem = /** @class */ (function (_super) {
         // 文本颜色
         context.fillStyle = "rgba(".concat(style.textColor[0], ", ").concat(style.textColor[1], ", ").concat(style.textColor[2], ", ").concat(style.textColor[3], ")");
         var charsInfo = [];
-        // /3 为了和编辑器行为保持一致
-        var offsetY = (lineHeight - fontSize) / 3;
         var x = 0;
-        var y = layout.getOffsetY(style) + offsetY;
+        var lineCount = this.text.split('\n').length;
+        var y = layout.getOffsetY(style, lineCount, lineHeight);
         var charsArray = [];
         var charOffsetX = [];
         for (var i = 0; i < this.char.length; i++) {