@leafer-draw/worker 1.0.0 → 1.0.2

package/dist/worker.module.js

@@ -48,6 +48,8 @@ const I$1 = IncrementId;
 const { round, pow: pow$1, PI: PI$4 } = Math;
 const MathHelper = {
     within(value, min, max) {
+        if (typeof min === 'object')
+            max = min.max, min = min.min;
         if (min !== undefined && value < min)
             value = min;
         if (max !== undefined && value > max)
@@ -109,6 +111,19 @@ const MathHelper = {
         const a = maxLength ? pow$1(10, maxLength) : 1000000000000;
         num = round(num * a) / a;
         return num === -0 ? 0 : num;
+    },
+    getScaleData(scale, size, originSize, scaleData) {
+        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;
+        }
+        else if (scale) {
+            scaleData.scaleX = typeof scale === 'number' ? scale : scale.x;
+            scaleData.scaleY = typeof scale === 'number' ? scale : scale.y;
+        }
+        return scaleData;
     }
 };
 const OneRadian = PI$4 / 180;
@@ -150,10 +165,10 @@ const MatrixHelper = {
         t.e += x;
         t.f += y;
     },
-    translateInner(t, x, y, isMoveOrigin) {
+    translateInner(t, x, y, hasOrigin) {
         t.e += t.a * x + t.c * y;
         t.f += t.b * x + t.d * y;
-        if (isMoveOrigin)
+        if (hasOrigin)
             t.e -= x, t.f -= y;
     },
     scale(t, scaleX, scaleY = scaleX) {
@@ -312,7 +327,7 @@ const MatrixHelper = {
             to.y -= (f * a - e * b) * s;
         }
     },
-    setLayout(t, layout, origin, bcChanged) {
+    setLayout(t, layout, origin, around, bcChanged) {
         const { x, y, scaleX, scaleY } = layout;
         if (bcChanged === undefined)
             bcChanged = layout.rotation || layout.skewX || layout.skewY;
@@ -344,10 +359,10 @@ const MatrixHelper = {
         }
         t.e = x;
         t.f = y;
-        if (origin)
-            M$6.translateInner(t, -origin.x, -origin.y, true);
+        if (origin = origin || around)
+            M$6.translateInner(t, -origin.x, -origin.y, !around);
     },
-    getLayout(t, origin, firstSkewY) {
+    getLayout(t, origin, around, firstSkewY) {
         const { a, b, c, d, e, f } = t;
         let x = e, y = f, scaleX, scaleY, rotation, skewX, skewY;
         if (b || c) {
@@ -376,9 +391,11 @@ const MatrixHelper = {
             scaleY = d;
             rotation = skewX = skewY = 0;
         }
-        if (origin) {
+        if (origin = around || origin) {
             x += origin.x * a + origin.y * c;
             y += origin.x * b + origin.y * d;
+            if (!around)
+                x -= origin.x, y -= origin.y;
         }
         return { x, y, scaleX, scaleY, rotation, skewX, skewY };
     },
@@ -405,7 +422,7 @@ const MatrixHelper = {
 };
 const M$6 = MatrixHelper;
 
-const { toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$2 } = MatrixHelper;
+const { toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3 } = MatrixHelper;
 const { sin: sin$4, cos: cos$4, abs: abs$4, sqrt: sqrt$2, atan2: atan2$2, min: min$1, PI: PI$3 } = Math;
 const PointHelper = {
     defaultPoint: getPointData(),
@@ -461,7 +478,7 @@ const PointHelper = {
     tempToOuterOf(t, matrix) {
         const { tempPoint: temp } = P$5;
         copy$a(temp, t);
-        toOuterPoint$2(matrix, temp, temp);
+        toOuterPoint$3(matrix, temp, temp);
         return temp;
     },
     tempToInnerRadiusPointOf(t, matrix) {
@@ -480,7 +497,7 @@ const PointHelper = {
         toInnerPoint$2(matrix, t, to);
     },
     toOuterOf(t, matrix, to) {
-        toOuterPoint$2(matrix, t, to);
+        toOuterPoint$3(matrix, t, to);
     },
     getCenter(t, to) {
         return { x: t.x + (to.x - t.x) / 2, y: t.y + (to.y - t.y) / 2 };
@@ -706,12 +723,12 @@ class Matrix {
     toInnerPoint(outer, to, distance) {
         MatrixHelper.toInnerPoint(this, outer, to, distance);
     }
-    setLayout(data, origin) {
-        MatrixHelper.setLayout(this, data, origin);
+    setLayout(data, origin, around) {
+        MatrixHelper.setLayout(this, data, origin, around);
         return this;
     }
-    getLayout(origin, firstSkewY) {
-        return MatrixHelper.getLayout(this, origin, firstSkewY);
+    getLayout(origin, around, firstSkewY) {
+        return MatrixHelper.getLayout(this, origin, around, firstSkewY);
     }
     withScale(scaleX, scaleY) {
         return MatrixHelper.withScale(this, scaleX, scaleY);
@@ -760,7 +777,7 @@ const TwoPointBoundsHelper = {
 const { addPoint: addPoint$4 } = TwoPointBoundsHelper;
 
 const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$3, addPoint: addPoint$3, toBounds: toBounds$4 } = TwoPointBoundsHelper;
-const { toOuterPoint: toOuterPoint$1 } = MatrixHelper;
+const { toOuterPoint: toOuterPoint$2 } = MatrixHelper;
 const { float, fourNumber } = MathHelper;
 const { floor, ceil: ceil$2 } = Math;
 let right$1, bottom$1, boundsRight, boundsBottom;
@@ -780,17 +797,24 @@ const BoundsHelper = {
         t.width = bounds.width;
         t.height = bounds.height;
     },
-    copyAndSpread(t, bounds, spread, isShrink) {
+    copyAndSpread(t, bounds, spread, isShrink, side) {
+        const { x, y, width, height } = bounds;
         if (spread instanceof Array) {
             const four = fourNumber(spread);
             isShrink
-                ? B.set(t, bounds.x + four[3], bounds.y + four[0], bounds.width - four[1] - four[3], bounds.height - four[2] - four[0])
-                : B.set(t, bounds.x - four[3], bounds.y - four[0], bounds.width + four[1] + four[3], bounds.height + four[2] + four[0]);
+                ? 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]);
         }
         else {
             if (isShrink)
                 spread = -spread;
-            B.set(t, bounds.x - spread, bounds.y - spread, bounds.width + spread * 2, bounds.height + spread * 2);
+            B.set(t, x - spread, y - spread, width + spread * 2, height + spread * 2);
+        }
+        if (side) {
+            if (side === 'width')
+                t.y = y, t.height = height;
+            else
+                t.x = x, t.width = width;
         }
     },
     minX(t) { return t.width > 0 ? t.x : t.x + t.width; },
@@ -867,16 +891,16 @@ const BoundsHelper = {
         else {
             point.x = t.x;
             point.y = t.y;
-            toOuterPoint$1(matrix, point, toPoint$5);
+            toOuterPoint$2(matrix, point, toPoint$5);
             setPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
             point.x = t.x + t.width;
-            toOuterPoint$1(matrix, point, toPoint$5);
+            toOuterPoint$2(matrix, point, toPoint$5);
             addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
             point.y = t.y + t.height;
-            toOuterPoint$1(matrix, point, toPoint$5);
+            toOuterPoint$2(matrix, point, toPoint$5);
             addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
             point.x = t.x;
-            toOuterPoint$1(matrix, point, toPoint$5);
+            toOuterPoint$2(matrix, point, toPoint$5);
             addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
             toBounds$4(tempPointBounds$1, to);
         }
@@ -890,16 +914,16 @@ const BoundsHelper = {
         const scale = Math.min(baseScale, Math.min(t.width / put.width, t.height / put.height));
         return new Matrix(scale, 0, 0, scale, -put.x * scale, -put.y * scale);
     },
-    getSpread(t, spread) {
+    getSpread(t, spread, side) {
         const n = {};
-        B.copyAndSpread(n, t, spread);
+        B.copyAndSpread(n, t, spread, false, side);
         return n;
     },
-    spread(t, spread) {
-        B.copyAndSpread(t, t, spread);
+    spread(t, spread, side) {
+        B.copyAndSpread(t, t, spread, false, side);
     },
-    shrink(t, shrink) {
-        B.copyAndSpread(t, t, shrink, true);
+    shrink(t, shrink, side) {
+        B.copyAndSpread(t, t, shrink, true, side);
     },
     ceil(t) {
         const { x, y } = t;
@@ -1082,12 +1106,12 @@ class Bounds {
     getFitMatrix(put, baseScale) {
         return BoundsHelper.getFitMatrix(this, put, baseScale);
     }
-    spread(fourNumber) {
-        BoundsHelper.spread(this, fourNumber);
+    spread(fourNumber, side) {
+        BoundsHelper.spread(this, fourNumber, side);
         return this;
     }
-    shrink(fourNumber) {
-        BoundsHelper.shrink(this, fourNumber);
+    shrink(fourNumber, side) {
+        BoundsHelper.shrink(this, fourNumber, side);
         return this;
     }
     ceil() {
@@ -1999,7 +2023,7 @@ class LeaferCanvasBase extends Canvas$1 {
         DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
         this.size.pixelRatio || (this.size.pixelRatio = 1);
         this.bounds = new Bounds(0, 0, this.width, this.height);
-        if (!this.unreal) {
+        if (this.context && !this.unreal) {
             this.updateViewSize();
             this.smooth = this.config.smooth;
         }
@@ -2172,7 +2196,7 @@ class LeaferCanvasBase extends Canvas$1 {
             this.manager ? this.manager.recycle(this) : this.destroy();
         }
     }
-    updateRender() { }
+    updateRender(_bounds) { }
     unrealCanvas() { }
     destroy() {
         this.manager = this.view = this.parentView = null;
@@ -2904,60 +2928,75 @@ class PathCreator {
     }
     beginPath() {
         beginPath(this.__path);
+        this.paint();
         return this;
     }
     moveTo(x, y) {
         moveTo$4(this.__path, x, y);
+        this.paint();
         return this;
     }
     lineTo(x, y) {
         lineTo$3(this.__path, x, y);
+        this.paint();
         return this;
     }
     bezierCurveTo(x1, y1, x2, y2, x, y) {
         bezierCurveTo(this.__path, x1, y1, x2, y2, x, y);
+        this.paint();
         return this;
     }
     quadraticCurveTo(x1, y1, x, y) {
         quadraticCurveTo(this.__path, x1, y1, x, y);
+        this.paint();
         return this;
     }
     closePath() {
         closePath$3(this.__path);
+        this.paint();
         return this;
     }
     rect(x, y, width, height) {
         rect$1(this.__path, x, y, width, height);
+        this.paint();
         return this;
     }
     roundRect(x, y, width, height, cornerRadius) {
         roundRect$1(this.__path, x, y, width, height, cornerRadius);
+        this.paint();
         return this;
     }
     ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
         ellipse$2(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     arc(x, y, radius, startAngle, endAngle, anticlockwise) {
         arc$1(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     arcTo(x1, y1, x2, y2, radius) {
         arcTo$2(this.__path, x1, y1, x2, y2, radius);
+        this.paint();
         return this;
     }
     drawEllipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
         drawEllipse(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     drawArc(x, y, radius, startAngle, endAngle, anticlockwise) {
         drawArc(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     drawPoints(points, curve, close) {
         drawPoints$2(this.__path, points, curve, close);
+        this.paint();
         return this;
     }
+    paint() { }
 }
 
 const { M: M$2, L: L$3, C: C$2, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
@@ -3979,7 +4018,7 @@ function registerUIEvent() {
     };
 }
 
-const { copy: copy$6, toInnerPoint: toInnerPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
+const { copy: copy$6, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
 const matrix = {};
 const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
@@ -4044,10 +4083,9 @@ const LeafHelper = {
         }
         return true;
     },
-    moveWorld(t, x, y = 0) {
+    moveWorld(t, x, y = 0, isInnerPoint) {
         const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
-        if (t.parent)
-            toInnerPoint$1(t.parent.worldTransform, local, local, true);
+        isInnerPoint ? toOuterPoint$1(t.localTransform, local, local, true) : (t.parent && toInnerPoint$1(t.parent.worldTransform, local, local, true));
         L.moveLocal(t, local.x, local.y);
     },
     moveLocal(t, x, y = 0) {
@@ -4066,8 +4104,13 @@ const LeafHelper = {
     zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize) {
         copy$6(matrix, t.__localMatrix);
         scaleOfOuter$2(matrix, origin, scaleX, scaleY);
-        moveByMatrix(t, matrix);
-        t.scaleResize(scaleX, scaleY, resize !== true);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix, resize);
+        }
+        else {
+            moveByMatrix(t, matrix);
+            t.scaleResize(scaleX, scaleY, resize !== true);
+        }
     },
     rotateOfWorld(t, origin, angle) {
         L.rotateOfLocal(t, getTempLocal(t, origin), angle);
@@ -4075,8 +4118,13 @@ const LeafHelper = {
     rotateOfLocal(t, origin, angle) {
         copy$6(matrix, t.__localMatrix);
         rotateOfOuter$2(matrix, origin, angle);
-        moveByMatrix(t, matrix);
-        t.rotation = MathHelper.formatRotation(t.rotation + angle);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix);
+        }
+        else {
+            moveByMatrix(t, matrix);
+            t.rotation = MathHelper.formatRotation(t.rotation + angle);
+        }
     },
     skewOfWorld(t, origin, skewX, skewY, resize) {
         L.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize);
@@ -4099,7 +4147,7 @@ const LeafHelper = {
         L.setTransform(t, matrix, resize);
     },
     setTransform(t, transform, resize) {
-        const layout = getLayout(transform);
+        const layout = getLayout(transform, t.origin && L.getInnerOrigin(t, t.origin), t.around && L.getInnerOrigin(t, t.around));
         if (resize) {
             const scaleX = layout.scaleX / t.scaleX;
             const scaleY = layout.scaleY / t.scaleY;
@@ -4112,13 +4160,19 @@ const LeafHelper = {
             t.set(layout);
         }
     },
+    getFlipTransform(t, axis) {
+        const m = getMatrixData();
+        const sign = axis === 'x' ? 1 : -1;
+        scaleOfOuter$2(m, L.getLocalOrigin(t, 'center'), -1 * sign, 1 * sign);
+        return m;
+    },
     getLocalOrigin(t, origin) {
         return PointHelper.tempToOuterOf(L.getInnerOrigin(t, origin), t.localTransform);
     },
     getInnerOrigin(t, origin) {
-        if (typeof origin === 'string')
-            AroundHelper.toPoint(origin, t.boxBounds, origin = {});
-        return origin;
+        const innerOrigin = {};
+        AroundHelper.toPoint(origin, t.boxBounds, innerOrigin);
+        return innerOrigin;
     },
     getRelativeWorld(t, relative, temp) {
         copy$6(matrix, t.worldTransform);
@@ -4545,7 +4599,10 @@ const LeafEventer = {
     on(type, listener, options) {
         let capture, once;
         if (options) {
-            if (typeof options === 'boolean') {
+            if (options === 'once') {
+                once = true;
+            }
+            else if (typeof options === 'boolean') {
                 capture = options;
             }
             else {
@@ -4576,7 +4633,7 @@ const LeafEventer = {
             if (listener) {
                 let capture;
                 if (options)
-                    capture = typeof options === 'boolean' ? options : options.capture;
+                    capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
                 let events, index;
                 const map = __getListenerMap(this, capture);
                 typeList.forEach(type => {
@@ -4878,7 +4935,7 @@ const LeafMatrix = {
             const layout = this.__layout, local = this.__local, data = this.__;
             if (layout.affectScaleOrRotation) {
                 if (layout.scaleChanged || layout.rotationChanged) {
-                    setLayout(local, data, null, layout.affectRotation);
+                    setLayout(local, data, null, null, layout.affectRotation);
                     layout.scaleChanged = layout.rotationChanged = false;
                 }
             }
@@ -4886,7 +4943,7 @@ const LeafMatrix = {
             local.f = data.y + data.offsetY;
             if (data.around || data.origin) {
                 toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$1);
-                translateInner(local, -tempPoint$1.x, -tempPoint$1.y, data.origin);
+                translateInner(local, -tempPoint$1.x, -tempPoint$1.y, !data.around);
             }
         }
         this.__layout.matrixChanged = false;
@@ -4895,7 +4952,7 @@ const LeafMatrix = {
 
 const { updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$2 } = LeafHelper;
 const { updateBounds: updateBounds$1 } = BranchHelper;
-const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$1, copy: copy$4 } = BoundsHelper;
+const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$2, copy: copy$4 } = BoundsHelper;
 const { toBounds: toBounds$2 } = PathBounds;
 const LeafBounds = {
     __updateWorldBounds() {
@@ -4996,7 +5053,7 @@ const LeafBounds = {
                 updateAllMatrix$2(this);
                 updateBounds$1(this, this);
                 if (this.__.__autoSide)
-                    this.__updateBoxBounds();
+                    this.__updateBoxBounds(true);
             }
             else {
                 updateAllMatrix$2(this);
@@ -5014,11 +5071,11 @@ const LeafBounds = {
     },
     __updateStrokeBounds() {
         const layout = this.__layout;
-        copyAndSpread$1(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread);
+        copyAndSpread$2(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread);
     },
     __updateRenderBounds() {
         const layout = this.__layout;
-        layout.renderSpread > 0 ? copyAndSpread$1(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$4(layout.renderBounds, layout.strokeBounds);
+        layout.renderSpread > 0 ? copyAndSpread$2(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$4(layout.renderBounds, layout.strokeBounds);
     }
 };
 
@@ -5115,7 +5172,7 @@ const { LEAF, create } = IncrementId;
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
 const { copy: copy$3 } = PointHelper;
-const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
+const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
 let Leaf = class Leaf {
     get tag() { return this.__tag; }
     set tag(_value) { }
@@ -5141,6 +5198,8 @@ let Leaf = class Leaf {
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
     get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
+    set event(map) { let event; for (let key in map)
+        event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event); }
     constructor(data) {
         this.innerId = create(LEAF);
         this.reset(data);
@@ -5376,6 +5435,9 @@ let Leaf = class Leaf {
     move(x, y) {
         moveLocal(this, x, y);
     }
+    moveInner(x, y) {
+        moveWorld(this, x, y, true);
+    }
     scaleOf(origin, scaleX, scaleY, resize) {
         zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize);
     }
@@ -5400,6 +5462,9 @@ let Leaf = class Leaf {
     skewOfWorld(worldOrigin, skewX, skewY, resize) {
         skewOfWorld(this, worldOrigin, skewX, skewY, resize);
     }
+    flip(axis) {
+        transform(this, getFlipTransform(this, axis));
+    }
     scaleResize(scaleX, scaleY = scaleX, _noResize) {
         this.scaleX *= scaleX;
         this.scaleY *= scaleY;
@@ -5757,7 +5822,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.30";
+const version = "1.0.1";
 const inviteCode = {};
 
 class LeaferCanvas extends LeaferCanvasBase {
@@ -5827,7 +5892,7 @@ function useCanvas(_canvasType, _power) {
 Platform.name = 'web';
 Platform.isWorker = true;
 Platform.requestRender = function (render) { requestAnimationFrame(render); };
-Platform.devicePixelRatio = 1;
+defineKey(Platform, 'devicePixelRatio', { get() { return 1; } });
 const { userAgent } = navigator;
 if (userAgent.indexOf("Firefox") > -1) {
     Platform.conicGradientRotate90 = true;
@@ -6323,14 +6388,14 @@ class Renderer {
         if (Debug.showRepaint)
             this.canvas.strokeWorld(bounds, 'red');
         this.target.__render(this.canvas, options);
-        this.renderBounds = realBounds || bounds;
+        this.renderBounds = realBounds = realBounds || bounds;
         this.renderOptions = options;
-        this.totalBounds.isEmpty() ? this.totalBounds = this.renderBounds : this.totalBounds.add(this.renderBounds);
+        this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
         if (Debug.showHitView)
             this.renderHitView(options);
         if (Debug.showBoundsView)
             this.renderBoundsView(options);
-        this.canvas.updateRender();
+        this.canvas.updateRender(realBounds);
     }
     renderHitView(_options) { }
     renderBoundsView(_options) { }
@@ -6639,6 +6704,11 @@ class BoxData extends GroupData {
 }
 
 class LeaferData extends GroupData {
+    __getInputData() {
+        const data = super.__getInputData();
+        canvasSizeAttrs.forEach(key => delete data[key]);
+        return data;
+    }
 }
 
 class FrameData extends BoxData {
@@ -6716,6 +6786,11 @@ class ImageData extends RectData {
 }
 
 class CanvasData extends RectData {
+    __getInputData() {
+        const data = super.__getInputData();
+        data.url = this.__leaf.canvas.toDataURL('image/png');
+        return data;
+    }
 }
 
 const UIBounds = {
@@ -7381,7 +7456,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.__controllers.push(this.renderer = Creator.renderer(this, canvas, config), this.watcher = Creator.watcher(this, config), this.layouter = Creator.layouter(this, config));
         if (this.isApp)
             this.__setApp();
-        this.__checkAutoLayout(config);
+        this.__checkAutoLayout(config, parentApp);
         this.view = canvas.view;
         if (parentApp) {
             this.__bindApp(parentApp);
@@ -7482,9 +7557,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.leafer = leafer;
         this.__level = 1;
     }
-    __checkAutoLayout(config) {
-        if (!config.width || !config.height) {
-            this.autoLayout = new AutoBounds(config);
+    __checkAutoLayout(config, parentApp) {
+        if (!parentApp) {
+            if (!config.width || !config.height)
+                this.autoLayout = new AutoBounds(config);
             this.canvas.startAutoLayout(this.autoLayout, this.__onResize.bind(this));
         }
     }
@@ -7619,12 +7695,21 @@ let Leafer = Leafer_1 = class Leafer extends Group {
             list.push(item);
         }
     }
-    zoom(_zoomType, _padding, _fixedScale) { return undefined; }
+    zoom(_zoomType, _padding, _fixedScale) {
+        return debug$1.error('need @leafer-in/view');
+    }
     getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
     getValidScale(changeScale) { return changeScale; }
     getWorldPointByClient(clientPoint, updateClient) {
         return this.interaction && this.interaction.getLocal(clientPoint, updateClient);
     }
+    getPagePointByClient(clientPoint, updateClient) {
+        return this.getPagePoint(this.getWorldPointByClient(clientPoint, updateClient));
+    }
+    updateClientBounds() {
+        this.canvas && this.canvas.updateClientBounds();
+    }
+    receiveEvent(_event) { }
     __checkUpdateLayout() {
         this.__layout.update();
     }
@@ -7708,7 +7793,7 @@ Rect = __decorate([
 const rect = Rect.prototype;
 const group = Group.prototype;
 const childrenRenderBounds = {};
-const { copy: copy$2, add, includes: includes$1 } = BoundsHelper;
+const { copy: copy$2, add, includes: includes$1, copyAndSpread: copyAndSpread$1 } = BoundsHelper;
 let Box = class Box extends Group {
     get __tag() { return 'Box'; }
     get isBranchLeaf() { return true; }
@@ -7722,20 +7807,23 @@ let Box = class Box extends Group {
         return this.__updateRectRenderSpread() || -1;
     }
     __updateRectBoxBounds() { }
-    __updateBoxBounds() {
+    __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) {
-                    const b = this.__layout.boxBounds;
-                    if (!data.__autoWidth)
-                        b.height += b.y, b.width = data.width, b.x = b.y = 0;
-                    if (!data.__autoHeight)
-                        b.width += b.x, b.height = data.height, b.y = b.x = 0;
+                    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 (secondLayout && data.flow && data.padding)
+                    copyAndSpread$1(boxBounds, boxBounds, data.padding, false, data.__autoSize ? null : (data.__autoWidth ? 'width' : 'height'));
+                this.__updateNaturalSize();
             }
             else {
                 this.__updateRectBoxBounds();
@@ -7755,13 +7843,13 @@ let Box = class Box extends Group {
             super.__updateRenderBounds();
             copy$2(childrenRenderBounds, renderBounds);
             this.__updateRectRenderBounds();
-            isOverflow = !includes$1(renderBounds, childrenRenderBounds) || undefined;
+            isOverflow = !includes$1(renderBounds, childrenRenderBounds) || !this.pathInputed || !this.__.cornerRadius;
         }
         else {
             this.__updateRectRenderBounds();
         }
         this.isOverflow !== isOverflow && (this.isOverflow = isOverflow);
-        if (isOverflow && !(this.__.__drawAfterFill = this.__.overflow === 'hide'))
+        if (!(this.__.__drawAfterFill = this.__.overflow === 'hide') && isOverflow)
             add(renderBounds, childrenRenderBounds);
     }
     __updateRectRenderBounds() { }
@@ -8095,14 +8183,26 @@ __decorate([
 Image = __decorate([
     registerUI()
 ], Image);
+const MyImage = Image;
 
 let Canvas = class Canvas extends Rect {
     get __tag() { return 'Canvas'; }
+    get ready() { return !this.url; }
     constructor(data) {
         super(data);
         this.canvas = Creator.canvas(this.__);
         this.context = this.canvas.context;
         this.__.__isCanvas = this.__.__drawAfterFill = true;
+        if (data && data.url)
+            this.drawImage(data.url);
+    }
+    drawImage(url) {
+        new LeaferImage({ url }).load((image) => {
+            this.context.drawImage(image.view, 0, 0);
+            this.url = undefined;
+            this.paint();
+            this.emitEvent(new ImageEvent(ImageEvent.LOADED, { image }));
+        });
     }
     draw(ui, offset, scale, rotation) {
         ui.__layout.update();
@@ -8146,8 +8246,7 @@ let Canvas = class Canvas extends Rect {
     destroy() {
         if (this.canvas) {
             this.canvas.destroy();
-            this.canvas = null;
-            this.context = null;
+            this.canvas = this.context = null;
         }
         super.destroy();
     }
@@ -8162,7 +8261,7 @@ __decorate([
     resizeType(100)
 ], Canvas.prototype, "height", void 0);
 __decorate([
-    resizeType(Platform.devicePixelRatio)
+    resizeType(1)
 ], Canvas.prototype, "pixelRatio", void 0);
 __decorate([
     resizeType(true)
@@ -8186,13 +8285,13 @@ let Text = class Text extends UI {
         super(data);
     }
     __drawHitPath(canvas) {
-        const { __lineHeight, __baseLine, __textDrawData: data } = this.__;
+        const { __lineHeight, fontSize, __baseLine, __textDrawData: data } = this.__;
         canvas.beginPath();
         if (this.__.__letterSpacing < 0) {
             this.__drawPathByData(canvas);
         }
         else {
-            data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight));
+            data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight < fontSize ? fontSize : __lineHeight));
         }
     }
     __drawPathByData(drawer, _data) {
@@ -8385,7 +8484,8 @@ let Pen = class Pen extends Group {
     drawPoints(_points, _curve, _close) { return this; }
     clearPath() { return this; }
     paint() {
-        this.pathElement.forceUpdate('path');
+        if (!this.pathElement.__layout.boxChanged)
+            this.pathElement.forceUpdate('path');
     }
 };
 __decorate([
@@ -8395,7 +8495,7 @@ __decorate([
     penPathType()
 ], Pen.prototype, "path", void 0);
 Pen = __decorate([
-    useModule(PathCreator, ['set', 'beginPath', 'path']),
+    useModule(PathCreator, ['set', 'beginPath', 'path', 'paint']),
     registerUI()
 ], Pen);
 function penPathType() {
@@ -8757,10 +8857,13 @@ function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, al
 const { get: get$2, translate } = MatrixHelper;
 const tempBox = new Bounds();
 const tempPoint = {};
+const tempScaleData = {};
 function createData(leafPaint, image, paint, box) {
-    const { blendMode } = paint;
+    const { blendMode, sync } = paint;
     if (blendMode)
         leafPaint.blendMode = blendMode;
+    if (sync)
+        leafPaint.sync = sync;
     leafPaint.data = getPatternData(paint, box, image);
 }
 function getPatternData(paint, box, image) {
@@ -8780,13 +8883,10 @@ function getPatternData(paint, box, image) {
             x += (box.width - width * scaleX) / 2, y += (box.height - height * scaleY) / 2;
         }
     }
-    else if (size) {
-        scaleX = (typeof size === 'number' ? size : size.width) / width;
-        scaleY = (typeof size === 'number' ? size : size.height) / height;
-    }
-    else if (scale) {
-        scaleX = typeof scale === 'number' ? scale : scale.x;
-        scaleY = typeof scale === 'number' ? scale : scale.y;
+    else if (scale || size) {
+        MathHelper.getScaleData(scale, size, image, tempScaleData);
+        scaleX = tempScaleData.scaleX;
+        scaleY = tempScaleData.scaleY;
     }
     if (align) {
         const imageBounds = { x, y, width: swapWidth, height: swapHeight };
@@ -8991,7 +9091,7 @@ function createPattern(ui, paint, pixelRatio) {
 const { abs } = Math;
 function checkImage(ui, canvas, paint, allowPaint) {
     const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
-    if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
+    if (!paint.data || (paint.patternId === scaleX + '-' + scaleY && !Export.running)) {
         return false;
     }
     else {
@@ -9025,7 +9125,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
             return true;
         }
         else {
-            if (!paint.style || Export.running) {
+            if (!paint.style || paint.sync || Export.running) {
                 createPattern(ui, paint, canvas.pixelRatio);
             }
             else {
@@ -9895,6 +9995,7 @@ const ExportModule = {
     export(leaf, filename, options) {
         this.running = true;
         const fileType = FileHelper.fileType(filename);
+        const isDownload = filename.includes('.');
         options = FileHelper.getExportOptions(options);
         return addTask((success) => new Promise((resolve) => {
             const over = (result) => {
@@ -9904,19 +10005,13 @@ const ExportModule = {
             };
             const { toURL } = Platform;
             const { download } = Platform.origin;
-            if (filename === 'json') {
-                return over({ data: leaf.toJSON(options.json) });
-            }
-            else if (fileType === 'json') {
-                download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
-                return over({ data: true });
+            if (fileType === 'json') {
+                isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
+                return over({ data: isDownload ? true : leaf.toJSON(options.json) });
             }
-            if (filename === 'svg') {
-                return over({ data: leaf.toSVG() });
-            }
-            else if (fileType === 'svg') {
-                download(toURL(leaf.toSVG(), 'svg'), filename);
-                return over({ data: true });
+            if (fileType === 'svg') {
+                isDownload && download(toURL(leaf.toSVG(), 'svg'), filename);
+                return over({ data: isDownload ? true : leaf.toSVG() });
             }
             const { leafer } = leaf;
             if (leafer) {
@@ -9925,14 +10020,8 @@ const ExportModule = {
                     let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
                     const { worldTransform, isLeafer, isFrame } = leaf;
                     const { slice, trim, onCanvas } = options;
-                    let scale = options.scale || 1;
-                    let pixelRatio = options.pixelRatio || 1;
                     const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
                     const contextSettings = options.contextSettings || leafer.config.contextSettings;
-                    if (leaf.isApp) {
-                        scale *= pixelRatio;
-                        pixelRatio = leaf.app.pixelRatio;
-                    }
                     const screenshot = options.screenshot || leaf.isApp;
                     const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill;
                     const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix();
@@ -9966,10 +10055,21 @@ const ExportModule = {
                         }
                         renderBounds = leaf.getBounds('render', relative);
                     }
-                    const { x, y, width, height } = new Bounds(renderBounds).scale(scale);
+                    const scaleData = { scaleX: 1, scaleY: 1 };
+                    MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData);
+                    let pixelRatio = options.pixelRatio || 1;
+                    if (leaf.isApp) {
+                        scaleData.scaleX *= pixelRatio;
+                        scaleData.scaleY *= pixelRatio;
+                        pixelRatio = leaf.app.pixelRatio;
+                    }
+                    const { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
+                    const renderOptions = { matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
                     let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
-                    const renderOptions = { matrix: matrix.scale(1 / scale).invert().translate(-x, -y).withScale(1 / scaleX * scale, 1 / scaleY * scale) };
+                    let sliceLeaf;
                     if (slice) {
+                        sliceLeaf = leaf;
+                        sliceLeaf.__worldOpacity = 0;
                         leaf = leafer;
                         renderOptions.bounds = canvas.bounds;
                     }
@@ -9984,6 +10084,8 @@ const ExportModule = {
                         leaf.__render(canvas, renderOptions);
                     }
                     canvas.restore();
+                    if (sliceLeaf)
+                        sliceLeaf.__updateWorldOpacity();
                     if (trim) {
                         trimBounds = getTrimBounds(canvas);
                         const old = canvas, { width, height } = trimBounds;
@@ -10068,4 +10170,4 @@ Object.assign(Export, ExportModule);
 
 useCanvas();
 
-export { AlignHelper, AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MyImage, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };