@galacean/effects-threejs 2.9.1 → 2.9.3

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.9.1
+ * Version: v2.9.3
  */
 
 'use strict';
@@ -30217,6 +30217,54 @@ var ParticleLoader = /*#__PURE__*/ function(Plugin) {
     return ParticleLoader;
 }(_wrap_native_super(Plugin));
 
+/**
+ * 文本换行机会判定：UAX #14 风格的"换行机会"模型。
+ *
+ * - CJK 表意字 / 假名 / 韩文音节：任意两个字之间都是合法断点（字符级）
+ * - 空格 / 制表符 / NBSP：可断，且断行时被吞掉（不留在行尾 / 行首）
+ * - 西文字母 / 数字：词内不可断；整体超宽时由调用方退化到字符级断（overflow-wrap）
+ *
+ * 不含 kinsoku 禁则（句号 / 逗号不进行首等留作后续）。
+ */ /** 换行机会类型（断点字符之后）：决定断点字符归属及断行时是否吞掉 */ /**
+ * 是否为可换行断点字符（空格 / 制表符 / NBSP）。
+ * 断在此字符之前，且断行时该字符被吞掉（不进旧行也不进新行）。
+ * @param ch - 当前字符
+ */ function isBreakChar(ch) {
+    return ch === " " || ch === "	" || ch === "\xa0";
+}
+/**
+ * 是否为 CJK 类字符（中文表意字 / 假名 / 韩文音节）。可在其与相邻字符之间换行。
+ * 用码点判定以支持 CJK 扩展 B 等代理对字符（不能用 /u 正则，browserslist 为 iOS 9）。
+ * @param ch - 当前字符（须为完整码点，调用方应使用 Array.from 遍历）
+ */ function isCJKLike(ch) {
+    var _ch_codePointAt;
+    var cp = (_ch_codePointAt = ch.codePointAt(0)) != null ? _ch_codePointAt : 0;
+    return cp >= 0x3400 && cp <= 0x4DBF || // CJK 统一表意扩展 A
+    cp >= 0x4E00 && cp <= 0x9FFF || // CJK 统一表意
+    cp >= 0xF900 && cp <= 0xFAFF || // CJK 兼容表意
+    cp >= 0x20000 && cp <= 0x2FA1F || // CJK 扩展 B~F + 兼容增补（代理对）
+    cp >= 0x3040 && cp <= 0x309F || // 平假名
+    cp >= 0x30A0 && cp <= 0x30FF || // 片假名
+    cp >= 0x31F0 && cp <= 0x31FF || // 片假名语音扩展
+    cp >= 0xAC00 && cp <= 0xD7AF // 韩文音节
+    ;
+}
+/**
+ * 计算 prev（已推入的字符）之后是否为换行机会。只看 prev，不看后续字符。
+ * @param prev - 前一字符（已推入旧行）
+ * @returns 'swallow'=prev 是空格类，断行时吞掉 prev；'keep'=prev 是 CJK，prev 留本行末、下行从其后起；false=不可断
+ */ function breakOpportunityAfter(prev) {
+    // prev 是空格类 → 断在 prev 处，断行时吞掉 prev（不进旧行也不进新行）
+    if (isBreakChar(prev)) {
+        return "swallow";
+    }
+    // prev 是 CJK → prev 留本行末，下行从 prev 之后起（字符级断点，不吞）
+    if (isCJKLike(prev)) {
+        return "keep";
+    }
+    return false;
+}
+
 var CanvasPool = /*#__PURE__*/ function() {
     function CanvasPool() {
         this.elements = [];
@@ -30698,9 +30746,6 @@ var DEFAULT_FONTS = [
     "courier"
 ];
 /** 检测字符串是否包含需要 RTL 和连写排版的字符（阿拉伯语等） */ var HAS_RTL_OR_JOINING = /[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\uFB50-\uFDFF\uFE70-\uFEFF]/;
-/** 可换行断点：空格、制表符等 */ var IS_BREAK_CHAR = function(ch) {
-    return ch === " " || ch === "	" || ch === "\xa0";
-};
 var seed$2 = 0;
 exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _inherits(TextComponent, MaskableGraphic);
@@ -30801,13 +30846,15 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         var lineCount = 1;
         var x = 0;
         var charCountInLine = 0;
+        // 使用码点遍历，正确处理 emoji 与 CJK 扩展 B 等代理对字符
+        var chars = Array.from(text);
         if (context) {
             context.font = this.getFontDesc(this.textStyle.fontSize);
         }
         if (overflow === TextOverflow.display) {
-            for(var i = 0; i < text.length; i++){
+            for(var _iterator = _create_for_of_iterator_helper_loose(chars), _step; !(_step = _iterator()).done;){
+                var str = _step.value;
                 var _context_measureText;
-                var str = text[i];
                 var _context_measureText_width;
                 var textMetrics = (_context_measureText_width = context == null ? void 0 : (_context_measureText = context.measureText(str)) == null ? void 0 : _context_measureText.width) != null ? _context_measureText_width : 0;
                 if (str === "\n") {
@@ -30826,12 +30873,12 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             return lineCount;
         }
         if (this.textLayout.keepWordIntact) {
-            // 单词完整换行：优先在空格处断行，避免从单词中间断开
+            // 单词完整换行：优先在换行机会处断行（空格吞断 / CJK 字间可断），避免从西文词中间断开
             var lastBreakX = 0;
             var countAtBreak = 0;
-            for(var i1 = 0; i1 < text.length; i1++){
+            for(var _iterator1 = _create_for_of_iterator_helper_loose(chars), _step1; !(_step1 = _iterator1()).done;){
+                var str1 = _step1.value;
                 var _context_measureText1;
-                var str1 = text[i1];
                 var _context_measureText_width1;
                 var textMetrics1 = (_context_measureText_width1 = context == null ? void 0 : (_context_measureText1 = context.measureText(str1)) == null ? void 0 : _context_measureText1.width) != null ? _context_measureText_width1 : 0;
                 if (str1 === "\n") {
@@ -30864,22 +30911,23 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 }
                 x += textMetrics1;
                 charCountInLine++;
-                if (IS_BREAK_CHAR(str1)) {
+                // 记换行机会：str 之后可断（空格 swallow / CJK keep）。lastBreakX 含 str 宽度（str 留本行末）
+                if (breakOpportunityAfter(str1) !== false) {
                     lastBreakX = x;
                     countAtBreak = charCountInLine;
                 }
             }
         } else {
             // 逐字符换行：允许在任意字符处断开
-            for(var i2 = 0; i2 < text.length; i2++){
+            for(var i = 0; i < chars.length; i++){
                 var _context_measureText2;
-                var str2 = text[i2];
+                var str2 = chars[i];
                 var _context_measureText_width2;
                 var textMetrics2 = (_context_measureText_width2 = context == null ? void 0 : (_context_measureText2 = context.measureText(str2)) == null ? void 0 : _context_measureText2.width) != null ? _context_measureText_width2 : 0;
                 if (charCountInLine > 0) {
                     x += letterSpace;
                 }
-                if (x + textMetrics2 > width && i2 > 0 || str2 === "\n") {
+                if (x + textMetrics2 > width && i > 0 || str2 === "\n") {
                     lineCount++;
                     this.maxLineWidth = Math.max(this.maxLineWidth, x);
                     x = 0;
@@ -30972,8 +31020,11 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             var charsArray = [];
             var charOffsetX = [];
             if (layout.keepWordIntact) {
-                // 单词完整换行：优先在空格处断行，避免从单词中间断开
+                // 单词完整换行：优先在换行机会处断行（空格吞断 / CJK 字间可断），避免从西文词中间断开。
+                // lastBreakIdx 指向断点字符在 charsArray 中的索引；breakSwallow=true 时该字符被吞（空格），
+                // false 时该字符留本行末（CJK），下行均从 lastBreakIdx+1 起。
                 var lastBreakIdx = -1;
+                var breakSwallow = false;
                 for(var i = 0; i < char.length; i++){
                     var str = char[i];
                     var textMetrics = context.measureText(str);
@@ -30989,15 +31040,18 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                         charsArray = [];
                         charOffsetX = [];
                         lastBreakIdx = -1;
+                        breakSwallow = false;
                         continue;
                     }
                     var spacing = charsArray.length > 0 ? layout.letterSpace : 0;
                     var willWidth = x + spacing + textMetrics.width;
                     if (willWidth > baseWidth && charsArray.length > 0) {
                         if (lastBreakIdx > 0) {
-                            // 在空格处换行
-                            var lineChars = charsArray.slice(0, lastBreakIdx);
-                            var lineOffsets = charOffsetX.slice(0, lastBreakIdx);
+                            // 在换行机会处断行：swallow 取 [0,lastBreakIdx)（吞掉断点字符），
+                            // keep 取 [0,lastBreakIdx]（断点字符留本行末），下行均从 lastBreakIdx+1 起。
+                            var endIdx = breakSwallow ? lastBreakIdx : lastBreakIdx + 1;
+                            var lineChars = charsArray.slice(0, endIdx);
+                            var lineOffsets = charOffsetX.slice(0, endIdx);
                             var lineWidth = lineChars.length > 0 ? lineOffsets[lineOffsets.length - 1] + context.measureText(lineChars[lineChars.length - 1]).width : 0;
                             charsInfo.push({
                                 y: y,
@@ -31018,6 +31072,7 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                                 x += context.measureText(charsArray[j]).width;
                             }
                             lastBreakIdx = -1;
+                            breakSwallow = false;
                         } else {
                             charsInfo.push({
                                 y: y,
@@ -31030,6 +31085,7 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                             charsArray = [];
                             charOffsetX = [];
                             lastBreakIdx = -1;
+                            breakSwallow = false;
                         }
                     }
                     if (charsArray.length > 0) {
@@ -31038,8 +31094,12 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     charOffsetX.push(x);
                     charsArray.push(str);
                     x += textMetrics.width;
-                    if (IS_BREAK_CHAR(str)) {
+                    // 记换行机会：str 之后可断。lastBreakIdx 指向 str（charsArray 末尾），
+                    // swallow=吞 str（空格），keep=str 留本行末（CJK）。
+                    var opp = breakOpportunityAfter(str);
+                    if (opp !== false) {
                         lastBreakIdx = charsArray.length - 1;
+                        breakSwallow = opp === "swallow";
                     }
                 }
             } else {
@@ -33677,7 +33737,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.9.1";
+var version$2 = "2.9.3";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -38731,7 +38791,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.9.1";
+var version$1 = "2.9.3";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -40305,7 +40365,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.9.1";
+var version = "2.9.3";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;
@@ -40502,6 +40562,7 @@ exports.applyMixins = applyMixins;
 exports.assertExist = assertExist;
 exports.asserts = asserts;
 exports.base64ToFile = base64ToFile;
+exports.breakOpportunityAfter = breakOpportunityAfter;
 exports.buildBezierData = buildBezierData;
 exports.buildEasingCurve = buildEasingCurve;
 exports.buildLine = buildLine;
@@ -40567,6 +40628,8 @@ exports.interpolateColor = interpolateColor;
 exports.isAlipayMiniApp = isAlipayMiniApp;
 exports.isAndroid = isAndroid;
 exports.isArray = isArray;
+exports.isBreakChar = isBreakChar;
+exports.isCJKLike = isCJKLike;
 exports.isCanvas = isCanvas;
 exports.isFunction = isFunction;
 exports.isIOS = isIOS;