@leafer-editor/worker 1.0.3 → 1.0.5

package/dist/worker.js

@@ -4059,7 +4059,7 @@ var LeaferUI = (function (exports) {
         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++) {
@@ -4229,7 +4229,7 @@ var LeaferUI = (function (exports) {
         }
     };
     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;
@@ -4486,15 +4486,16 @@ var LeaferUI = (function (exports) {
         }
         getLayoutBounds(type, relative = 'world', unscale) {
             const { leaf } = this;
-            let point, matrix, bounds = this.getInnerBounds(type);
+            let point, matrix, layoutBounds, bounds = this.getInnerBounds(type);
             switch (relative) {
                 case 'world':
                     point = leaf.getWorldPoint(bounds);
                     matrix = leaf.__world;
                     break;
                 case 'local':
+                    const { scaleX, scaleY, rotation, skewX, skewY } = leaf.__;
+                    layoutBounds = { scaleX, scaleY, rotation, skewX, skewY };
                     point = leaf.getLocalPointByInner(bounds);
-                    matrix = leaf.__localMatrix;
                     break;
                 case 'inner':
                     point = bounds;
@@ -4506,7 +4507,8 @@ var LeaferUI = (function (exports) {
                     point = leaf.getWorldPoint(bounds, relative);
                     matrix = getRelativeWorld$1(leaf, relative, true);
             }
-            const layoutBounds = MatrixHelper.getLayout(matrix);
+            if (!layoutBounds)
+                layoutBounds = MatrixHelper.getLayout(matrix);
             copy$9(layoutBounds, bounds);
             PointHelper.copy(layoutBounds, point);
             if (unscale) {
@@ -4756,6 +4758,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';
@@ -4931,7 +4934,7 @@ var LeaferUI = (function (exports) {
     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);
@@ -5001,9 +5004,9 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    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() {
@@ -5086,7 +5089,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;
@@ -5098,7 +5101,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)
@@ -5114,7 +5117,7 @@ var LeaferUI = (function (exports) {
                 }
             }
             else {
-                updateMatrix$1(this);
+                updateMatrix$2(this);
             }
         },
         __updateNaturalSize() {
@@ -5124,11 +5127,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$8(layout.renderBounds, layout.strokeBounds);
+            layout.renderSpread > 0 ? copyAndSpread$1(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$8(layout.renderBounds, layout.strokeBounds);
         }
     };
 
@@ -5233,6 +5236,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; }
@@ -5674,6 +5679,7 @@ var LeaferUI = (function (exports) {
         add(child, index) {
             if (child === this)
                 return;
+            child.__ || (child = UICreator.get(child.tag, child));
             if (child.parent)
                 child.parent.remove(child);
             child.parent = this;
@@ -5696,10 +5702,14 @@ var LeaferUI = (function (exports) {
         }
         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);
@@ -5917,7 +5927,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.3";
+    const version = "1.0.5";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6103,7 +6113,7 @@ var LeaferUI = (function (exports) {
 
     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;
@@ -6271,7 +6281,7 @@ var LeaferUI = (function (exports) {
             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)
@@ -6386,6 +6396,7 @@ var LeaferUI = (function (exports) {
             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);
@@ -6683,7 +6694,7 @@ var LeaferUI = (function (exports) {
                 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);
                     }
                 }
@@ -7393,12 +7404,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;
@@ -7406,9 +7412,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');
@@ -7417,10 +7422,10 @@ var LeaferUI = (function (exports) {
         export(filename, options) {
             return Export.export(this, filename, options);
         }
-        clone(newData) {
+        clone(data) {
             const json = this.toJSON();
-            if (newData)
-                Object.assign(json, newData);
+            if (data)
+                Object.assign(json, data);
             return UI_1.one(json);
         }
         static one(data, x, y, width, height) {
@@ -8091,10 +8096,9 @@ var LeaferUI = (function (exports) {
         registerUI()
     ], exports.Rect);
 
-    const rect$1 = exports.Rect.prototype;
-    const group$1 = exports.Group.prototype;
+    const { copy: copy$6, add, includes: includes$1 } = BoundsHelper;
+    const rect$1 = exports.Rect.prototype, group$1 = exports.Group.prototype;
     const childrenRenderBounds = {};
-    const { copy: copy$6, add, includes: includes$1, copyAndSpread: copyAndSpread$1 } = BoundsHelper;
     exports.Box = class Box extends exports.Group {
         get __tag() { return 'Box'; }
         get isBranchLeaf() { return true; }
@@ -8108,29 +8112,27 @@ var LeaferUI = (function (exports) {
             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 {
                     this.__updateRectBoxBounds();
                 }
-                if (data.flow)
-                    this.__updateContentBounds();
             }
             else {
                 this.__updateRectBoxBounds();
@@ -8196,6 +8198,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);
@@ -8725,6 +8730,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);
@@ -9445,9 +9453,10 @@ var LeaferUI = (function (exports) {
             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) ? (exports.DragEvent.list || this.dragableList || emptyList) : emptyList;
+            const hasProxyList = proxy && proxy.list.length, dragList = exports.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;
@@ -9472,8 +9481,8 @@ var LeaferUI = (function (exports) {
                 this.dragging = canDrag && PointerButton.left(data);
                 if (this.dragging) {
                     this.interaction.emit(exports.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));
                 }
             }
         }
@@ -9481,12 +9490,12 @@ var LeaferUI = (function (exports) {
             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;
                 }
             }
@@ -9511,7 +9520,7 @@ var LeaferUI = (function (exports) {
         }
         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(exports.DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })));
@@ -9600,7 +9609,7 @@ var LeaferUI = (function (exports) {
             this.interaction.emit(exports.DragEvent.LEAVE, data, dragEnterPath);
         }
         dragReset() {
-            exports.DragEvent.list = exports.DragEvent.data = this.dragableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
+            exports.DragEvent.list = exports.DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
         }
         checkDragOut(data) {
             const { interaction } = this;
@@ -9741,6 +9750,7 @@ var LeaferUI = (function (exports) {
         touch: {
             preventDefault: true
         },
+        multiTouch: {},
         cursor: true,
         keyEvent: true
     };
@@ -9867,6 +9877,8 @@ var LeaferUI = (function (exports) {
             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));
@@ -10056,7 +10068,7 @@ var LeaferUI = (function (exports) {
                 data = this.hoverData;
             if (!data)
                 return;
-            this.findPath(data, { exclude: this.dragger.getList(), name: exports.PointerEvent.MOVE });
+            this.findPath(data, { exclude: this.dragger.getList(false, true), name: exports.PointerEvent.MOVE });
             this.hoverData = data;
         }
         updateCursor(data) {
@@ -10078,7 +10090,7 @@ var LeaferUI = (function (exports) {
             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;
             }
@@ -10260,7 +10272,7 @@ var LeaferUI = (function (exports) {
         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();
@@ -10316,15 +10328,14 @@ var LeaferUI = (function (exports) {
         return hitWidth ? this.__hitStroke(inner, hitWidth) : false;
     };
 
-    const ui$2 = new exports.UI();
-    const rect = exports.Rect.prototype;
-    rect.__updateHitCanvas = function () {
+    const ui$2 = exports.UI.prototype, rect = exports.Rect.prototype, box$1 = exports.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);
     };
 
@@ -10663,7 +10674,7 @@ var LeaferUI = (function (exports) {
         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();
@@ -10703,11 +10714,11 @@ var LeaferUI = (function (exports) {
                 }
             }
         }
-        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;
     }
 
@@ -10823,9 +10834,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) {
@@ -11437,14 +11449,15 @@ 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$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';
@@ -11526,7 +11539,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();
             });
         }
     }
@@ -11555,12 +11571,18 @@ var LeaferUI = (function (exports) {
             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;
@@ -11632,34 +11654,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)
@@ -11764,14 +11784,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$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 },
@@ -11791,22 +11811,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$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]);
             }
         }
     }
@@ -12328,31 +12346,29 @@ var LeaferUI = (function (exports) {
             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);
@@ -12360,7 +12376,7 @@ var LeaferUI = (function (exports) {
                             typeof fill === 'string' ? Paint.fill(fill, this, canvas) : Paint.fills(fill, this, canvas);
                     }
                 }
-                this.__.strokeWidth = strokeWidth;
+                data.strokeWidth = strokeWidth;
             }
         }
         destroy() {
@@ -12738,7 +12754,6 @@ var LeaferUI = (function (exports) {
                 scaleY = within(nowHeight * scaleY, heightRange) / nowHeight;
             }
             toPoint(around || align, boxBounds, origin, true);
-            console.log({ origin, scaleX, scaleY, direction, lockRatio, around });
             return { origin, scaleX, scaleY, direction, lockRatio, around };
         },
         getRotateData(bounds, direction, current, last, around) {
@@ -12912,7 +12927,6 @@ var LeaferUI = (function (exports) {
             this.editor = editor;
             this.visible = false;
             this.create();
-            this.rect.syncEventer = editor;
             this.__listenEvents();
         }
         create() {
@@ -12952,8 +12966,11 @@ var LeaferUI = (function (exports) {
             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;
@@ -13125,6 +13142,11 @@ var LeaferUI = (function (exports) {
             if (editor.single) {
                 const { element } = editor;
                 if (element.isBranch) {
+                    if (element.textBox) {
+                        const find = element.children.find(item => item.editable && item instanceof exports.Text);
+                        if (find)
+                            return editor.openInnerEditor(find);
+                    }
                     editor.openGroup(element);
                     editor.target = editor.selector.findDeepOne(e);
                 }
@@ -13270,12 +13292,12 @@ ${filterStyle}
         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) {
@@ -13284,6 +13306,7 @@ ${filterStyle}
             editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target);
         }
         else {
+            editor.simulateTarget.remove();
             editor.leafList.reset();
             editor.closeInnerEditor();
         }
@@ -13338,7 +13361,7 @@ ${filterStyle}
             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]);
@@ -13409,17 +13432,77 @@ ${filterStyle}
     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 exports.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 exports.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) {
@@ -13427,7 +13510,7 @@ ${filterStyle}
             this.config = DataHelper.clone(config);
             this.leafList = new LeafList();
             this.openedGroupList = new LeafList();
-            this.simulateTarget = new exports.Rect({ visible: false });
+            this.simulateTarget = new SimulateElement(this);
             this.editBox = new EditBox(this);
             this.editToolList = {};
             this.selector = new EditSelect(this);
@@ -13565,18 +13648,18 @@ ${filterStyle}
             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) }));
@@ -13584,50 +13667,53 @@ ${filterStyle}
             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);
@@ -13684,11 +13770,11 @@ ${filterStyle}
             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();
@@ -13740,14 +13826,15 @@ ${filterStyle}
         }
         listenTargetEvents() {
             if (!this.targetEventIds.length) {
-                const { leafer } = this.list[0];
+                const { app, leafer } = this;
                 this.targetEventIds = [
-                    this.app.on_(exports.MoveEvent.BEFORE_MOVE, this.onMove, this, true),
-                    this.app.on_(exports.ZoomEvent.BEFORE_ZOOM, this.onScale, this, true),
-                    this.app.on_(exports.RotateEvent.BEFORE_ROTATE, this.onRotate, this, true),
                     leafer.on_(RenderEvent.START, this.update, this),
-                    leafer.on_([exports.KeyEvent.HOLD, exports.KeyEvent.UP], (e) => { updateCursor(this, e); }),
-                    leafer.on_(exports.KeyEvent.DOWN, this.editBox.onArrow, this.editBox)
+                    app.on_(RenderEvent.CHILD_START, this.forceRender, this),
+                    app.on_(exports.MoveEvent.BEFORE_MOVE, this.onMove, this, true),
+                    app.on_(exports.ZoomEvent.BEFORE_ZOOM, this.onScale, this, true),
+                    app.on_(exports.RotateEvent.BEFORE_ROTATE, this.onRotate, this, true),
+                    app.on_([exports.KeyEvent.HOLD, exports.KeyEvent.UP], (e) => { updateCursor(this, e); }),
+                    app.on_(exports.KeyEvent.DOWN, this.editBox.onArrow, this.editBox)
                 ];
             }
         }
@@ -13880,10 +13967,7 @@ ${filterStyle}
         }
         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();
@@ -14572,18 +14656,7 @@ ${filterStyle}
             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 = [
@@ -14632,16 +14705,46 @@ ${filterStyle}
                 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;