@leafer-ui/worker 1.0.1 → 1.0.2

package/dist/worker.module.js

@@ -111,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;
@@ -409,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(),
@@ -465,7 +478,7 @@ const PointHelper = {
     tempToOuterOf(t, matrix) {
         const { tempPoint: temp } = P$5;
         copy$b(temp, t);
-        toOuterPoint$2(matrix, temp, temp);
+        toOuterPoint$3(matrix, temp, temp);
         return temp;
     },
     tempToInnerRadiusPointOf(t, matrix) {
@@ -484,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 };
@@ -764,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;
@@ -784,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; },
@@ -871,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);
         }
@@ -894,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;
@@ -1086,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() {
@@ -2908,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$2(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;
@@ -3983,7 +4018,7 @@ function registerUIEvent() {
     };
 }
 
-const { copy: copy$7, toInnerPoint: toInnerPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
+const { copy: copy$7, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
 const matrix$1 = {};
 const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
@@ -4048,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) {
@@ -4918,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$5 } = BoundsHelper;
+const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$2, copy: copy$5 } = BoundsHelper;
 const { toBounds: toBounds$2 } = PathBounds;
 const LeafBounds = {
     __updateWorldBounds() {
@@ -5019,7 +5053,7 @@ const LeafBounds = {
                 updateAllMatrix$2(this);
                 updateBounds$1(this, this);
                 if (this.__.__autoSide)
-                    this.__updateBoxBounds();
+                    this.__updateBoxBounds(true);
             }
             else {
                 updateAllMatrix$2(this);
@@ -5037,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$5(layout.renderBounds, layout.strokeBounds);
+        layout.renderSpread > 0 ? copyAndSpread$2(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy$5(layout.renderBounds, layout.strokeBounds);
     }
 };
 
@@ -5401,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);
     }
@@ -6938,6 +6975,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 {
@@ -7015,6 +7057,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 = {
@@ -7927,6 +7974,13 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     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();
     }
@@ -8010,7 +8064,7 @@ Rect = __decorate([
 const rect$1 = Rect.prototype;
 const group$1 = Group.prototype;
 const childrenRenderBounds = {};
-const { copy: copy$3, add, includes: includes$1 } = BoundsHelper;
+const { copy: copy$3, add, includes: includes$1, copyAndSpread: copyAndSpread$1 } = BoundsHelper;
 let Box = class Box extends Group {
     get __tag() { return 'Box'; }
     get isBranchLeaf() { return true; }
@@ -8024,20 +8078,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();
@@ -8057,13 +8114,13 @@ let Box = class Box extends Group {
             super.__updateRenderBounds();
             copy$3(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() { }
@@ -8397,14 +8454,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();
@@ -8463,7 +8532,7 @@ __decorate([
     resizeType(100)
 ], Canvas.prototype, "height", void 0);
 __decorate([
-    resizeType(Platform.devicePixelRatio)
+    resizeType(1)
 ], Canvas.prototype, "pixelRatio", void 0);
 __decorate([
     resizeType(true)
@@ -8487,13 +8556,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) {
@@ -8686,7 +8755,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([
@@ -8696,7 +8766,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() {
@@ -8919,6 +8989,7 @@ PointerEvent.MENU_TAP = 'pointer.menu_tap';
 PointerEvent = __decorate([
     registerUIEvent()
 ], PointerEvent);
+const MyPointerEvent = PointerEvent;
 
 const move = {};
 let DragEvent = class DragEvent extends PointerEvent {
@@ -9018,6 +9089,7 @@ DragEvent.LEAVE = 'drag.leave';
 DragEvent = __decorate([
     registerUIEvent()
 ], DragEvent);
+const MyDragEvent = DragEvent;
 
 let DropEvent = class DropEvent extends PointerEvent {
     static setList(data) {
@@ -9099,36 +9171,32 @@ function addInteractionWindow(leafer) {
 
 function document(leafer) {
     addInteractionWindow(leafer);
-    leafer.config.move.scroll = 'limit';
-    leafer.config.zoom.min = 1;
+    const { move, zoom } = leafer.config;
+    move.scroll = 'limit';
+    zoom.min = 1;
+}
+
+function block(leafer) {
+    const { config } = leafer;
+    (config.wheel || (config.wheel = {})).preventDefault = false;
+    (config.touch || (config.touch = {})).preventDefault = 'auto';
 }
 
 const debug$2 = Debug.get('LeaferTypeCreator');
 const LeaferTypeCreator = {
     list: {},
     register(name, fn) {
-        if (list[name]) {
-            debug$2.repeat(name);
-        }
-        else {
-            list[name] = fn;
-        }
+        list[name] ? debug$2.repeat(name) : list[name] = fn;
     },
     run(name, leafer) {
         const fn = list[name];
-        if (fn) {
-            fn(leafer);
-        }
-        else {
-            debug$2.error('no', name);
-        }
+        fn && fn(leafer);
     }
 };
 const { list, register } = LeaferTypeCreator;
-register('draw', () => { });
-register('custom', () => { });
 register('design', addInteractionWindow);
 register('document', document);
+register('block', block);
 
 const leafer = Leafer.prototype;
 leafer.initType = function (type) {
@@ -9317,7 +9385,13 @@ const InteractionHelper = {
                 find.add(list[i]);
         }
         return find;
-    }
+    },
+    pathCanDrag(path) {
+        return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(DragEvent.DRAG)));
+    },
+    pathHasOutside(path) {
+        return path && path.list.some(item => item.isOutside);
+    },
 };
 const I = InteractionHelper;
 
@@ -9627,15 +9701,18 @@ const config = {
         swipeDistance: 20,
         preventDefaultMenu: true
     },
+    touch: {
+        preventDefault: true
+    },
     cursor: true,
     keyEvent: true
 };
 
-const { pathHasEventType, getMoveEventData, getZoomEventData, getRotateEventData } = InteractionHelper;
+const { pathHasEventType, getMoveEventData, getZoomEventData, getRotateEventData, pathCanDrag, pathHasOutside } = InteractionHelper;
 class InteractionBase {
     get dragging() { return this.dragger.dragging; }
     get transforming() { return this.transformer.transforming; }
-    get moveMode() { return this.config.move.drag || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty; }
+    get moveMode() { return this.config.move.drag === true || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty; }
     get canHover() { return this.config.pointer.hover && !this.config.mobile; }
     get isDragEmpty() { return this.config.move.dragEmpty && this.isRootPath(this.hoverData) && (!this.downData || this.isRootPath(this.downData)); }
     get isMobileDragEmpty() { return this.config.move.dragEmpty && !this.canHover && this.downData && this.isTreePath(this.downData); }
@@ -9644,7 +9721,7 @@ class InteractionBase {
     get isHoldSpaceKey() { return this.config.move.holdSpaceKey && Keyboard.isHoldSpaceKey(); }
     get hitRadius() { return this.config.pointer.hitRadius; }
     constructor(target, canvas, selector, userConfig) {
-        this.config = config;
+        this.config = DataHelper.clone(config);
         this.tapCount = 0;
         this.downKeyMap = {};
         this.target = target;
@@ -9896,11 +9973,11 @@ class InteractionBase {
         return app.editor && (!data.path.has(app.editor) && data.path.has(app.tree) && !data.target.syncEventer);
     }
     checkPath(data, useDefaultPath) {
-        if (useDefaultPath || this.canMove(data))
+        if (useDefaultPath || (this.moveMode && !pathHasOutside(data.path)))
             data.path = this.defaultPath;
     }
     canMove(data) {
-        return this.moveMode && data && data.path.list.every(item => !item.isOutside);
+        return data && (this.moveMode || (this.config.move.drag === 'auto' && !pathCanDrag(data.path))) && !pathHasOutside(data.path);
     }
     isDrag(leaf) {
         return this.dragger.getList().has(leaf);
@@ -10595,10 +10672,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) {
@@ -10618,13 +10698,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 };
@@ -10863,7 +10940,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 {
@@ -11733,6 +11810,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) => {
@@ -11742,19 +11820,13 @@ const ExportModule = {
             };
             const { toURL } = Platform;
             const { download } = Platform.origin;
-            if (filename === 'json') {
-                return over({ data: leaf.toJSON(options.json) });
+            if (fileType === 'json') {
+                isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
+                return over({ data: isDownload ? true : leaf.toJSON(options.json) });
             }
-            else if (fileType === 'json') {
-                download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
-                return over({ data: true });
-            }
-            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) {
@@ -11763,14 +11835,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();
@@ -11804,9 +11870,17 @@ 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;
@@ -11916,4 +11990,4 @@ Object.assign(Creator, {
 });
 useCanvas();
 
-export { AlignHelper, AnimateEvent, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, 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, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, addInteractionWindow, 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, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, MyDragEvent, MyImage, MyPointerEvent, 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, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, addInteractionWindow, 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 };