@galacean/effects-plugin-rich-text 2.8.8 → 2.8.10

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player rich text plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 云垣
- * Version: v2.8.8
+ * Version: v2.8.10
  */
 
 'use strict';
@@ -426,7 +426,7 @@ var RichTextLayout = /*#__PURE__*/ function() {
         // TODO: width 和 height 新版富文本计算没有地方用到
         this.width = 0;
         this.height = 0;
-        var size = options.size, _options_textOverflow = options.textOverflow, textOverflow = _options_textOverflow === void 0 ? EFFECTS.spec.TextOverflow.clip : _options_textOverflow, _options_textVerticalAlign = options.textVerticalAlign, textVerticalAlign = _options_textVerticalAlign === void 0 ? EFFECTS.spec.TextVerticalAlign.middle : _options_textVerticalAlign, _options_textAlign = options.textAlign, textAlign = _options_textAlign === void 0 ? EFFECTS.spec.TextAlignment.left : _options_textAlign, _options_letterSpace = options.letterSpace, letterSpace = _options_letterSpace === void 0 ? 0 : _options_letterSpace, _options_lineHeight = options.lineHeight, lineHeight = _options_lineHeight === void 0 ? 0.571 : _options_lineHeight, _options_wrapEnabled = options.wrapEnabled, wrapEnabled = _options_wrapEnabled === void 0 ? false : _options_wrapEnabled, _options_maxTextWidth = options.maxTextWidth, maxTextWidth = _options_maxTextWidth === void 0 ? 350 : _options_maxTextWidth, _options_maxTextHeight = options.maxTextHeight, maxTextHeight = _options_maxTextHeight === void 0 ? 1000 : _options_maxTextHeight, _options_sizeMode = options.sizeMode, sizeMode = _options_sizeMode === void 0 ? EFFECTS.spec.TextSizeMode.autoWidth : _options_sizeMode, _options_useLegacyRichText = options.// @ts-expect-error 兼容旧版
+        var size = options.size, _options_textOverflow = options.textOverflow, textOverflow = _options_textOverflow === void 0 ? EFFECTS.spec.TextOverflow.clip : _options_textOverflow, _options_textVerticalAlign = options.textVerticalAlign, textVerticalAlign = _options_textVerticalAlign === void 0 ? EFFECTS.spec.TextVerticalAlign.middle : _options_textVerticalAlign, _options_textAlign = options.textAlign, textAlign = _options_textAlign === void 0 ? EFFECTS.spec.TextAlignment.left : _options_textAlign, _options_letterSpace = options.letterSpace, letterSpace = _options_letterSpace === void 0 ? 0 : _options_letterSpace, _options_lineHeight = options.lineHeight, lineHeight = _options_lineHeight === void 0 ? 0.571 : _options_lineHeight, _options_wrapEnabled = options.wrapEnabled, wrapEnabled = _options_wrapEnabled === void 0 ? false : _options_wrapEnabled, _options_maxTextWidth = options.maxTextWidth, maxTextWidth = _options_maxTextWidth === void 0 ? 350 : _options_maxTextWidth, _options_maxTextHeight = options.maxTextHeight, maxTextHeight = _options_maxTextHeight === void 0 ? 1000 : _options_maxTextHeight, _options_autoResize = options.autoResize, autoResize = _options_autoResize === void 0 ? EFFECTS.spec.TextSizeMode.autoWidth : _options_autoResize, _options_useLegacyRichText = options.// @ts-expect-error 兼容旧版
         useLegacyRichText, useLegacyRichText = _options_useLegacyRichText === void 0 ? false : _options_useLegacyRichText;
         this.letterSpace = letterSpace;
         this.lineHeight = lineHeight;
@@ -439,7 +439,7 @@ var RichTextLayout = /*#__PURE__*/ function() {
         this.wrapEnabled = wrapEnabled;
         this.maxTextWidth = maxTextWidth;
         this.maxTextHeight = maxTextHeight;
-        this.sizeMode = sizeMode;
+        this.autoResize = autoResize;
     }
     var _proto = RichTextLayout.prototype;
     _proto.getOffsetY = function getOffsetY(style, lineCount, lineHeight, fontSize, totalLineHeight) {
@@ -520,7 +520,7 @@ var RichTextLayout = /*#__PURE__*/ function() {
    */ _proto.getOffsetXRich = function getOffsetXRich(style, maxWidth, contentW) {
         switch(this.textAlign){
             case EFFECTS.spec.TextAlignment.left:
-                return style.outlineWidth * style.fontScale;
+                return style.outlineWidth;
             case EFFECTS.spec.TextAlignment.middle:
                 return (maxWidth - contentW) / 2;
             case EFFECTS.spec.TextAlignment.right:
@@ -619,11 +619,11 @@ var RichTextLayout = /*#__PURE__*/ function() {
  */ var RichWrapDisabledStrategy = /*#__PURE__*/ function() {
     function RichWrapDisabledStrategy() {}
     var _proto = RichWrapDisabledStrategy.prototype;
-    _proto.computeLines = function computeLines(processedOptions, context, style, layout, singleLineHeight, fontScale, letterSpace) {
+    _proto.computeLines = function computeLines(processedOptions, context, style, layout, letterSpace) {
         var _this = this;
         var lines = [];
         var baselines = [];
-        var gapPx = (layout.lineHeight || 0) * fontScale;
+        var gapPx = layout.lineHeight || 0;
         var scaleFactor = 1 / 10; // 1/10px, 后面 context.font 设置的字号为10px
         var currentLine = this.createNewLine();
         var maxLineWidth = 0;
@@ -632,8 +632,8 @@ var RichTextLayout = /*#__PURE__*/ function() {
             if (currentLine.chars.length === 0) {
                 return;
             }
-            // 第1行用真实首行高度，其余行用 gapPx
-            currentLine.lineHeight = lines.length === 0 ? (currentLine.lineAscent || 0) + (currentLine.lineDescent || 0) : gapPx;
+            // 所有行都使用配置的行高（gapPx）
+            currentLine.lineHeight = gapPx;
             // 记录本行基线
             var baseline = lines.length === 0 ? 0 : baselines[baselines.length - 1] + gapPx;
             baselines.push(baseline);
@@ -653,22 +653,20 @@ var RichTextLayout = /*#__PURE__*/ function() {
             context.font = fontStyle + " " + (options.fontWeight || style.textWeight) + " 10px " + (options.fontFamily || style.fontFamily);
             // 记录段起始 x
             currentLine.offsetX.push(currentLine.width);
-            // 逐字宽度和高度测量（asc/desc 测量）
+            // 预计算缩放因子：measureText 基于 10px，乘 fontSize/10 得到逻辑像素
+            var glyphScale = fontSize * scaleFactor;
+            // 使用字体级别度量（不随具体字符变化），保证基线位置稳定
+            var refMetrics = context.measureText("x");
+            var fontAsc = refMetrics.fontBoundingBoxAscent * glyphScale;
+            var fontDesc = refMetrics.fontBoundingBoxDescent * glyphScale;
+            // 逐字宽度测量
             var segmentInnerX = 0;
             var charArr = [];
-            var lineAscent = 0;
-            var lineDescent = 0;
             for(var i = 0; i < text.length; i++){
                 var ch = text[i];
                 var m = context.measureText(ch);
                 var w = m.width;
-                var charWidth = (w <= 0 ? 0 : w) * fontSize * scaleFactor * fontScale;
-                // 测量 asc/desc 并按目标字号缩放
-                var scale = fontSize * fontScale * scaleFactor;
-                var asc = m.actualBoundingBoxAscent * scale;
-                var desc = m.actualBoundingBoxDescent * scale;
-                lineAscent = Math.max(lineAscent, asc);
-                lineDescent = Math.max(lineDescent, desc);
+                var charWidth = (w <= 0 ? 0 : w) * glyphScale;
                 if (i > 0) {
                     segmentInnerX += letterSpace; // 先加"前一个字符与当前字符之间"的间距
                 }
@@ -681,13 +679,13 @@ var RichTextLayout = /*#__PURE__*/ function() {
             currentLine.chars.push(charArr);
             currentLine.width += segmentInnerX;
             currentLine.richOptions.push(options);
-            // 累计行级 asc/desc
-            currentLine.lineAscent = Math.max(currentLine.lineAscent || 0, lineAscent);
-            currentLine.lineDescent = Math.max(currentLine.lineDescent || 0, lineDescent);
+            // 累计行级 asc/desc（字体级别，不因字符形状改变）
+            currentLine.lineAscent = Math.max(currentLine.lineAscent || 0, fontAsc);
+            currentLine.lineDescent = Math.max(currentLine.lineDescent || 0, fontDesc);
         });
         // 结束最后一行
         finishCurrentLine();
-        // 计算 bbox
+        // 计算 bbox（包含行高带来的上下边距）
         var bboxTop = Infinity;
         var bboxBottom = -Infinity;
         if (lines.length === 0) {
@@ -701,8 +699,12 @@ var RichTextLayout = /*#__PURE__*/ function() {
             };
         }
         for(var i = 0; i < lines.length; i++){
-            bboxTop = Math.min(bboxTop, baselines[i] - (lines[i].lineAscent || 0));
-            bboxBottom = Math.max(bboxBottom, baselines[i] + (lines[i].lineDescent || 0));
+            var asc = lines[i].lineAscent || 0;
+            var desc = lines[i].lineDescent || 0;
+            var textHeight = asc + desc;
+            var margin = (gapPx - textHeight) / 2;
+            bboxTop = Math.min(bboxTop, baselines[i] - asc - margin);
+            bboxBottom = Math.max(bboxBottom, baselines[i] + desc + margin);
         }
         var bboxHeight = bboxBottom - bboxTop;
         return {
@@ -737,12 +739,14 @@ var RichTextLayout = /*#__PURE__*/ function() {
  */ var RichWrapEnabledStrategy = /*#__PURE__*/ function() {
     function RichWrapEnabledStrategy() {}
     var _proto = RichWrapEnabledStrategy.prototype;
-    _proto.computeLines = function computeLines(processedOptions, context, style, layout, singleLineHeight, fontScale, letterSpace) {
+    _proto.computeLines = function computeLines(processedOptions, context, style, layout, letterSpace) {
         var _this = this;
         var lines = [];
         var baselines = [];
-        var gapPx = (layout.lineHeight || 0) * fontScale;
+        var gapPx = layout.lineHeight || 0;
         var scaleFactor = 1 / 10; // 1/10px, 后面 context.font 设置的字号为10px
+        // 换行阈值，预计算避免每字符重复读取
+        var wrapWidth = layout.maxTextWidth || Infinity;
         var currentLine = this.createNewLine();
         var maxLineWidth = 0;
         var totalHeight = 0;
@@ -757,8 +761,8 @@ var RichTextLayout = /*#__PURE__*/ function() {
             if (currentLine.chars.length === 0) {
                 return;
             }
-            // 第1行用真实首行高度，其余行用 gapPx
-            currentLine.lineHeight = lines.length === 0 ? (currentLine.lineAscent || 0) + (currentLine.lineDescent || 0) : gapPx;
+            // 所有行都使用配置的行高（gapPx）
+            currentLine.lineHeight = gapPx;
             // 记录本行基线
             var baseline = lines.length === 0 ? 0 : baselines[baselines.length - 1] + gapPx;
             baselines.push(baseline);
@@ -800,22 +804,24 @@ var RichTextLayout = /*#__PURE__*/ function() {
                 flushChunk();
                 finishCurrentLine();
             }
+            // 预计算缩放因子：measureText 基于 10px，乘 fontSize/10 得到逻辑像素
+            var glyphScale = fontSize * scaleFactor;
+            // 使用字体级别度量（不随具体字符变化），保证基线位置稳定
+            var refMetrics = context.measureText("x");
+            var fontAsc = refMetrics.fontBoundingBoxAscent * glyphScale;
+            var fontDesc = refMetrics.fontBoundingBoxDescent * glyphScale;
             // 逐字符处理
             for(var i = 0; i < text.length; i++){
                 var ch = text[i];
                 // 获取基础宽度并计算实际宽度（动态缩放）
                 var m = context.measureText(ch);
                 var baseW = m.width;
-                var charWidth = (baseW <= 0 ? 0 : baseW) * fontSize * scaleFactor * fontScale;
-                // 测量 asc/desc 并按目标字号缩放
-                var scale = fontSize * fontScale * scaleFactor;
-                var asc = m.actualBoundingBoxAscent * scale;
-                var desc = m.actualBoundingBoxDescent * scale;
+                var charWidth = (baseW <= 0 ? 0 : baseW) * glyphScale;
                 // 计算预期宽度（包含字符间距）
                 var spacing = chunkChars.length > 0 ? letterSpace : 0;
                 var willWidth = currentLine.width + spacing + charWidth;
                 // 自动换行判断
-                if (willWidth > (layout.maxTextWidth * fontScale || Infinity)) {
+                if (willWidth > wrapWidth) {
                     flushChunk();
                     finishCurrentLine();
                 }
@@ -834,9 +840,9 @@ var RichTextLayout = /*#__PURE__*/ function() {
                     char: ch,
                     x: segmentInnerX
                 });
-                // 累计行级 asc/desc
-                currentLine.lineAscent = Math.max(currentLine.lineAscent || 0, asc);
-                currentLine.lineDescent = Math.max(currentLine.lineDescent || 0, desc);
+                // 累计行级 asc/desc（字体级别，不因字符形状改变）
+                currentLine.lineAscent = Math.max(currentLine.lineAscent || 0, fontAsc);
+                currentLine.lineDescent = Math.max(currentLine.lineDescent || 0, fontDesc);
                 // 更新位置和宽度
                 segmentInnerX += charWidth;
                 currentLine.width += charWidth;
@@ -846,12 +852,26 @@ var RichTextLayout = /*#__PURE__*/ function() {
         });
         // 结束最后一行
         finishCurrentLine();
-        // 计算 bbox
+        // 计算 bbox（包含行高带来的上下边距）
         var bboxTop = Infinity;
         var bboxBottom = -Infinity;
+        if (lines.length === 0) {
+            return {
+                lines: lines,
+                maxLineWidth: maxLineWidth,
+                totalHeight: totalHeight,
+                bboxTop: 0,
+                bboxBottom: 0,
+                bboxHeight: 0
+            };
+        }
         for(var i = 0; i < lines.length; i++){
-            bboxTop = Math.min(bboxTop, baselines[i] - (lines[i].lineAscent || 0));
-            bboxBottom = Math.max(bboxBottom, baselines[i] + (lines[i].lineDescent || 0));
+            var asc = lines[i].lineAscent || 0;
+            var desc = lines[i].lineDescent || 0;
+            var textHeight = asc + desc;
+            var margin = (gapPx - textHeight) / 2;
+            bboxTop = Math.min(bboxTop, baselines[i] - asc - margin);
+            bboxBottom = Math.max(bboxBottom, baselines[i] + desc + margin);
         }
         var bboxHeight = bboxBottom - bboxTop;
         return {
@@ -880,117 +900,117 @@ var RichTextLayout = /*#__PURE__*/ function() {
     return RichWrapEnabledStrategy;
 }();
 
-/**
- * 富文本 Display 溢出策略
- * 在溢出策略中对所有几何量进行一次性缩放
- */ var RichDisplayOverflowStrategy = /*#__PURE__*/ function() {
-    function RichDisplayOverflowStrategy() {}
-    var _proto = RichDisplayOverflowStrategy.prototype;
-    _proto.apply = function apply(lines, sizeResult, layout, style) {
-        // 安全处理除零情况
-        var safeDiv = function(a, b) {
-            return Math.abs(b) > 1e-5 ? a / b : 1;
-        };
-        // 用像素空间计算
-        var frameWpx = layout.maxTextWidth * style.fontScale;
-        var frameHpx = layout.maxTextHeight * style.fontScale;
-        var _sizeResult_contentWidth;
-        var contentWpx = Math.max(1, (_sizeResult_contentWidth = sizeResult.contentWidth) != null ? _sizeResult_contentWidth : sizeResult.canvasWidth);
-        var _sizeResult_bboxHeight;
-        var contentHpx = Math.max(1, (_sizeResult_bboxHeight = sizeResult.bboxHeight) != null ? _sizeResult_bboxHeight : sizeResult.canvasHeight);
-        // 只缩小不放大（基于像素空间计算）
-        var s = Math.min(1, safeDiv(frameWpx, contentWpx), safeDiv(frameHpx, contentHpx));
-        // 浮点精度处理
-        if (s > 0.9999) {
-            return {
-                globalScale: 1
-            };
-        }
-        // 统一缩放所有几何量
-        for(var _iterator = _create_for_of_iterator_helper_loose(lines), _step; !(_step = _iterator()).done;){
-            var line = _step.value;
-            line.width *= s;
-            line.lineHeight *= s; // 缩小行距（你的 gap-only 模式行高=gapPx）
-            if (line.offsetX) {
-                for(var i = 0; i < line.offsetX.length; i++){
-                    line.offsetX[i] *= s;
-                }
-            }
-            for(var _iterator1 = _create_for_of_iterator_helper_loose(line.chars || []), _step1; !(_step1 = _iterator1()).done;){
-                var seg = _step1.value;
-                for(var _iterator2 = _create_for_of_iterator_helper_loose(seg), _step2; !(_step2 = _iterator2()).done;){
-                    var ch = _step2.value;
-                    ch.x *= s;
-                }
-            }
-            for(var _iterator3 = _create_for_of_iterator_helper_loose(line.richOptions || []), _step3; !(_step3 = _iterator3()).done;){
-                var opt = _step3.value;
-                opt.fontSize *= s; // 缩小字形
-            }
-            // 同步缩放 asc/desc
-            if (line.lineAscent != null) {
-                line.lineAscent *= s;
-            }
-            if (line.lineDescent != null) {
-                line.lineDescent *= s;
-            }
-        }
-        return {
-            globalScale: s
-        };
-    };
-    return RichDisplayOverflowStrategy;
-}();
-
 /**
  * Clip 溢出策略
- * 超出画布部分自然裁切
+ * 画布尺寸固定为帧尺寸，超出部分自然裁切
+ * 不依赖对齐模式
  */ var RichClippedOverflowStrategy = /*#__PURE__*/ function() {
     function RichClippedOverflowStrategy() {}
     var _proto = RichClippedOverflowStrategy.prototype;
-    _proto.apply = function apply(lines, sizeResult, layout, style) {
-        // 不进行任何缩放，直接返回单位缩放系数
+    _proto.resolveCanvas = function resolveCanvas(lines, frameWidth, frameHeight, horizontalResult, verticalResult) {
         return {
-            globalScale: 1
+            canvasWidth: Math.max(1, Math.ceil(frameWidth)),
+            canvasHeight: Math.max(1, Math.ceil(frameHeight)),
+            renderOffsetX: 0,
+            renderOffsetY: 0
         };
     };
     return RichClippedOverflowStrategy;
 }();
 
 /**
- * Visible 溢出策略
- * 允许内容超出画布可见
- */ var RichVisibleOverflowStrategy = /*#__PURE__*/ function() {
-    function RichVisibleOverflowStrategy() {}
-    var _proto = RichVisibleOverflowStrategy.prototype;
-    _proto.apply = function apply(lines, sizeResult, layout, style) {
-        // 不进行任何缩放或裁剪
+ * 扩展画布溢出策略（visible / display 模式共用）
+ *
+ * 根据对齐后的内容位置检测溢出，对称扩展画布以容纳所有内容。
+ * 不依赖对齐模式（textAlign / textVerticalAlign）的枚举值，
+ * 仅使用对齐策略输出的位置和行的度量数据。
+ *
+ * 对称扩展的原因：元素定位以中心点为锚点，
+ * 单侧扩展会导致视觉偏移。使用 max(溢出左, 溢出右) 作为双侧扩展量
+ * 可以保持中心点稳定并兼容所有对齐模式。
+ */ var RichExpandingOverflowStrategy = /*#__PURE__*/ function() {
+    function RichExpandingOverflowStrategy() {}
+    var _proto = RichExpandingOverflowStrategy.prototype;
+    _proto.resolveCanvas = function resolveCanvas(lines, frameWidth, frameHeight, horizontalResult, verticalResult) {
+        if (lines.length === 0) {
+            return {
+                canvasWidth: Math.max(1, frameWidth),
+                canvasHeight: Math.max(1, frameHeight),
+                renderOffsetX: 0,
+                renderOffsetY: 0
+            };
+        }
+        // ── 垂直溢出检测 ──
+        // 遍历每行基线，结合 ascent/descent 找出实际渲染范围
+        var contentTop = Infinity;
+        var contentBottom = -Infinity;
+        var currentY = verticalResult.baselineY;
+        for(var i = 0; i < lines.length; i++){
+            var _lines_i_lineAscent;
+            var asc = (_lines_i_lineAscent = lines[i].lineAscent) != null ? _lines_i_lineAscent : 0;
+            var _lines_i_lineDescent;
+            var desc = (_lines_i_lineDescent = lines[i].lineDescent) != null ? _lines_i_lineDescent : 0;
+            // 当 lineHeight >= textHeight 时，margin 为正，需要把行高边距纳入内容范围；
+            // 当 lineHeight < textHeight 时，margin 为负，此时字形超出行高框，
+            // 必须用原始字形边界（margin=0），否则负 margin 会把边界向内收缩，
+            // 导致检测不到溢出，最终首行顶部/末行底部被裁切。
+            var textHeight = asc + desc;
+            var margin = Math.max(0, (lines[i].lineHeight - textHeight) / 2);
+            contentTop = Math.min(contentTop, currentY - asc - margin);
+            contentBottom = Math.max(contentBottom, currentY + desc + margin);
+            if (i < lines.length - 1) {
+                currentY += lines[i + 1].lineHeight;
+            }
+        }
+        var overflowTop = Math.max(0, -contentTop);
+        var overflowBottom = Math.max(0, contentBottom - frameHeight);
+        // 对称扩展（保持中心点稳定）
+        var expandV = Math.max(overflowTop, overflowBottom);
+        // ── 水平溢出检测 ──
+        var contentLeft = Infinity;
+        var contentRight = -Infinity;
+        for(var i1 = 0; i1 < lines.length; i1++){
+            var _horizontalResult_lineOffsets_i;
+            var xOff = (_horizontalResult_lineOffsets_i = horizontalResult.lineOffsets[i1]) != null ? _horizontalResult_lineOffsets_i : 0;
+            var _lines_i_width;
+            var w = (_lines_i_width = lines[i1].width) != null ? _lines_i_width : 0;
+            contentLeft = Math.min(contentLeft, xOff);
+            contentRight = Math.max(contentRight, xOff + w);
+        }
+        if (!isFinite(contentLeft)) {
+            contentLeft = 0;
+        }
+        if (!isFinite(contentRight)) {
+            contentRight = 0;
+        }
+        var overflowLeft = Math.max(0, -contentLeft);
+        var overflowRight = Math.max(0, contentRight - frameWidth);
+        // 对称扩展
+        var expandH = Math.max(overflowLeft, overflowRight);
+        // ── 最终画布尺寸 ──
+        var canvasWidth = Math.ceil(frameWidth + expandH * 2);
+        var canvasHeight = Math.ceil(frameHeight + expandV * 2);
         return {
-            globalScale: 1
+            canvasWidth: Math.max(1, canvasWidth),
+            canvasHeight: Math.max(1, canvasHeight),
+            renderOffsetX: expandH,
+            renderOffsetY: expandV
         };
     };
-    return RichVisibleOverflowStrategy;
+    return RichExpandingOverflowStrategy;
 }();
 
 /**
  * 富文本水平对齐策略
- * 直接使用已缩放的行宽计算偏移量
+ * 在帧坐标系中计算每行的水平偏移，不依赖溢出模式
  */ var RichHorizontalAlignStrategyImpl = /*#__PURE__*/ function() {
     function RichHorizontalAlignStrategyImpl() {}
     var _proto = RichHorizontalAlignStrategyImpl.prototype;
-    _proto.getHorizontalOffsets = function getHorizontalOffsets(lines, sizeResult, overflowResult, layout, style) {
-        var _sizeResult_containerWidth;
-        var containerWidthPx = (_sizeResult_containerWidth = sizeResult.containerWidth) != null ? _sizeResult_containerWidth : layout.maxTextWidth * style.fontScale;
-        var _sizeResult_baselineCompensationX;
-        var compX = (_sizeResult_baselineCompensationX = sizeResult.baselineCompensationX) != null ? _sizeResult_baselineCompensationX : 0;
-        // 使用像素单位的容器宽度
-        var baseOffsets = lines.map(function(line) {
-            return layout.getOffsetXRich(style, containerWidthPx, line.width);
+    _proto.getHorizontalOffsets = function getHorizontalOffsets(lines, frameWidth, layout, style) {
+        // 在帧坐标系 [0, frameWidth] 中计算对齐偏移
+        var lineOffsets = lines.map(function(line) {
+            return layout.getOffsetXRich(style, frameWidth, line.width);
         });
-        // visible 模式下使用 baseOffset + baselineCompensationX
-        var lineOffsets = layout.overflow === EFFECTS.spec.TextOverflow.visible ? baseOffsets.map(function(x) {
-            return x + compX;
-        }) : baseOffsets;
         return {
             lineOffsets: lineOffsets
         };
@@ -1000,147 +1020,63 @@ var RichTextLayout = /*#__PURE__*/ function() {
 
 /**
  * 富文本垂直对齐策略
- * 直接使用已缩放的行高
+ * 在帧坐标系中计算基线位置，不依赖溢出模式
+ *
+ * 算法：
+ * 1. 从行数据重建各行基线（baseline[0]=0, baseline[i]=baseline[i-1]+lineHeight[i]）
+ * 2. 计算 bbox（包含行高边距）
+ * 3. 根据 textVerticalAlign 将内容定位到帧中
  */ var RichVerticalAlignStrategyImpl = /*#__PURE__*/ function() {
     function RichVerticalAlignStrategyImpl() {}
     var _proto = RichVerticalAlignStrategyImpl.prototype;
-    _proto.getVerticalOffsets = function getVerticalOffsets(lines, sizeResult, overflowResult, layout, style, singleLineHeight) {
-        var _sizeResult_baselineCompensationY;
-        var compY = (_sizeResult_baselineCompensationY = sizeResult.baselineCompensationY) != null ? _sizeResult_baselineCompensationY : 0;
-        var baselineY = 0;
+    _proto.getVerticalOffsets = function getVerticalOffsets(lines, frameHeight, layout) {
         if (lines.length === 0) {
             return {
                 baselineY: 0,
                 lineYOffsets: []
             };
         }
-        switch(layout.overflow){
-            case EFFECTS.spec.TextOverflow.visible:
-                {
-                    // frame-based 计算
-                    var frameHpx = layout.maxTextHeight * style.fontScale;
-                    var _sizeResult_bboxTop;
-                    var bboxTop = (_sizeResult_bboxTop = sizeResult.bboxTop) != null ? _sizeResult_bboxTop : 0;
-                    var _sizeResult_bboxHeight, _sizeResult_bboxBottom;
-                    var bboxBottom = (_sizeResult_bboxBottom = sizeResult.bboxBottom) != null ? _sizeResult_bboxBottom : bboxTop + ((_sizeResult_bboxHeight = sizeResult.bboxHeight) != null ? _sizeResult_bboxHeight : 0);
-                    var _sizeResult_bboxHeight1;
-                    var bboxHeight = (_sizeResult_bboxHeight1 = sizeResult.bboxHeight) != null ? _sizeResult_bboxHeight1 : bboxBottom - bboxTop;
-                    // 计算 frame 基线
-                    var baselineYFrame = 0;
-                    switch(layout.textVerticalAlign){
-                        case EFFECTS.spec.TextVerticalAlign.top:
-                            baselineYFrame = -bboxTop;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.middle:
-                            baselineYFrame = (frameHpx - bboxHeight) / 2 - bboxTop;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.bottom:
-                            baselineYFrame = frameHpx - bboxHeight - bboxTop;
-                            break;
-                    }
-                    baselineY = baselineYFrame + compY; // 关键：叠加"向下移动 E"
-                    break;
-                }
-            case EFFECTS.spec.TextOverflow.clip:
-                {
-                    // 让 clip 垂直对齐逻辑与 display 保持一致（基于 bbox 的几何模型）
-                    var frameHpx1 = layout.maxTextHeight * style.fontScale;
-                    // 用缩放后的行数据重建 baselines 和 bbox
-                    var baselines = [
-                        0
-                    ];
-                    for(var i = 1; i < lines.length; i++){
-                        baselines[i] = baselines[i - 1] + lines[i].lineHeight;
-                    }
-                    var bboxTop1 = Infinity;
-                    var bboxBottom1 = -Infinity;
-                    for(var i1 = 0; i1 < lines.length; i1++){
-                        var _lines_i_lineAscent;
-                        var asc = (_lines_i_lineAscent = lines[i1].lineAscent) != null ? _lines_i_lineAscent : 0;
-                        var _lines_i_lineDescent;
-                        var desc = (_lines_i_lineDescent = lines[i1].lineDescent) != null ? _lines_i_lineDescent : 0;
-                        bboxTop1 = Math.min(bboxTop1, baselines[i1] - asc);
-                        bboxBottom1 = Math.max(bboxBottom1, baselines[i1] + desc);
-                    }
-                    var bboxHeight1 = bboxBottom1 - bboxTop1;
-                    var baselineClipY = 0;
-                    switch(layout.textVerticalAlign){
-                        case EFFECTS.spec.TextVerticalAlign.top:
-                            baselineClipY = -bboxTop1;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.middle:
-                            baselineClipY = (frameHpx1 - bboxHeight1) / 2 - bboxTop1;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.bottom:
-                            baselineClipY = frameHpx1 - bboxHeight1 - bboxTop1;
-                            break;
-                    }
-                    baselineY = baselineClipY + compY;
-                    break;
-                }
-            case EFFECTS.spec.TextOverflow.display:
-                {
-                    // display 垂直对齐改为基于 bbox，而不是 getOffsetYRich
-                    var frameHpx2 = layout.maxTextHeight * style.fontScale;
-                    // 用缩放后的行数据重建 baselines 和 bbox
-                    var baselines1 = [
-                        0
-                    ];
-                    for(var i2 = 1; i2 < lines.length; i2++){
-                        baselines1[i2] = baselines1[i2 - 1] + lines[i2].lineHeight;
-                    }
-                    // 计算 bboxTop / bboxBottom（使用行的测量值 lineAscent/lineDescent）
-                    var bboxTop2 = Infinity;
-                    var bboxBottom2 = -Infinity;
-                    for(var i3 = 0; i3 < lines.length; i3++){
-                        var _lines_i_lineAscent1;
-                        var asc1 = (_lines_i_lineAscent1 = lines[i3].lineAscent) != null ? _lines_i_lineAscent1 : 0;
-                        var _lines_i_lineDescent1;
-                        var desc1 = (_lines_i_lineDescent1 = lines[i3].lineDescent) != null ? _lines_i_lineDescent1 : 0;
-                        bboxTop2 = Math.min(bboxTop2, baselines1[i3] - asc1);
-                        bboxBottom2 = Math.max(bboxBottom2, baselines1[i3] + desc1);
-                    }
-                    var bboxHeight2 = bboxBottom2 - bboxTop2;
-                    // 计算 display 模式的基线
-                    var baselineDisplayY = 0;
-                    switch(layout.textVerticalAlign){
-                        case EFFECTS.spec.TextVerticalAlign.top:
-                            baselineDisplayY = -bboxTop2;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.middle:
-                            baselineDisplayY = (frameHpx2 - bboxHeight2) / 2 - bboxTop2;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.bottom:
-                            baselineDisplayY = frameHpx2 - bboxHeight2 - bboxTop2;
-                            break;
-                    }
-                    // 后续 lineYOffsets 保持按行高累计
-                    var lineYOffsets = [];
-                    var currentY = baselineDisplayY;
-                    for(var i4 = 0; i4 < lines.length; i4++){
-                        lineYOffsets.push(currentY);
-                        if (i4 < lines.length - 1) {
-                            currentY += lines[i4 + 1].lineHeight;
-                        }
-                    }
-                    return {
-                        baselineY: baselineDisplayY,
-                        lineYOffsets: lineYOffsets
-                    };
-                }
+        // 1. 重建各行基线（相对于第一行基线=0）
+        var baselines = [
+            0
+        ];
+        for(var i = 1; i < lines.length; i++){
+            baselines[i] = baselines[i - 1] + lines[i].lineHeight;
         }
-        // 下面行偏移保持不变
-        var lineYOffsets1 = [];
-        var currentY1 = baselineY;
-        lines.forEach(function(line, index) {
-            lineYOffsets1.push(currentY1);
-            if (index < lines.length - 1) {
-                currentY1 += lines[index + 1].lineHeight;
-            }
+        // 2. 计算内容 bbox（含行高边距）
+        var bboxTop = Infinity;
+        var bboxBottom = -Infinity;
+        for(var i1 = 0; i1 < lines.length; i1++){
+            var _lines_i_lineAscent;
+            var asc = (_lines_i_lineAscent = lines[i1].lineAscent) != null ? _lines_i_lineAscent : 0;
+            var _lines_i_lineDescent;
+            var desc = (_lines_i_lineDescent = lines[i1].lineDescent) != null ? _lines_i_lineDescent : 0;
+            var textHeight = asc + desc;
+            var margin = (lines[i1].lineHeight - textHeight) / 2;
+            bboxTop = Math.min(bboxTop, baselines[i1] - asc - margin);
+            bboxBottom = Math.max(bboxBottom, baselines[i1] + desc + margin);
+        }
+        var bboxHeight = bboxBottom - bboxTop;
+        // 3. 在帧坐标系 [0, frameHeight] 中定位第一行基线
+        var baselineY = 0;
+        switch(layout.textVerticalAlign){
+            case EFFECTS.spec.TextVerticalAlign.top:
+                baselineY = -bboxTop;
+                break;
+            case EFFECTS.spec.TextVerticalAlign.middle:
+                baselineY = (frameHeight - bboxHeight) / 2 - bboxTop;
+                break;
+            case EFFECTS.spec.TextVerticalAlign.bottom:
+                baselineY = frameHeight - bboxHeight - bboxTop;
+                break;
+        }
+        // 4. 各行 Y 坐标
+        var lineYOffsets = baselines.map(function(b) {
+            return baselineY + b;
         });
         return {
             baselineY: baselineY,
-            lineYOffsets: lineYOffsets1
+            lineYOffsets: lineYOffsets
         };
     };
     return RichVerticalAlignStrategyImpl;
@@ -1149,11 +1085,12 @@ var RichTextLayout = /*#__PURE__*/ function() {
 /**
  * 富文本策略工厂
  * 负责创建各种策略实例
+ *
+ * 管线顺序：Wrap → scaleLinesToFit（display）→ Align → Overflow.resolveCanvas
  */ var RichTextStrategyFactory = /*#__PURE__*/ function() {
     function RichTextStrategyFactory() {}
     /**
    * 创建换行策略
-   * 根据wrapEnabled参数决定使用哪种策略
    */ RichTextStrategyFactory.createWrapStrategy = function createWrapStrategy(wrapEnabled) {
         if (wrapEnabled) {
             return new RichWrapEnabledStrategy();
@@ -1162,17 +1099,17 @@ var RichTextLayout = /*#__PURE__*/ function() {
         }
     };
     /**
-   * 创建溢出策略
-   * 支持三种模式：clip（裁切）、display（行级缩放）、visible（不缩放不裁剪）
+   * 创建溢出策略（画布解析）
+   * clip：画布=帧，超出裁切
+   * display/visible：检测溢出并对称扩展画布
    */ RichTextStrategyFactory.createOverflowStrategy = function createOverflowStrategy(mode) {
         switch(mode){
             case EFFECTS.spec.TextOverflow.clip:
                 return new RichClippedOverflowStrategy();
             case EFFECTS.spec.TextOverflow.display:
-                return new RichDisplayOverflowStrategy();
             case EFFECTS.spec.TextOverflow.visible:
             default:
-                return new RichVisibleOverflowStrategy();
+                return new RichExpandingOverflowStrategy();
         }
     };
     /**
@@ -1188,6 +1125,66 @@ var RichTextLayout = /*#__PURE__*/ function() {
     return RichTextStrategyFactory;
 }();
 
+function _extends() {
+    _extends = Object.assign || function assign(target) {
+        for(var i = 1; i < arguments.length; i++){
+            var source = arguments[i];
+            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
+        }
+        return target;
+    };
+    return _extends.apply(this, arguments);
+}
+
+/**
+ * 将行数据等比缩小以适配帧尺寸（display 模式使用）
+ * 只缩小不放大，就地修改行数据
+ */ function scaleLinesToFit(lines, contentWidth, contentHeight, frameWidth, frameHeight) {
+    var safeDiv = function(a, b) {
+        return Math.abs(b) > 1e-5 ? a / b : 1;
+    };
+    var safeContentW = Math.max(1, contentWidth);
+    var safeContentH = Math.max(1, contentHeight);
+    // 只缩小不放大
+    var s = Math.min(1, safeDiv(frameWidth, safeContentW), safeDiv(frameHeight, safeContentH));
+    // 浮点精度处理
+    if (s > 0.9999) {
+        return;
+    }
+    for(var _iterator = _create_for_of_iterator_helper_loose(lines), _step; !(_step = _iterator()).done;){
+        var line = _step.value;
+        line.width *= s;
+        line.lineHeight *= s;
+        if (line.offsetX) {
+            for(var i = 0; i < line.offsetX.length; i++){
+                line.offsetX[i] *= s;
+            }
+        }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(line.chars || []), _step1; !(_step1 = _iterator1()).done;){
+            var seg = _step1.value;
+            for(var _iterator2 = _create_for_of_iterator_helper_loose(seg), _step2; !(_step2 = _iterator2()).done;){
+                var ch = _step2.value;
+                ch.x *= s;
+            }
+        }
+        // 创建新的 richOptions 数组，避免修改原始对象
+        var originalOptions = line.richOptions || [];
+        var newOptions = [];
+        for(var i1 = 0; i1 < originalOptions.length; i1++){
+            newOptions.push(_extends({}, originalOptions[i1], {
+                fontSize: originalOptions[i1].fontSize * s
+            }));
+        }
+        line.richOptions = newOptions;
+        if (line.lineAscent != null) {
+            line.lineAscent *= s;
+        }
+        if (line.lineDescent != null) {
+            line.lineDescent *= s;
+        }
+    }
+}
+
 var seed = 0;
 exports.RichTextComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _inherits(RichTextComponent, MaskableGraphic);
@@ -1197,10 +1194,10 @@ exports.RichTextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         _this.isDirty = true;
         _this.text = "";
         _this.processedTextOptions = [];
-        _this.singleLineHeight = 1.571;
-        _this.size = null;
-        _this.initialized = false;
-        _this.canvasSize = null;
+        /** @deprecated Use for legacy mode*/ _this.singleLineHeight = 1.571;
+        /** @deprecated Use for legacy mode*/ _this.size = null;
+        /** @deprecated Use for legacy mode*/ _this.initialized = false;
+        /** @deprecated Use for legacy mode*/ _this.canvasSize = null;
         _this.SCALE_FACTOR = 0.11092565;
         _this.ALPHA_FIX_VALUE = 1 / 255;
         _this.name = "MRichText" + seed++;
@@ -1237,7 +1234,7 @@ exports.RichTextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         this.material.setColor("_Color", new EFFECTS.math.Color(1, 1, 1, 1));
     };
     /**
-   * 使用策略结果绘制文本
+   * 根据布局配置更新策略实例
    */ _proto.updateStrategies = function updateStrategies() {
         var layout = this.textLayout;
         if (layout) {
@@ -1437,11 +1434,20 @@ exports.RichTextComponent = /*#__PURE__*/ function(MaskableGraphic) {
     };
     /**
    * 使用策略管线路径的渲染方法
+   *
+   * 管线顺序：
+   * 1. Wrap        → 换行与度量
+   * 2. SizeMode    → 根据 autoResize 回写帧尺寸
+   * 3. ContentScale → 内容缩放（仅 display 模式）
+   * 4. Alignment   → 在帧坐标系中对齐（不依赖 overflow）
+   * 5. Overflow    → 画布解析：确定最终画布尺寸与渲染偏移（不依赖对齐模式）
+   * 6. Render      → 绘制
    */ _proto.updateTextureWithStrategies = function updateTextureWithStrategies(flipY) {
         var _this = this;
         if (!this.isDirty || !this.context || !this.canvas) {
             return;
         }
+        this.updateStrategies();
         // 解析富文本
         this.generateTextProgram(this.text);
         var layout = this.textLayout;
@@ -1450,227 +1456,84 @@ exports.RichTextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         if (!context) {
             return;
         }
-        // 步骤1: 换行策略计算行信息
-        var wrapResult = this.richWrapStrategy.computeLines(this.processedTextOptions, context, this.textStyle, layout, this.singleLineHeight, this.textStyle.fontScale, letterSpace);
-        if (wrapResult.lines.length === 0 || wrapResult.maxLineWidth === 0 || wrapResult.totalHeight === 0) {
-            this.isDirty = false;
-            return;
+        var fontScale = this.textStyle.fontScale;
+        // autoWidth 模式下先去掉宽度约束，避免内容被提前换行
+        if (layout.autoResize === EFFECTS.spec.TextSizeMode.autoWidth) {
+            layout.maxTextWidth = Number.MAX_SAFE_INTEGER;
         }
-        // 步骤2: 尺寸处理
-        var sizeResult = this.resolveCanvasSize(wrapResult, layout, this.textStyle, this.singleLineHeight);
-        // 首次渲染时初始化 canvas 尺寸和组件变换
-        this.setCanvasSize(sizeResult);
-        // 步骤3: 溢出策略处理
-        var overflowResult = this.richOverflowStrategy.apply(wrapResult.lines, sizeResult, layout, this.textStyle);
-        // 步骤4: 水平对齐策略
-        var horizontalAlignResult = this.richHorizontalAlignStrategy.getHorizontalOffsets(wrapResult.lines, sizeResult, overflowResult, layout, this.textStyle);
-        // 步骤5: 垂直对齐策略
-        var TextVerticalAlignResult = this.richVerticalAlignStrategy.getVerticalOffsets(wrapResult.lines, sizeResult, overflowResult, layout, this.textStyle, this.singleLineHeight);
-        // 使用 this.canvasSize 统一设置画布尺寸
-        EFFECTS.assertExist(this.canvasSize);
-        var _this_canvasSize = this.canvasSize, canvasWidth = _this_canvasSize.x, canvasHeight = _this_canvasSize.y;
-        // 确保canvas宽高至少为1
-        var safeW = Math.max(1, Math.ceil(canvasWidth));
-        var safeH = Math.max(1, Math.ceil(canvasHeight));
-        layout.width = safeW / this.textStyle.fontScale;
-        layout.height = safeH / this.textStyle.fontScale;
-        this.renderToTexture(safeW, safeH, flipY, function(context) {
-            // 步骤6: 绘制文本
-            _this.drawTextWithStrategies(context, wrapResult.lines, horizontalAlignResult, TextVerticalAlignResult, overflowResult, _this.textStyle);
+        // ── 步骤 1: 换行策略（逻辑坐标系，fontScale 不参与排版）──
+        var wrapResult = this.richWrapStrategy.computeLines(this.processedTextOptions, context, this.textStyle, layout, letterSpace);
+        // ── 步骤 2: SizeMode → 帧尺寸（逻辑单位）──
+        // fontScale 不参与排版，全部在逻辑坐标系中完成。
+        var frameW;
+        var frameH;
+        switch(layout.autoResize){
+            case EFFECTS.spec.TextSizeMode.autoWidth:
+                frameW = Math.max(1, wrapResult.maxLineWidth || 0);
+                frameH = Math.max(1, wrapResult.totalHeight || 0);
+                break;
+            case EFFECTS.spec.TextSizeMode.autoHeight:
+                frameW = layout.maxTextWidth;
+                frameH = Math.max(1, wrapResult.totalHeight || 0);
+                break;
+            case EFFECTS.spec.TextSizeMode.fixed:
+            default:
+                frameW = layout.maxTextWidth;
+                frameH = layout.maxTextHeight;
+                break;
+        }
+        // ── 步骤 3: 内容缩放（display 模式缩小以适配帧，其他模式跳过）──
+        if (layout.overflow === EFFECTS.spec.TextOverflow.display) {
+            var contentW = Math.max(1, wrapResult.maxLineWidth || 0);
+            var contentH = Math.max(1, wrapResult.totalHeight || 0);
+            scaleLinesToFit(wrapResult.lines, contentW, contentH, frameW, frameH);
+        }
+        // ── 步骤 4: 对齐（在帧坐标系中，不依赖 overflow 模式）──
+        var horizontalAlignResult = this.richHorizontalAlignStrategy.getHorizontalOffsets(wrapResult.lines, frameW, layout, this.textStyle);
+        var verticalAlignResult = this.richVerticalAlignStrategy.getVerticalOffsets(wrapResult.lines, frameH, layout);
+        // ── 步骤 5: 溢出 / 画布解析（不依赖对齐模式枚举）──
+        var overflowResult = this.richOverflowStrategy.resolveCanvas(wrapResult.lines, frameW, frameH, horizontalAlignResult, verticalAlignResult);
+        // 排版结果（逻辑单位）→ 物理像素画布
+        var physicalW = Math.max(1, Math.ceil(overflowResult.canvasWidth * fontScale));
+        var physicalH = Math.max(1, Math.ceil(overflowResult.canvasHeight * fontScale));
+        // 渲染尺寸不随 fontScale 改变
+        this.item.transform.size.set(overflowResult.canvasWidth * this.SCALE_FACTOR * this.SCALE_FACTOR, overflowResult.canvasHeight * this.SCALE_FACTOR * this.SCALE_FACTOR);
+        // 统一回写布局属性（逻辑单位）
+        layout.maxTextWidth = frameW;
+        layout.maxTextHeight = frameH;
+        layout.width = overflowResult.canvasWidth;
+        layout.height = overflowResult.canvasHeight;
+        this.renderToTexture(physicalW, physicalH, flipY, function(context) {
+            // fontScale 仅作为渲染分辨率倍率，排版坐标全部为逻辑单位
+            context.scale(fontScale, fontScale);
+            // ── 步骤 6: 绘制 ──
+            _this.drawTextWithStrategies(context, wrapResult.lines, horizontalAlignResult, verticalAlignResult, overflowResult, _this.textStyle);
         }, {
             disposeOld: false
         });
         this.isDirty = false;
     };
-    _proto.setCanvasSize = function setCanvasSize(sizeResult) {
-        var _this = this;
-        if (this.size === undefined || this.size === null) {
-            this.size = this.item.transform.size.clone();
-        }
-        var _this_size = this.size, _this_size_x = _this_size.x, x = _this_size_x === void 0 ? 1 : _this_size_x, _this_size_y = _this_size.y, y = _this_size_y === void 0 ? 1 : _this_size_y;
-        var layout = this.textLayout;
-        var fontScale = this.textStyle.fontScale || 1;
-        // 防止 frameW / frameH 为 0
-        var frameW = Math.max(1, layout.maxTextWidth || 0);
-        var frameH = Math.max(1, layout.maxTextHeight || 0);
-        switch(layout.overflow){
-            case EFFECTS.spec.TextOverflow.visible:
-                {
-                    var frameWpx = frameW * fontScale;
-                    var frameHpx = frameH * fontScale;
-                    var _sizeResult_bboxTop;
-                    var bboxTop = (_sizeResult_bboxTop = sizeResult.bboxTop) != null ? _sizeResult_bboxTop : 0;
-                    var _sizeResult_bboxHeight, _sizeResult_bboxBottom;
-                    var bboxBottom = (_sizeResult_bboxBottom = sizeResult.bboxBottom) != null ? _sizeResult_bboxBottom : bboxTop + ((_sizeResult_bboxHeight = sizeResult.bboxHeight) != null ? _sizeResult_bboxHeight : 0);
-                    var _sizeResult_bboxHeight1;
-                    var bboxHeight = (_sizeResult_bboxHeight1 = sizeResult.bboxHeight) != null ? _sizeResult_bboxHeight1 : bboxBottom - bboxTop;
-                    // 计算 frame 基线
-                    var baselineYFrame = 0;
-                    switch(layout.textVerticalAlign){
-                        case EFFECTS.spec.TextVerticalAlign.top:
-                            baselineYFrame = -bboxTop;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.middle:
-                            baselineYFrame = (frameHpx - bboxHeight) / 2 - bboxTop;
-                            break;
-                        case EFFECTS.spec.TextVerticalAlign.bottom:
-                            baselineYFrame = frameHpx - bboxHeight - bboxTop;
-                            break;
-                    }
-                    // 上下溢出检测
-                    var contentTopInFrame = baselineYFrame + bboxTop;
-                    var contentBottomInFrame = baselineYFrame + bboxBottom;
-                    var overflowTop = Math.max(0, -contentTopInFrame);
-                    var overflowBottom = Math.max(0, contentBottomInFrame - frameHpx);
-                    // 垂直扩张
-                    var expandTop = overflowTop;
-                    var expandBottom = overflowBottom;
-                    switch(layout.textVerticalAlign){
-                        case EFFECTS.spec.TextVerticalAlign.top:
-                            {
-                                var E = overflowBottom;
-                                expandTop = E;
-                                expandBottom = E;
-                                break;
-                            }
-                        case EFFECTS.spec.TextVerticalAlign.bottom:
-                            {
-                                var E1 = overflowTop;
-                                expandTop = E1;
-                                expandBottom = E1;
-                                break;
-                            }
-                        case EFFECTS.spec.TextVerticalAlign.middle:
-                            {
-                                // 保持非对称：上扩 overflowTop，下扩 overflowBottom
-                                expandTop = overflowTop;
-                                expandBottom = overflowBottom;
-                                break;
-                            }
-                    }
-                    // 位移补偿：始终使用 expandTop
-                    var compY = expandTop;
-                    // 水平扩张
-                    var lines = sizeResult.lines || [];
-                    // 1. 先按 frameWpx 计算每行的对齐起点（逻辑对齐）
-                    var xOffsetsFrame = lines.map(function(line) {
-                        return layout.getOffsetXRich(_this.textStyle, frameWpx, line.width);
-                    });
-                    // 2. 用对齐后的偏移 + 行宽算出内容的左右边界
-                    var contentMinX = Infinity;
-                    var contentMaxX = -Infinity;
-                    for(var i = 0; i < lines.length; i++){
-                        var _xOffsetsFrame_i;
-                        var off = (_xOffsetsFrame_i = xOffsetsFrame[i]) != null ? _xOffsetsFrame_i : 0;
-                        var _lines_i_width;
-                        var w = (_lines_i_width = lines[i].width) != null ? _lines_i_width : 0; // 像素宽
-                        contentMinX = Math.min(contentMinX, off);
-                        contentMaxX = Math.max(contentMaxX, off + w);
-                    }
-                    if (!isFinite(contentMinX)) {
-                        contentMinX = 0;
-                    }
-                    if (!isFinite(contentMaxX)) {
-                        contentMaxX = 0;
-                    }
-                    // 3. 计算内容相对于 frame 的越界量
-                    var overflowLeft = Math.max(0, -contentMinX); // 内容左边 < 0
-                    var overflowRight = Math.max(0, contentMaxX - frameWpx); // 内容右边 > frameWpx?
-                    // 4. 让 canvas 左右都扩张到能容下整个内容 bbox
-                    var expandLeft = overflowLeft;
-                    var expandRight = overflowRight;
-                    // 5. 最终 canvas 宽高
-                    var finalWpx = Math.ceil(frameWpx + expandLeft + expandRight);
-                    var finalHpx = Math.ceil(frameHpx + expandTop + expandBottom);
-                    // 记录补偿，供垂直对齐策略叠加
-                    sizeResult.baselineCompensationX = expandLeft;
-                    sizeResult.baselineCompensationY = compY;
-                    // containerWidth 用 frameWpx，而不是 finalWpx
-                    sizeResult.containerWidth = frameWpx;
-                    sizeResult.canvasWidth = finalWpx;
-                    sizeResult.canvasHeight = finalHpx;
-                    this.canvasSize = new EFFECTS.math.Vector2(finalWpx, finalHpx);
-                    var _this_size1;
-                    var _ref = (_this_size1 = this.size) != null ? _this_size1 : this.item.transform.size, _ref_x = _ref.x, x1 = _ref_x === void 0 ? 1 : _ref_x, _ref_y = _ref.y, y1 = _ref_y === void 0 ? 1 : _ref_y;
-                    // 实际元素渲染尺寸不随着 fontScale 改变
-                    this.item.transform.size.set(x1 * finalWpx / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR, y1 * finalHpx / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR);
-                    this.initialized = true;
-                    break;
-                }
-            case EFFECTS.spec.TextOverflow.clip:
-                {
-                    var frameWpx1 = frameW * fontScale;
-                    var frameHpx1 = frameH * fontScale;
-                    // 直接使用 frame 尺寸作为画布尺寸
-                    sizeResult.canvasWidth = frameWpx1;
-                    sizeResult.canvasHeight = frameHpx1;
-                    // clip 模式不需要任何补偿
-                    sizeResult.baselineCompensationX = 0;
-                    sizeResult.baselineCompensationY = 0;
-                    // 设置 canvas 和节点变换
-                    this.canvasSize = new EFFECTS.math.Vector2(frameWpx1, frameHpx1);
-                    // 把 layout 的尺寸更新为 frame 尺寸
-                    layout.width = frameW;
-                    layout.height = frameH;
-                    var _this_size2;
-                    var _ref1 = (_this_size2 = this.size) != null ? _this_size2 : this.item.transform.size, _ref_x1 = _ref1.x, x2 = _ref_x1 === void 0 ? 1 : _ref_x1, _ref_y1 = _ref1.y, y2 = _ref_y1 === void 0 ? 1 : _ref_y1;
-                    this.item.transform.size.set(x2 * frameWpx1 / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR, y2 * frameHpx1 / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR);
-                    this.initialized = true;
-                    break;
-                }
-            case EFFECTS.spec.TextOverflow.display:
-                {
-                    if (!this.initialized) {
-                        var frameWpx2 = frameW * fontScale;
-                        var frameHpx2 = frameH * fontScale;
-                        this.canvasSize = new EFFECTS.math.Vector2(frameWpx2, frameHpx2);
-                        this.item.transform.size.set(x * frameWpx2 / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR, y * frameHpx2 / fontScale * this.SCALE_FACTOR * this.SCALE_FACTOR);
-                        this.initialized = true;
-                    }
-                    break;
-                }
-        }
-    };
-    /**
-   * 尺寸处理
-   */ _proto.resolveCanvasSize = function resolveCanvasSize(wrapResult, layout, style, singleLineHeight) {
-        var canvasWidth = Math.max(1, wrapResult.maxLineWidth || 0);
-        var canvasHeight = Math.max(1, wrapResult.totalHeight || 0); // stepTotalHeight
-        layout.width = canvasWidth / style.fontScale;
-        layout.height = canvasHeight / style.fontScale;
-        return {
-            canvasWidth: canvasWidth,
-            canvasHeight: canvasHeight,
-            contentWidth: wrapResult.maxLineWidth,
-            bboxTop: wrapResult.bboxTop,
-            bboxBottom: wrapResult.bboxBottom,
-            bboxHeight: wrapResult.bboxHeight,
-            // 为 visible 模式的画布尺寸计算保留行信息
-            lines: wrapResult.lines
-        };
-    };
     /**
    * 使用策略结果绘制文本
-   */ _proto.drawTextWithStrategies = function drawTextWithStrategies(context, lines, horizontalAlignResult, TextVerticalAlignResult, overflowResult, textStyle) {
-        var currentBaselineY = TextVerticalAlignResult.baselineY;
+   * 坐标 = 帧坐标（对齐结果） + 渲染偏移（溢出结果）
+   */ _proto.drawTextWithStrategies = function drawTextWithStrategies(context, lines, horizontalAlignResult, verticalAlignResult, overflowResult, textStyle) {
+        var renderOffsetX = overflowResult.renderOffsetX, renderOffsetY = overflowResult.renderOffsetY;
+        var currentBaselineY = verticalAlignResult.baselineY + renderOffsetY;
         var lineOffsets = horizontalAlignResult.lineOffsets;
         lines.forEach(function(line, index) {
             var richOptions = line.richOptions, chars = line.chars;
-            var xOffset = lineOffsets[index];
+            var xOffset = lineOffsets[index] + renderOffsetX;
             var yOffset = currentBaselineY;
             richOptions.forEach(function(options, segIndex) {
-                var fontScale = textStyle.fontScale, textColor = textStyle.textColor, textFamily = textStyle.fontFamily, textWeight = textStyle.textWeight, richStyle = textStyle.fontStyle;
+                var textColor = textStyle.textColor, textFamily = textStyle.fontFamily, textWeight = textStyle.textWeight, richStyle = textStyle.fontStyle;
                 var fontSize = options.fontSize, _options_fontColor = options.fontColor, fontColor = _options_fontColor === void 0 ? textColor : _options_fontColor, _options_fontFamily = options.fontFamily, fontFamily = _options_fontFamily === void 0 ? textFamily : _options_fontFamily, _options_fontWeight = options.fontWeight, fontWeight = _options_fontWeight === void 0 ? textWeight : _options_fontWeight, _options_fontStyle = options.fontStyle, fontStyle = _options_fontStyle === void 0 ? richStyle : _options_fontStyle;
-                // 直接使用原始字体大小（已在行数据中预缩放）
                 var textSize = fontSize;
-                context.font = fontStyle + " " + fontWeight + " " + textSize * fontScale + "px " + fontFamily;
+                context.font = fontStyle + " " + fontWeight + " " + textSize + "px " + fontFamily;
                 var r = fontColor[0], g = fontColor[1], b = fontColor[2], a = fontColor[3];
                 context.fillStyle = "rgba(" + r + ", " + g + ", " + b + ", " + a + ")";
-                // 逐字绘制
                 var segStartX = line.offsetX && line.offsetX[segIndex] ? line.offsetX[segIndex] : 0;
                 var charArr = chars[segIndex];
                 charArr.forEach(function(charDetail) {
-                    // 直接使用缩放后的字符位置
                     context.fillText(charDetail.char, xOffset + segStartX + charDetail.x, yOffset);
                 });
             });
@@ -1743,7 +1606,7 @@ EFFECTS.applyMixins(exports.RichTextComponent, [
 
 /**
  * 插件版本号
- */ var version = "2.8.8";
+ */ var version = "2.8.10";
 EFFECTS.registerPlugin("rich-text", RichTextLoader);
 EFFECTS.logger.info("Plugin rich text version: " + version + ".");
 if (version !== EFFECTS__namespace.version) {