@leafer-editor/worker 1.0.4 → 1.0.6

package/dist/worker.module.js

@@ -552,6 +552,12 @@ const PointHelper = {
         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$7.reset(t);
     }
@@ -1542,7 +1548,10 @@ const { assign } = DataHelper;
 
 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';
@@ -2305,11 +2314,12 @@ const RectHelper = {
 
 const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$4, PI: PI$2, sqrt: sqrt$1, pow } = Math;
 const { setPoint: setPoint$4, addPoint: addPoint$2 } = TwoPointBoundsHelper;
-const { set } = PointHelper;
+const { set, toNumberPoints: toNumberPoints$1 } = PointHelper;
 const { M: M$8, L: L$9, C: C$8, Q: Q$7, Z: Z$7 } = PathCommandMap;
 const tempPoint$2 = {};
 const BezierHelper = {
-    points(data, points, curve, close) {
+    points(data, originPoints, curve, close) {
+        let points = toNumberPoints$1(originPoints);
         data.push(M$8, points[0], points[1]);
         if (curve && points.length > 5) {
             let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
@@ -2818,6 +2828,27 @@ const PathConvert = {
         }
         return data;
     },
+    objectToCanvasData(list) {
+        const data = [];
+        list.forEach(item => {
+            switch (item.name) {
+                case 'M':
+                    data.push(M$7, item.x, item.y);
+                    break;
+                case 'L':
+                    data.push(L$8, item.x, item.y);
+                    break;
+                case 'C':
+                    data.push(C$7, item.x1, item.y1, item.x2, item.y2, item.x, item.y);
+                    break;
+                case 'Q':
+                    data.push(Q$6, item.x1, item.y1, item.x, item.y);
+                    break;
+                case 'Z': data.push(Z$6);
+            }
+        });
+        return data;
+    },
     copyData(data, old, index, count) {
         for (let i = index, end = index + count; i < end; i++) {
             data.push(old[i]);
@@ -4056,7 +4087,7 @@ const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
         if (checkAutoLayout && leaf.__hasAutoLayout && leaf.__layout.matrixChanged)
             waitAutoLayout = true;
-        updateMatrix$2(leaf, checkAutoLayout, waitAutoLayout);
+        updateMatrix$3(leaf, checkAutoLayout, waitAutoLayout);
         if (leaf.isBranch) {
             const { children } = leaf;
             for (let i = 0, len = children.length; i < len; i++) {
@@ -4226,7 +4257,7 @@ const LeafHelper = {
     }
 };
 const L$3 = LeafHelper;
-const { updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity$1, updateAllChange: updateAllChange$1 } = L$3;
+const { updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$3, updateAllWorldOpacity: updateAllWorldOpacity$1, updateAllChange: updateAllChange$1 } = L$3;
 function moveByMatrix(t, matrix) {
     const { e, f } = t.__localMatrix;
     t.x += matrix.e - e;
@@ -4755,6 +4786,7 @@ class RenderEvent extends Event {
     }
 }
 RenderEvent.REQUEST = 'render.request';
+RenderEvent.CHILD_START = 'render.child_start';
 RenderEvent.START = 'render.start';
 RenderEvent.BEFORE = 'render.before';
 RenderEvent.RENDER = 'render';
@@ -4930,7 +4962,7 @@ const { isFinite } = Number;
 const debug$8 = 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$8.warn(this.innerName, name, newValue);
@@ -5000,9 +5032,9 @@ const LeafMatrix = {
     }
 };
 
-const { updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$2 } = LeafHelper;
+const { updateMatrix: updateMatrix$2, updateAllMatrix: updateAllMatrix$2 } = LeafHelper;
 const { updateBounds: updateBounds$1 } = BranchHelper;
-const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$2, copy: copy$8 } = BoundsHelper;
+const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$1, copy: copy$8 } = BoundsHelper;
 const { toBounds: toBounds$2 } = PathBounds;
 const LeafBounds = {
     __updateWorldBounds() {
@@ -5085,7 +5117,7 @@ const LeafBounds = {
         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;
@@ -5097,7 +5129,7 @@ const LeafBounds = {
     __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)
@@ -5113,7 +5145,7 @@ const LeafBounds = {
             }
         }
         else {
-            updateMatrix$1(this);
+            updateMatrix$2(this);
         }
     },
     __updateNaturalSize() {
@@ -5123,11 +5155,11 @@ const LeafBounds = {
     },
     __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$8(layout.renderBounds, layout.strokeBounds);
+        layout.renderSpread > 0 ? copyAndSpread$1(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$8(layout.renderBounds, layout.strokeBounds);
     }
 };
 
@@ -5158,7 +5190,7 @@ const LeafRender = {
         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() {
@@ -5232,6 +5264,8 @@ let Leaf = class Leaf {
     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; }
@@ -5673,10 +5707,17 @@ let Branch = class Branch extends Leaf {
     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();
@@ -5690,15 +5731,17 @@ let Branch = class Branch extends Leaf {
         }
         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);
@@ -5916,7 +5959,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.4";
+const version = "1.0.6";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return true; }
@@ -6102,7 +6145,7 @@ class Watcher {
 
 const { updateAllMatrix: updateAllMatrix$1, updateBounds: updateOneBounds, updateAllWorldOpacity } = LeafHelper;
 const { pushAllChildBranch, pushAllParent } = BranchHelper;
-function updateMatrix(updateList, levelList) {
+function updateMatrix$1(updateList, levelList) {
     let layout;
     updateList.list.forEach(leaf => {
         layout = leaf.__layout;
@@ -6270,7 +6313,7 @@ class Layouter {
         target.emitEvent(new LayoutEvent(BEFORE, blocks, this.times));
         this.extraBlock = null;
         updateList.sort();
-        updateMatrix(updateList, this.__levelList);
+        updateMatrix$1(updateList, this.__levelList);
         updateBounds(this.__levelList);
         updateChange(updateList);
         if (this.extraBlock)
@@ -6385,6 +6428,7 @@ class Renderer {
         this.totalBounds = new Bounds();
         debug$6.log(target.innerName, '--->');
         try {
+            target.app.emit(RenderEvent.CHILD_START, target);
             this.emitRender(RenderEvent.START);
             this.renderOnce(callback);
             this.emitRender(RenderEvent.END, this.totalBounds);
@@ -6682,7 +6726,7 @@ class Picker {
             if (child.isBranch) {
                 if (hit || child.__ignoreHitWorld) {
                     this.eachFind(child.children, child.__onlyHitMask);
-                    if (child.isBranchLeaf && !this.findList.length)
+                    if (child.isBranchLeaf)
                         this.hitChild(child, point);
                 }
             }
@@ -6895,6 +6939,13 @@ function zoomLayerType() {
 
 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 = {};
@@ -6915,7 +6966,7 @@ const Transition = {
     }
 };
 
-const { parse } = PathConvert;
+const { parse, objectToCanvasData } = PathConvert;
 const emptyPaint = {};
 const debug$5 = Debug.get('UIData');
 class UIData extends LeafData {
@@ -6929,10 +6980,11 @@ class UIData extends LeafData {
                 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; }
@@ -6949,9 +7001,8 @@ class UIData extends LeafData {
             this.__leaf.scaleX *= -1;
             debug$5.warn('width < 0, instead -scaleX ', this);
         }
-        else {
+        else
             this._width = value;
-        }
     }
     setHeight(value) {
         if (value < 0) {
@@ -6959,9 +7010,8 @@ class UIData extends LeafData {
             this.__leaf.scaleY *= -1;
             debug$5.warn('height < 0, instead -scaleY', this);
         }
-        else {
+        else
             this._height = value;
-        }
     }
     setFill(value) {
         if (this.__naturalWidth)
@@ -7002,9 +7052,10 @@ class UIData extends LeafData {
         }
     }
     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)
@@ -7019,12 +7070,8 @@ class UIData extends LeafData {
                 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);
@@ -7033,12 +7080,8 @@ class UIData extends LeafData {
                 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;
@@ -7049,24 +7092,19 @@ class UIData extends LeafData {
         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;
     }
@@ -7093,6 +7131,7 @@ class StarData extends UIData {
 }
 
 class PathData extends UIData {
+    get __pathInputed() { return 2; }
 }
 
 class PenData extends GroupData {
@@ -7139,16 +7178,18 @@ class ImageData extends RectData {
         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;
     }
@@ -7175,16 +7216,12 @@ const UIBounds = {
         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;
@@ -7266,6 +7303,16 @@ const UIRender = {
             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) {
@@ -7332,8 +7379,8 @@ let UI = UI_1 = class UI extends Leaf {
         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);
     }
@@ -7344,9 +7391,8 @@ let UI = UI_1 = class UI extends Leaf {
             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);
@@ -7392,12 +7438,7 @@ let UI = UI_1 = class UI extends Leaf {
         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;
@@ -7405,9 +7446,8 @@ let UI = UI_1 = class UI extends Leaf {
             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');
@@ -7654,23 +7694,13 @@ let Group = class Group extends UI {
         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);
@@ -8090,10 +8120,9 @@ Rect = __decorate([
     registerUI()
 ], Rect);
 
-const rect$1 = Rect.prototype;
-const group$1 = Group.prototype;
+const { copy: copy$6, add, includes: includes$1 } = BoundsHelper;
+const rect$1 = Rect.prototype, group$1 = Group.prototype;
 const childrenRenderBounds = {};
-const { copy: copy$6, add, includes: includes$1, copyAndSpread: copyAndSpread$1 } = BoundsHelper;
 let Box = class Box extends Group {
     get __tag() { return 'Box'; }
     get isBranchLeaf() { return true; }
@@ -8103,37 +8132,31 @@ let Box = class Box extends Group {
     }
     __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() {
@@ -8143,14 +8166,13 @@ let Box = class Box extends Group {
             super.__updateRenderBounds();
             copy$6(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() { }
@@ -8170,20 +8192,9 @@ let Box = class Box extends Group {
                 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);
         }
@@ -8195,6 +8206,9 @@ __decorate([
 __decorate([
     dataType(false)
 ], Box.prototype, "resizeChildren", void 0);
+__decorate([
+    dataType(false)
+], Box.prototype, "textBox", void 0);
 __decorate([
     affectRenderBoundsType('show')
 ], Box.prototype, "overflow", void 0);
@@ -8344,17 +8358,15 @@ let Line = class Line extends UI {
             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([
@@ -8492,7 +8504,6 @@ let Canvas = class Canvas extends Rect {
         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);
     }
@@ -8505,8 +8516,7 @@ let Canvas = class Canvas extends Rect {
         });
     }
     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);
@@ -8521,17 +8531,9 @@ let Canvas = class Canvas extends Rect {
     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;
@@ -8575,7 +8577,6 @@ Canvas = __decorate([
 const { copyAndSpread, includes, isSame: isSame$1, spread, setList } = BoundsHelper;
 let Text = class Text extends UI {
     get __tag() { return 'Text'; }
-    get editInner() { return 'TextEditor'; }
     get textDrawData() {
         this.__layout.update();
         return this.__.__textDrawData;
@@ -8724,6 +8725,9 @@ __decorate([
 __decorate([
     boundsType('top')
 ], Text.prototype, "verticalAlign", void 0);
+__decorate([
+    boundsType(true)
+], Text.prototype, "autoSizeAlign", void 0);
 __decorate([
     boundsType('normal')
 ], Text.prototype, "textWrap", void 0);
@@ -8738,7 +8742,6 @@ let Path = class Path extends UI {
     get __tag() { return 'Path'; }
     constructor(data) {
         super(data);
-        this.__.__pathInputed = 2;
     }
 };
 __decorate([
@@ -8821,21 +8824,17 @@ let App = class App extends Leafer {
                 this.tree = this.addLeafer(tree);
             if (sky || editor)
                 this.sky = this.addLeafer(sky || { type: 'draw', usePartRender: false });
-            if (editor) {
-                this.editor = Creator.editor(editor);
-                this.sky.add(this.editor);
-            }
+            if (editor)
+                this.sky.add(this.editor = Creator.editor(editor));
         }
     }
     __setApp() {
         const { canvas } = this;
         const { realCanvas, view } = this.config;
-        if (realCanvas || view === this.canvas.view || !canvas.parentView) {
+        if (realCanvas || view === this.canvas.view || !canvas.parentView)
             this.realCanvas = true;
-        }
-        else {
+        else
             canvas.unrealCanvas();
-        }
         this.leafer = this;
         this.watcher.disable();
         this.layouter.disable();
@@ -9241,10 +9240,7 @@ leafer.initType = function (type) {
 leafer.getValidMove = function (moveX, moveY) {
     const { scroll, disabled } = this.app.config.move;
     if (scroll) {
-        if (Math.abs(moveX) > Math.abs(moveY))
-            moveY = 0;
-        else
-            moveX = 0;
+        Math.abs(moveX) > Math.abs(moveY) ? moveY = 0 : moveX = 0;
         if (scroll === 'limit') {
             const { x, y, width, height } = new Bounds(this.__world).addPoint(this.zoomLayer);
             const right = x + width - this.width, bottom = y + height - this.height;
@@ -9444,9 +9440,10 @@ class Dragger {
         this.dragData = getDragEventData(data, data, data);
         this.canAnimate = this.canDragOut = true;
     }
-    getList() {
+    getList(realDraggable, hover) {
         const { proxy } = this.interaction.selector;
-        return this.dragging && (!proxy || !proxy.list.length) ? (DragEvent.list || this.dragableList || emptyList) : emptyList;
+        const hasProxyList = proxy && proxy.list.length, dragList = DragEvent.list || this.draggableList || emptyList;
+        return this.dragging && (hasProxyList ? (realDraggable ? emptyList : new LeafList(hover ? [...proxy.list, ...proxy.dragHoverExclude] : proxy.list)) : dragList);
     }
     checkDrag(data, canDrag) {
         const { interaction } = this;
@@ -9471,8 +9468,8 @@ class Dragger {
             this.dragging = canDrag && PointerButton.left(data);
             if (this.dragging) {
                 this.interaction.emit(DragEvent.START, this.dragData);
-                this.getDragableList(this.dragData.path);
-                this.setDragStartPoints(this.realDragableList = this.getList());
+                this.getDraggableList(this.dragData.path);
+                this.setDragStartPoints(this.realDraggableList = this.getList(true));
             }
         }
     }
@@ -9480,12 +9477,12 @@ class Dragger {
         this.dragStartPoints = {};
         list.forEach(leaf => this.dragStartPoints[leaf.innerId] = { x: leaf.x, y: leaf.y });
     }
-    getDragableList(path) {
+    getDraggableList(path) {
         let leaf;
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i];
-            if ((leaf.__.draggable || leaf.__.editable) && leaf.__.hitSelf && !leaf.__.locked) {
-                this.dragableList = new LeafList(leaf);
+            if ((leaf.draggable || leaf.editable) && leaf.hitSelf && !leaf.locked) {
+                this.draggableList = new LeafList(leaf);
                 break;
             }
         }
@@ -9510,7 +9507,7 @@ class Dragger {
     }
     dragReal() {
         const { running } = this.interaction;
-        const list = this.realDragableList;
+        const list = this.realDraggableList;
         if (list.length && running) {
             const { totalX, totalY } = this.dragData;
             list.forEach(leaf => leaf.draggable && leaf.move(DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })));
@@ -9599,7 +9596,7 @@ class Dragger {
         this.interaction.emit(DragEvent.LEAVE, data, dragEnterPath);
     }
     dragReset() {
-        DragEvent.list = DragEvent.data = this.dragableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
+        DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
     }
     checkDragOut(data) {
         const { interaction } = this;
@@ -9740,6 +9737,7 @@ const config$1 = {
     touch: {
         preventDefault: true
     },
+    multiTouch: {},
     cursor: true,
     keyEvent: true
 };
@@ -9866,6 +9864,8 @@ class InteractionBase {
         this.pointerUp(data);
     }
     multiTouch(data, list) {
+        if (this.config.multiTouch.disabled)
+            return;
         const { move, angle, scale, center } = MultiTouchHelper.getData(list);
         this.rotate(getRotateEventData(center, angle, data));
         this.zoom(getZoomEventData(center, scale, data));
@@ -10055,7 +10055,7 @@ class InteractionBase {
             data = this.hoverData;
         if (!data)
             return;
-        this.findPath(data, { exclude: this.dragger.getList(), name: PointerEvent.MOVE });
+        this.findPath(data, { exclude: this.dragger.getList(false, true), name: PointerEvent.MOVE });
         this.hoverData = data;
     }
     updateCursor(data) {
@@ -10077,7 +10077,7 @@ class InteractionBase {
         const { path } = data;
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i];
-            cursor = leaf.syncEventer ? leaf.syncEventer.cursor : leaf.cursor;
+            cursor = (leaf.syncEventer && leaf.syncEventer.cursor) || leaf.cursor;
             if (cursor)
                 break;
         }
@@ -10259,7 +10259,7 @@ ui$3.__updateHitCanvas = function () {
     if (isHitPixel) {
         const { renderBounds } = this.__layout;
         const size = Platform.image.hitCanvasSize;
-        const scale = h.hitScale = tempBounds$1.set(0, 0, size, size).getFitMatrix(renderBounds, 0.5).a;
+        const scale = h.hitScale = tempBounds$1.set(0, 0, size, size).getFitMatrix(renderBounds).a;
         const { x, y, width, height } = tempBounds$1.set(renderBounds).scale(scale);
         h.resize({ width, height, pixelRatio: 1 });
         h.clear();
@@ -10315,15 +10315,14 @@ ui$3.__hit = function (inner) {
     return hitWidth ? this.__hitStroke(inner, hitWidth) : false;
 };
 
-const ui$2 = new UI();
-const rect = Rect.prototype;
-rect.__updateHitCanvas = function () {
+const ui$2 = UI.prototype, rect = Rect.prototype, box$1 = Box.prototype;
+rect.__updateHitCanvas = box$1.__updateHitCanvas = function () {
     if (this.stroke || this.cornerRadius || ((this.fill || this.__.__isCanvas) && this.hitFill === 'pixel') || this.hitStroke === 'all')
         ui$2.__updateHitCanvas.call(this);
     else if (this.__hitCanvas)
         this.__hitCanvas = null;
 };
-rect.__hitFill = function (inner) {
+rect.__hitFill = box$1.__hitFill = function (inner) {
     return this.__hitCanvas ? ui$2.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
 };
 
@@ -10662,7 +10661,7 @@ const PaintModule = {
     shape
 };
 
-let origin = {};
+let origin$1 = {};
 const { get: get$3, rotateOfOuter: rotateOfOuter$1, translate: translate$1, scaleOfOuter: scaleOfOuter$1, scale: scaleHelper, rotate: rotate$2 } = MatrixHelper;
 function fillOrFitMode(data, box, x, y, scaleX, scaleY, rotation) {
     const transform = get$3();
@@ -10702,11 +10701,11 @@ function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, al
             }
         }
     }
-    origin.x = box.x + x;
-    origin.y = box.y + y;
-    translate$1(transform, origin.x, origin.y);
+    origin$1.x = box.x + x;
+    origin$1.y = box.y + y;
+    translate$1(transform, origin$1.x, origin$1.y);
     if (scaleX)
-        scaleOfOuter$1(transform, origin, scaleX, scaleY);
+        scaleOfOuter$1(transform, origin$1, scaleX, scaleY);
     data.transform = transform;
 }
 
@@ -10822,9 +10821,10 @@ function image(ui, attrName, paint, boxBounds, firstUse) {
             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) {
@@ -10972,7 +10972,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
         }
         if (allowPaint) {
             canvas.save();
-            canvas.clip();
+            ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
             if (paint.blendMode)
                 canvas.blendMode = paint.blendMode;
             if (data.opacity)
@@ -11436,14 +11436,15 @@ const { trimRight } = TextRowHelper;
 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$1, findMaxWidth;
 function createRows(drawData, content, style) {
     textDrawData = drawData;
     rows = drawData.rows;
-    bounds = drawData.bounds;
+    bounds$1 = drawData.bounds;
+    findMaxWidth = !bounds$1.width && !style.autoSizeAlign;
     const { __letterSpacing, paraIndent, textCase } = style;
     const { canvas } = Platform;
-    const { width, height } = bounds;
+    const { width, height } = bounds$1;
     const charMode = width || height || __letterSpacing || (textCase !== 'none');
     if (charMode) {
         const wrap = style.textWrap !== 'none';
@@ -11525,7 +11526,10 @@ function createRows(drawData, content, style) {
     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();
         });
     }
 }
@@ -11554,12 +11558,18 @@ function addRow() {
         startCharSize = 0;
     }
     row.width = rowWidth;
-    if (bounds.width)
+    if (bounds$1.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;
@@ -11631,34 +11641,32 @@ function toChar(data, charX, rowData, isOverflow) {
 
 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)
@@ -11763,14 +11771,14 @@ function getDrawData(content, style) {
     let height = style.__getInput('height') || 0;
     const { textDecoration, __font, __padding: padding } = style;
     if (padding) {
-        if (width) {
+        if (width)
+            x = padding[left$3], width -= (padding[right$3] + padding[left$3]);
+        else if (!style.autoSizeAlign)
             x = padding[left$3];
-            width -= (padding[right$3] + padding[left$3]);
-        }
-        if (height) {
+        if (height)
+            y = padding[top$2], height -= (padding[top$2] + padding[bottom$2]);
+        else if (!style.autoSizeAlign)
             y = padding[top$2];
-            height -= (padding[top$2] + padding[bottom$2]);
-        }
     }
     const drawData = {
         bounds: { x, y, width, height },
@@ -11790,22 +11798,20 @@ function getDrawData(content, style) {
     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$3]);
                 break;
-            case 'right':
-                offsetText(drawData, 'x', -padding[right$3]);
+            case 'right': offsetText(drawData, 'x', -padding[right$3]);
         }
     }
-    if (!height) {
+    if (!height && style.autoSizeAlign) {
         switch (style.verticalAlign) {
             case 'top':
                 offsetText(drawData, 'y', padding[top$2]);
                 break;
-            case 'bottom':
-                offsetText(drawData, 'y', -padding[bottom$2]);
+            case 'bottom': offsetText(drawData, 'y', -padding[bottom$2]);
         }
     }
 }
@@ -12167,8 +12173,9 @@ function scaleResizePath(leaf, scaleX, scaleY) {
     leaf.path = leaf.__.path;
 }
 function scaleResizePoints(leaf, scaleX, scaleY) {
-    PathScaler.scalePoints(leaf.__.points, scaleX, scaleY);
-    leaf.points = leaf.__.points;
+    const { points } = leaf;
+    typeof points[0] === 'object' ? points.forEach(p => { p.x *= scaleX, p.y *= scaleY; }) : PathScaler.scalePoints(points, scaleX, scaleY);
+    leaf.points = points;
 }
 function scaleResizeGroup(group, scaleX, scaleY) {
     const { children } = group;
@@ -12327,31 +12334,29 @@ class Stroker extends UI {
         const { list } = this;
         if (list.length) {
             let leaf;
-            const { stroke, strokeWidth, fill } = this.__;
-            const { bounds } = options;
+            const data = this.__, { stroke, strokeWidth, fill } = data, { bounds } = options;
             for (let i = 0; i < list.length; i++) {
                 leaf = list[i];
-                if (bounds && bounds.hit(leaf.__world, options.matrix)) {
-                    const aScaleX = abs(leaf.__world.scaleX), aScaleY = abs(leaf.__world.scaleY);
+                const { worldTransform, worldRenderBounds } = leaf;
+                if (bounds && bounds.hit(worldRenderBounds, options.matrix)) {
+                    const aScaleX = abs(worldTransform.scaleX), aScaleY = abs(worldTransform.scaleY);
                     if (aScaleX !== aScaleY) {
-                        copy$2(matrix, leaf.__world);
+                        copy$2(matrix, worldTransform);
                         scale$1(matrix, 1 / aScaleX, 1 / aScaleY);
                         canvas.setWorld(matrix, options.matrix);
                         canvas.beginPath();
-                        this.__.strokeWidth = strokeWidth;
+                        data.strokeWidth = strokeWidth;
                         const { x, y, width, height } = leaf.__layout.boxBounds;
                         canvas.rect(x * aScaleX, y * aScaleY, width * aScaleX, height * aScaleY);
                     }
                     else {
-                        canvas.setWorld(leaf.__world, options.matrix);
+                        canvas.setWorld(worldTransform, options.matrix);
                         canvas.beginPath();
-                        if (leaf.__.__useArrow) {
+                        if (leaf.__.__useArrow)
                             leaf.__drawPath(canvas);
-                        }
-                        else {
+                        else
                             leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
-                        }
-                        this.__.strokeWidth = strokeWidth / abs(leaf.__world.scaleX);
+                        data.strokeWidth = strokeWidth / abs(worldTransform.scaleX);
                     }
                     if (stroke)
                         typeof stroke === 'string' ? Paint.stroke(stroke, this, canvas) : Paint.strokes(stroke, this, canvas);
@@ -12359,7 +12364,7 @@ class Stroker extends UI {
                         typeof fill === 'string' ? Paint.fill(fill, this, canvas) : Paint.fills(fill, this, canvas);
                 }
             }
-            this.__.strokeWidth = strokeWidth;
+            data.strokeWidth = strokeWidth;
         }
     }
     destroy() {
@@ -12910,7 +12915,6 @@ class EditBox extends Group {
         this.editor = editor;
         this.visible = false;
         this.create();
-        this.rect.syncEventer = editor;
         this.__listenEvents();
     }
     create() {
@@ -12950,8 +12954,11 @@ class EditBox extends Group {
         circle.set(this.getPointStyle(mergeConfig.circle || mergeConfig.rotatePoint || pointsStyle[0]));
         rect.set(Object.assign({ stroke, strokeWidth }, (mergeConfig.rect || {})));
         rect.hittable = !single && !!moveable;
-        element.syncEventer = (single && moveable) ? rect : null;
-        this.app.interaction.bottomList = (single && moveable) ? [{ target: rect, proxy: element }] : null;
+        rect.syncEventer = single && this.editor;
+        if (single && moveable) {
+            element.syncEventer = rect;
+            this.app.interaction.bottomList = [{ target: rect, proxy: element }];
+        }
     }
     update(bounds) {
         this.visible = !this.editor.element.locked;
@@ -13123,6 +13130,11 @@ class EditBox extends Group {
         if (editor.single) {
             const { element } = editor;
             if (element.isBranch) {
+                if (element.textBox) {
+                    const find = element.children.find(item => item.editable && item instanceof Text);
+                    if (find)
+                        return editor.openInnerEditor(find);
+                }
                 editor.openGroup(element);
                 editor.target = editor.selector.findDeepOne(e);
             }
@@ -13268,12 +13280,12 @@ const config = {
     skewable: true
 };
 
+const bounds = new Bounds();
 function simulate(editor) {
-    const { simulateTarget, leafList: targetList } = editor;
-    const { x, y, width, height } = new Bounds().setListWithFn(targetList.list, (leaf) => leaf.worldBoxBounds);
-    const parent = simulateTarget.parent = targetList.list[0].leafer.zoomLayer;
-    const { scaleX, scaleY, e: worldX, f: worldY } = parent.__world;
-    simulateTarget.reset({ x: (x - worldX) / scaleX, y: (y - worldY) / scaleY, width: width / scaleX, height: height / scaleY });
+    const { simulateTarget, list } = editor;
+    const { zoomLayer } = list[0].leafer.zoomLayer;
+    simulateTarget.safeChange(() => simulateTarget.reset(bounds.setListWithFn(list, (leaf) => leaf.getBounds('box', 'page')).get()));
+    zoomLayer.add(simulateTarget);
 }
 
 function onTarget(editor, oldValue) {
@@ -13282,6 +13294,7 @@ function onTarget(editor, oldValue) {
         editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target);
     }
     else {
+        editor.simulateTarget.remove();
         editor.leafList.reset();
         editor.closeInnerEditor();
     }
@@ -13336,7 +13349,7 @@ const EditorHelper = {
         const ungroupList = [];
         app.lockLayout();
         list.forEach(leaf => {
-            if (leaf.isBranch) {
+            if (leaf.isBranch && !leaf.isBranchLeaf) {
                 const { parent, children } = leaf;
                 while (children.length) {
                     ungroupList.push(children[0]);
@@ -13407,17 +13420,77 @@ EditorGroupEvent.UNGROUP = 'editor.ungroup';
 EditorGroupEvent.OPEN = 'editor.open_group';
 EditorGroupEvent.CLOSE = 'editor.close_group';
 
+const { updateMatrix } = LeafHelper;
+const checkMap = { x: 1, y: 1, scaleX: 1, scaleY: 1, rotation: 1, skewX: 1, skewY: 1 }, origin = 'top-left';
+class SimulateElement extends Rect {
+    get __tag() { return 'SimulateElement'; }
+    constructor(editor) {
+        super();
+        this.checkChange = true;
+        this.canChange = true;
+        this.visible = this.hittable = false;
+        this.on(PropertyEvent.CHANGE, (event) => {
+            if (this.checkChange && checkMap[event.attrName]) {
+                const { attrName, newValue, oldValue } = event;
+                const addValue = attrName[0] === 's' ? (newValue || 1) / (oldValue || 1) : (newValue || 0) - (oldValue || 0);
+                this.canChange = false;
+                const data = this.__;
+                data[attrName] = oldValue;
+                updateMatrix(this.parent);
+                updateMatrix(this);
+                const oldMatrix = new Matrix(this.__world);
+                data[attrName] = newValue;
+                this.__layout.rotationChange();
+                updateMatrix(this);
+                this.changedTransform = new Matrix(this.__world).divide(oldMatrix);
+                switch (attrName) {
+                    case 'x':
+                        editor.move(addValue, 0);
+                        break;
+                    case 'y':
+                        editor.move(0, addValue);
+                        break;
+                    case 'rotation':
+                        editor.rotateOf(origin, addValue);
+                        break;
+                    case 'scaleX':
+                        editor.scaleOf(origin, addValue, 1);
+                        break;
+                    case 'scaleY':
+                        editor.scaleOf(origin, 1, addValue);
+                        break;
+                    case 'skewX':
+                        editor.skewOf(origin, addValue, 0);
+                        break;
+                    case 'skewY':
+                        editor.skewOf(origin, 0, addValue);
+                }
+                this.canChange = true;
+            }
+        });
+    }
+    safeChange(changeFn) {
+        if (this.canChange) {
+            this.checkChange = false;
+            changeFn();
+            this.checkChange = true;
+        }
+    }
+}
+
 class Editor extends Group {
     get mergeConfig() {
         const { element, config } = this;
         return this.single && element.editConfig ? Object.assign(Object.assign({}, config), element.editConfig) : config;
     }
     get list() { return this.leafList.list; }
+    get dragHoverExclude() { return [this.editBox.rect]; }
     get editing() { return !!this.list.length; }
     get groupOpening() { return !!this.openedGroupList.length; }
     get multiple() { return this.list.length > 1; }
     get single() { return this.list.length === 1; }
     get dragging() { return this.editBox.dragging; }
+    get moving() { return this.editBox.moving; }
     get element() { return this.multiple ? this.simulateTarget : this.list[0]; }
     get buttons() { return this.editBox.buttons; }
     constructor(userConfig, data) {
@@ -13425,7 +13498,7 @@ class Editor extends Group {
         this.config = DataHelper.clone(config);
         this.leafList = new LeafList();
         this.openedGroupList = new LeafList();
-        this.simulateTarget = new Rect({ visible: false });
+        this.simulateTarget = new SimulateElement(this);
         this.editBox = new EditBox(this);
         this.editToolList = {};
         this.selector = new EditSelect(this);
@@ -13563,18 +13636,18 @@ class Editor extends Group {
         this.skewOf(origin, skewX, skewY);
     }
     move(x, y = 0) {
-        if (!this.mergeConfig.moveable || this.element.locked)
+        if (!this.checkTransform('moveable'))
             return;
         const { element } = this;
         const world = element.getWorldPointByLocal(typeof x === 'object' ? Object.assign({}, x) : { x, y }, null, true);
+        if (this.multiple)
+            element.safeChange(() => element.move(x, y));
         const event = new EditorMoveEvent(EditorMoveEvent.MOVE, { target: element, editor: this, moveX: world.x, moveY: world.y });
         this.editTool.onMove(event);
         this.emitEvent(event);
-        if (this.multiple)
-            element.move(x, y);
     }
     scaleWithDrag(data) {
-        if (!this.mergeConfig.resizeable || this.element.locked)
+        if (!this.checkTransform('resizeable'))
             return;
         const { element } = this;
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, Object.assign(Object.assign({}, data), { target: element, editor: this, worldOrigin: element.getWorldPoint(data.origin) }));
@@ -13582,50 +13655,53 @@ class Editor extends Group {
         this.emitEvent(event);
     }
     scaleOf(origin, scaleX, scaleY = scaleX, _resize) {
-        if (!this.mergeConfig.resizeable || this.element.locked)
+        if (!this.checkTransform('resizeable'))
             return;
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => element.scaleOf(origin, scaleX, scaleY));
+        const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.scaleOf(origin, scaleX, scaleY)));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, { target: element, editor: this, worldOrigin, scaleX, scaleY, transform });
         this.editTool.onScale(event);
         this.emitEvent(event);
     }
     flip(axis) {
-        if (this.element.locked)
+        if (!this.checkTransform('resizeable'))
             return;
         const { element } = this;
         const worldOrigin = this.getWorldOrigin('center');
-        const transform = this.multiple ? this.getChangedTransform(() => element.flip(axis)) : new Matrix(LeafHelper.getFlipTransform(element, axis));
+        const transform = this.multiple ? this.getChangedTransform(() => element.safeChange(() => element.flip(axis))) : new Matrix(LeafHelper.getFlipTransform(element, axis));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, { target: element, editor: this, worldOrigin, scaleX: axis === 'x' ? -1 : 1, scaleY: axis === 'y' ? -1 : 1, transform });
         this.editTool.onScale(event);
         this.emitEvent(event);
     }
     rotateOf(origin, rotation) {
-        if (!this.mergeConfig.rotateable || this.element.locked)
+        if (!this.checkTransform('rotateable'))
             return;
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => element.rotateOf(origin, rotation));
+        const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.rotateOf(origin, rotation)));
         const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, { target: element, editor: this, worldOrigin, rotation, transform });
         this.editTool.onRotate(event);
         this.emitEvent(event);
     }
     skewOf(origin, skewX, skewY = 0, _resize) {
-        if (!this.mergeConfig.skewable || this.element.locked)
+        if (!this.checkTransform('skewable'))
             return;
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => element.skewOf(origin, skewX, skewY));
+        const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.skewOf(origin, skewX, skewY)));
         const event = new EditorSkewEvent(EditorSkewEvent.SKEW, { target: element, editor: this, worldOrigin, skewX, skewY, transform });
         this.editTool.onSkew(event);
         this.emitEvent(event);
     }
+    checkTransform(type) { return this.element && !this.element.locked && this.mergeConfig[type]; }
     getWorldOrigin(origin) {
         return this.element.getWorldPoint(LeafHelper.getInnerOrigin(this.element, origin));
     }
     getChangedTransform(func) {
         const { element } = this;
+        if (this.multiple && !element.canChange)
+            return element.changedTransform;
         const oldMatrix = new Matrix(element.worldTransform);
         func();
         return new Matrix(element.worldTransform).divide(oldMatrix);
@@ -13682,11 +13758,11 @@ class Editor extends Group {
         this.emitEvent(event);
         group.emitEvent(event);
     }
-    openInnerEditor(target) {
-        if (target)
+    openInnerEditor(target, select) {
+        if (target && select)
             this.target = target;
         if (this.single) {
-            const editTarget = this.element;
+            const editTarget = target || this.element;
             const tag = editTarget.editInner;
             if (tag && EditToolCreator.list[tag]) {
                 this.editTool.unload();
@@ -13738,14 +13814,15 @@ class Editor extends Group {
     }
     listenTargetEvents() {
         if (!this.targetEventIds.length) {
-            const { leafer } = this.list[0];
+            const { app, leafer } = this;
             this.targetEventIds = [
-                this.app.on_(MoveEvent.BEFORE_MOVE, this.onMove, this, true),
-                this.app.on_(ZoomEvent.BEFORE_ZOOM, this.onScale, this, true),
-                this.app.on_(RotateEvent.BEFORE_ROTATE, this.onRotate, this, true),
                 leafer.on_(RenderEvent.START, this.update, this),
-                leafer.on_([KeyEvent.HOLD, KeyEvent.UP], (e) => { updateCursor(this, e); }),
-                leafer.on_(KeyEvent.DOWN, this.editBox.onArrow, this.editBox)
+                app.on_(RenderEvent.CHILD_START, this.forceRender, this),
+                app.on_(MoveEvent.BEFORE_MOVE, this.onMove, this, true),
+                app.on_(ZoomEvent.BEFORE_ZOOM, this.onScale, this, true),
+                app.on_(RotateEvent.BEFORE_ROTATE, this.onRotate, this, true),
+                app.on_([KeyEvent.HOLD, KeyEvent.UP], (e) => { updateCursor(this, e); }),
+                app.on_(KeyEvent.DOWN, this.editBox.onArrow, this.editBox)
             ];
         }
     }
@@ -13761,7 +13838,8 @@ class Editor extends Group {
             this.simulateTarget.destroy();
             Object.values(this.editToolList).forEach(item => item.destroy());
             this.editToolList = {};
-            this.target = this.hoverTarget = this.simulateTarget = this.editTool = this.innerEditor = null;
+            this.target = this.hoverTarget = null;
+            this.simulateTarget = this.editTool = this.innerEditor = null;
             super.destroy();
         }
     }
@@ -13878,10 +13956,7 @@ let EditTool = class EditTool extends InnerEditor {
     }
     update() {
         const { editor, editBox } = this;
-        const { simulateTarget, element } = editor;
-        if (editor.multiple)
-            simulateTarget.parent.updateLayout();
-        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = element.getLayoutBounds('box', editor, true);
+        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = editor.element.getLayoutBounds('box', editor, true);
         editBox.set({ x, y, scaleX, scaleY, rotation, skewX, skewY });
         editBox.update({ x: 0, y: 0, width, height });
         this.onUpdate();
@@ -13896,7 +13971,7 @@ EditTool = __decorate([
 ], EditTool);
 
 const { left, right } = Direction9;
-const { move, copy: copy$1 } = PointHelper;
+const { move, copy: copy$1, toNumberPoints } = PointHelper;
 let LineEditTool = class LineEditTool extends EditTool {
     constructor() {
         super(...arguments);
@@ -13938,14 +14013,8 @@ let LineEditTool = class LineEditTool extends EditTool {
     }
     getInnerMove(ui, event, lockRatio) {
         const movePoint = event.getInnerMove(ui);
-        if (lockRatio) {
-            if (Math.abs(movePoint.x) > Math.abs(movePoint.y)) {
-                movePoint.y = 0;
-            }
-            else {
-                movePoint.x = 0;
-            }
-        }
+        if (lockRatio)
+            Math.abs(movePoint.x) > Math.abs(movePoint.y) ? movePoint.y = 0 : movePoint.x = 0;
         return movePoint;
     }
     getFromToByPath(path) {
@@ -13954,7 +14023,8 @@ let LineEditTool = class LineEditTool extends EditTool {
             to: { x: path[4], y: path[5] }
         };
     }
-    getFromToByPoints(points) {
+    getFromToByPoints(originPoints) {
+        const points = toNumberPoints(originPoints);
         return {
             from: { x: points[0], y: points[1] },
             to: { x: points[2], y: points[3] }
@@ -14007,6 +14077,15 @@ LineEditTool = __decorate([
 ], LineEditTool);
 
 Creator.editor = function (options) { return new Editor(options); };
+defineKey(UI.prototype, 'editOuter', {
+    get() { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool'; }
+});
+defineKey(UI.prototype, 'editInner', {
+    get() { return 'PathEditor'; }
+});
+defineKey(Text.prototype, 'editInner', {
+    get() { return 'TextEditor'; }
+});
 UI.setEditConfig = function (config) {
     defineKey(this.prototype, 'editConfig', {
         get() { return typeof config === 'function' ? config(this) : config; }
@@ -14570,18 +14649,7 @@ let TextEditor = class TextEditor extends InnerEditor {
         style.position = 'fixed';
         style.transformOrigin = 'left top';
         style.boxSizing = 'border-box';
-        if (this.isHTMLText) {
-            div.innerHTML = text.text;
-            this.textScale = 1;
-        }
-        else {
-            div.innerText = text.text;
-            const { scaleX, scaleY } = text.worldTransform;
-            this.textScale = Math.max(Math.abs(scaleX), Math.abs(scaleY));
-            const fontSize = text.fontSize * this.textScale;
-            if (fontSize < 12)
-                this.textScale *= 12 / fontSize;
-        }
+        this.isHTMLText ? div.innerHTML = text.text : div.innerText = text.text;
         const { view } = editor.app;
         (this.inBody = view instanceof HTMLCanvasElement) ? document.body.appendChild(div) : view.appendChild(div);
         this.eventIds = [
@@ -14630,16 +14698,46 @@ let TextEditor = class TextEditor extends InnerEditor {
             this.editor.closeInnerEditor();
     }
     onUpdate() {
-        const { editTarget: text, textScale } = this;
-        const { style } = this.editDom;
-        const { x, y } = this.inBody ? text.app.clientBounds : text.app.tree.clientBounds;
+        const { editTarget: text } = this;
+        let textScale = 1;
+        if (!this.isHTMLText) {
+            const { scaleX, scaleY } = text.worldTransform;
+            textScale = Math.max(Math.abs(scaleX), Math.abs(scaleY));
+            const fontSize = text.fontSize * textScale;
+            if (fontSize < 12)
+                textScale *= 12 / text.fontSize;
+        }
+        this.textScale = textScale;
         const { a, b, c, d, e, f } = new Matrix(text.worldTransform).scale(1 / textScale);
+        let { x, y } = this.inBody ? text.app.clientBounds : text.app.tree.clientBounds;
+        let { width, height } = text;
+        x -= window.scrollX, y -= window.scrollY, width *= textScale, height *= textScale;
+        const data = text.__;
+        if (data.__autoWidth && data.autoSizeAlign) {
+            width += 20;
+            switch (data.textAlign) {
+                case 'center':
+                    x -= width / 2;
+                    break;
+                case 'right': x -= width;
+            }
+        }
+        if (data.__autoHeight && data.autoSizeAlign) {
+            height += 20;
+            switch (data.verticalAlign) {
+                case 'middle':
+                    y -= height / 2;
+                    break;
+                case 'bottom': y -= height;
+            }
+        }
+        const { style } = this.editDom;
         style.transform = `matrix(${a},${b},${c},${d},${e},${f})`;
-        style.left = x - window.scrollX + 'px';
-        style.top = y - window.scrollY + 'px';
-        style.width = text.width * textScale + (text.__.__autoWidth ? 20 : 0) + 'px';
-        style.height = text.height * textScale + (text.__.__autoHeight ? 20 : 0) + 'px';
-        this.isHTMLText || updateStyle(this.editDom, text, this.textScale);
+        style.left = x + 'px';
+        style.top = y + 'px';
+        style.width = width + 'px';
+        style.height = height + 'px';
+        this.isHTMLText || updateStyle(this.editDom, text, textScale);
     }
     onUnload() {
         const { editTarget: text, editor, editDom: dom } = this;