@leafer/miniapp 2.1.8 → 2.1.10

package/dist/miniapp.module.js

@@ -784,24 +784,24 @@ const PointHelper = {
     },
     tempToInnerOf(t, matrix) {
         const {tempPoint: temp} = P$7;
-        copy$c(temp, t);
+        copy$d(temp, t);
         toInnerPoint$2(matrix, temp, temp);
         return temp;
     },
     tempToOuterOf(t, matrix) {
         const {tempPoint: temp} = P$7;
-        copy$c(temp, t);
+        copy$d(temp, t);
         toOuterPoint$4(matrix, temp, temp);
         return temp;
     },
     tempToInnerRadiusPointOf(t, matrix) {
         const {tempRadiusPoint: temp} = P$7;
-        copy$c(temp, t);
+        copy$d(temp, t);
         P$7.toInnerRadiusPointOf(t, matrix, temp);
         return temp;
     },
     copyRadiusPoint(t, point, x, y) {
-        copy$c(t, point);
+        copy$d(t, point);
         setRadius(t, x, y);
         return t;
     },
@@ -881,7 +881,7 @@ const PointHelper = {
 
 const P$7 = PointHelper;
 
-const {getDistanceFrom: getDistanceFrom, copy: copy$c, setRadius: setRadius, getAtan2: getAtan2} = P$7;
+const {getDistanceFrom: getDistanceFrom, copy: copy$d, setRadius: setRadius, getAtan2: getAtan2} = P$7;
 
 class Point {
     constructor(x, y) {
@@ -1088,7 +1088,7 @@ class Matrix {
     }
 }
 
-const tempMatrix$2 = new Matrix;
+const tempMatrix$3 = new Matrix;
 
 const TwoPointBoundsHelper = {
     tempPointBounds: {},
@@ -1256,6 +1256,7 @@ const BoundsHelper = {
     },
     copyAndSpread(t, bounds, spread, isShrink, side) {
         const {x: x, y: y, width: width, height: height} = bounds;
+        if (!spread) spread = 0;
         if (isArray(spread)) {
             const four = fourNumber$1(spread);
             isShrink ? B.set(t, x + four[3], y + four[0], width - four[1] - four[3], height - four[2] - four[0]) : B.set(t, x - four[3], y - four[0], width + four[1] + four[3], height + four[2] + four[0]);
@@ -1293,7 +1294,7 @@ const BoundsHelper = {
         return t;
     },
     toOffsetOutBounds(t, to, offsetBounds) {
-        if (!to) to = t; else copy$b(to, t);
+        if (!to) to = t; else copy$c(to, t);
         if (!offsetBounds) offsetBounds = t;
         to.offsetX = B.maxX(offsetBounds);
         to.offsetY = B.maxY(offsetBounds);
@@ -1440,7 +1441,7 @@ const BoundsHelper = {
             if (bounds && (bounds.width || bounds.height)) {
                 if (first) {
                     first = false;
-                    if (!addMode) copy$b(t, bounds);
+                    if (!addMode) copy$c(t, bounds);
                 } else {
                     add$2(t, bounds);
                 }
@@ -1533,7 +1534,7 @@ const BoundsHelper = {
 
 const B = BoundsHelper;
 
-const {add: add$2, copy: copy$b} = B;
+const {add: add$2, copy: copy$c} = B;
 
 class Bounds {
     get minX() {
@@ -2306,7 +2307,7 @@ __decorate([ contextMethod() ], Canvas$1.prototype, "measureText", null);
 
 __decorate([ contextMethod() ], Canvas$1.prototype, "strokeText", null);
 
-const {copy: copy$a, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
+const {copy: copy$b, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
 
 const minSize = {
     width: 1,
@@ -2561,7 +2562,7 @@ class LeaferCanvasBase extends Canvas$1 {
     getSameCanvas(useSameWorldTransform, useSameSmooth) {
         const {size: size, pixelSnap: pixelSnap} = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas(Object.assign({}, size));
         canvas.save();
-        if (useSameWorldTransform) copy$a(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
+        if (useSameWorldTransform) copy$b(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
         if (useSameSmooth) canvas.smooth = this.smooth;
         canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap);
         return canvas;
@@ -3583,7 +3584,7 @@ const {M: M$7, L: L$7, C: C$5, Q: Q$3, Z: Z$5, N: N$2, D: D$3, X: X$2, G: G$2, F
 
 const {toTwoPointBounds: toTwoPointBounds, toTwoPointBoundsByQuadraticCurve: toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$2, arc: arc, ellipse: ellipse$2} = BezierHelper;
 
-const {addPointBounds: addPointBounds, copy: copy$9, addPoint: addPoint$1, setPoint: setPoint$3, addBounds: addBounds, toBounds: toBounds$2} = TwoPointBoundsHelper;
+const {addPointBounds: addPointBounds, copy: copy$a, addPoint: addPoint$1, setPoint: setPoint$3, addBounds: addBounds, toBounds: toBounds$2} = TwoPointBoundsHelper;
 
 const debug$d = Debug.get("PathBounds");
 
@@ -3665,7 +3666,7 @@ const PathBounds = {
 
               case G$2:
                 ellipse$2(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], data[i + 7], data[i + 8], tempPointBounds, setEndPoint);
-                i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
+                i === 0 ? copy$a(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
                 x = setEndPoint.x;
                 y = setEndPoint.y;
                 i += 9;
@@ -3683,7 +3684,7 @@ const PathBounds = {
 
               case O$3:
                 arc(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], tempPointBounds, setEndPoint);
-                i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
+                i === 0 ? copy$a(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
                 x = setEndPoint.x;
                 y = setEndPoint.y;
                 i += 7;
@@ -3700,7 +3701,7 @@ const PathBounds = {
 
               case U$2:
                 arcTo$2(null, x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], tempPointBounds, setEndPoint);
-                i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
+                i === 0 ? copy$a(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
                 x = setEndPoint.x;
                 y = setEndPoint.y;
                 i += 6;
@@ -4781,7 +4782,7 @@ function registerUIEvent() {
     };
 }
 
-const {copy: copy$8, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$2, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
+const {copy: copy$9, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$2, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
 
 const matrix$3 = {}, {round: round$3} = Math;
 
@@ -4886,7 +4887,7 @@ const LeafHelper = {
             if (scaleY) transition = scaleY;
             scaleY = scaleX;
         }
-        copy$8(matrix$3, o);
+        copy$9(matrix$3, o);
         scaleOfOuter$2(matrix$3, origin, scaleX, scaleY);
         if (L$5.hasHighPosition(t)) {
             L$5.setTransform(t, matrix$3, resize, transition, boundsType);
@@ -4905,7 +4906,7 @@ const LeafHelper = {
     },
     rotateOfLocal(t, origin, angle, transition) {
         const o = t.__localMatrix;
-        copy$8(matrix$3, o);
+        copy$9(matrix$3, o);
         rotateOfOuter$2(matrix$3, origin, angle);
         if (L$5.hasHighPosition(t)) L$5.setTransform(t, matrix$3, false, transition); else t.set({
             x: t.x + matrix$3.e - o.e,
@@ -4917,18 +4918,18 @@ const LeafHelper = {
         L$5.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize, transition);
     },
     skewOfLocal(t, origin, skewX, skewY = 0, resize, transition) {
-        copy$8(matrix$3, t.__localMatrix);
+        copy$9(matrix$3, t.__localMatrix);
         skewOfOuter(matrix$3, origin, skewX, skewY);
         L$5.setTransform(t, matrix$3, resize, transition);
     },
     transformWorld(t, transform, resize, transition, boundsType) {
-        copy$8(matrix$3, t.worldTransform);
+        copy$9(matrix$3, t.worldTransform);
         multiplyParent$3(matrix$3, transform);
         if (t.parent) divideParent(matrix$3, t.parent.scrollWorldTransform);
         L$5.setTransform(t, matrix$3, resize, transition, boundsType);
     },
     transform(t, transform, resize, transition, boundsType) {
-        copy$8(matrix$3, t.localTransform);
+        copy$9(matrix$3, t.localTransform);
         multiplyParent$3(matrix$3, transform);
         L$5.setTransform(t, matrix$3, resize, transition, boundsType);
     },
@@ -4966,7 +4967,7 @@ const LeafHelper = {
         return innerOrigin;
     },
     getRelativeWorld(t, relative, temp) {
-        copy$8(matrix$3, t.worldTransform);
+        copy$9(matrix$3, t.worldTransform);
         divideParent(matrix$3, relative.scrollWorldTransform);
         return temp ? matrix$3 : Object.assign({}, matrix$3);
     },
@@ -5180,7 +5181,7 @@ const WaitHelper = {
 
 const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$3} = LeafHelper;
 
-const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$7} = BoundsHelper;
+const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$8} = BoundsHelper;
 
 const localContent = "_localContentBounds";
 
@@ -5419,7 +5420,7 @@ class LeafLayout {
             matrix = getRelativeWorld$1(leaf, relative, true);
         }
         if (!layoutBounds) layoutBounds = MatrixHelper.getLayout(matrix);
-        copy$7(layoutBounds, bounds);
+        copy$8(layoutBounds, bounds);
         PointHelper.copy(layoutBounds, point);
         if (unscale) {
             const {scaleX: scaleX, scaleY: scaleY} = layoutBounds;
@@ -6074,7 +6075,7 @@ const {updateMatrix: updateMatrix$3, updateAllMatrix: updateAllMatrix$3} = LeafH
 
 const {updateBounds: updateBounds$2} = BranchHelper;
 
-const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$4, copy: copy$6} = BoundsHelper;
+const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$4, copy: copy$7} = BoundsHelper;
 
 const {toBounds: toBounds$1} = PathBounds;
 
@@ -6196,7 +6197,7 @@ const LeafBounds = {
     },
     __updateRenderBounds(_bounds) {
         const layout = this.__layout, {renderSpread: renderSpread} = layout;
-        isNumber(renderSpread) && renderSpread <= 0 ? copy$6(layout.renderBounds, layout.strokeBounds) : copyAndSpread$4(layout.renderBounds, layout.boxBounds, renderSpread);
+        isNumber(renderSpread) && renderSpread <= 0 ? copy$7(layout.renderBounds, layout.strokeBounds) : copyAndSpread$4(layout.renderBounds, layout.boxBounds, renderSpread);
     }
 };
 
@@ -6296,7 +6297,7 @@ const {toInnerPoint: toInnerPoint, toOuterPoint: toOuterPoint$1, multiplyParent:
 
 const {toOuterOf: toOuterOf$1} = BoundsHelper;
 
-const {copy: copy$5, move: move$8} = PointHelper;
+const {copy: copy$6, move: move$8} = PointHelper;
 
 const {getScaleFixedData: getScaleFixedData$1} = MathHelper;
 
@@ -6560,14 +6561,14 @@ let Leaf = class Leaf {
         if (this.parent) {
             this.parent.worldToInner(world, to, distance, relative);
         } else {
-            if (to) copy$5(to, world);
+            if (to) copy$6(to, world);
         }
     }
     localToWorld(local, to, distance, relative) {
         if (this.parent) {
             this.parent.innerToWorld(local, to, distance, relative);
         } else {
-            if (to) copy$5(to, local);
+            if (to) copy$6(to, local);
         }
     }
     worldToInner(world, to, distance, relative) {
@@ -6984,7 +6985,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.8";
+const version = "2.1.10";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -7300,7 +7301,10 @@ class Watcher {
         if (this.running) this.target.emit(RenderEvent.REQUEST);
     }
     __onAttrChange(event) {
-        if (this.config.usePartLayout) this.__updatedList.add(event.target);
+        this.add(event.target);
+    }
+    add(leaf) {
+        if (this.config.usePartLayout) this.__updatedList.add(leaf);
         this.update();
     }
     __onChildEvent(event) {
@@ -8339,11 +8343,7 @@ class PolygonData extends UIData {
     }
 }
 
-class StarData extends UIData {
-    get __boxStroke() {
-        return !this.__pathInputed;
-    }
-}
+class StarData extends UIData {}
 
 class PathData extends UIData {
     get __pathInputed() {
@@ -12174,7 +12174,7 @@ function getGapValue(gap, size, totalSize, rows) {
     return gap === "auto" ? value < 0 ? 0 : value : value;
 }
 
-let origin$1 = {}, tempMatrix$1 = getMatrixData();
+let origin$1 = {}, tempMatrix$2 = getMatrixData();
 
 const {get: get$2, set: set, rotateOfOuter: rotateOfOuter$1, translate: translate, scaleOfOuter: scaleOfOuter$1, multiplyParent: multiplyParent, scale: scaleHelper, rotate: rotate$2, skew: skewHelper} = MatrixHelper;
 
@@ -12201,9 +12201,9 @@ function clipMode(data, box, x, y, scaleX, scaleY, rotation, skew, clipScaleX, c
     layout$3(transform, box, x, y, scaleX, scaleY, rotation, skew);
     if (clipScaleX) {
         if (rotation || skew) {
-            set(tempMatrix$1);
-            scaleOfOuter$1(tempMatrix$1, box, clipScaleX, clipScaleY);
-            multiplyParent(transform, tempMatrix$1);
+            set(tempMatrix$2);
+            scaleOfOuter$1(tempMatrix$2, box, clipScaleX, clipScaleY);
+            multiplyParent(transform, tempMatrix$2);
         } else scaleOfOuter$1(transform, box, clipScaleX, clipScaleY);
     }
     data.transform = transform;
@@ -12252,7 +12252,7 @@ function layout$3(transform, box, x, y, scaleX, scaleY, rotation, skew) {
     translate(transform, box.x + x, box.y + y);
 }
 
-const {get: get$1, scale: scale$3, copy: copy$4} = MatrixHelper;
+const {get: get$1, scale: scale$3, copy: copy$5} = MatrixHelper;
 
 const {getFloorScale: getFloorScale} = MathHelper, {abs: abs$7} = Math;
 
@@ -12278,19 +12278,15 @@ function createPattern(paint, ui, canvas, renderOptions) {
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
             width *= scaleX;
             height *= scaleY;
-            if (gap) {
+            if (gap && !brush) {
                 xGap = gap.x * scaleX / abs$7(data.scaleX || 1);
                 yGap = gap.y * scaleY / abs$7(data.scaleY || 1);
-                if (brush) {
-                    const brushScale = PaintImage.getBrushScale(paint, ui);
-                    xGap /= brushScale, yGap /= brushScale;
-                }
             }
             if (transform || scaleX !== 1 || scaleY !== 1) {
                 scaleX *= getFloorScale(width + (xGap || 0));
                 scaleY *= getFloorScale(height + (yGap || 0));
                 imageMatrix = get$1();
-                if (transform) copy$4(imageMatrix, transform);
+                if (transform) copy$5(imageMatrix, transform);
                 scale$3(imageMatrix, 1 / scaleX, 1 / scaleY);
             }
             const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
@@ -12528,9 +12524,9 @@ const PaintGradientModule = {
     getTransform: getTransform
 };
 
-const {copy: copy$3, move: move$6, toOffsetOutBounds: toOffsetOutBounds$1} = BoundsHelper, {max: max$2, abs: abs$6} = Math;
+const {copy: copy$4, move: move$6, toOffsetOutBounds: toOffsetOutBounds$1} = BoundsHelper, {max: max$2, abs: abs$6} = Math;
 
-const tempBounds$1 = {}, tempMatrix = new Matrix;
+const tempBounds$1 = {}, tempMatrix$1 = new Matrix;
 
 const offsetOutBounds$1 = {};
 
@@ -12584,11 +12580,11 @@ function getShadowRenderSpread(_ui, shadow) {
 function getShadowTransform(ui, canvas, _shape, shadow, outBounds, otherScale, isInnerShaodw) {
     if (shadow.spread) {
         const spread = shadow.spread * 2 * otherScale * (isInnerShaodw ? -1 : 1), {width: width, height: height} = ui.__layout.strokeBounds;
-        tempMatrix.set().scaleOfOuter({
+        tempMatrix$1.set().scaleOfOuter({
             x: (outBounds.x + outBounds.width / 2) * canvas.pixelRatio,
             y: (outBounds.y + outBounds.height / 2) * canvas.pixelRatio
         }, 1 + spread / width, 1 + spread / height);
-        return tempMatrix;
+        return tempMatrix$1;
     }
     return undefined;
 }
@@ -12597,7 +12593,7 @@ function drawWorldShadow(canvas, outBounds, shape) {
     const {shapeBounds: shapeBounds} = shape;
     let from, to;
     if (Platform.fullImageShadow) {
-        copy$3(tempBounds$1, canvas.bounds);
+        copy$4(tempBounds$1, canvas.bounds);
         move$6(tempBounds$1, outBounds.x - shapeBounds.x, outBounds.y - shapeBounds.y);
         from = canvas.bounds, to = tempBounds$1;
     } else {
@@ -13416,7 +13412,7 @@ function mergeConfigAttr() {
 
 const {abs: abs$5} = Math;
 
-const {copy: copy$2} = MatrixHelper;
+const {copy: copy$3} = MatrixHelper;
 
 const {setListWithFn: setListWithFn} = BoundsHelper;
 
@@ -13458,7 +13454,7 @@ class Stroker extends UI {
                 const {worldTransform: worldTransform, worldRenderBounds: worldRenderBounds} = leaf;
                 if (worldRenderBounds.width && worldRenderBounds.height && (!bounds || bounds.hit(worldRenderBounds, options.matrix))) {
                     const aScaleX = abs$5(worldTransform.scaleX), aScaleY = abs$5(worldTransform.scaleY);
-                    copy$2(matrix$1, worldTransform);
+                    copy$3(matrix$1, worldTransform);
                     matrix$1.half = strokeWidth % 2;
                     canvas.setWorld(matrix$1, options.matrix);
                     canvas.beginPath();
@@ -13790,7 +13786,7 @@ const EditDataHelper = {
     getScaleData(target, startBounds, direction, totalMoveOrScale, lockRatio, around, flipable, scaleMode, boundsType) {
         let align, origin = {}, scaleX = 1, scaleY = 1, lockScale;
         const {widthRange: widthRange, heightRange: heightRange, dragBounds: dragBounds, worldTransform: worldTransform, boxBounds: boxBounds} = target;
-        const {width: width, height: height} = startBounds;
+        const {width: width, height: height} = startBounds, worldScaleX = abs$4(worldTransform.scaleX), worldScaleY = abs$4(worldTransform.scaleY);
         const innerBounds = target.getBounds(boundsType, "inner");
         const originChangedScaleX = target.scaleX / startBounds.scaleX;
         const originChangedScaleY = target.scaleY / startBounds.scaleY;
@@ -13882,9 +13878,8 @@ const EditDataHelper = {
         if (useScaleX) scaleX /= changedScaleX;
         if (useScaleY) scaleY /= changedScaleY;
         if (!flipable) {
-            const {worldTransform: worldTransform} = target;
-            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldTransform.scaleX;
-            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldTransform.scaleY;
+            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldScaleX;
+            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldScaleY;
         }
         toPoint(around || align, innerBounds, origin, true);
         this.checkOrigin(target, origin, boundsType);
@@ -13905,13 +13900,14 @@ const EditDataHelper = {
             const nowHeight = innerBounds.height * target.scaleY;
             scaleY = within$3(nowHeight * scaleY, heightRange) / nowHeight;
         }
-        let minWidth = 1 * abs$4(worldTransform.scaleX), minHeight = 1 * abs$4(worldTransform.scaleY);
+        let minWidth = 1, minHeight = 1;
         if (boundsType !== "box") {
-            minWidth += innerBounds.width - boxBounds.width;
-            minHeight += innerBounds.height - boxBounds.height;
+            minWidth += (innerBounds.width - boxBounds.width) * worldScaleX;
+            minHeight += (innerBounds.height - boxBounds.height) * worldScaleY;
         }
-        if (useScaleX && abs$4(scaleX * innerBounds.width) < minWidth) scaleX = sign$1(scaleX) * minWidth / innerBounds.width;
-        if (useScaleY && abs$4(scaleY * innerBounds.height) < minHeight) scaleY = sign$1(scaleY) * minHeight / innerBounds.height;
+        const worldWidth = worldScaleX * innerBounds.width, worldHeight = worldScaleY * innerBounds.height;
+        if (useScaleX && abs$4(scaleX * worldWidth) < minWidth) scaleX = sign$1(scaleX) * minWidth / worldWidth;
+        if (useScaleY && abs$4(scaleY * worldHeight) < minHeight) scaleY = sign$1(scaleY) * minHeight / worldHeight;
         if (lockRatio && scaleX !== scaleY) {
             lockScale = Math.min(abs$4(scaleX), abs$4(scaleY));
             scaleX = sign$1(scaleX) * lockScale;
@@ -14294,8 +14290,8 @@ class EditBox extends Group {
         updateMoveCursor(this);
     }
     update() {
-        const {editor: editor, mergeConfig: mergeConfig} = this;
-        const {x: x, y: y, scaleX: scaleX, scaleY: scaleY, rotation: rotation, skewX: skewX, skewY: skewY, width: width, height: height} = this.target.getLayoutBounds(mergeConfig.editBoxType, editor, true);
+        const {editor: editor} = this;
+        const {x: x, y: y, scaleX: scaleX, scaleY: scaleY, rotation: rotation, skewX: skewX, skewY: skewY, width: width, height: height} = this.target.getLayoutBounds("box", editor, true);
         this.visible = !this.target.locked;
         this.set({
             x: x,
@@ -14318,9 +14314,9 @@ class EditBox extends Group {
         if (this.app) this.rect.syncEventer = this.app.interaction.bottomList = null;
     }
     updateBounds(bounds) {
-        const {editor: editor, mergedConfig: mergedConfig, single: single, rect: rect, circle: circle, buttons: buttons, resizePoints: resizePoints, rotatePoints: rotatePoints, resizeLines: resizeLines} = this;
+        const {editor: editor, mergeConfig: mergeConfig, single: single, rect: rect, circle: circle, buttons: buttons, resizePoints: resizePoints, rotatePoints: rotatePoints, resizeLines: resizeLines} = this;
         const {editMask: editMask} = editor;
-        const {middlePoint: middlePoint, resizeable: resizeable, rotateable: rotateable, hideOnSmall: hideOnSmall, editBox: editBox, mask: mask, dimOthers: dimOthers, bright: bright, spread: spread, hideRotatePoints: hideRotatePoints, hideResizeLines: hideResizeLines} = mergedConfig;
+        const {middlePoint: middlePoint, resizeable: resizeable, rotateable: rotateable, hideOnSmall: hideOnSmall, editBox: editBox, editBoxType: editBoxType, mask: mask, dimOthers: dimOthers, bright: bright, spread: spread, hideRotatePoints: hideRotatePoints, hideResizeLines: hideResizeLines} = mergeConfig;
         editMask.visible = mask ? true : 0;
         if (!isUndefined(dimOthers) || !isUndefined(bright)) {
             editor.setDimOthers(dimOthers);
@@ -14329,6 +14325,7 @@ class EditBox extends Group {
         } else if (editor.hasDimOthers) {
             editor.cancelDimOthers();
         }
+        if (editBoxType === "stroke") BoundsHelper.spread(bounds, this.target.__layout.strokeBoxSpread);
         if (spread) BoundsHelper.spread(bounds, spread);
         if (this.view.worldOpacity) {
             const {width: width, height: height} = bounds;
@@ -14358,7 +14355,7 @@ class EditBox extends Group {
                     }
                 }
             }
-            circle.visible = showPoints && rotateable && !!(mergedConfig.circle || mergedConfig.rotatePoint);
+            circle.visible = showPoints && rotateable && !!(mergeConfig.circle || mergeConfig.rotatePoint);
             if (circle.visible) this.layoutCircle();
             if (rect.path) rect.path = null;
             rect.set(Object.assign(Object.assign({}, bounds), {
@@ -15409,17 +15406,19 @@ let Editor = class Editor extends Group {
             if (EditToolCreator.list[name]) {
                 const tool = this.editTool = this.getEditTool(name);
                 this.editBox.load();
+                tool.editTarget = target;
                 tool.load();
                 this.update();
             }
         }
     }
-    unloadEditTool() {
+    unloadEditTool(onlyTool) {
         let tool = this.editTool;
         if (tool) {
-            this.editBox.unload();
+            if (!onlyTool) this.editBox.unload();
             tool.unload();
-            this.editTool = null;
+            if (!onlyTool) this.editTool = null;
+            tool.editTarget = null;
         }
     }
     getEditSize(_ui) {
@@ -15518,7 +15517,7 @@ let Editor = class Editor extends Group {
                 if (isString(check)) name = check; else if (check === false) return;
             }
             if (EditToolCreator.list[name]) {
-                this.editTool.unload();
+                this.unloadEditTool(true);
                 this.innerEditing = true;
                 this.innerEditor = this.getInnerEditor(name);
                 this.innerEditor.editTarget = target;
@@ -15535,7 +15534,7 @@ let Editor = class Editor extends Group {
             this.innerEditor.unload();
             this.emitInnerEvent(InnerEditorEvent.CLOSE);
             if (!onlyInnerEditor) this.updateEditTool();
-            this.innerEditor = null;
+            this.innerEditor = this.innerEditor.editTarget = null;
         }
     }
     emitInnerEvent(type) {
@@ -15670,8 +15669,13 @@ class InnerEditor {
 }
 
 let EditTool = class EditTool extends InnerEditor {
-    static registerEditTool(name) {
+    static registerEditTool(name, changeTag) {
         EditToolCreator.register(this, name);
+        if (changeTag) defineKey(this.prototype, "tag", {
+            get() {
+                return name;
+            }
+        });
     }
     get tag() {
         return "EditTool";
@@ -15733,7 +15737,7 @@ EditTool = __decorate([ registerEditTool() ], EditTool);
 
 const {left: left$1, right: right$1} = Direction9;
 
-const {move: move$5, copy: copy$1, toNumberPoints: toNumberPoints} = PointHelper;
+const {move: move$5, copy: copy$2, toNumberPoints: toNumberPoints} = PointHelper;
 
 let LineEditTool = class LineEditTool extends EditTool {
     constructor() {
@@ -15825,10 +15829,10 @@ let LineEditTool = class LineEditTool extends EditTool {
             line.innerToWorld(from, from, false, editBox);
             line.innerToWorld(to, to, false, editBox);
             rect.pen.clearPath().moveTo(from.x, from.y).lineTo(to.x, to.y);
-            copy$1(resizePoints[7], from);
-            copy$1(rotatePoints[7], from);
-            copy$1(resizePoints[3], to);
-            copy$1(rotatePoints[3], to);
+            copy$2(resizePoints[7], from);
+            copy$2(rotatePoints[7], from);
+            copy$2(resizePoints[3], to);
+            copy$2(rotatePoints[3], to);
         }
         for (let i = 0; i < 8; i++) {
             if (i < 4) resizeLines[i].visible = false;
@@ -16008,7 +16012,7 @@ function scaleResizeGroup(group, scaleX, scaleY) {
     }
 }
 
-const leaf = Leaf.prototype, tempPoint$1 = {}, {scale: scale$2, toOuterPoint: toOuterPoint} = MatrixHelper;
+const leaf = Leaf.prototype, tempPoint$1 = {}, tempMatrix = {}, {copy: copy$1, scale: scale$2, toOuterPoint: toOuterPoint} = MatrixHelper;
 
 leaf.scaleResize = function(scaleX, scaleY = scaleX, noResize, boundsType) {
     const data = this;
@@ -16016,14 +16020,16 @@ leaf.scaleResize = function(scaleX, scaleY = scaleX, noResize, boundsType) {
         data.scaleX *= scaleX;
         data.scaleY *= scaleY;
     } else {
-        const local = this.__localMatrix;
-        if (scaleX < 0) data.scaleX *= -1, scaleX = -scaleX, scale$2(local, -1, 1);
-        if (scaleY < 0) data.scaleY *= -1, scaleY = -scaleY, scale$2(local, 1, -1);
+        if (scaleX < 0) data.scaleX *= -1, scaleX = -scaleX;
+        if (scaleY < 0) data.scaleY *= -1, scaleY = -scaleY;
         if (boundsType === "stroke") {
+            copy$1(tempMatrix, this.__localMatrix);
+            if (scaleX < 0) scale$2(tempMatrix, -1, 1);
+            if (scaleY < 0) scale$2(tempMatrix, 1, -1);
             const {boxBounds: boxBounds, strokeBounds: strokeBounds} = this.__layout, {x: x, y: y, width: width, height: height} = strokeBounds;
             tempPoint$1.x = (x - boxBounds.x) * (scaleX - 1);
             tempPoint$1.y = (y - boxBounds.y) * (scaleY - 1);
-            toOuterPoint(local, tempPoint$1, tempPoint$1, true);
+            toOuterPoint(tempMatrix, tempPoint$1, tempPoint$1, true);
             this.x += tempPoint$1.x;
             this.y += tempPoint$1.y;
             scaleX = (width * scaleX - (width - boxBounds.width)) / boxBounds.width;
@@ -21065,4 +21071,4 @@ function isSame(a, b) {
 
 Plugin.add("corner");
 
-export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, Arrow, ArrowData, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, Effect, Ellipse, EllipseBox, EllipseBoxData, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, Flow, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageBox, ImageBoxData, ImageData, ImageEvent, ImageManager, IncrementId, InnerEditor, InnerEditorEvent, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferTypeCreator, LeaferVideo, Line, LineData, LineEditTool, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathArrowModule, PathBounds, PathBox, PathBoxData, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathMatrixHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, PathScaler, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonBox, PolygonBoxData, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, ScrollBar, Scroller, SelectArea, Selector, Star, StarBox, StarBoxData, StarData, State, StringNumberMap, Stroker, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, TransformTool, Transformer, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, WheelEventHelper, ZoomEvent, addViewport, addViewportConfig, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite$1 as isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerEditTool, registerInnerEditor, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleResize, scaleResizeFontSize, scaleResizeGroup, scaleResizePath, scaleResizePoints, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$3 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$6 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, Arrow, ArrowData, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, Effect, Ellipse, EllipseBox, EllipseBoxData, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, Flow, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageBox, ImageBoxData, ImageData, ImageEvent, ImageManager, IncrementId, InnerEditor, InnerEditorEvent, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferTypeCreator, LeaferVideo, Line, LineData, LineEditTool, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathArrowModule, PathBounds, PathBox, PathBoxData, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathMatrixHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, PathScaler, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonBox, PolygonBoxData, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, ScrollBar, Scroller, SelectArea, Selector, Star, StarBox, StarBoxData, StarData, State, StringNumberMap, Stroker, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, TransformTool, Transformer, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, WheelEventHelper, ZoomEvent, addViewport, addViewportConfig, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite$1 as isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerEditTool, registerInnerEditor, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleResize, scaleResizeFontSize, scaleResizeGroup, scaleResizePath, scaleResizePoints, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$3 as tempBounds, tempMatrix$3 as tempMatrix, tempPoint$6 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };