@visactor/vrender-core 0.21.0-alpha.4 → 0.21.0-alpha.5

package/dist/index.es.js

@@ -3016,6 +3016,7 @@ const DefaultStrokeStyle = Object.assign({ outerBorder: Object.assign(Object.ass
 const DefaultTextStyle = {
     text: '',
     maxLineWidth: Infinity,
+    maxWidth: Infinity,
     textAlign: 'left',
     textBaseline: 'alphabetic',
     fontSize: 16,
@@ -3055,7 +3056,7 @@ const DefaultConnectAttribute = {
 const DefaultDebugAttribute = {
     _debug_bounds: false
 };
-const DefaultAttribute = Object.assign(Object.assign(Object.assign({ strokeSeg: null, renderable: true, pickable: true, shadowGraphic: undefined, childrenPickable: true, fillPickable: true, strokePickable: true, visible: true, zIndex: 0, layout: null, boundsPadding: 0, fillStrokeOrder: 0, renderStyle: 'default', pickMode: 'accurate', customPickShape: null, boundsMode: 'accurate', keepDirIn3d: true, shadowRootIdx: 1, globalZIndex: 1, globalCompositeOperation: '', overflow: 'hidden', shadowPickMode: 'graphic' }, DefaultDebugAttribute), DefaultStyle), DefaultTransform);
+const DefaultAttribute = Object.assign(Object.assign(Object.assign({ strokeSeg: null, renderable: true, pickable: true, shadowGraphic: undefined, childrenPickable: true, fillPickable: true, strokePickable: true, visible: true, zIndex: 0, layout: null, boundsPadding: 0, fillStrokeOrder: 0, renderStyle: 'default', pickMode: 'accurate', customPickShape: null, boundsMode: 'accurate', keepDirIn3d: true, shadowRootIdx: 1, globalZIndex: 1, globalCompositeOperation: '', overflow: 'hidden', shadowPickMode: 'graphic', keepStrokeScale: false }, DefaultDebugAttribute), DefaultStyle), DefaultTransform);
 function addAttributeToPrototype(obj, c, keys) {
     keys.forEach(key => {
         c.prototype[key] = obj[key];
@@ -3249,13 +3250,33 @@ let ATextMeasure = class ATextMeasure {
         this.context = service.context;
         service.bindTextMeasure(this);
     }
-    measureTextWidth(text, options) {
-        if (!this.context) {
-            return this.estimate(text, options).width;
-        }
+    _measureTextWithoutAlignBaseline(text, options, compatible) {
         this.context.setTextStyleWithoutAlignBaseline(options);
-        const textMeasure = this.context.measureText(text);
-        return textMeasure.width;
+        const metrics = this.context.measureText(text);
+        return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+    }
+    _measureTextWithAlignBaseline(text, options, compatible) {
+        this.context.setTextStyle(options);
+        const metrics = this.context.measureText(text);
+        return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+    }
+    compatibleMetrics(metrics, options) {
+        if (metrics.actualBoundingBoxAscent == null ||
+            metrics.actualBoundingBoxDescent == null ||
+            metrics.fontBoundingBoxAscent == null ||
+            metrics.fontBoundingBoxDescent == null) {
+            const { ascent, descent } = this.measureTextBoundADscentEstimate(options);
+            metrics.actualBoundingBoxAscent = ascent;
+            metrics.actualBoundingBoxDescent = descent;
+            metrics.fontBoundingBoxAscent = ascent;
+            metrics.fontBoundingBoxDescent = descent;
+        }
+        if (metrics.actualBoundingBoxLeft == null || metrics.actualBoundingBoxRight == null) {
+            const { left, right } = this.measureTextBoundLeftRightEstimate(options);
+            metrics.actualBoundingBoxLeft = left;
+            metrics.actualBoundingBoxRight = right;
+        }
+        return metrics;
     }
     estimate(text, { fontSize = DefaultTextAttribute.fontSize }) {
         let eCharLen = 0;
@@ -3268,24 +3289,125 @@ let ATextMeasure = class ATextMeasure {
             height: fontSize
         };
     }
-    measureTextPixelHeight(text, options) {
+    measureTextWidth(text, options, textMeasure) {
+        if (!this.context) {
+            return this.estimate(text, options).width;
+        }
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithoutAlignBaseline(text, options);
+        return textMeasure.width;
+    }
+    measureTextBoundsWidth(text, options, textMeasure) {
+        if (!this.context) {
+            return this.estimate(text, options).width;
+        }
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithoutAlignBaseline(text, options);
+        return textMeasure.width;
+    }
+    measureTextBoundsLeftRight(text, options, textMeasure) {
+        if (!this.context) {
+            return this.measureTextBoundLeftRightEstimate(options);
+        }
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithAlignBaseline(text, options, true);
+        return {
+            left: textMeasure.actualBoundingBoxLeft,
+            right: textMeasure.actualBoundingBoxRight
+        };
+    }
+    measureTextPixelHeight(text, options, textMeasure) {
         var _a;
         if (!this.context) {
             return (_a = options.fontSize) !== null && _a !== void 0 ? _a : DefaultTextStyle.fontSize;
         }
-        this.context.setTextStyleWithoutAlignBaseline(options);
-        const textMeasure = this.context.measureText(text);
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, true);
         return Math.abs(textMeasure.actualBoundingBoxAscent - textMeasure.actualBoundingBoxDescent);
     }
-    measureTextBoundHieght(text, options) {
+    measureTextPixelADscent(text, options, textMeasure) {
+        if (!this.context) {
+            return this.measureTextBoundADscentEstimate(options);
+        }
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithAlignBaseline(text, options, true);
+        return {
+            ascent: textMeasure.actualBoundingBoxAscent,
+            descent: textMeasure.actualBoundingBoxDescent
+        };
+    }
+    measureTextBoundHieght(text, options, textMeasure) {
         var _a;
         if (!this.context) {
             return (_a = options.fontSize) !== null && _a !== void 0 ? _a : DefaultTextStyle.fontSize;
         }
-        this.context.setTextStyleWithoutAlignBaseline(options);
-        const textMeasure = this.context.measureText(text);
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, true);
         return Math.abs(textMeasure.fontBoundingBoxAscent - textMeasure.fontBoundingBoxDescent);
     }
+    measureTextBoundADscent(text, options, textMeasure) {
+        if (!this.context) {
+            return this.measureTextBoundADscentEstimate(options);
+        }
+        textMeasure = textMeasure !== null && textMeasure !== void 0 ? textMeasure : this._measureTextWithAlignBaseline(text, options, true);
+        return {
+            ascent: textMeasure.fontBoundingBoxAscent,
+            descent: textMeasure.fontBoundingBoxDescent
+        };
+    }
+    measureTextBoundADscentEstimate(options) {
+        var _a;
+        const fontSize = (_a = options.fontSize) !== null && _a !== void 0 ? _a : DefaultTextStyle.fontSize;
+        const { textBaseline } = options;
+        if (textBaseline === 'bottom') {
+            return {
+                ascent: fontSize,
+                descent: 0
+            };
+        }
+        else if (textBaseline === 'middle') {
+            return {
+                ascent: fontSize / 2,
+                descent: fontSize / 2
+            };
+        }
+        else if (textBaseline === 'alphabetic') {
+            return {
+                ascent: 0.79 * fontSize,
+                descent: 0.21 * fontSize
+            };
+        }
+        return {
+            ascent: 0,
+            descent: fontSize
+        };
+    }
+    measureTextBoundLeftRightEstimate(options) {
+        var _a;
+        const fontSize = (_a = options.fontSize) !== null && _a !== void 0 ? _a : DefaultTextStyle.fontSize;
+        const { textAlign } = options;
+        if (textAlign === 'center') {
+            return {
+                left: fontSize / 2,
+                right: fontSize / 2
+            };
+        }
+        else if (textAlign === 'right' || textAlign === 'end') {
+            return {
+                left: fontSize,
+                right: 0
+            };
+        }
+        return {
+            left: 0,
+            right: fontSize
+        };
+    }
+    measureTextPixelADscentAndWidth(text, options) {
+        if (!this.context) {
+            return Object.assign(Object.assign({}, this.measureTextBoundADscentEstimate(options)), { width: this.estimate(text, options).width });
+        }
+        const out = this._measureTextWithoutAlignBaseline(text, options, true);
+        return {
+            ascent: out.actualBoundingBoxAscent,
+            descent: out.actualBoundingBoxDescent,
+            width: out.width
+        };
+    }
     measureText(text, options) {
         if (!this.context) {
             return this.estimate(text, options);
@@ -6841,7 +6963,7 @@ class TimeOutTickHandler {
     }
 }
 
-class DefaultTicker {
+class DefaultTicker extends EventEmitter {
     set mode(m) {
         if (this._mode === m) {
             return;
@@ -6853,18 +6975,19 @@ class DefaultTicker {
         return this._mode;
     }
     constructor(timelines = []) {
+        super();
         this.handleTick = (handler, params) => {
             const { once = false } = params !== null && params !== void 0 ? params : {};
             if (this.ifCanStop()) {
                 this.stop();
                 return;
             }
-            this._handlerTick(handler);
+            this._handlerTick();
             if (!once) {
                 handler.tick(this.interval, this.handleTick);
             }
         };
-        this._handlerTick = (handler) => {
+        this._handlerTick = () => {
             const tickerHandler = this.tickerHandler;
             const time = tickerHandler.getTime();
             let delta = 0;
@@ -6879,6 +7002,7 @@ class DefaultTicker {
             this.timelines.forEach(t => {
                 t.tick(delta);
             });
+            this.emit('afterTick');
         };
         this.init();
         this.lastFrameTime = -1;
@@ -7018,6 +7142,11 @@ class DefaultTicker {
         this.setupTickHandler();
         this.lastFrameTime = -1;
     }
+    trySyncTickStatus() {
+        if (this.status === STATUS$1.RUNNING) {
+            this._handlerTick();
+        }
+    }
 }
 
 class ManualTickHandler {
@@ -8838,6 +8967,11 @@ class TagPointsUpdate extends ACustomAnimate {
                     this.clipRange =
                         this.toPoints[lastMatchedIndex][this.clipRangeByDimension] /
                             this.toPoints[this.toPoints.length - 1][this.clipRangeByDimension];
+                    if (this.clipRange === 1) {
+                        this.shrinkClipRange =
+                            this.toPoints[lastMatchedIndex][this.clipRangeByDimension] /
+                                this.fromPoints[this.fromPoints.length - 1][this.clipRangeByDimension];
+                    }
                     if (!isValidNumber(this.clipRange)) {
                         this.clipRange = 0;
                     }
@@ -8877,6 +9011,12 @@ class TagPointsUpdate extends ACustomAnimate {
             return newPoint;
         });
     }
+    onFirstRun() {
+        const lastClipRange = this.target.attribute.clipRange;
+        if (isValidNumber(lastClipRange * this.clipRange)) {
+            this.clipRange *= lastClipRange;
+        }
+    }
     onUpdate(end, ratio, out) {
         this.points = this.points.map((point, index) => {
             const newPoint = pointInterpolation(this.interpolatePoints[index][0], this.interpolatePoints[index][1], ratio);
@@ -8884,6 +9024,17 @@ class TagPointsUpdate extends ACustomAnimate {
             return newPoint;
         });
         if (this.clipRange) {
+            if (this.shrinkClipRange) {
+                if (!end) {
+                    out.points = this.fromPoints;
+                    out.clipRange = this.clipRange - (this.clipRange - this.shrinkClipRange) * ratio;
+                }
+                else {
+                    out.points = this.toPoints;
+                    out.clipRange = 1;
+                }
+                return;
+            }
             out.clipRange = this.clipRange + (1 - this.clipRange) * ratio;
         }
         if (this.segmentsCache && this.to.segments) {
@@ -10810,10 +10961,10 @@ class ResourceLoader {
     static GetFile(url, type) {
         let data = ResourceLoader.cache.get(url);
         if (data) {
-            if (data.loadState === 'fail') {
+            if (data.loadState === 'init' || data.loadState === 'fail') {
                 return Promise.reject();
             }
-            else if (data.loadState === 'init' || data.loadState === 'loading') {
+            else if (data.loadState === 'loading') {
                 return data.dataPromise.then(data => data.data);
             }
             return Promise.resolve(data.data);
@@ -15409,14 +15560,14 @@ class DefaultArcRenderContribution {
         if (!(doOuterBorder || doInnerBorder)) {
             return;
         }
-        const { innerPadding = arcAttribute.innerPadding, outerPadding = arcAttribute.outerPadding, startAngle = arcAttribute.startAngle, endAngle = arcAttribute.endAngle, opacity = arcAttribute.opacity, x: originX = arcAttribute.x, y: originY = arcAttribute.y, scaleX = arcAttribute.scaleX, scaleY = arcAttribute.scaleY } = arc.attribute;
+        const { innerPadding = arcAttribute.innerPadding, outerPadding = arcAttribute.outerPadding, startAngle = arcAttribute.startAngle, endAngle = arcAttribute.endAngle, opacity = arcAttribute.opacity, x: originX = arcAttribute.x, y: originY = arcAttribute.y, scaleX = arcAttribute.scaleX, scaleY = arcAttribute.scaleY, keepStrokeScale = arcAttribute.keepStrokeScale } = arc.attribute;
         let { innerRadius = arcAttribute.innerRadius, outerRadius = arcAttribute.outerRadius } = arc.attribute;
         outerRadius += outerPadding;
         innerRadius -= innerPadding;
         const renderBorder = (borderStyle, key) => {
             const doStroke = !!(borderStyle && borderStyle.stroke);
             const { distance = arcAttribute[key].distance } = borderStyle;
-            const d = getScaledStroke(context, distance, context.dpr);
+            const d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr);
             const deltaAngle = distance / outerRadius;
             const sign = key === 'outerBorder' ? 1 : -1;
             arc.setAttributes({
@@ -15461,11 +15612,11 @@ class DefaultCircleRenderContribution {
         if (!(doOuterBorder || doInnerBorder)) {
             return;
         }
-        const { radius = circleAttribute.radius, startAngle = circleAttribute.startAngle, endAngle = circleAttribute.endAngle, opacity = circleAttribute.opacity, x: originX = circleAttribute.x, y: originY = circleAttribute.y, scaleX = circleAttribute.scaleX, scaleY = circleAttribute.scaleY } = circle.attribute;
+        const { radius = circleAttribute.radius, startAngle = circleAttribute.startAngle, endAngle = circleAttribute.endAngle, opacity = circleAttribute.opacity, x: originX = circleAttribute.x, y: originY = circleAttribute.y, scaleX = circleAttribute.scaleX, scaleY = circleAttribute.scaleY, keepStrokeScale = circleAttribute.keepStrokeScale } = circle.attribute;
         const renderBorder = (borderStyle, key) => {
             const doStroke = !!(borderStyle && borderStyle.stroke);
             const { distance = circleAttribute[key].distance } = borderStyle;
-            const d = getScaledStroke(context, distance, context.dpr);
+            const d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr);
             const sign = key === 'outerBorder' ? 1 : -1;
             context.beginPath();
             context.arc(x, y, radius + sign * d, startAngle, endAngle);
@@ -15650,7 +15801,7 @@ class DefaultRectRenderContribution {
         if (!(doOuterBorder || doInnerBorder)) {
             return;
         }
-        const { cornerRadius = rectAttribute.cornerRadius, opacity = rectAttribute.opacity, x: originX = rectAttribute.x, y: originY = rectAttribute.y, scaleX = rectAttribute.scaleX, scaleY = rectAttribute.scaleY, x1, y1 } = rect.attribute;
+        const { cornerRadius = rectAttribute.cornerRadius, opacity = rectAttribute.opacity, x: originX = rectAttribute.x, y: originY = rectAttribute.y, scaleX = rectAttribute.scaleX, scaleY = rectAttribute.scaleY, x1, y1, keepStrokeScale = rectAttribute.keepStrokeScale } = rect.attribute;
         let { width, height } = rect.attribute;
         width = (width !== null && width !== void 0 ? width : x1 - x) || 0;
         height = (height !== null && height !== void 0 ? height : y1 - y) || 0;
@@ -15658,7 +15809,7 @@ class DefaultRectRenderContribution {
             const doStroke = !!(borderStyle && borderStyle.stroke);
             const sign = key === 'outerBorder' ? -1 : 1;
             const { distance = rectAttribute[key].distance } = borderStyle;
-            const d = getScaledStroke(context, distance, context.dpr);
+            const d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr);
             const nextX = x + sign * d;
             const nextY = y + sign * d;
             const dw = d * 2;
@@ -15874,13 +16025,8 @@ class DefaultImageRenderContribution extends DefaultRectRenderContribution {
         this.useStyle = true;
         this.order = 0;
     }
-    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-        if (image.isGifImage && image.renderFrame && image.playing) {
-            image.renderFrame(context, x, y);
-        }
-        else {
-            return super.drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
-        }
+    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+        return super.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
     }
 }
 const defaultImageRenderContribution = new DefaultImageRenderContribution();
@@ -15903,11 +16049,11 @@ class DefaultSymbolRenderContribution {
         if (!(doOuterBorder || doInnerBorder)) {
             return;
         }
-        const { size = symbolAttribute.size, opacity = symbolAttribute.opacity, x: originX = symbolAttribute.x, y: originY = symbolAttribute.y, scaleX = symbolAttribute.scaleX, scaleY = symbolAttribute.scaleY } = symbol.attribute;
+        const { size = symbolAttribute.size, opacity = symbolAttribute.opacity, x: originX = symbolAttribute.x, y: originY = symbolAttribute.y, scaleX = symbolAttribute.scaleX, scaleY = symbolAttribute.scaleY, keepStrokeScale = symbolAttribute.keepStrokeScale } = symbol.attribute;
         const renderBorder = (borderStyle, key) => {
             const doStroke = !!(borderStyle && borderStyle.stroke);
             const { distance = symbolAttribute[key].distance } = borderStyle;
-            const d = getScaledStroke(context, distance, context.dpr);
+            const d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr);
             const sign = key === 'outerBorder' ? 1 : -1;
             context.beginPath();
             if (parsedPath.drawOffset(context, size, x, y, sign * d) === false) {
@@ -17796,13 +17942,7 @@ let DefaultCanvasTextRender = class DefaultCanvasTextRender extends BaseRender {
         var _a, _b, _c;
         const textAttribute = getTheme(text, params === null || params === void 0 ? void 0 : params.theme).text;
         const { text: str, underline = textAttribute.underline, lineThrough = textAttribute.lineThrough, keepDirIn3d = textAttribute.keepDirIn3d, direction = textAttribute.direction, fontSize = textAttribute.fontSize, verticalMode = textAttribute.verticalMode, x: originX = textAttribute.x, y: originY = textAttribute.y } = text.attribute;
-        let { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline } = text.attribute;
-        if (!verticalMode && direction === 'vertical') {
-            const t = textAlign;
-            textAlign = (_a = text.getBaselineMapAlign()[textBaseline]) !== null && _a !== void 0 ? _a : 'left';
-            textBaseline = (_b = text.getAlignMapBaseline()[t]) !== null && _b !== void 0 ? _b : 'top';
-        }
-        const lineHeight = (_c = calculateLineHeight(text.attribute.lineHeight, fontSize)) !== null && _c !== void 0 ? _c : fontSize;
+        const lineHeight = (_a = calculateLineHeight(text.attribute.lineHeight, fontSize)) !== null && _a !== void 0 ? _a : fontSize;
         const data = this.valid(text, textAttribute, fillCb, strokeCb);
         if (!data) {
             return;
@@ -17841,7 +17981,6 @@ let DefaultCanvasTextRender = class DefaultCanvasTextRender extends BaseRender {
                 else if (fVisible) {
                     context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);
                     context.fillText(t, _x, _y, z);
-                    this.drawUnderLine(underline, lineThrough, text, _x, _y, z, textAttribute, context);
                 }
             }
             if (direction) {
@@ -17849,132 +17988,88 @@ let DefaultCanvasTextRender = class DefaultCanvasTextRender extends BaseRender {
                 context.setTransformForCurrent();
             }
         };
-        if (text.isMultiLine) {
-            context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);
-            if (direction === 'horizontal') {
-                const { multilineLayout } = text;
-                if (!multilineLayout) {
-                    context.highPerformanceRestore();
-                    return;
-                }
-                const { xOffset, yOffset } = multilineLayout.bbox;
-                if (doStroke) {
-                    if (strokeCb) {
-                        strokeCb(context, text.attribute, textAttribute);
-                    }
-                    else if (sVisible) {
-                        context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);
-                        multilineLayout.lines.forEach(line => {
-                            context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
-                        });
-                    }
-                }
-                if (doFill) {
-                    if (fillCb) {
-                        fillCb(context, text.attribute, textAttribute);
-                    }
-                    else if (fVisible) {
-                        context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);
-                        multilineLayout.lines.forEach(line => {
-                            context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
-                            this.drawUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y - textDrawOffsetY('bottom', fontSize) - 0.05 * fontSize, z, textAttribute, context, {
-                                width: line.width
-                            });
-                        });
-                    }
-                }
+        context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);
+        if (direction === 'horizontal') {
+            const { multilineLayout } = text;
+            if (!multilineLayout) {
+                context.highPerformanceRestore();
+                return;
             }
-            else {
-                text.tryUpdateAABBBounds();
-                const cache = text.cache;
-                const { verticalList } = cache;
-                context.textAlign = 'left';
-                context.textBaseline = 'top';
-                const totalHeight = lineHeight * verticalList.length;
-                let totalW = 0;
-                verticalList.forEach(verticalData => {
-                    const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);
-                    totalW = max(_w, totalW);
-                });
-                let offsetY = 0;
-                let offsetX = 0;
-                if (textBaseline === 'bottom') {
-                    offsetX = -totalHeight;
+            const { xOffset, yOffset } = multilineLayout.bbox;
+            if (doStroke) {
+                if (strokeCb) {
+                    strokeCb(context, text.attribute, textAttribute);
                 }
-                else if (textBaseline === 'middle') {
-                    offsetX = -totalHeight / 2;
+                else if (sVisible) {
+                    context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);
+                    multilineLayout.lines.forEach(line => {
+                        context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
+                    });
                 }
-                if (textAlign === 'center') {
-                    offsetY -= totalW / 2;
+            }
+            if (doFill) {
+                if (fillCb) {
+                    fillCb(context, text.attribute, textAttribute);
                 }
-                else if (textAlign === 'right') {
-                    offsetY -= totalW;
-                }
-                verticalList.forEach((verticalData, i) => {
-                    const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0);
-                    const dw = totalW - currentW;
-                    let currentOffsetY = offsetY;
-                    if (textAlign === 'center') {
-                        currentOffsetY += dw / 2;
-                    }
-                    else if (textAlign === 'right') {
-                        currentOffsetY += dw;
-                    }
-                    verticalData.forEach(item => {
-                        const { text, width, direction } = item;
-                        drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction);
-                        currentOffsetY += width;
+                else if (fVisible) {
+                    context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);
+                    multilineLayout.lines.forEach(line => {
+                        context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
+                        this.drawUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, line.descent, (line.descent - line.ascent) / 2, z, textAttribute, context, {
+                            width: line.width
+                        });
                     });
-                });
+                }
             }
         }
         else {
-            if (direction === 'horizontal') {
-                context.setTextStyle(text.attribute, textAttribute, z);
-                const t = text.clipedText;
-                let dy = 0;
-                if (lineHeight !== fontSize) {
-                    if (textBaseline === 'top') {
-                        dy = (lineHeight - fontSize) / 2;
-                    }
-                    else if (textBaseline === 'middle') ;
-                    else if (textBaseline === 'bottom') {
-                        dy = -(lineHeight - fontSize) / 2;
-                    }
-                    else ;
-                }
-                drawText(t, 0, dy, 0);
+            let { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline } = text.attribute;
+            if (!verticalMode) {
+                const t = textAlign;
+                textAlign = (_b = text.getBaselineMapAlign()[textBaseline]) !== null && _b !== void 0 ? _b : 'left';
+                textBaseline = (_c = text.getAlignMapBaseline()[t]) !== null && _c !== void 0 ? _c : 'top';
+            }
+            text.tryUpdateAABBBounds();
+            const cache = text.cache;
+            const { verticalList } = cache;
+            context.textAlign = 'left';
+            context.textBaseline = 'top';
+            const totalHeight = lineHeight * verticalList.length;
+            let totalW = 0;
+            verticalList.forEach(verticalData => {
+                const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);
+                totalW = max(_w, totalW);
+            });
+            let offsetY = 0;
+            let offsetX = 0;
+            if (textBaseline === 'bottom') {
+                offsetX = -totalHeight;
             }
-            else {
-                text.tryUpdateAABBBounds();
-                const cache = text.cache;
-                if (cache) {
-                    context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);
-                    const { verticalList } = cache;
-                    let offsetY = 0;
-                    const totalW = verticalList[0].reduce((a, b) => a + (b.width || 0), 0);
-                    let offsetX = 0;
-                    if (textBaseline === 'bottom') {
-                        offsetX = -lineHeight;
-                    }
-                    else if (textBaseline === 'middle') {
-                        offsetX = -lineHeight / 2;
-                    }
-                    if (textAlign === 'center') {
-                        offsetY -= totalW / 2;
-                    }
-                    else if (textAlign === 'right') {
-                        offsetY -= totalW;
-                    }
-                    context.textAlign = 'left';
-                    context.textBaseline = 'top';
-                    verticalList[0].forEach(item => {
-                        const { text, width, direction } = item;
-                        drawText(text, offsetX, offsetY, direction);
-                        offsetY += width;
-                    });
-                }
+            else if (textBaseline === 'middle') {
+                offsetX = -totalHeight / 2;
             }
+            if (textAlign === 'center') {
+                offsetY -= totalW / 2;
+            }
+            else if (textAlign === 'right') {
+                offsetY -= totalW;
+            }
+            verticalList.forEach((verticalData, i) => {
+                const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0);
+                const dw = totalW - currentW;
+                let currentOffsetY = offsetY;
+                if (textAlign === 'center') {
+                    currentOffsetY += dw / 2;
+                }
+                else if (textAlign === 'right') {
+                    currentOffsetY += dw;
+                }
+                verticalData.forEach(item => {
+                    const { text, width, direction } = item;
+                    drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction);
+                    currentOffsetY += width;
+                });
+            });
         }
         transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context);
         this.afterRenderStep(text, context, x, y, doFill, doStroke, fVisible, sVisible, textAttribute, drawContext, fillCb, strokeCb);
@@ -17985,37 +18080,32 @@ let DefaultCanvasTextRender = class DefaultCanvasTextRender extends BaseRender {
         const computed3dMatrix = !keepDirIn3d;
         this._draw(text, textAttribute, computed3dMatrix, drawContext, params);
     }
-    drawUnderLine(underline, lineThrough, text, x, y, z, textAttribute, context, multiOption) {
+    drawUnderLine(underline, lineThrough, text, anchorX, anchorY, offsetUnderLineY, offsetThroughLineY, z, textAttribute, context, multiOption) {
         if (lineThrough + underline <= 0) {
             return;
         }
-        const { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline, fontSize = textAttribute.fontSize, fill = textAttribute.fill, opacity = textAttribute.opacity, underlineOffset = textAttribute.underlineOffset, underlineDash = textAttribute.underlineDash, fillOpacity = textAttribute.fillOpacity } = text.attribute;
+        const { textAlign = textAttribute.textAlign, fill = textAttribute.fill, opacity = textAttribute.opacity, underlineOffset = textAttribute.underlineOffset, underlineDash = textAttribute.underlineDash, fillOpacity = textAttribute.fillOpacity } = text.attribute;
         const isMulti = !isNil(multiOption);
         const w = isMulti ? multiOption.width : text.clipedWidth;
         const offsetX = isMulti ? 0 : textDrawOffsetX(textAlign, w);
-        const offsetY = textLayoutOffsetY(isMulti ? 'alphabetic' : textBaseline, fontSize, fontSize);
         const attribute = { lineWidth: 0, stroke: fill, opacity, strokeOpacity: fillOpacity };
-        let deltaY = isMulti ? -3 : 0;
         if (underline) {
             attribute.lineWidth = underline;
-            context.setStrokeStyle(text, attribute, x, y, textAttribute);
+            context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);
             underlineDash && context.setLineDash(underlineDash);
             context.beginPath();
-            const dy = y + offsetY + fontSize + underlineOffset + deltaY;
-            context.moveTo(x + offsetX, dy, z);
-            context.lineTo(x + offsetX + w, dy, z);
+            const dy = anchorY + offsetUnderLineY + underlineOffset;
+            context.moveTo(anchorX + offsetX, dy, z);
+            context.lineTo(anchorX + offsetX + w, dy, z);
             context.stroke();
         }
-        if (isMulti) {
-            deltaY = -1;
-        }
         if (lineThrough) {
             attribute.lineWidth = lineThrough;
-            context.setStrokeStyle(text, attribute, x, y, textAttribute);
+            context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);
             context.beginPath();
-            const dy = y + offsetY + fontSize / 2 + deltaY;
-            context.moveTo(x + offsetX, dy, z);
-            context.lineTo(x + offsetX + w, dy, z);
+            const dy = anchorY + offsetThroughLineY;
+            context.moveTo(anchorX + offsetX, dy, z);
+            context.lineTo(anchorX + offsetX + w, dy, z);
             context.stroke();
         }
     }
@@ -18455,18 +18545,16 @@ let DefaultCanvasImageRender = class DefaultCanvasImageRender extends BaseRender
     }
     draw(image, renderService, drawContext) {
         const { image: url } = image.attribute;
-        if (!image.isGifImage) {
-            if (!url || !image.resources) {
-                return;
-            }
-            const res = image.resources.get(url);
-            if (res.state === 'loading' && isString(url)) {
-                ResourceLoader.improveImageLoading(url);
-                return;
-            }
-            else if (res.state !== 'success') {
-                return;
-            }
+        if (!url || !image.resources) {
+            return;
+        }
+        const res = image.resources.get(url);
+        if (res.state === 'loading' && isString(url)) {
+            ResourceLoader.improveImageLoading(url);
+            return;
+        }
+        else if (res.state !== 'success') {
+            return;
         }
         const { context } = renderService.drawParams;
         if (!context) {
@@ -19046,40 +19134,6 @@ class CanvasTextLayout {
         }
         return bbox;
     }
-    GetLayout(str, width, height, textAlign, textBaseline, lineHeight, suffix, wordBreak, suffixPosition) {
-        const linesLayout = [];
-        const bboxWH = [width, height];
-        const bboxOffset = [0, 0];
-        while (str.length > 0) {
-            const { str: clipText } = this.textMeasure.clipTextWithSuffix(str, this.textOptions, width, suffix, wordBreak, suffixPosition);
-            linesLayout.push({
-                str: clipText,
-                width: this.textMeasure.measureTextWidth(clipText, this.textOptions)
-            });
-            str = str.substring(clipText.length);
-        }
-        if (textAlign === 'left' || textAlign === 'start') ;
-        else if (textAlign === 'center') {
-            bboxOffset[0] = bboxWH[0] / -2;
-        }
-        else if (textAlign === 'right' || textAlign === 'end') {
-            bboxOffset[0] = -bboxWH[0];
-        }
-        if (textBaseline === 'top') ;
-        else if (textBaseline === 'middle') {
-            bboxOffset[1] = bboxWH[1] / -2;
-        }
-        else if (textBaseline === 'bottom') {
-            bboxOffset[1] = -bboxWH[1];
-        }
-        const bbox = {
-            xOffset: bboxOffset[0],
-            yOffset: bboxOffset[1],
-            width: bboxWH[0],
-            height: bboxWH[1]
-        };
-        return this.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
-    }
     GetLayoutByLines(lines, textAlign, textBaseline, lineHeight, suffix = '', wordBreak, lineWidth, suffixPosition = 'end') {
         lines = lines.map(l => l.toString());
         const linesLayout = [];
@@ -19087,10 +19141,15 @@ class CanvasTextLayout {
         if (typeof lineWidth === 'number' && lineWidth !== Infinity) {
             let width;
             for (let i = 0, len = lines.length; i < len; i++) {
-                width = Math.min(this.textMeasure.measureTextWidth(lines[i], this.textOptions), lineWidth);
+                const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
+                width = Math.min(metrics.width, lineWidth);
                 linesLayout.push({
-                    str: this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
-                    width
+                    str: metrics.width <= lineWidth
+                        ? lines[i].toString()
+                        : this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
+                    width,
+                    ascent: metrics.ascent,
+                    descent: metrics.descent
                 });
             }
             bboxWH[0] = lineWidth;
@@ -19101,9 +19160,10 @@ class CanvasTextLayout {
             let text;
             for (let i = 0, len = lines.length; i < len; i++) {
                 text = lines[i];
-                width = this.textMeasure.measureTextWidth(text, this.textOptions);
+                const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
+                width = metrics.width;
                 lineWidth = Math.max(lineWidth, width);
-                linesLayout.push({ str: text, width });
+                linesLayout.push({ str: text, width, ascent: metrics.ascent, descent: metrics.descent });
             }
             bboxWH[0] = lineWidth;
         }
@@ -19152,7 +19212,7 @@ class CanvasTextLayout {
         else if (textAlign === 'right' || textAlign === 'end') {
             line.leftOffset = bbox.width - line.width;
         }
-        line.topOffset = (lineHeight - this.textOptions.fontSize) / 2 + this.textOptions.fontSize * 0.79 + origin[1];
+        line.topOffset = lineHeight / 2 + (line.ascent - line.descent) / 2 + origin[1];
         origin[1] += lineHeight;
         return line;
     }
@@ -19161,6 +19221,7 @@ class CanvasTextLayout {
 const TEXT_UPDATE_TAG_KEY = [
     'text',
     'maxLineWidth',
+    'maxWidth',
     'textAlign',
     'textBaseline',
     'heightLimit',
@@ -19188,20 +19249,14 @@ class Text extends Graphic {
         var _a;
         const attribute = this.attribute;
         const textTheme = this.getGraphicTheme();
-        if (!this.isSimplify()) {
-            return undefined;
-        }
-        const { maxLineWidth = textTheme.maxLineWidth } = attribute;
-        if (!Number.isFinite(maxLineWidth)) {
+        const maxWidth = this.getMaxWidth(textTheme);
+        if (!Number.isFinite(maxWidth)) {
             return ((_a = attribute.text) !== null && _a !== void 0 ? _a : textTheme.text).toString();
         }
         this.tryUpdateAABBBounds();
         return this.cache.clipedText;
     }
     get clipedWidth() {
-        if (!this.isSimplify()) {
-            return undefined;
-        }
         this.tryUpdateAABBBounds();
         return this.cache.clipedWidth;
     }
@@ -19209,10 +19264,11 @@ class Text extends Graphic {
         var _a, _b;
         const textTheme = this.getGraphicTheme();
         const attribute = this.attribute;
-        const { maxLineWidth = textTheme.maxLineWidth, text, whiteSpace = textTheme.whiteSpace } = attribute;
-        if (!Number.isFinite(maxLineWidth)) {
+        const maxWidth = this.getMaxWidth(textTheme);
+        if (!Number.isFinite(maxWidth)) {
             return false;
         }
+        const { text } = this.attribute;
         this.tryUpdateAABBBounds();
         if ((_b = (_a = this.cache) === null || _a === void 0 ? void 0 : _a.layoutData) === null || _b === void 0 ? void 0 : _b.lines) {
             let mergedText = '';
@@ -19231,15 +19287,9 @@ class Text extends Graphic {
         return this.clipedText !== attribute.text.toString();
     }
     get multilineLayout() {
-        if (!this.isMultiLine) {
-            return undefined;
-        }
         this.tryUpdateAABBBounds();
         return this.cache.layoutData;
     }
-    isSimplify() {
-        return !this.isMultiLine && this.attribute.direction !== 'vertical';
-    }
     get isMultiLine() {
         return Array.isArray(this.attribute.text) || this.attribute.whiteSpace === 'normal';
     }
@@ -19307,13 +19357,64 @@ class Text extends Graphic {
         transformBoundsWithMatrix(aabbBounds, aabbBounds, this.transMatrix);
         return aabbBounds;
     }
+    updateSingallineAABBBounds(text) {
+        this.updateMultilineAABBBounds([text]);
+        const layoutData = this.cache.layoutData;
+        if (layoutData) {
+            const line = layoutData.lines[0];
+            this.cache.clipedText = line.str;
+            this.cache.clipedWidth = line.width;
+        }
+        return this._AABBBounds;
+    }
+    updateMultilineAABBBounds(text) {
+        const textTheme = this.getGraphicTheme();
+        const { direction = textTheme.direction, underlineOffset = textTheme.underlineOffset } = this.attribute;
+        const b = direction === 'horizontal'
+            ? this.updateHorizontalMultilineAABBBounds(text)
+            : this.updateVerticalMultilineAABBBounds(text);
+        if (direction === 'horizontal') {
+            if (underlineOffset) {
+                this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset);
+            }
+        }
+        return b;
+    }
+    updateHorizontalMultilineAABBBounds(text) {
+        var _a;
+        const textTheme = this.getGraphicTheme();
+        const attribute = this.attribute;
+        const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, wrap = textTheme.wrap, ignoreBuf = textTheme.ignoreBuf, lineWidth = textTheme.lineWidth, whiteSpace = textTheme.whiteSpace, suffixPosition = textTheme.suffixPosition } = attribute;
+        const lineHeight = this.getLineHeight(attribute, textTheme);
+        if (whiteSpace === 'normal' || wrap) {
+            return this.updateWrapAABBBounds(text);
+        }
+        if (!this.shouldUpdateShape() && ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.layoutData)) {
+            const bbox = this.cache.layoutData.bbox;
+            this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
+            if (stroke) {
+                this._AABBBounds.expand(lineWidth / 2);
+            }
+            return this._AABBBounds;
+        }
+        const textMeasure = application.graphicUtil.textMeasure;
+        const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);
+        const layoutData = layoutObj.GetLayoutByLines(text, textAlign, textBaseline, lineHeight, ellipsis === true ? textTheme.ellipsis : ellipsis || undefined, false, maxLineWidth, suffixPosition);
+        const { bbox } = layoutData;
+        this.cache.layoutData = layoutData;
+        this.clearUpdateShapeTag();
+        this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
+        if (stroke) {
+            this._AABBBounds.expand(lineWidth / 2);
+        }
+        return this._AABBBounds;
+    }
     updateWrapAABBBounds(text) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const textTheme = this.getGraphicTheme();
         const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak, fontWeight = textTheme.fontWeight, ignoreBuf = textTheme.ignoreBuf, suffixPosition = textTheme.suffixPosition, heightLimit = 0, lineClamp } = this.attribute;
-        const lineHeight = (_a = calculateLineHeight(this.attribute.lineHeight, this.attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (this.attribute.fontSize || textTheme.fontSize);
-        const buf = ignoreBuf ? 0 : 2;
-        if (!this.shouldUpdateShape() && ((_b = this.cache) === null || _b === void 0 ? void 0 : _b.layoutData)) {
+        const lineHeight = this.getLineHeight(this.attribute, textTheme);
+        if (!this.shouldUpdateShape() && ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.layoutData)) {
             const bbox = this.cache.layoutData.bbox;
             this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
             if (stroke) {
@@ -19322,7 +19423,8 @@ class Text extends Graphic {
             return this._AABBBounds;
         }
         const textMeasure = application.graphicUtil.textMeasure;
-        const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);
+        const textOptions = { fontSize, fontWeight, fontFamily };
+        const layoutObj = new CanvasTextLayout(fontFamily, textOptions, textMeasure);
         const lines = isArray(text) ? text.map(l => l.toString()) : [text.toString()];
         const linesLayout = [];
         const bboxWH = [0, 0];
@@ -19339,19 +19441,22 @@ class Text extends Graphic {
                     const str = lines[i];
                     let needCut = true;
                     if (i === lineCountLimit - 1) {
-                        const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, false, suffixPosition, i !== lines.length - 1);
+                        const clip = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, false, suffixPosition, i !== lines.length - 1);
+                        const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
                         linesLayout.push({
                             str: clip.str,
-                            width: clip.width
+                            width: clip.width,
+                            ascent: matrics.ascent,
+                            descent: matrics.descent
                         });
                         break;
                     }
-                    const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth, wordBreak !== 'break-all', wordBreak === 'keep-all');
+                    const clip = textMeasure.clipText(str, textOptions, maxLineWidth, wordBreak !== 'break-all', wordBreak === 'keep-all');
                     if ((str !== '' && clip.str === '') || clip.wordBreaked) {
                         if (ellipsis) {
-                            const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, false, suffixPosition);
-                            clip.str = (_c = clipEllipsis.str) !== null && _c !== void 0 ? _c : '';
-                            clip.width = (_d = clipEllipsis.width) !== null && _d !== void 0 ? _d : 0;
+                            const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, false, suffixPosition);
+                            clip.str = (_b = clipEllipsis.str) !== null && _b !== void 0 ? _b : '';
+                            clip.width = (_c = clipEllipsis.width) !== null && _c !== void 0 ? _c : 0;
                         }
                         else {
                             clip.str = '';
@@ -19359,9 +19464,12 @@ class Text extends Graphic {
                         }
                         needCut = false;
                     }
+                    const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
                     linesLayout.push({
                         str: clip.str,
-                        width: clip.width
+                        width: clip.width,
+                        ascent: matrics.ascent,
+                        descent: matrics.descent
                     });
                     let cutLength = clip.str.length;
                     if (clip.wordBreaked && !(str !== '' && clip.str === '')) {
@@ -19370,10 +19478,7 @@ class Text extends Graphic {
                     }
                     if (clip.str.length === str.length) ;
                     else if (needCut) {
-                        let newStr = str.substring(cutLength);
-                        if (wordBreak === 'keep-all') {
-                            newStr = newStr.replace(/^\s+/g, '');
-                        }
+                        const newStr = str.substring(cutLength);
                         lines.splice(i + 1, 0, newStr);
                     }
                 }
@@ -19390,22 +19495,26 @@ class Text extends Graphic {
             let text;
             for (let i = 0, len = lines.length; i < len; i++) {
                 if (i === lineCountLimit - 1) {
-                    const clip = layoutObj.textMeasure.clipTextWithSuffix(lines[i], layoutObj.textOptions, maxLineWidth, ellipsis, false, suffixPosition);
+                    const clip = textMeasure.clipTextWithSuffix(lines[i], textOptions, maxLineWidth, ellipsis, false, suffixPosition);
+                    const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
                     linesLayout.push({
                         str: clip.str,
-                        width: clip.width
+                        width: clip.width,
+                        ascent: matrics.ascent,
+                        descent: matrics.descent
                     });
                     lineWidth = Math.max(lineWidth, clip.width);
                     break;
                 }
                 text = lines[i];
-                width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions, wordBreak === 'break-word');
+                width = textMeasure.measureTextWidth(text, textOptions);
                 lineWidth = Math.max(lineWidth, width);
-                linesLayout.push({ str: text, width });
+                const matrics = textMeasure.measureTextPixelADscentAndWidth(text, textOptions);
+                linesLayout.push({ str: text, width, ascent: matrics.ascent, descent: matrics.descent });
             }
             bboxWH[0] = lineWidth;
         }
-        bboxWH[1] = linesLayout.length * (lineHeight + buf);
+        bboxWH[1] = linesLayout.length * lineHeight;
         const bbox = {
             xOffset: 0,
             yOffset: 0,
@@ -19422,212 +19531,19 @@ class Text extends Graphic {
         }
         return this._AABBBounds;
     }
-    updateSingallineAABBBounds(text) {
-        const textTheme = this.getGraphicTheme();
-        const { direction = textTheme.direction, underlineOffset = textTheme.underlineOffset } = this.attribute;
-        const b = direction === 'horizontal'
-            ? this.updateHorizontalSinglelineAABBBounds(text)
-            : this.updateVerticalSinglelineAABBBounds(text);
-        if (direction === 'horizontal') {
-            if (underlineOffset) {
-                this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset);
-            }
-        }
-        return b;
-    }
-    updateMultilineAABBBounds(text) {
-        const textTheme = this.getGraphicTheme();
-        const { direction = textTheme.direction, underlineOffset = textTheme.underlineOffset } = this.attribute;
-        const b = direction === 'horizontal'
-            ? this.updateHorizontalMultilineAABBBounds(text)
-            : this.updateVerticalMultilineAABBBounds(text);
-        if (direction === 'horizontal') {
-            if (underlineOffset) {
-                this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset);
-            }
-        }
-        return b;
-    }
-    updateHorizontalSinglelineAABBBounds(text) {
-        var _a, _b;
-        const textTheme = this.getGraphicTheme();
-        const { wrap = textTheme.wrap } = this.attribute;
-        if (wrap) {
-            return this.updateWrapAABBBounds([text]);
-        }
-        const textMeasure = application.graphicUtil.textMeasure;
-        let width;
-        let str;
-        const attribute = this.attribute;
-        const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontFamily = textTheme.fontFamily, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, ignoreBuf = textTheme.ignoreBuf, whiteSpace = textTheme.whiteSpace, suffixPosition = textTheme.suffixPosition } = attribute;
-        if (whiteSpace === 'normal') {
-            return this.updateWrapAABBBounds(text);
-        }
-        const buf = ignoreBuf ? 0 : Math.max(2, fontSize * 0.075);
-        const textFontSize = attribute.fontSize || textTheme.fontSize;
-        const lineHeight = (_a = calculateLineHeight(attribute.lineHeight, textFontSize)) !== null && _a !== void 0 ? _a : textFontSize + buf;
-        if (!this.shouldUpdateShape() && this.cache) {
-            width = (_b = this.cache.clipedWidth) !== null && _b !== void 0 ? _b : 0;
-            const dx = textDrawOffsetX(textAlign, width);
-            const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-            this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);
-            if (stroke) {
-                this._AABBBounds.expand(lineWidth / 2);
-            }
-            return this._AABBBounds;
-        }
-        if (Number.isFinite(maxLineWidth)) {
-            if (ellipsis) {
-                const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis);
-                const data = textMeasure.clipTextWithSuffix(text.toString(), { fontSize, fontWeight, fontFamily }, maxLineWidth, strEllipsis, false, suffixPosition);
-                str = data.str;
-                width = data.width;
-            }
-            else {
-                const data = textMeasure.clipText(text.toString(), { fontSize, fontWeight, fontFamily }, maxLineWidth, false);
-                str = data.str;
-                width = data.width;
-            }
-            this.cache.clipedText = str;
-            this.cache.clipedWidth = width;
-        }
-        else {
-            width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontWeight, fontFamily });
-            this.cache.clipedText = text.toString();
-            this.cache.clipedWidth = width;
-        }
-        this.clearUpdateShapeTag();
-        const dx = textDrawOffsetX(textAlign, width);
-        let lh = lineHeight;
-        if (application.global && application.global.isSafari()) {
-            lh += fontSize * 0.2;
-        }
-        const dy = textLayoutOffsetY(textBaseline, lh, fontSize, buf);
-        this._AABBBounds.set(dx, dy, dx + width, dy + lh);
-        if (stroke) {
-            this._AABBBounds.expand(lineWidth / 2);
-        }
-        return this._AABBBounds;
-    }
-    getBaselineMapAlign() {
-        return Text.baselineMapAlign;
-    }
-    getAlignMapBaseline() {
-        return Text.alignMapBaseline;
-    }
-    updateVerticalSinglelineAABBBounds(text) {
-        var _a, _b, _c;
-        const textTheme = this.getGraphicTheme();
-        const textMeasure = application.graphicUtil.textMeasure;
-        let width;
-        const attribute = this.attribute;
-        const { ignoreBuf = textTheme.ignoreBuf } = attribute;
-        const buf = ignoreBuf ? 0 : 2;
-        const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, fontFamily = textTheme.fontFamily, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, verticalMode = textTheme.verticalMode, suffixPosition = textTheme.suffixPosition } = attribute;
-        const lineHeight = (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
-        let { textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline } = attribute;
-        if (!verticalMode) {
-            const t = textAlign;
-            textAlign = (_b = Text.baselineMapAlign[textBaseline]) !== null && _b !== void 0 ? _b : 'left';
-            textBaseline = (_c = Text.alignMapBaseline[t]) !== null && _c !== void 0 ? _c : 'top';
-        }
-        if (!this.shouldUpdateShape() && this.cache) {
-            width = this.cache.clipedWidth;
-            const dx = textDrawOffsetX(textAlign, width);
-            const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-            this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);
-            if (stroke) {
-                this._AABBBounds.expand(lineWidth / 2);
-            }
-            return this._AABBBounds;
-        }
-        let verticalList = [
-            verticalLayout(text.toString())
-        ];
-        if (Number.isFinite(maxLineWidth)) {
-            if (ellipsis) {
-                const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis);
-                const data = textMeasure.clipTextWithSuffixVertical(verticalList[0], { fontSize, fontWeight, fontFamily }, maxLineWidth, strEllipsis, false, suffixPosition);
-                verticalList = [data.verticalList];
-                width = data.width;
-            }
-            else {
-                const data = textMeasure.clipTextVertical(verticalList[0], { fontSize, fontWeight, fontFamily }, maxLineWidth, false);
-                verticalList = [data.verticalList];
-                width = data.width;
-            }
-            this.cache.verticalList = verticalList;
-            this.cache.clipedWidth = width;
-        }
-        else {
-            width = 0;
-            verticalList[0].forEach(t => {
-                const w = t.direction === TextDirection.HORIZONTAL
-                    ? fontSize
-                    : textMeasure.measureTextWidth(t.text, { fontSize, fontWeight, fontFamily });
-                width += w;
-                t.width = w;
-            });
-            this.cache.verticalList = verticalList;
-            this.cache.clipedWidth = width;
-        }
-        this.clearUpdateShapeTag();
-        const dx = textDrawOffsetX(textAlign, width);
-        const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-        this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);
-        if (stroke) {
-            this._AABBBounds.expand(lineWidth / 2);
-        }
-        return this._AABBBounds;
-    }
-    updateHorizontalMultilineAABBBounds(text) {
-        var _a, _b;
-        const textTheme = this.getGraphicTheme();
-        const { wrap = textTheme.wrap } = this.attribute;
-        if (wrap) {
-            return this.updateWrapAABBBounds(text);
-        }
-        const attribute = this.attribute;
-        const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, whiteSpace = textTheme.whiteSpace, suffixPosition = textTheme.suffixPosition } = attribute;
-        const lineHeight = (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize);
-        if (whiteSpace === 'normal') {
-            return this.updateWrapAABBBounds(text);
-        }
-        if (!this.shouldUpdateShape() && ((_b = this.cache) === null || _b === void 0 ? void 0 : _b.layoutData)) {
-            const bbox = this.cache.layoutData.bbox;
-            this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
-            if (stroke) {
-                this._AABBBounds.expand(lineWidth / 2);
-            }
-            return this._AABBBounds;
-        }
-        const textMeasure = application.graphicUtil.textMeasure;
-        const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);
-        const layoutData = layoutObj.GetLayoutByLines(text, textAlign, textBaseline, lineHeight, ellipsis === true ? textTheme.ellipsis : ellipsis || undefined, false, maxLineWidth, suffixPosition);
-        const { bbox } = layoutData;
-        this.cache.layoutData = layoutData;
-        this.clearUpdateShapeTag();
-        this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
-        if (stroke) {
-            this._AABBBounds.expand(lineWidth / 2);
-        }
-        return this._AABBBounds;
-    }
     updateVerticalMultilineAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b;
         const textTheme = this.getGraphicTheme();
         const textMeasure = application.graphicUtil.textMeasure;
         let width;
         const attribute = this.attribute;
-        const { ignoreBuf = textTheme.ignoreBuf } = attribute;
-        const buf = ignoreBuf ? 0 : 2;
         const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, fontFamily = textTheme.fontFamily, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, verticalMode = textTheme.verticalMode, suffixPosition = textTheme.suffixPosition } = attribute;
-        const lineHeight = (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
+        const lineHeight = this.getLineHeight(attribute, textTheme);
         let { textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline } = attribute;
         if (!verticalMode) {
             const t = textAlign;
-            textAlign = (_b = Text.baselineMapAlign[textBaseline]) !== null && _b !== void 0 ? _b : 'left';
-            textBaseline = (_c = Text.alignMapBaseline[t]) !== null && _c !== void 0 ? _c : 'top';
+            textAlign = (_a = Text.baselineMapAlign[textBaseline]) !== null && _a !== void 0 ? _a : 'left';
+            textBaseline = (_b = Text.alignMapBaseline[t]) !== null && _b !== void 0 ? _b : 'top';
         }
         width = 0;
         if (!this.shouldUpdateShape() && this.cache) {
@@ -19687,6 +19603,15 @@ class Text extends Graphic {
         }
         return this._AABBBounds;
     }
+    getMaxWidth(theme) {
+        var _a, _b;
+        const attribute = this.attribute;
+        return (_b = (_a = attribute.maxLineWidth) !== null && _a !== void 0 ? _a : attribute.maxWidth) !== null && _b !== void 0 ? _b : theme.maxWidth;
+    }
+    getLineHeight(attribute, textTheme) {
+        var _a;
+        return ((_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize));
+    }
     needUpdateTags(keys, k = TEXT_UPDATE_TAG_KEY) {
         return super.needUpdateTags(keys, k);
     }
@@ -19699,6 +19624,12 @@ class Text extends Graphic {
     getNoWorkAnimateAttr() {
         return Text.NOWORK_ANIMATE_ATTR;
     }
+    getBaselineMapAlign() {
+        return Text.baselineMapAlign;
+    }
+    getAlignMapBaseline() {
+        return Text.alignMapBaseline;
+    }
 }
 Text.NOWORK_ANIMATE_ATTR = Object.assign({ ellipsis: 1, wordBreak: 1, direction: 1, textAlign: 1, textBaseline: 1, fontFamily: 1, fontWeight: 1 }, NOWORK_ANIMATE_ATTR);
 Text.baselineMapAlign = {
@@ -19762,7 +19693,9 @@ class WrapText extends Text {
                         const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, false, suffixPosition);
                         linesLayout.push({
                             str: clip.str,
-                            width: clip.width
+                            width: clip.width,
+                            ascent: 0,
+                            descent: 0
                         });
                         break;
                     }
@@ -19781,7 +19714,9 @@ class WrapText extends Text {
                     }
                     linesLayout.push({
                         str: clip.str,
-                        width: clip.width
+                        width: clip.width,
+                        ascent: 0,
+                        descent: 0
                     });
                     if (clip.str.length === str.length) ;
                     else if (needCut) {
@@ -19805,7 +19740,9 @@ class WrapText extends Text {
                     const clip = layoutObj.textMeasure.clipTextWithSuffix(lines[i], layoutObj.textOptions, maxLineWidth, ellipsis, false, suffixPosition);
                     linesLayout.push({
                         str: clip.str,
-                        width: clip.width
+                        width: clip.width,
+                        ascent: 0,
+                        descent: 0
                     });
                     lineWidth = Math.max(lineWidth, clip.width);
                     break;
@@ -19813,7 +19750,7 @@ class WrapText extends Text {
                 text = lines[i];
                 width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions, wordBreak === 'break-word');
                 lineWidth = Math.max(lineWidth, width);
-                linesLayout.push({ str: text, width });
+                linesLayout.push({ str: text, width, ascent: 0, descent: 0 });
             }
             bboxWH[0] = lineWidth;
         }
@@ -19876,6 +19813,9 @@ class BaseSymbol {
             bounds.y2 = size[1] / 2;
         }
     }
+    parseSize(size) {
+        return isNumber(size) ? size : Math.min(size[0], size[1]);
+    }
 }
 
 function circle(ctx, r, x, y, z) {
@@ -19894,15 +19834,15 @@ class CircleSymbol extends BaseSymbol {
         this.pathStr = 'M0.5,0A0.5,0.5,0,1,1,-0.5,0A0.5,0.5,0,1,1,0.5,0';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return circle(ctx, r, x, y, z);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return circle(ctx, r, x, y, z);
     }
     drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y} a ${r},${r} 0 1,0 ${r * 2},0 a ${r},${r} 0 1,0 -${r * 2},0`;
     }
 }
@@ -19947,11 +19887,11 @@ class CrossSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,-0.2L-0.5,0.2L-0.2,0.2L-0.2,0.5L0.2,0.5L0.2,0.2L0.5,0.2L0.5,-0.2L0.2,-0.2L0.2,-0.5L-0.2,-0.5L-0.2,-0.2Z';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 6;
+        const r = this.parseSize(size) / 6;
         return cross(ctx, r, x, y, z);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 6;
+        const r = this.parseSize(size) / 6;
         return crossOffset(ctx, r, x, y, offset, z);
     }
 }
@@ -19972,15 +19912,15 @@ class DiamondSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,0L0,-0.5L0.5,0L0,0.5Z';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return diamond(ctx, r, x, y, z);
     }
     drawFitDir(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return diamond(ctx, r, x, y, z);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return diamond(ctx, r, x, y, z);
     }
 }
@@ -19998,11 +19938,11 @@ class SquareSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,-0.5h1v1h-1Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return square(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return square(ctx, r, x, y);
     }
 }
@@ -20022,11 +19962,11 @@ class TriangleUpSymbol extends BaseSymbol {
         this.pathStr = 'M0.5,0.5 L-0.5,0.5 L0,-0.5 Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglUpOffset(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglUpOffset(ctx, r, x, y, offset);
     }
 }
@@ -20065,11 +20005,11 @@ class StarSymbol extends BaseSymbol {
         this.pathStr = 'M0 -1L0.22451398828979266 -0.3090169943749474L0.9510565162951535 -0.30901699437494745L0.3632712640026804 0.1180339887498948L0.5877852522924732 0.8090169943749473L8.326672684688674e-17 0.3819660112501051L-0.587785252292473 0.8090169943749476L-0.3632712640026804 0.11803398874989487L-0.9510565162951536 -0.30901699437494723L-0.22451398828979274 -0.30901699437494734Z';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return star(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return star(ctx, r, transX, transY);
     }
 }
@@ -20098,11 +20038,11 @@ class ArrowSymbol extends BaseSymbol {
         this.pathStr = 'M-0.07142857142857142,0.5L0.07142857142857142,0.5L0.07142857142857142,-0.0625L0.2,-0.0625L0,-0.5L-0.2,-0.0625L-0.07142857142857142,-0.0625Z';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return arrow(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return arrow(ctx, r, transX, transY);
     }
 }
@@ -20123,11 +20063,11 @@ class WedgeSymbol extends BaseSymbol {
         this.pathStr = 'M0,-0.5773502691896257L-0.125,0.28867513459481287L0.125,0.28867513459481287Z';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return wedge(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return wedge(ctx, r, transX, transY);
     }
 }
@@ -20145,11 +20085,11 @@ class StrokeSymbol extends BaseSymbol {
         this.pathStr = '';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return stroke(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return stroke(ctx, r, transX, transY);
     }
 }
@@ -20184,11 +20124,11 @@ class WyeSymbol extends BaseSymbol {
         this.pathStr = 'M0.25 0.14433756729740646L0.25 0.6443375672974064L-0.25 0.6443375672974064L-0.25 0.14433756729740643L-0.6830127018922193 -0.10566243270259357L-0.4330127018922193 -0.5386751345948129L0 -0.28867513459481287L0.4330127018922193 -0.5386751345948129L0.6830127018922193 -0.10566243270259357Z';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return wye(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return wye(ctx, r, transX, transY);
     }
 }
@@ -20208,11 +20148,11 @@ class TriangleLeftSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,0 L0.5,0.5 L0.5,-0.5 Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglLeftOffset(ctx, r, x, y, 0);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglLeftOffset(ctx, r, x, y, offset);
     }
 }
@@ -20232,11 +20172,11 @@ class TriangleRightSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,0.5 L0.5,0 L-0.5,-0.5 Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglRightOffset(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglRightOffset(ctx, r, x, y, offset);
     }
 }
@@ -20256,11 +20196,11 @@ class TriangleDownSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,-0.5 L0.5,-0.5 L0,0.5 Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglDownOffset(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return trianglDownOffset(ctx, r, x, y, offset);
     }
 }
@@ -20282,11 +20222,11 @@ class ThinTriangleSymbol extends BaseSymbol {
         this.pathStr = 'M0,-0.5773502691896257L-0.5,0.28867513459481287L0.5,0.28867513459481287Z';
     }
     draw(ctx, size, x, y) {
-        const r = size / 2 / sqrt3;
+        const r = this.parseSize(size) / 2 / sqrt3;
         return thinTriangle(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset) {
-        const r = size / 2 / sqrt3 + offset;
+        const r = this.parseSize(size) / 2 / sqrt3 + offset;
         return thinTriangle(ctx, r, x, y);
     }
 }
@@ -20306,11 +20246,11 @@ class Arrow2LeftSymbol extends BaseSymbol {
         this.pathStr = 'M 0.25 -0.5 L -0.25 0 l 0.25 0.5';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 4;
+        const r = this.parseSize(size) / 4;
         return arrow2Left(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 4 + offset;
+        const r = this.parseSize(size) / 4 + offset;
         return arrow2Left(ctx, r, transX, transY);
     }
 }
@@ -20330,11 +20270,11 @@ class Arrow2RightSymbol extends BaseSymbol {
         this.pathStr = 'M -0.25 -0.5 l 0.25 0 l -0.25 0.5';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 4;
+        const r = this.parseSize(size) / 4;
         return arrow2Right(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 4 + offset;
+        const r = this.parseSize(size) / 4 + offset;
         return arrow2Right(ctx, r, transX, transY);
     }
 }
@@ -20354,11 +20294,11 @@ class Arrow2UpSymbol extends BaseSymbol {
         this.pathStr = 'M -0.5 0.25 L 0 -0.25 l 0.5 0.25';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 4;
+        const r = this.parseSize(size) / 4;
         return arrow2Up(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 4 + offset;
+        const r = this.parseSize(size) / 4 + offset;
         return arrow2Up(ctx, r, transX, transY);
     }
 }
@@ -20378,11 +20318,11 @@ class Arrow2DownSymbol extends BaseSymbol {
         this.pathStr = 'M -0.5 -0.25 L 0 0.25 l 0.5 -0.25';
     }
     draw(ctx, size, transX, transY) {
-        const r = size / 4;
+        const r = this.parseSize(size) / 4;
         return arrow2Down(ctx, r, transX, transY);
     }
     drawOffset(ctx, size, transX, transY, offset) {
-        const r = size / 4 + offset;
+        const r = this.parseSize(size) / 4 + offset;
         return arrow2Down(ctx, r, transX, transY);
     }
 }
@@ -20400,15 +20340,15 @@ class LineVSymbol extends BaseSymbol {
         this.pathStr = 'M0,-0.5L0,0.5';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return lineV(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return lineV(ctx, r, x, y);
     }
     drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x}, ${y - r} L ${x},${y + r}`;
     }
 }
@@ -20426,15 +20366,15 @@ class LineHSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,0L0.5,0';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return lineH(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return lineH(ctx, r, x, y);
     }
     drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y} L ${x + r},${y}`;
     }
 }
@@ -20454,15 +20394,15 @@ class CloseSymbol extends BaseSymbol {
         this.pathStr = 'M-0.5,-0.5L0.5,0.5,M0.5,-0.5L-0.5,0.5';
     }
     draw(ctx, size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return close(ctx, r, x, y);
     }
     drawOffset(ctx, size, x, y, offset, z) {
-        const r = size / 2 + offset;
+        const r = this.parseSize(size) / 2 + offset;
         return close(ctx, r, x, y);
     }
     drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y - r} L ${x + r},${y + r} M ${x + r}, ${y - r} L ${x - r},${y + r}`;
     }
 }
@@ -20513,6 +20453,7 @@ class CustomSymbolClass {
         this.isSvg = isSvg;
     }
     drawOffset(ctx, size, x, y, offset, z, cb) {
+        size = this.parseSize(size);
         if (this.isSvg) {
             if (!this.svgCache) {
                 return false;
@@ -20528,9 +20469,14 @@ class CustomSymbolClass {
         return false;
     }
     draw(ctx, size, x, y, z, cb) {
+        size = this.parseSize(size);
         return this.drawOffset(ctx, size, x, y, 0, z, cb);
     }
+    parseSize(size) {
+        return isNumber(size) ? size : Math.min(size[0], size[1]);
+    }
     bounds(size, bounds) {
+        size = this.parseSize(size);
         if (this.isSvg) {
             if (!this.svgCache) {
                 return;
@@ -21550,7 +21496,8 @@ class Paragraph {
             left = 0;
             baseline = 0;
         }
-        if (this.character.stroke) {
+        const { lineWidth = 1 } = this.character;
+        if (this.character.stroke && lineWidth) {
             applyStrokeStyle(ctx, this.character);
             ctx.strokeText(text, left, baseline);
         }
@@ -24707,6 +24654,7 @@ class Stage extends Group {
     constructor(params = {}) {
         var _a;
         super({});
+        this.tickedBeforeRender = true;
         this._onVisibleChange = (visible) => {
             if (this._skipRender < 0) {
                 return;
@@ -24733,6 +24681,15 @@ class Stage extends Group {
             this._afterRender && this._afterRender(stage);
             this._afterNextRenderCbs && this._afterNextRenderCbs.forEach(cb => cb(stage));
             this._afterNextRenderCbs = null;
+            this.tickedBeforeRender = false;
+        };
+        this.afterTickCb = () => {
+            var _a;
+            this.tickedBeforeRender = true;
+            if (((_a = this.params.optimize) === null || _a === void 0 ? void 0 : _a.tickRenderMode) === 'performance') ;
+            else {
+                this.state !== 'rendering' && this.render();
+            }
         };
         this.params = params;
         this.theme = new Theme();
@@ -24800,6 +24757,7 @@ class Stage extends Group {
         if (params.background && isString(this._background) && this._background.includes('/')) {
             this.setAttributes({ background: this._background });
         }
+        this.ticker.on('afterTick', this.afterTickCb);
     }
     pauseRender(sr = -1) {
         this._skipRender = sr;
@@ -25113,6 +25071,9 @@ class Stage extends Group {
         this.timeline.resume();
         const state = this.state;
         this.state = 'rendering';
+        if (!this.tickedBeforeRender) {
+            this.ticker.trySyncTickStatus();
+        }
         this.layerService.prepareStageLayer(this);
         if (!this._skipRender) {
             this.lastRenderparams = params;
@@ -25310,6 +25271,7 @@ class Stage extends Group {
         }
         this.window.release();
         this.ticker.remTimeline(this.timeline);
+        this.ticker.removeListener('afterTick', this.afterTickCb);
         this.renderService.renderTreeRoots = [];
     }
     setStage(stage) {