leafer-ui 1.0.1 → 1.0.2

package/dist/web.js

@@ -114,6 +114,19 @@ var LeaferUI = (function (exports) {
             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;
@@ -412,7 +425,7 @@ var LeaferUI = (function (exports) {
     };
     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(),
@@ -468,7 +481,7 @@ var LeaferUI = (function (exports) {
         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) {
@@ -487,7 +500,7 @@ var LeaferUI = (function (exports) {
             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 };
@@ -767,7 +780,7 @@ var LeaferUI = (function (exports) {
     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;
@@ -787,17 +800,24 @@ var LeaferUI = (function (exports) {
             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; },
@@ -874,16 +894,16 @@ var LeaferUI = (function (exports) {
             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);
             }
@@ -897,16 +917,16 @@ var LeaferUI = (function (exports) {
             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;
@@ -1089,12 +1109,12 @@ var LeaferUI = (function (exports) {
         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() {
@@ -2911,60 +2931,75 @@ var LeaferUI = (function (exports) {
         }
         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;
@@ -3986,7 +4021,7 @@ var LeaferUI = (function (exports) {
         };
     }
 
-    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) {
@@ -4051,10 +4086,9 @@ var LeaferUI = (function (exports) {
             }
             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) {
@@ -4921,7 +4955,7 @@ var LeaferUI = (function (exports) {
 
     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() {
@@ -5022,7 +5056,7 @@ var LeaferUI = (function (exports) {
                     updateAllMatrix$2(this);
                     updateBounds$1(this, this);
                     if (this.__.__autoSide)
-                        this.__updateBoxBounds();
+                        this.__updateBoxBounds(true);
                 }
                 else {
                     updateAllMatrix$2(this);
@@ -5040,11 +5074,11 @@ var LeaferUI = (function (exports) {
         },
         __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);
         }
     };
 
@@ -5404,6 +5438,9 @@ var LeaferUI = (function (exports) {
         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);
         }
@@ -7114,6 +7151,11 @@ var LeaferUI = (function (exports) {
     }
 
     class LeaferData extends GroupData {
+        __getInputData() {
+            const data = super.__getInputData();
+            canvasSizeAttrs.forEach(key => delete data[key]);
+            return data;
+        }
     }
 
     class FrameData extends BoxData {
@@ -7191,6 +7233,11 @@ var LeaferUI = (function (exports) {
     }
 
     class CanvasData extends RectData {
+        __getInputData() {
+            const data = super.__getInputData();
+            data.url = this.__leaf.canvas.toDataURL('image/png');
+            return data;
+        }
     }
 
     const UIBounds = {
@@ -8103,6 +8150,13 @@ var LeaferUI = (function (exports) {
         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();
         }
@@ -8186,7 +8240,7 @@ var LeaferUI = (function (exports) {
     const rect$1 = exports.Rect.prototype;
     const group$1 = exports.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;
     exports.Box = class Box extends exports.Group {
         get __tag() { return 'Box'; }
         get isBranchLeaf() { return true; }
@@ -8200,20 +8254,23 @@ var LeaferUI = (function (exports) {
             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();
@@ -8233,13 +8290,13 @@ var LeaferUI = (function (exports) {
                 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() { }
@@ -8573,14 +8630,26 @@ var LeaferUI = (function (exports) {
     exports.Image = __decorate([
         registerUI()
     ], exports.Image);
+    const MyImage = exports.Image;
 
     exports.Canvas = class Canvas extends exports.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();
@@ -8639,7 +8708,7 @@ var LeaferUI = (function (exports) {
         resizeType(100)
     ], exports.Canvas.prototype, "height", void 0);
     __decorate([
-        resizeType(Platform.devicePixelRatio)
+        resizeType(1)
     ], exports.Canvas.prototype, "pixelRatio", void 0);
     __decorate([
         resizeType(true)
@@ -8663,13 +8732,13 @@ var LeaferUI = (function (exports) {
             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) {
@@ -8862,7 +8931,8 @@ var LeaferUI = (function (exports) {
         drawPoints(_points, _curve, _close) { return this; }
         clearPath() { return this; }
         paint() {
-            this.pathElement.forceUpdate('path');
+            if (!this.pathElement.__layout.boxChanged)
+                this.pathElement.forceUpdate('path');
         }
     };
     __decorate([
@@ -8872,7 +8942,7 @@ var LeaferUI = (function (exports) {
         penPathType()
     ], exports.Pen.prototype, "path", void 0);
     exports.Pen = __decorate([
-        useModule(PathCreator, ['set', 'beginPath', 'path']),
+        useModule(PathCreator, ['set', 'beginPath', 'path', 'paint']),
         registerUI()
     ], exports.Pen);
     function penPathType() {
@@ -9095,6 +9165,7 @@ var LeaferUI = (function (exports) {
     exports.PointerEvent = __decorate([
         registerUIEvent()
     ], exports.PointerEvent);
+    const MyPointerEvent = exports.PointerEvent;
 
     const move = {};
     exports.DragEvent = class DragEvent extends exports.PointerEvent {
@@ -9194,6 +9265,7 @@ var LeaferUI = (function (exports) {
     exports.DragEvent = __decorate([
         registerUIEvent()
     ], exports.DragEvent);
+    const MyDragEvent = exports.DragEvent;
 
     exports.DropEvent = class DropEvent extends exports.PointerEvent {
         static setList(data) {
@@ -9275,36 +9347,32 @@ var LeaferUI = (function (exports) {
 
     function document$1(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$1);
+    register('block', block);
 
     const leafer = exports.Leafer.prototype;
     leafer.initType = function (type) {
@@ -9493,7 +9561,13 @@ var LeaferUI = (function (exports) {
                     find.add(list[i]);
             }
             return find;
-        }
+        },
+        pathCanDrag(path) {
+            return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(exports.DragEvent.DRAG)));
+        },
+        pathHasOutside(path) {
+            return path && path.list.some(item => item.isOutside);
+        },
     };
     const I = InteractionHelper;
 
@@ -9803,15 +9877,18 @@ var LeaferUI = (function (exports) {
             swipeDistance: 20,
             preventDefaultMenu: true
         },
+        touch: {
+            preventDefault: true
+        },
         cursor: true,
         keyEvent: true
     };
 
-    const { pathHasEventType, getMoveEventData: getMoveEventData$1, getZoomEventData: getZoomEventData$1, getRotateEventData: getRotateEventData$1 } = InteractionHelper;
+    const { pathHasEventType, getMoveEventData: getMoveEventData$1, getZoomEventData: getZoomEventData$1, getRotateEventData: getRotateEventData$1, pathCanDrag: pathCanDrag$1, 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); }
@@ -9820,7 +9897,7 @@ var LeaferUI = (function (exports) {
         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;
@@ -10072,11 +10149,11 @@ var LeaferUI = (function (exports) {
             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$1(data.path))) && !pathHasOutside(data.path);
         }
         isDrag(leaf) {
             return this.dragger.getList().has(leaf);
@@ -10494,7 +10571,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { getMoveEventData, getZoomEventData, getRotateEventData } = InteractionHelper;
+    const { getMoveEventData, getZoomEventData, getRotateEventData, pathCanDrag } = InteractionHelper;
     class Interaction extends InteractionBase {
         __listenEvents() {
             super.__listenEvents();
@@ -10627,7 +10704,11 @@ var LeaferUI = (function (exports) {
             this.pointerCancel();
         }
         onTouchStart(e) {
-            e.preventDefault();
+            const touch = PointerEventHelper.getTouch(e);
+            const local = this.getLocal(touch, true);
+            const { preventDefault } = this.config.touch;
+            if (preventDefault === true || (preventDefault === 'auto' && pathCanDrag(this.findPath(local))))
+                e.preventDefault();
             this.multiTouchStart(e);
             if (this.usePointer)
                 return;
@@ -10636,8 +10717,7 @@ var LeaferUI = (function (exports) {
                 this.touchTimer = 0;
             }
             this.useTouch = true;
-            const touch = PointerEventHelper.getTouch(e);
-            this.pointerDown(PointerEventHelper.convertTouch(e, this.getLocal(touch, true)));
+            this.pointerDown(PointerEventHelper.convertTouch(e, local));
         }
         onTouchMove(e) {
             this.multiTouchMove(e);
@@ -11120,10 +11200,13 @@ var LeaferUI = (function (exports) {
     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) {
@@ -11143,13 +11226,10 @@ var LeaferUI = (function (exports) {
                 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 };
@@ -11388,7 +11468,7 @@ var LeaferUI = (function (exports) {
                 return true;
             }
             else {
-                if (!paint.style || Export.running) {
+                if (!paint.style || paint.sync || Export.running) {
                     createPattern(ui, paint, canvas.pixelRatio);
                 }
                 else {
@@ -12258,6 +12338,7 @@ var LeaferUI = (function (exports) {
         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) => {
@@ -12267,19 +12348,13 @@ var LeaferUI = (function (exports) {
                 };
                 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) {
@@ -12288,14 +12363,8 @@ var LeaferUI = (function (exports) {
                         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();
@@ -12329,9 +12398,17 @@ var LeaferUI = (function (exports) {
                             }
                             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;
@@ -12501,6 +12578,9 @@ var LeaferUI = (function (exports) {
     exports.Matrix = Matrix;
     exports.MatrixHelper = MatrixHelper;
     exports.MultiTouchHelper = MultiTouchHelper;
+    exports.MyDragEvent = MyDragEvent;
+    exports.MyImage = MyImage;
+    exports.MyPointerEvent = MyPointerEvent;
     exports.NeedConvertToCanvasCommandMap = NeedConvertToCanvasCommandMap;
     exports.OneRadian = OneRadian;
     exports.PI2 = PI2;