leafer-draw 1.0.4 → 1.0.6

package/dist/web.js

@@ -555,6 +555,12 @@ var LeaferUI = (function (exports) {
             to.y = t.y + sin$4(r) * distance;
             return to;
         },
+        toNumberPoints(originPoints) {
+            let points = originPoints;
+            if (typeof originPoints[0] === 'object')
+                points = [], originPoints.forEach(p => points.push(p.x, p.y));
+            return points;
+        },
         reset(t) {
             P$5.reset(t);
         }
@@ -1545,7 +1551,10 @@ var LeaferUI = (function (exports) {
 
     class LeafData {
         get __useNaturalRatio() { return true; }
-        get __isLinePath() { return this.path && this.path.length === 6; }
+        get __isLinePath() {
+            const { path } = this;
+            return path && path.length === 6 && path[0] === 1;
+        }
         get __blendMode() {
             if (this.eraser && this.eraser !== 'path')
                 return 'destination-out';
@@ -2308,11 +2317,12 @@ var LeaferUI = (function (exports) {
 
     const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI$2, sqrt: sqrt$1, pow } = Math;
     const { setPoint: setPoint$2, addPoint: addPoint$2 } = TwoPointBoundsHelper;
-    const { set } = PointHelper;
+    const { set, toNumberPoints } = PointHelper;
     const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$5 } = PathCommandMap;
     const tempPoint$2 = {};
     const BezierHelper = {
-        points(data, points, curve, close) {
+        points(data, originPoints, curve, close) {
+            let points = toNumberPoints(originPoints);
             data.push(M$5, points[0], points[1]);
             if (curve && points.length > 5) {
                 let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
@@ -2821,6 +2831,27 @@ var LeaferUI = (function (exports) {
             }
             return data;
         },
+        objectToCanvasData(list) {
+            const data = [];
+            list.forEach(item => {
+                switch (item.name) {
+                    case 'M':
+                        data.push(M$4, item.x, item.y);
+                        break;
+                    case 'L':
+                        data.push(L$5, item.x, item.y);
+                        break;
+                    case 'C':
+                        data.push(C$4, item.x1, item.y1, item.x2, item.y2, item.x, item.y);
+                        break;
+                    case 'Q':
+                        data.push(Q$3, item.x1, item.y1, item.x, item.y);
+                        break;
+                    case 'Z': data.push(Z$4);
+                }
+            });
+            return data;
+        },
         copyData(data, old, index, count) {
             for (let i = index, end = index + count; i < end; i++) {
                 data.push(old[i]);
@@ -4758,6 +4789,7 @@ var LeaferUI = (function (exports) {
         }
     }
     RenderEvent.REQUEST = 'render.request';
+    RenderEvent.CHILD_START = 'render.child_start';
     RenderEvent.START = 'render.start';
     RenderEvent.BEFORE = 'render.before';
     RenderEvent.RENDER = 'render';
@@ -4933,7 +4965,7 @@ var LeaferUI = (function (exports) {
     const debug$6 = Debug.get('setAttr');
     const LeafDataProxy = {
         __setAttr(name, newValue, checkFiniteNumber) {
-            if (this.leafer && this.leafer.created) {
+            if (this.leaferIsCreated) {
                 const oldValue = this.__.__getInput(name);
                 if (checkFiniteNumber && !isFinite(newValue) && newValue !== undefined) {
                     debug$6.warn(this.innerName, name, newValue);
@@ -5005,7 +5037,7 @@ var LeaferUI = (function (exports) {
 
     const { updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$2 } = LeafHelper;
     const { updateBounds: updateBounds$1 } = BranchHelper;
-    const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$2, copy: copy$4 } = BoundsHelper;
+    const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$1, copy: copy$4 } = BoundsHelper;
     const { toBounds: toBounds$2 } = PathBounds;
     const LeafBounds = {
         __updateWorldBounds() {
@@ -5088,7 +5120,7 @@ var LeaferUI = (function (exports) {
             const b = this.__layout.boxBounds;
             const data = this.__;
             if (data.__pathInputed) {
-                toBounds$2(data.__pathForRender, b);
+                toBounds$2(data.path, b);
             }
             else {
                 b.x = 0;
@@ -5100,7 +5132,7 @@ var LeaferUI = (function (exports) {
         __updateAutoLayout() {
             this.__layout.matrixChanged = true;
             if (this.isBranch) {
-                if (this.leafer && this.leafer.ready)
+                if (this.leaferIsReady)
                     this.leafer.layouter.addExtra(this);
                 if (this.__.flow) {
                     if (this.__layout.boxChanged)
@@ -5126,11 +5158,11 @@ var LeaferUI = (function (exports) {
         },
         __updateStrokeBounds() {
             const layout = this.__layout;
-            copyAndSpread$2(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread);
+            copyAndSpread$1(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread);
         },
         __updateRenderBounds() {
             const layout = this.__layout;
-            layout.renderSpread > 0 ? copyAndSpread$2(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$4(layout.renderBounds, layout.strokeBounds);
+            layout.renderSpread > 0 ? copyAndSpread$1(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$4(layout.renderBounds, layout.strokeBounds);
         }
     };
 
@@ -5161,7 +5193,7 @@ var LeaferUI = (function (exports) {
             if (this.__worldOpacity) {
                 canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
                 this.__drawRenderPath(canvas);
-                this.__.windingRule ? canvas.clip(this.__.windingRule) : canvas.clip();
+                this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
             }
         },
         __updateWorldOpacity() {
@@ -5235,6 +5267,8 @@ var LeaferUI = (function (exports) {
         get innerName() { return this.__.name || this.tag + this.innerId; }
         get __DataProcessor() { return LeafData; }
         get __LayoutProcessor() { return LeafLayout; }
+        get leaferIsCreated() { return this.leafer && this.leafer.created; }
+        get leaferIsReady() { return this.leafer && this.leafer.ready; }
         get isLeafer() { return false; }
         get isBranch() { return false; }
         get isBranchLeaf() { return false; }
@@ -5676,10 +5710,17 @@ var LeaferUI = (function (exports) {
         add(child, index) {
             if (child === this)
                 return;
+            const noIndex = index === undefined;
+            if (!child.__) {
+                if (child instanceof Array)
+                    return child.forEach(item => { this.add(item, index); noIndex || index++; });
+                else
+                    child = UICreator.get(child.tag, child);
+            }
             if (child.parent)
                 child.parent.remove(child);
             child.parent = this;
-            index === undefined ? this.children.push(child) : this.children.splice(index, 0, child);
+            noIndex ? this.children.push(child) : this.children.splice(index, 0, child);
             if (child.isBranch)
                 this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
             child.__layout.boxChanged || child.__layout.boxChange();
@@ -5693,15 +5734,17 @@ var LeaferUI = (function (exports) {
             }
             this.__layout.affectChildrenSort && this.__layout.childrenSortChange();
         }
-        addMany(...children) {
-            children.forEach(child => this.add(child));
-        }
+        addMany(...children) { this.add(children); }
         remove(child, destroy) {
             if (child) {
-                if (child.animationOut)
-                    child.__runAnimation('out', () => this.__remove(child, destroy));
+                if (child.__) {
+                    if (child.animationOut)
+                        child.__runAnimation('out', () => this.__remove(child, destroy));
+                    else
+                        this.__remove(child, destroy);
+                }
                 else
-                    this.__remove(child, destroy);
+                    this.find(child).forEach(item => this.remove(item, destroy));
             }
             else if (child === undefined) {
                 super.remove(null, destroy);
@@ -5919,7 +5962,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.4";
+    const version = "1.0.6";
 
     const debug$5 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -6077,7 +6120,7 @@ var LeaferUI = (function (exports) {
             const oldSize = {};
             DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs);
             this.resize(size);
-            if (this.width !== undefined)
+            if (this.resizeListener && this.width !== undefined)
                 this.resizeListener(new ResizeEvent(size, oldSize));
         }
         unrealCanvas() {
@@ -6561,6 +6604,7 @@ var LeaferUI = (function (exports) {
             this.totalBounds = new Bounds();
             debug$3.log(target.innerName, '--->');
             try {
+                target.app.emit(RenderEvent.CHILD_START, target);
                 this.emitRender(RenderEvent.START);
                 this.renderOnce(callback);
                 this.emitRender(RenderEvent.END, this.totalBounds);
@@ -6800,6 +6844,13 @@ var LeaferUI = (function (exports) {
 
     const TextConvert = {};
     const ColorConvert = {};
+    const UnitConvert = {
+        number(value, percentRefer) {
+            if (typeof value === 'object')
+                return value.type === 'percent' ? value.value * percentRefer : value.value;
+            return value;
+        }
+    };
     const PathArrow = {};
     const Paint = {};
     const PaintImage = {};
@@ -6820,7 +6871,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { parse } = PathConvert;
+    const { parse, objectToCanvasData } = PathConvert;
     const emptyPaint = {};
     const debug$2 = Debug.get('UIData');
     class UIData extends LeafData {
@@ -6834,10 +6885,11 @@ var LeaferUI = (function (exports) {
                     scaleX = -scaleX;
                 return scaleX > 1 ? strokeWidth / scaleX : strokeWidth;
             }
-            else {
+            else
                 return strokeWidth;
-            }
         }
+        get __hasStroke() { return this.stroke && this.strokeWidth; }
+        get __clipAfterFill() { return (this.cornerRadius || this.__pathInputed); }
         get __autoWidth() { return !this._width; }
         get __autoHeight() { return !this._height; }
         get __autoSide() { return !this._width || !this._height; }
@@ -6854,9 +6906,8 @@ var LeaferUI = (function (exports) {
                 this.__leaf.scaleX *= -1;
                 debug$2.warn('width < 0, instead -scaleX ', this);
             }
-            else {
+            else
                 this._width = value;
-            }
         }
         setHeight(value) {
             if (value < 0) {
@@ -6864,9 +6915,8 @@ var LeaferUI = (function (exports) {
                 this.__leaf.scaleY *= -1;
                 debug$2.warn('height < 0, instead -scaleY', this);
             }
-            else {
+            else
                 this._height = value;
-            }
         }
         setFill(value) {
             if (this.__naturalWidth)
@@ -6907,9 +6957,10 @@ var LeaferUI = (function (exports) {
             }
         }
         setPath(value) {
-            if (typeof value === 'string') {
+            const isString = typeof value === 'string';
+            if (isString || (value && typeof value[0] === 'object')) {
                 this.__setInput('path', value);
-                this._path = parse(value);
+                this._path = isString ? parse(value) : objectToCanvasData(value);
             }
             else {
                 if (this.__input)
@@ -6924,12 +6975,8 @@ var LeaferUI = (function (exports) {
                     value = value.filter((item) => item.visible !== false);
                 this._shadow = value.length ? value : null;
             }
-            else if (value) {
-                this._shadow = value.visible === false ? null : [value];
-            }
-            else {
-                this._shadow = null;
-            }
+            else
+                this._shadow = value && value.visible !== false ? [value] : null;
         }
         setInnerShadow(value) {
             this.__setInput('innerShadow', value);
@@ -6938,12 +6985,8 @@ var LeaferUI = (function (exports) {
                     value = value.filter((item) => item.visible !== false);
                 this._innerShadow = value.length ? value : null;
             }
-            else if (value) {
-                this._innerShadow = value.visible === false ? null : [value];
-            }
-            else {
-                this._innerShadow = null;
-            }
+            else
+                this._innerShadow = value && value.visible !== false ? [value] : null;
         }
         __computePaint() {
             const { fill, stroke } = this.__input;
@@ -6954,24 +6997,19 @@ var LeaferUI = (function (exports) {
             this.__needComputePaint = false;
         }
     }
-    const UnitConvert = {
-        number(value, percentRefer) {
-            if (typeof value === 'object')
-                return value.type === 'percent' ? value.value * percentRefer : value.value;
-            return value;
-        }
-    };
 
     class GroupData extends UIData {
     }
 
     class BoxData extends GroupData {
         get __boxStroke() { return !this.__pathInputed; }
+        get __drawAfterFill() { return this.overflow === 'hide' && this.__clipAfterFill && this.__leaf.children.length; }
+        get __clipAfterFill() { return this.__leaf.isOverflow || super.__clipAfterFill; }
     }
 
     class LeaferData extends GroupData {
-        __getInputData() {
-            const data = super.__getInputData();
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             canvasSizeAttrs.forEach(key => delete data[key]);
             return data;
         }
@@ -6998,6 +7036,7 @@ var LeaferUI = (function (exports) {
     }
 
     class PathData extends UIData {
+        get __pathInputed() { return 2; }
     }
 
     class PenData extends GroupData {
@@ -7044,16 +7083,18 @@ var LeaferUI = (function (exports) {
             delete data.fill;
             return data;
         }
-        __getInputData() {
-            const data = super.__getInputData();
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             delete data.fill;
             return data;
         }
     }
 
     class CanvasData extends RectData {
-        __getInputData() {
-            const data = super.__getInputData();
+        get __isCanvas() { return true; }
+        get __drawAfterFill() { return true; }
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             data.url = this.__leaf.canvas.toDataURL('image/png');
             return data;
         }
@@ -7080,16 +7121,12 @@ var LeaferUI = (function (exports) {
             let width = 0;
             const { shadow, innerShadow, blur, backgroundBlur } = this.__;
             if (shadow)
-                shadow.forEach(item => {
-                    width = Math.max(width, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread > 0 ? item.spread : 0) + item.blur * 1.5);
-                });
+                shadow.forEach(item => width = Math.max(width, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread > 0 ? item.spread : 0) + item.blur * 1.5));
             if (blur)
                 width = Math.max(width, blur);
             let shapeWidth = width = Math.ceil(width);
             if (innerShadow)
-                innerShadow.forEach(item => {
-                    shapeWidth = Math.max(shapeWidth, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5);
-                });
+                innerShadow.forEach(item => shapeWidth = Math.max(shapeWidth, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5));
             if (backgroundBlur)
                 shapeWidth = Math.max(shapeWidth, backgroundBlur);
             this.__layout.renderShapeSpread = shapeWidth;
@@ -7171,6 +7208,16 @@ var LeaferUI = (function (exports) {
                 if (stroke && !ignoreStroke)
                     this.__.__pixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
             }
+        },
+        __drawAfterFill(canvas, options) {
+            if (this.__.__clipAfterFill) {
+                canvas.save();
+                this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
+                this.__drawContent(canvas, options);
+                canvas.restore();
+            }
+            else
+                this.__drawContent(canvas, options);
         }
     };
     function drawFast(ui, canvas, options) {
@@ -7237,8 +7284,8 @@ var LeaferUI = (function (exports) {
             return pen;
         }
         get editConfig() { return undefined; }
-        get editOuter() { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool'; }
-        get editInner() { return 'PathEditor'; }
+        get editOuter() { return ''; }
+        get editInner() { return ''; }
         constructor(data) {
             super(data);
         }
@@ -7249,9 +7296,8 @@ var LeaferUI = (function (exports) {
                 Object.assign(this, data);
                 this.lockNormalStyle = false;
             }
-            else {
+            else
                 Object.assign(this, data);
-            }
         }
         get(name) {
             return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name);
@@ -7297,12 +7343,7 @@ var LeaferUI = (function (exports) {
             this.__drawPathByData(canvas, this.__.path);
         }
         __drawPathByData(drawer, data) {
-            if (data) {
-                PathDrawer.drawPathByData(drawer, data);
-            }
-            else {
-                this.__drawPathByBox(drawer);
-            }
+            data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer);
         }
         __drawPathByBox(drawer) {
             const { x, y, width, height } = this.__layout.boxBounds;
@@ -7310,9 +7351,8 @@ var LeaferUI = (function (exports) {
                 const { cornerRadius } = this.__;
                 drawer.roundRect(x, y, width, height, typeof cornerRadius === 'number' ? [cornerRadius] : cornerRadius);
             }
-            else {
+            else
                 drawer.rect(x, y, width, height);
-            }
         }
         animate(_keyframe, _options, _type, _isTemp) {
             return needPlugin('animate');
@@ -7559,23 +7599,13 @@ var LeaferUI = (function (exports) {
             if (data.children) {
                 const { children } = data;
                 delete data.children;
-                if (!this.children) {
-                    this.__setBranch();
-                }
-                else {
-                    this.clear();
-                }
+                this.children ? this.clear() : this.__setBranch();
                 super.set(data, isTemp);
-                let child;
-                children.forEach(childData => {
-                    child = childData.__ ? childData : UICreator.get(childData.tag, childData);
-                    this.add(child);
-                });
+                children.forEach(child => this.add(child));
                 data.children = children;
             }
-            else {
+            else
                 super.set(data, isTemp);
-            }
         }
         toJSON(options) {
             const data = super.toJSON(options);
@@ -7995,10 +8025,9 @@ var LeaferUI = (function (exports) {
         registerUI()
     ], exports.Rect);
 
-    const rect = exports.Rect.prototype;
-    const group = exports.Group.prototype;
+    const { copy: copy$2, add, includes: includes$1 } = BoundsHelper;
+    const rect = exports.Rect.prototype, group = exports.Group.prototype;
     const childrenRenderBounds = {};
-    const { copy: copy$2, add, includes: includes$1, copyAndSpread: copyAndSpread$1 } = BoundsHelper;
     exports.Box = class Box extends exports.Group {
         get __tag() { return 'Box'; }
         get isBranchLeaf() { return true; }
@@ -8008,37 +8037,31 @@ var LeaferUI = (function (exports) {
         }
         __updateStrokeSpread() { return 0; }
         __updateRectRenderSpread() { return 0; }
-        __updateRenderSpread() {
-            return this.__updateRectRenderSpread() || -1;
-        }
+        __updateRenderSpread() { return this.__updateRectRenderSpread() || -1; }
         __updateRectBoxBounds() { }
-        __updateBoxBounds(secondLayout) {
+        __updateBoxBounds(_secondLayout) {
             const data = this.__;
             if (this.children.length) {
                 if (data.__autoSide) {
-                    if (this.leafer && this.leafer.ready)
-                        this.leafer.layouter.addExtra(this);
                     super.__updateBoxBounds();
                     const { boxBounds } = this.__layout;
                     if (!data.__autoSize) {
-                        if (data.__autoWidth)
-                            boxBounds.width += boxBounds.x, boxBounds.height = data.height, boxBounds.y = boxBounds.x = 0;
-                        else
-                            boxBounds.height += boxBounds.y, boxBounds.width = data.width, boxBounds.x = boxBounds.y = 0;
+                        if (data.__autoWidth) {
+                            boxBounds.width += boxBounds.x, boxBounds.x = 0;
+                            boxBounds.height = data.height, boxBounds.y = 0;
+                        }
+                        else {
+                            boxBounds.height += boxBounds.y, boxBounds.y = 0;
+                            boxBounds.width = data.width, boxBounds.x = 0;
+                        }
                     }
-                    if (secondLayout && data.flow && data.padding)
-                        copyAndSpread$1(boxBounds, boxBounds, data.padding, false, data.__autoSize ? null : (data.__autoWidth ? 'width' : 'height'));
                     this.__updateNaturalSize();
                 }
-                else {
+                else
                     this.__updateRectBoxBounds();
-                }
-                if (data.flow)
-                    this.__updateContentBounds();
             }
-            else {
+            else
                 this.__updateRectBoxBounds();
-            }
         }
         __updateStrokeBounds() { }
         __updateRenderBounds() {
@@ -8048,14 +8071,13 @@ var LeaferUI = (function (exports) {
                 super.__updateRenderBounds();
                 copy$2(childrenRenderBounds, renderBounds);
                 this.__updateRectRenderBounds();
-                isOverflow = !includes$1(renderBounds, childrenRenderBounds) || !this.pathInputed || !this.__.cornerRadius;
+                isOverflow = !includes$1(renderBounds, childrenRenderBounds);
+                if (isOverflow && this.__.overflow !== 'hide')
+                    add(renderBounds, childrenRenderBounds);
             }
-            else {
+            else
                 this.__updateRectRenderBounds();
-            }
-            this.isOverflow !== isOverflow && (this.isOverflow = isOverflow);
-            if (!(this.__.__drawAfterFill = this.__.overflow === 'hide') && isOverflow)
-                add(renderBounds, childrenRenderBounds);
+            !this.isOverflow !== !isOverflow && (this.isOverflow = isOverflow);
         }
         __updateRectRenderBounds() { }
         __updateRectChange() { }
@@ -8075,20 +8097,9 @@ var LeaferUI = (function (exports) {
                     this.__renderGroup(canvas, options);
             }
         }
-        __drawAfterFill(canvas, options) {
-            const { length } = this.children;
-            if (this.isOverflow) {
-                canvas.save();
-                canvas.clip();
-                if (length)
-                    this.__renderGroup(canvas, options);
-                canvas.restore();
-            }
-            else {
-                if (length)
-                    this.__renderGroup(canvas, options);
-            }
-            if (this.__.stroke && length) {
+        __drawContent(canvas, options) {
+            this.__renderGroup(canvas, options);
+            if (this.__.__hasStroke) {
                 canvas.setWorld(this.__nowWorld);
                 this.__drawRenderPath(canvas);
             }
@@ -8100,6 +8111,9 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataType(false)
     ], exports.Box.prototype, "resizeChildren", void 0);
+    __decorate([
+        dataType(false)
+    ], exports.Box.prototype, "textBox", void 0);
     __decorate([
         affectRenderBoundsType('show')
     ], exports.Box.prototype, "overflow", void 0);
@@ -8249,17 +8263,15 @@ var LeaferUI = (function (exports) {
                 if (data.__useArrow)
                     PathArrow.addArrows(this, false);
             }
-            else {
+            else
                 super.__updateRenderPath();
-            }
         }
         __updateBoxBounds() {
             if (this.points) {
                 toBounds$1(this.__.__pathForRender, this.__layout.boxBounds);
             }
-            else {
+            else
                 super.__updateBoxBounds();
-            }
         }
     };
     __decorate([
@@ -8397,7 +8409,6 @@ var LeaferUI = (function (exports) {
             super(data);
             this.canvas = Creator.canvas(this.__);
             this.context = this.canvas.context;
-            this.__.__isCanvas = this.__.__drawAfterFill = true;
             if (data && data.url)
                 this.drawImage(data.url);
         }
@@ -8410,8 +8421,7 @@ var LeaferUI = (function (exports) {
             });
         }
         draw(ui, offset, scale, rotation) {
-            ui.__layout.update();
-            const matrix = new Matrix(ui.__world).invert();
+            const matrix = new Matrix(ui.worldTransform).invert();
             const m = new Matrix();
             if (offset)
                 m.translate(offset.x, offset.y);
@@ -8426,17 +8436,9 @@ var LeaferUI = (function (exports) {
         paint() {
             this.forceRender();
         }
-        __drawAfterFill(canvas, _options) {
-            const { width, height, cornerRadius } = this.__, { view } = this.canvas;
-            if (cornerRadius || this.pathInputed) {
-                canvas.save();
-                canvas.clip();
-                canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
-                canvas.restore();
-            }
-            else {
-                canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
-            }
+        __drawContent(canvas, _options) {
+            const { width, height } = this.__, { view } = this.canvas;
+            canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
         }
         __updateSize() {
             const { canvas } = this;
@@ -8480,7 +8482,6 @@ var LeaferUI = (function (exports) {
     const { copyAndSpread, includes, isSame: isSame$1, spread, setList } = BoundsHelper;
     exports.Text = class Text extends exports.UI {
         get __tag() { return 'Text'; }
-        get editInner() { return 'TextEditor'; }
         get textDrawData() {
             this.__layout.update();
             return this.__.__textDrawData;
@@ -8629,6 +8630,9 @@ var LeaferUI = (function (exports) {
     __decorate([
         boundsType('top')
     ], exports.Text.prototype, "verticalAlign", void 0);
+    __decorate([
+        boundsType(true)
+    ], exports.Text.prototype, "autoSizeAlign", void 0);
     __decorate([
         boundsType('normal')
     ], exports.Text.prototype, "textWrap", void 0);
@@ -8643,7 +8647,6 @@ var LeaferUI = (function (exports) {
         get __tag() { return 'Path'; }
         constructor(data) {
             super(data);
-            this.__.__pathInputed = 2;
         }
     };
     __decorate([
@@ -9170,9 +9173,10 @@ var LeaferUI = (function (exports) {
                 onLoadError(ui, event, image.error);
         }
         else {
-            ignoreRender(ui, true);
-            if (firstUse)
+            if (firstUse) {
+                ignoreRender(ui, true);
                 onLoad(ui, event);
+            }
             leafPaint.loadId = image.load(() => {
                 ignoreRender(ui, false);
                 if (!ui.destroyed) {
@@ -9320,7 +9324,7 @@ var LeaferUI = (function (exports) {
             }
             if (allowPaint) {
                 canvas.save();
-                canvas.clip();
+                ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
                 if (paint.blendMode)
                     canvas.blendMode = paint.blendMode;
                 if (data.opacity)
@@ -9784,11 +9788,12 @@ var LeaferUI = (function (exports) {
     const { Letter, Single, Before, After, Symbol, Break } = CharType;
     let word, row, wordWidth, rowWidth, realWidth;
     let char, charWidth, startCharSize, charSize, charType, lastCharType, langBreak, afterBreak, paraStart;
-    let textDrawData, rows = [], bounds;
+    let textDrawData, rows = [], bounds, findMaxWidth;
     function createRows(drawData, content, style) {
         textDrawData = drawData;
         rows = drawData.rows;
         bounds = drawData.bounds;
+        findMaxWidth = !bounds.width && !style.autoSizeAlign;
         const { __letterSpacing, paraIndent, textCase } = style;
         const { canvas } = Platform;
         const { width, height } = bounds;
@@ -9873,7 +9878,10 @@ var LeaferUI = (function (exports) {
         else {
             content.split('\n').forEach(content => {
                 textDrawData.paraNumber++;
-                rows.push({ x: paraIndent || 0, text: content, width: canvas.measureText(content).width, paraStart: true });
+                rowWidth = canvas.measureText(content).width;
+                rows.push({ x: paraIndent || 0, text: content, width: rowWidth, paraStart: true });
+                if (findMaxWidth)
+                    setMaxWidth();
             });
         }
     }
@@ -9904,10 +9912,16 @@ var LeaferUI = (function (exports) {
         row.width = rowWidth;
         if (bounds.width)
             trimRight(row);
+        else if (findMaxWidth)
+            setMaxWidth();
         rows.push(row);
         row = { words: [] };
         rowWidth = 0;
     }
+    function setMaxWidth() {
+        if (rowWidth > (textDrawData.maxWidth || 0))
+            textDrawData.maxWidth = rowWidth;
+    }
 
     const CharMode = 0;
     const WordMode = 1;
@@ -9979,34 +9993,32 @@ var LeaferUI = (function (exports) {
 
     function layoutText(drawData, style) {
         const { rows, bounds } = drawData;
-        const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing } = style;
+        const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing, autoSizeAlign } = style;
         let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
         let starY = __baseLine;
         if (__clipText && realHeight > height) {
             realHeight = Math.max(height, __lineHeight);
             drawData.overflow = rows.length;
         }
-        else {
+        else if (height || autoSizeAlign) {
             switch (verticalAlign) {
                 case 'middle':
                     y += (height - realHeight) / 2;
                     break;
-                case 'bottom':
-                    y += (height - realHeight);
+                case 'bottom': y += (height - realHeight);
             }
         }
         starY += y;
-        let row, rowX, rowWidth;
+        let row, rowX, rowWidth, layoutWidth = (width || autoSizeAlign) ? width : drawData.maxWidth;
         for (let i = 0, len = rows.length; i < len; i++) {
             row = rows[i];
             row.x = x;
             if (row.width < width || (row.width > width && !__clipText)) {
                 switch (textAlign) {
                     case 'center':
-                        row.x += (width - row.width) / 2;
+                        row.x += (layoutWidth - row.width) / 2;
                         break;
-                    case 'right':
-                        row.x += width - row.width;
+                    case 'right': row.x += layoutWidth - row.width;
                 }
             }
             if (row.paraStart && paraSpacing && i > 0)
@@ -10111,14 +10123,14 @@ var LeaferUI = (function (exports) {
         let height = style.__getInput('height') || 0;
         const { textDecoration, __font, __padding: padding } = style;
         if (padding) {
-            if (width) {
+            if (width)
+                x = padding[left], width -= (padding[right] + padding[left]);
+            else if (!style.autoSizeAlign)
                 x = padding[left];
-                width -= (padding[right] + padding[left]);
-            }
-            if (height) {
+            if (height)
+                y = padding[top], height -= (padding[top] + padding[bottom]);
+            else if (!style.autoSizeAlign)
                 y = padding[top];
-                height -= (padding[top] + padding[bottom]);
-            }
         }
         const drawData = {
             bounds: { x, y, width, height },
@@ -10138,22 +10150,20 @@ var LeaferUI = (function (exports) {
         return drawData;
     }
     function padAutoText(padding, drawData, style, width, height) {
-        if (!width) {
+        if (!width && style.autoSizeAlign) {
             switch (style.textAlign) {
                 case 'left':
                     offsetText(drawData, 'x', padding[left]);
                     break;
-                case 'right':
-                    offsetText(drawData, 'x', -padding[right]);
+                case 'right': offsetText(drawData, 'x', -padding[right]);
             }
         }
-        if (!height) {
+        if (!height && style.autoSizeAlign) {
             switch (style.verticalAlign) {
                 case 'top':
                     offsetText(drawData, 'y', padding[top]);
                     break;
-                case 'bottom':
-                    offsetText(drawData, 'y', -padding[bottom]);
+                case 'bottom': offsetText(drawData, 'y', -padding[bottom]);
             }
         }
     }