@leafer-editor/worker 1.5.1 → 1.5.3

package/dist/worker.js

@@ -119,8 +119,9 @@ var LeaferUI = (function (exports) {
             if (!scaleData)
                 scaleData = {};
             if (size) {
-                scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
-                scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
+                const scaleX = (typeof size === 'number' ? size : size.width || 0) / originSize.width, scaleY = (typeof size === 'number' ? size : size.height || 0) / originSize.height;
+                scaleData.scaleX = scaleX || scaleY || 1;
+                scaleData.scaleY = scaleY || scaleX || 1;
             }
             else if (scale)
                 MathHelper.assignScale(scaleData, scale);
@@ -1693,6 +1694,9 @@ var LeaferUI = (function (exports) {
     function isNull(value) {
         return value === undefined || value === null;
     }
+    function isEmptyData(value) {
+        return JSON.stringify(value) === '{}';
+    }
 
     /******************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -2348,7 +2352,7 @@ var LeaferUI = (function (exports) {
     const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$5, PI: PI$2, sqrt: sqrt$1, pow } = Math;
     const { setPoint: setPoint$4, addPoint: addPoint$2 } = TwoPointBoundsHelper;
     const { set, toNumberPoints: toNumberPoints$1 } = PointHelper;
-    const { M: M$8, L: L$9, C: C$8, Q: Q$7, Z: Z$7 } = PathCommandMap;
+    const { M: M$8, L: L$9, C: C$7, Q: Q$7, Z: Z$7 } = PathCommandMap;
     const tempPoint$2 = {};
     const BezierHelper = {
         points(data, originPoints, curve, close) {
@@ -2383,7 +2387,7 @@ var LeaferUI = (function (exports) {
                             data.push(Q$7, c1X, c1Y, bX, bY);
                     }
                     else {
-                        data.push(C$8, c2X, c2Y, c1X, c1Y, bX, bY);
+                        data.push(C$7, c2X, c2Y, c1X, c1Y, bX, bY);
                     }
                     c2X = bX + cb * cX;
                     c2Y = bY + cb * cY;
@@ -2488,7 +2492,7 @@ var LeaferUI = (function (exports) {
                 x2 = cx + x + control * (rotationCos * radiusX * endSin + rotationSin * radiusY * endCos);
                 y2 = cy + y + control * (rotationSin * radiusX * endSin - rotationCos * radiusY * endCos);
                 if (data)
-                    data.push(C$8, x1, y1, x2, y2, cx + x, cy + y);
+                    data.push(C$7, x1, y1, x2, y2, cx + x, cy + y);
                 if (setPointBounds)
                     toTwoPointBounds$1(cx + startX, cy + startY, x1, y1, x2, y2, cx + x, cy + y, setPointBounds, true);
                 startX = x;
@@ -2502,7 +2506,7 @@ var LeaferUI = (function (exports) {
                 set(setEndPoint, cx + x, cy + y);
         },
         quadraticCurveTo(data, fromX, fromY, x1, y1, toX, toY) {
-            data.push(C$8, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY);
+            data.push(C$7, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY);
         },
         toTwoPointBoundsByQuadraticCurve(fromX, fromY, x1, y1, toX, toY, pointBounds, addMode) {
             toTwoPointBounds$1(fromX, fromY, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY, pointBounds, addMode);
@@ -2610,7 +2614,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M: M$7, m, L: L$8, l, H, h, V, v, C: C$7, c, S, s, Q: Q$6, q, T, t, A, a, Z: Z$6, z, N: N$5, D: D$5, X: X$5, G: G$5, F: F$6, O: O$6, P: P$5, U: U$5 } = PathCommandMap;
+    const { M: M$7, m, L: L$8, l, H, h, V, v, C: C$6, c, S, s, Q: Q$6, q, T, t, A, a, Z: Z$6, z, N: N$5, D: D$5, X: X$5, G: G$5, F: F$6, O: O$6, P: P$5, U: U$5 } = PathCommandMap;
     const { rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
     const { ellipticalArc } = EllipseHelper;
     const debug$f = Debug.get('PathConvert');
@@ -2738,14 +2742,14 @@ var LeaferUI = (function (exports) {
                         old[i + 4] += y;
                         command = S;
                     case S:
-                        smooth = (lastCommand === C$7) || (lastCommand === S);
+                        smooth = (lastCommand === C$6) || (lastCommand === S);
                         x1 = smooth ? (x * 2 - controlX) : old[i + 1];
                         y1 = smooth ? (y * 2 - controlY) : old[i + 2];
                         controlX = old[i + 1];
                         controlY = old[i + 2];
                         x = old[i + 3];
                         y = old[i + 4];
-                        data.push(C$7, x1, y1, controlX, controlY, x, y);
+                        data.push(C$6, x1, y1, controlX, controlY, x, y);
                         i += 5;
                         break;
                     case c:
@@ -2755,13 +2759,13 @@ var LeaferUI = (function (exports) {
                         old[i + 4] += y;
                         old[i + 5] += x;
                         old[i + 6] += y;
-                        command = C$7;
-                    case C$7:
+                        command = C$6;
+                    case C$6:
                         controlX = old[i + 3];
                         controlY = old[i + 4];
                         x = old[i + 5];
                         y = old[i + 6];
-                        data.push(C$7, old[i + 1], old[i + 2], controlX, controlY, x, y);
+                        data.push(C$6, old[i + 1], old[i + 2], controlX, controlY, x, y);
                         i += 7;
                         break;
                     case t:
@@ -2872,7 +2876,7 @@ var LeaferUI = (function (exports) {
                         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);
+                        data.push(C$6, 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);
@@ -2899,7 +2903,7 @@ var LeaferUI = (function (exports) {
     };
     const { current, pushData, copyData } = PathConvert;
 
-    const { M: M$6, L: L$7, C: C$6, Q: Q$5, Z: Z$5, N: N$4, D: D$4, X: X$4, G: G$4, F: F$5, O: O$5, P: P$4, U: U$4 } = PathCommandMap;
+    const { M: M$6, L: L$7, C: C$5, Q: Q$5, Z: Z$5, N: N$4, D: D$4, X: X$4, G: G$4, F: F$5, O: O$5, P: P$4, U: U$4 } = PathCommandMap;
     const { getMinDistanceFrom, getRadianFrom } = PointHelper;
     const { tan, min, abs: abs$4 } = Math;
     const startPoint = {};
@@ -2914,7 +2918,7 @@ var LeaferUI = (function (exports) {
             data.push(L$7, x, y);
         },
         bezierCurveTo(data, x1, y1, x2, y2, x, y) {
-            data.push(C$6, x1, y1, x2, y2, x, y);
+            data.push(C$5, x1, y1, x2, y2, x, y);
         },
         quadraticCurveTo(data, x1, y1, x, y) {
             data.push(Q$5, x1, y1, x, y);
@@ -3076,7 +3080,7 @@ var LeaferUI = (function (exports) {
         paint() { }
     }
 
-    const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$4, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$4, P: P$3, U: U$3 } = PathCommandMap;
+    const { M: M$5, L: L$6, C: C$4, Q: Q$4, Z: Z$4, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$4, P: P$3, U: U$3 } = PathCommandMap;
     const debug$e = Debug.get('PathDrawer');
     const PathDrawer = {
         drawPathByData(drawer, data) {
@@ -3095,7 +3099,7 @@ var LeaferUI = (function (exports) {
                         drawer.lineTo(data[i + 1], data[i + 2]);
                         i += 3;
                         break;
-                    case C$5:
+                    case C$4:
                         drawer.bezierCurveTo(data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6]);
                         i += 7;
                         break;
@@ -3147,7 +3151,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M: M$4, L: L$5, C: C$4, Q: Q$3, Z: Z$3, N: N$2, D: D$2, X: X$2, G: G$2, F: F$3, O: O$3, P: P$2, U: U$2 } = PathCommandMap;
+    const { M: M$4, L: L$5, C: C$3, Q: Q$3, Z: Z$3, N: N$2, D: D$2, X: X$2, G: G$2, F: F$3, O: O$3, P: P$2, U: U$2 } = PathCommandMap;
     const { toTwoPointBounds, toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc, ellipse: ellipse$1 } = BezierHelper;
     const { addPointBounds, copy: copy$b, addPoint: addPoint$1, setPoint: setPoint$3, addBounds, toBounds: toBounds$3 } = TwoPointBoundsHelper;
     const debug$d = Debug.get('PathBounds');
@@ -3168,7 +3172,7 @@ var LeaferUI = (function (exports) {
             while (i < len) {
                 command = data[i];
                 if (i === 0) {
-                    if (command === Z$3 || command === C$4 || command === Q$3) {
+                    if (command === Z$3 || command === C$3 || command === Q$3) {
                         setPoint$3(setPointBounds, x, y);
                     }
                     else {
@@ -3183,7 +3187,7 @@ var LeaferUI = (function (exports) {
                         addPoint$1(setPointBounds, x, y);
                         i += 3;
                         break;
-                    case C$4:
+                    case C$3:
                         toX = data[i + 5];
                         toY = data[i + 6];
                         toTwoPointBounds(x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], toX, toY, tempPointBounds);
@@ -3265,12 +3269,12 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M: M$3, L: L$4, C: C$3, Z: Z$2 } = PathCommandMap;
+    const { M: M$3, L: L$4, Z: Z$2 } = PathCommandMap;
     const { getCenterX, getCenterY } = PointHelper;
     const { arcTo } = PathCommandDataHelper;
     const PathCorner = {
         smooth(data, cornerRadius, _cornerSmoothing) {
-            let command;
+            let command, commandLen;
             let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
             const len = data.length;
             const smooth = [];
@@ -3307,15 +3311,16 @@ var LeaferUI = (function (exports) {
                         lastX = x;
                         lastY = y;
                         break;
-                    case C$3:
-                        smooth.push(C$3, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6]);
-                        i += 7;
-                        break;
                     case Z$2:
                         arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
                         smooth.push(Z$2);
                         i += 1;
                         break;
+                    default:
+                        commandLen = PathNumberCommandLengthMap[command];
+                        for (let j = 0; j < commandLen; j++)
+                            smooth.push(data[i + j]);
+                        i += commandLen;
                 }
             }
             if (command !== Z$2) {
@@ -4077,28 +4082,42 @@ var LeaferUI = (function (exports) {
                 return v === undefined ? defaultValue(this.__leaf) : v;
             };
         }
+        else if (typeof defaultValue === 'object') {
+            const isEmpty = isEmptyData(defaultValue);
+            property.get = function () {
+                let v = this[computedKey];
+                return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
+            };
+        }
+        const isBox = target.isBranchLeaf;
         if (key === 'width') {
             property.get = function () {
                 const v = this[computedKey];
                 if (v === undefined) {
-                    const t = this;
-                    return t._height && t.__naturalWidth && t.__useNaturalRatio ? t._height * t.__naturalWidth / t.__naturalHeight : t.__naturalWidth || defaultValue;
+                    const t = this, naturalWidth = t.__naturalWidth, leaf = t.__leaf;
+                    if (!defaultValue || leaf.pathInputed)
+                        return leaf.boxBounds.width;
+                    if (naturalWidth)
+                        return t._height && t.__useNaturalRatio ? t._height * naturalWidth / t.__naturalHeight : naturalWidth;
+                    return (isBox && leaf.children.length) ? leaf.boxBounds.width : defaultValue;
                 }
-                else {
+                else
                     return v;
-                }
             };
         }
         else if (key === 'height') {
             property.get = function () {
                 const v = this[computedKey];
                 if (v === undefined) {
-                    const t = this;
-                    return t._width && t.__naturalHeight && t.__useNaturalRatio ? t._width * t.__naturalHeight / t.__naturalWidth : t.__naturalHeight || defaultValue;
+                    const t = this, naturalHeight = t.__naturalHeight, leaf = t.__leaf;
+                    if (!defaultValue || leaf.pathInputed)
+                        return leaf.boxBounds.height;
+                    if (naturalHeight)
+                        return t._width && t.__useNaturalRatio ? t._width * naturalHeight / t.__naturalWidth : naturalHeight;
+                    return (isBox && leaf.children.length) ? leaf.boxBounds.height : defaultValue;
                 }
-                else {
+                else
                     return v;
-                }
             };
         }
         let descriptor, find = data;
@@ -4525,7 +4544,12 @@ var LeaferUI = (function (exports) {
                 while (root.parent && !root.parent.leafer) {
                     root = root.parent;
                 }
-                Platform.layout(root);
+                const r = root;
+                if (r.__fullLayouting)
+                    return;
+                r.__fullLayouting = true;
+                Platform.layout(r);
+                delete r.__fullLayouting;
             }
         }
         getTransform(relative = 'world') {
@@ -6050,7 +6074,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.5.1";
+    const version = "1.5.3";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -7640,7 +7664,7 @@ var LeaferUI = (function (exports) {
         strokeType()
     ], exports.UI.prototype, "dashPattern", void 0);
     __decorate([
-        strokeType()
+        strokeType(0)
     ], exports.UI.prototype, "dashOffset", void 0);
     __decorate([
         strokeType(10)
@@ -7733,6 +7757,12 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataProcessor(GroupData)
     ], exports.Group.prototype, "__", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.Group.prototype, "width", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.Group.prototype, "height", void 0);
     exports.Group = __decorate([
         useModule(exports.Branch),
         registerUI()
@@ -8148,7 +8178,7 @@ var LeaferUI = (function (exports) {
         __updateRectBoxBounds() { }
         __updateBoxBounds(_secondLayout) {
             const data = this.__;
-            if (this.children.length) {
+            if (this.children.length && !this.pathInputed) {
                 if (data.__autoSide) {
                     if (data.__hasSurface)
                         this.__extraUpdate();
@@ -8217,6 +8247,12 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataProcessor(BoxData)
     ], exports.Box.prototype, "__", void 0);
+    __decorate([
+        boundsType(100)
+    ], exports.Box.prototype, "width", void 0);
+    __decorate([
+        boundsType(100)
+    ], exports.Box.prototype, "height", void 0);
     __decorate([
         dataType(false)
     ], exports.Box.prototype, "resizeChildren", void 0);
@@ -10102,16 +10138,20 @@ var LeaferUI = (function (exports) {
     };
 
     function fillText(ui, canvas) {
-        let row;
-        const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+        let row, data = ui.__.__textDrawData;
+        const { rows, decorationY } = data;
         for (let i = 0, len = rows.length; i < len; i++) {
             row = rows[i];
             if (row.text)
                 canvas.fillText(row.text, row.x, row.y);
             else if (row.data)
                 row.data.forEach(charData => { canvas.fillText(charData.char, charData.x, row.y); });
-            if (decorationY)
-                canvas.fillRect(row.x, row.y + decorationY, row.width, decorationHeight);
+        }
+        if (decorationY) {
+            const { decorationColor, decorationHeight } = data;
+            if (decorationColor)
+                canvas.fillStyle = decorationColor;
+            rows.forEach(row => decorationY.forEach(value => canvas.fillRect(row.x, row.y + value, row.width, decorationHeight)));
         }
     }
 
@@ -10182,16 +10222,18 @@ var LeaferUI = (function (exports) {
         out.recycle(ui.__nowWorld);
     }
     function drawTextStroke(ui, canvas) {
-        let row;
-        const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+        let row, data = ui.__.__textDrawData;
+        const { rows, decorationY } = data;
         for (let i = 0, len = rows.length; i < len; i++) {
             row = rows[i];
             if (row.text)
                 canvas.strokeText(row.text, row.x, row.y);
             else if (row.data)
                 row.data.forEach(charData => { canvas.strokeText(charData.char, charData.x, row.y); });
-            if (decorationY)
-                canvas.strokeRect(row.x, row.y + decorationY, row.width, decorationHeight);
+        }
+        if (decorationY) {
+            const { decorationHeight } = data;
+            rows.forEach(row => decorationY.forEach(value => canvas.strokeRect(row.x, row.y + value, row.width, decorationHeight)));
         }
     }
     function drawStrokesStyle(strokes, isText, ui, canvas) {
@@ -10757,6 +10799,8 @@ var LeaferUI = (function (exports) {
                         }
                         image.unload(paints[i].loadId, !input.some((item) => item.url === url));
                     }
+                    else
+                        paints[i].style = null;
                 }
             }
             return recycleMap;
@@ -11489,14 +11533,25 @@ var LeaferUI = (function (exports) {
     }
 
     function decorationText(drawData, style) {
-        const { fontSize } = style;
+        let type;
+        const { fontSize, textDecoration } = style;
         drawData.decorationHeight = fontSize / 11;
-        switch (style.textDecoration) {
+        if (typeof textDecoration === 'object') {
+            type = textDecoration.type;
+            if (textDecoration.color)
+                drawData.decorationColor = ColorConvert.string(textDecoration.color);
+        }
+        else
+            type = textDecoration;
+        switch (type) {
             case 'under':
-                drawData.decorationY = fontSize * 0.15;
+                drawData.decorationY = [fontSize * 0.15];
                 break;
             case 'delete':
-                drawData.decorationY = -fontSize * 0.35;
+                drawData.decorationY = [-fontSize * 0.35];
+                break;
+            case 'under-delete':
+                drawData.decorationY = [fontSize * 0.15, -fontSize * 0.35];
         }
     }
 
@@ -11654,9 +11709,24 @@ var LeaferUI = (function (exports) {
                 set(value) {
                     const old = this[privateKey];
                     if (old !== value) {
-                        const type = key === 'target' ? EditorEvent.BEFORE_SELECT : EditorEvent.BEFORE_HOVER;
-                        if (this.hasEvent(type))
-                            this.emitEvent(new EditorEvent(type, { editor: this, value: value, oldValue: old }));
+                        if (this.config) {
+                            const isSelect = key === 'target';
+                            if (isSelect) {
+                                if (value instanceof Array && value.length > 1 && value[0].locked)
+                                    value.splice(0, 1);
+                                const { beforeSelect } = this.config;
+                                if (beforeSelect) {
+                                    const check = beforeSelect({ target: value });
+                                    if (typeof check === 'object')
+                                        value = check;
+                                    else if (check === false)
+                                        return;
+                                }
+                            }
+                            const type = isSelect ? EditorEvent.BEFORE_SELECT : EditorEvent.BEFORE_HOVER;
+                            if (this.hasEvent(type))
+                                this.emitEvent(new EditorEvent(type, { editor: this, value: value, oldValue: old }));
+                        }
                         this[privateKey] = value, fn(this, old);
                     }
                 }
@@ -11957,7 +12027,8 @@ var LeaferUI = (function (exports) {
             return target.leafer !== this.editor.leafer;
         }
         allowDrag(e) {
-            if (this.running && (this.editor.mergeConfig.boxSelect) && !e.target.draggable) {
+            const { boxSelect, multipleSelect } = this.editor.mergeConfig;
+            if (this.running && (multipleSelect && boxSelect) && !e.target.draggable) {
                 return (!this.editor.editing && this.allow(e.target)) || (e.shiftKey && !findOne(e.path));
             }
             else {
@@ -11975,7 +12046,8 @@ var LeaferUI = (function (exports) {
             return this.isMultipleSelect(e) ? this.findDeepOne(e) : findOne(e.path);
         }
         isMultipleSelect(e) {
-            return e.shiftKey || this.editor.mergeConfig.continuousSelect;
+            const { multipleSelect, continuousSelect } = this.editor.mergeConfig;
+            return multipleSelect && (e.shiftKey || continuousSelect);
         }
         __listenEvents() {
             const { editor } = this;
@@ -12150,21 +12222,25 @@ var LeaferUI = (function (exports) {
             let last;
             switch (direction) {
                 case top$1:
+                case topLeft$1:
                     last = { x: 0.5, y: 0 };
                     align = 'bottom';
                     skewX = 1;
                     break;
                 case bottom$1:
+                case bottomRight:
                     last = { x: 0.5, y: 1 };
                     align = 'top';
                     skewX = 1;
                     break;
                 case left$2:
+                case bottomLeft:
                     last = { x: 0, y: 0.5 };
                     align = 'right';
                     skewY = 1;
                     break;
                 case right$2:
+                case topRight$1:
                     last = { x: 1, y: 0.5 };
                     align = 'left';
                     skewY = 1;
@@ -12253,7 +12329,7 @@ var LeaferUI = (function (exports) {
         let showResize = pointType.includes('resize');
         if (showResize && rotateable && (e.metaKey || e.ctrlKey || !resizeable))
             showResize = false;
-        const showSkew = skewable && !showResize && point.name === 'resize-line';
+        const showSkew = skewable && !showResize && (point.name === 'resize-line' || pointType === 'skew');
         const cursor = showSkew ? skewCursor : (showResize ? resizeCursor : rotateCursor);
         rotation += (EditDataHelper.getFlipDirection(point.direction, flippedX, flippedY) + 1) * 45;
         rotation = Math.round(MathHelper.formatRotation(rotation, true) / 2) * 2;
@@ -12475,6 +12551,8 @@ var LeaferUI = (function (exports) {
                 editor.onRotate(e);
             if (pointType.includes('resize'))
                 editor.onScale(e);
+            if (pointType === 'skew')
+                editor.onSkew(e);
             updateCursor(editor, e);
         }
         onArrow(e) {
@@ -12656,6 +12734,7 @@ ${filterStyle}
         hover: true,
         select: 'press',
         openInner: 'double',
+        multipleSelect: true,
         boxSelect: true,
         moveable: true,
         resizeable: true,
@@ -12682,11 +12761,7 @@ ${filterStyle}
     function onTarget(editor, oldValue) {
         const { target } = editor;
         if (target) {
-            const { list } = editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target);
-            if (!list.every(checkEditable)) {
-                editor.target = list.filter(checkEditable);
-                return;
-            }
+            editor.leafList = target instanceof LeafList ? target : new LeafList(target);
             if (editor.multiple)
                 simulate(editor);
         }
@@ -12713,9 +12788,6 @@ ${filterStyle}
     function onHover(editor, oldValue) {
         editor.emitEvent(new EditorEvent(EditorEvent.HOVER, { editor, value: editor.hoverTarget, oldValue }));
     }
-    function checkEditable(item) {
-        return item.editable && !item.locked;
-    }
 
     const order = (a, b) => a.parent.children.indexOf(a) - b.parent.children.indexOf(b);
     const reverseOrder = (a, b) => b.parent.children.indexOf(b) - a.parent.children.indexOf(a);
@@ -12747,13 +12819,16 @@ ${filterStyle}
             const ungroupList = [];
             app.lockLayout();
             list.forEach(leaf => {
-                if (leaf.isBranch && !leaf.isBranchLeaf) {
+                if (leaf.isBranch) {
                     const { parent, children } = leaf;
                     while (children.length) {
                         ungroupList.push(children[0]);
                         children[0].dropTo(parent, parent.children.indexOf(leaf));
                     }
-                    leaf.remove();
+                    if (leaf.isBranchLeaf)
+                        ungroupList.push(leaf);
+                    else
+                        leaf.remove();
                 }
                 else {
                     ungroupList.push(leaf);
@@ -13058,13 +13133,22 @@ ${filterStyle}
             this.skewOf(origin, skewX, skewY);
         }
         move(x, y = 0) {
-            const { element } = this;
             if (!this.checkTransform('moveable'))
                 return;
-            const world = element.getWorldPointByLocal(typeof x === 'object' ? Object.assign({}, x) : { x, y }, null, true);
+            if (typeof x === 'object')
+                y = x.y, x = x.x;
+            const { element: target } = this, { beforeMove } = this.mergeConfig;
+            if (beforeMove) {
+                const check = beforeMove({ target, x, y });
+                if (typeof check === 'object')
+                    x = check.x, y = check.y;
+                else if (check === false)
+                    return;
+            }
+            const world = target.getWorldPointByLocal({ x, y }, null, true);
             if (this.multiple)
-                element.safeChange(() => element.move(x, y));
-            const data = { target: element, editor: this, moveX: world.x, moveY: world.y };
+                target.safeChange(() => target.move(x, y));
+            const data = { target, editor: this, moveX: world.x, moveY: world.y };
             this.emitEvent(new EditorMoveEvent(EditorMoveEvent.BEFORE_MOVE, data));
             const event = new EditorMoveEvent(EditorMoveEvent.MOVE, data);
             this.editTool.onMove(event);
@@ -13073,8 +13157,14 @@ ${filterStyle}
         scaleWithDrag(data) {
             if (!this.checkTransform('resizeable'))
                 return;
-            const { element } = this;
-            data = Object.assign(Object.assign({}, data), { target: element, editor: this, worldOrigin: element.getWorldPoint(data.origin) });
+            const { element: target } = this, { beforeScale } = this.mergeConfig;
+            if (beforeScale) {
+                const { origin, scaleX, scaleY, drag } = data;
+                const check = beforeScale({ target, drag, origin, scaleX, scaleY });
+                if (check === false)
+                    return;
+            }
+            data = Object.assign(Object.assign({}, data), { target, editor: this, worldOrigin: target.getWorldPoint(data.origin) });
             this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
             const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
             this.editTool.onScaleWithDrag(event);
@@ -13083,10 +13173,17 @@ ${filterStyle}
         scaleOf(origin, scaleX, scaleY = scaleX, _resize) {
             if (!this.checkTransform('resizeable'))
                 return;
-            const { element } = this;
+            const { element: target } = this, { beforeScale } = this.mergeConfig;
+            if (beforeScale) {
+                const check = beforeScale({ target, origin, scaleX, scaleY });
+                if (typeof check === 'object')
+                    scaleX = check.scaleX, scaleY = check.scaleY;
+                else if (check === false)
+                    return;
+            }
             const worldOrigin = this.getWorldOrigin(origin);
-            const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.scaleOf(origin, scaleX, scaleY)));
-            const data = { target: element, editor: this, worldOrigin, scaleX, scaleY, transform };
+            const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.scaleOf(origin, scaleX, scaleY)));
+            const data = { target, editor: this, worldOrigin, scaleX, scaleY, transform };
             this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
             const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
             this.editTool.onScale(event);
@@ -13107,10 +13204,17 @@ ${filterStyle}
         rotateOf(origin, rotation) {
             if (!this.checkTransform('rotateable'))
                 return;
-            const { element } = this;
+            const { element: target } = this, { beforeRotate } = this.mergeConfig;
+            if (beforeRotate) {
+                const check = beforeRotate({ target, origin, rotation });
+                if (typeof check === 'number')
+                    rotation = check;
+                else if (check === false)
+                    return;
+            }
             const worldOrigin = this.getWorldOrigin(origin);
-            const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.rotateOf(origin, rotation)));
-            const data = { target: element, editor: this, worldOrigin, rotation, transform };
+            const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.rotateOf(origin, rotation)));
+            const data = { target, editor: this, worldOrigin, rotation, transform };
             this.emitEvent(new EditorRotateEvent(EditorRotateEvent.BEFORE_ROTATE, data));
             const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, data);
             this.editTool.onRotate(event);
@@ -13119,10 +13223,17 @@ ${filterStyle}
         skewOf(origin, skewX, skewY = 0, _resize) {
             if (!this.checkTransform('skewable'))
                 return;
-            const { element } = this;
+            const { element: target } = this, { beforeSkew } = this.mergeConfig;
+            if (beforeSkew) {
+                const check = beforeSkew({ target, origin, skewX, skewY });
+                if (typeof check === 'object')
+                    skewX = check.skewX, skewY = check.skewY;
+                else if (check === false)
+                    return;
+            }
             const worldOrigin = this.getWorldOrigin(origin);
-            const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.skewOf(origin, skewX, skewY)));
-            const data = { target: element, editor: this, worldOrigin, skewX, skewY, transform };
+            const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.skewOf(origin, skewX, skewY)));
+            const data = { target, editor: this, worldOrigin, skewX, skewY, transform };
             this.emitEvent(new EditorSkewEvent(EditorSkewEvent.BEFORE_SKEW, data));
             const event = new EditorSkewEvent(EditorSkewEvent.SKEW, data);
             this.editTool.onSkew(event);
@@ -13635,7 +13746,9 @@ ${filterStyle}
             }
         }
         leaf.fontSize *= fontScale;
-        const data = leaf.__;
+        const data = leaf.__, { padding } = data;
+        if (padding)
+            leaf.padding = padding instanceof Array ? padding.map(item => item * fontScale) : padding * fontScale;
         if (!data.__autoWidth)
             leaf.width *= fontScale;
         if (!data.__autoHeight)
@@ -13723,14 +13836,11 @@ ${filterStyle}
         scaleResizeGroup(this, scaleX, scaleY);
     };
     exports.Box.prototype.__scaleResize = function (scaleX, scaleY) {
-        if (this.__.__autoSize && this.children.length) {
-            scaleResizeGroup(this, scaleX, scaleY);
-        }
-        else {
+        const { resizeChildren, __autoSize } = this.__;
+        if (!(__autoSize && resizeChildren))
             scaleResize(this, scaleX, scaleY);
-            if (this.__.resizeChildren)
-                scaleResizeGroup(this, scaleX, scaleY);
-        }
+        if (resizeChildren)
+            scaleResizeGroup(this, scaleX, scaleY);
     };
 
     Plugin.add('resize');
@@ -14930,6 +15040,12 @@ ${filterStyle}
         'middle': 'center',
         'bottom': 'flex-end'
     };
+    const textDecorationMap = {
+        'none': 'none',
+        'under': 'underline',
+        'delete': 'line-through',
+        'under-delete': 'underline line-through'
+    };
     function updateStyle(textDom, text, textScale) {
         const { style } = textDom;
         const { fill, padding, textWrap, textOverflow, textDecoration } = text;
@@ -14938,7 +15054,16 @@ ${filterStyle}
         setFill(style, fill);
         style.fontStyle = text.italic ? 'italic' : 'normal';
         style.fontWeight = text.fontWeight;
-        style.textDecoration = textDecoration === 'delete' ? 'line-through' : textDecoration;
+        let decorationType;
+        if (typeof textDecoration === 'object') {
+            decorationType = textDecoration.type;
+            if (textDecoration.color)
+                style.textDecorationColor = ColorConvert.string(textDecoration.color);
+        }
+        else {
+            decorationType = textDecoration;
+        }
+        style.textDecoration = textDecorationMap[decorationType];
         style.textTransform = textCaseMap[text.textCase];
         style.textAlign = text.textAlign === 'both' ? 'justify' : text.textAlign;
         style.display = 'flex';
@@ -15367,6 +15492,7 @@ ${filterStyle}
     exports.getMatrixData = getMatrixData;
     exports.getPointData = getPointData;
     exports.hitType = hitType;
+    exports.isEmptyData = isEmptyData;
     exports.isNull = isNull;
     exports.layoutProcessor = layoutProcessor;
     exports.maskType = maskType;