@leafer-ui/miniapp 1.0.0-rc.20 → 1.0.0-rc.22

package/dist/miniapp.module.js

@@ -117,7 +117,7 @@ function getMatrixData() { return { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }; }
 
 const { sin: sin$5, cos: cos$5, acos, sqrt: sqrt$3 } = Math;
 const { float: float$1 } = MathHelper;
-const tempPoint$3 = {};
+const tempPoint$4 = {};
 function getWorld() {
     return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), { scaleX: 1, scaleY: 1, rotation: 0, skewX: 0, skewY: 0 });
 }
@@ -158,8 +158,8 @@ const MatrixHelper = {
         t.d *= scaleY;
     },
     scaleOfOuter(t, origin, scaleX, scaleY) {
-        M$6.toInnerPoint(t, origin, tempPoint$3);
-        M$6.scaleOfInner(t, tempPoint$3, scaleX, scaleY);
+        M$6.toInnerPoint(t, origin, tempPoint$4);
+        M$6.scaleOfInner(t, tempPoint$4, scaleX, scaleY);
     },
     scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
         M$6.translateInner(t, origin.x, origin.y);
@@ -177,8 +177,8 @@ const MatrixHelper = {
         t.d = c * sinR + d * cosR;
     },
     rotateOfOuter(t, origin, rotation) {
-        M$6.toInnerPoint(t, origin, tempPoint$3);
-        M$6.rotateOfInner(t, tempPoint$3, rotation);
+        M$6.toInnerPoint(t, origin, tempPoint$4);
+        M$6.rotateOfInner(t, tempPoint$4, rotation);
     },
     rotateOfInner(t, origin, rotation) {
         M$6.translateInner(t, origin.x, origin.y);
@@ -199,8 +199,8 @@ const MatrixHelper = {
         }
     },
     skewOfOuter(t, origin, skewX, skewY) {
-        M$6.toInnerPoint(t, origin, tempPoint$3);
-        M$6.skewOfInner(t, tempPoint$3, skewX, skewY);
+        M$6.toInnerPoint(t, origin, tempPoint$4);
+        M$6.skewOfInner(t, tempPoint$4, skewX, skewY);
     },
     skewOfInner(t, origin, skewX, skewY = 0) {
         M$6.translateInner(t, origin.x, origin.y);
@@ -594,7 +594,7 @@ class Point {
         return this;
     }
 }
-const tempPoint$2 = new Point();
+const tempPoint$3 = new Point();
 
 class Matrix {
     constructor(a, b, c, d, e, f) {
@@ -1206,11 +1206,19 @@ const AroundHelper = {
     directionData,
     tempPoint: {},
     get: get$5,
-    toPoint(around, bounds, to, onlySize) {
+    toPoint(around, bounds, to, onlySize, pointBounds) {
         to || (to = {});
         const point = get$5(around);
         to.x = point.x * bounds.width;
         to.y = point.y * bounds.height;
+        if (pointBounds) {
+            to.x -= pointBounds.x;
+            to.y -= pointBounds.y;
+            if (point.x)
+                to.x -= (point.x === 1) ? pointBounds.width : (point.x === 0.5 ? point.x * pointBounds.width : 0);
+            if (point.y)
+                to.y -= (point.y === 1) ? pointBounds.height : (point.y === 0.5 ? point.y * pointBounds.height : 0);
+        }
         if (!onlySize) {
             to.x += bounds.x;
             to.y += bounds.y;
@@ -1265,7 +1273,8 @@ class Debug {
             this.warn(...messages);
     }
     warn(...messages) {
-        console.warn(this.name, ...messages);
+        if (D$4.showWarn)
+            console.warn(this.name, ...messages);
     }
     repeat(name, ...messages) {
         if (!this.repeatMap[name]) {
@@ -1284,6 +1293,7 @@ class Debug {
 }
 Debug.filterList = [];
 Debug.excludeList = [];
+Debug.showWarn = true;
 function getNameList(name) {
     if (!name)
         name = [];
@@ -2206,7 +2216,7 @@ const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI
 const { setPoint: setPoint$2, addPoint: addPoint$2 } = TwoPointBoundsHelper;
 const { set: set$2 } = PointHelper;
 const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$5 } = PathCommandMap;
-const tempPoint$1 = {};
+const tempPoint$2 = {};
 const BezierHelper = {
     points(data, points, curve, close) {
         data.push(M$5, points[0], points[1]);
@@ -2396,8 +2406,8 @@ const BezierHelper = {
         addMode ? addPoint$2(pointBounds, fromX, fromY) : setPoint$2(pointBounds, fromX, fromY);
         addPoint$2(pointBounds, toX, toY);
         for (let i = 0, len = tList.length; i < len; i++) {
-            getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$1);
-            addPoint$2(pointBounds, tempPoint$1.x, tempPoint$1.y);
+            getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$2);
+            addPoint$2(pointBounds, tempPoint$2.x, tempPoint$2.y);
         }
     },
     getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
@@ -2467,7 +2477,7 @@ const EllipseHelper = {
 };
 
 const { M: M$4, m, L: L$5, l, H, h, V, v, C: C$4, c, S, s, Q: Q$3, q, T, t, A, a, Z: Z$4, z, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3 } = PathCommandMap;
-const { rect: rect$2, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
+const { rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
 const { ellipticalArc } = EllipseHelper;
 const debug$c = Debug.get('PathConvert');
 const setEndPoint$1 = {};
@@ -2660,7 +2670,7 @@ const PathConvert = {
                 case N$3:
                     x = old[i + 1];
                     y = old[i + 2];
-                    curveMode ? rect$2(data, x, y, old[i + 3], old[i + 4]) : copyData(data, old, i, 5);
+                    curveMode ? rect$3(data, x, y, old[i + 3], old[i + 4]) : copyData(data, old, i, 5);
                     i += 5;
                     break;
                 case D$3:
@@ -2817,7 +2827,7 @@ const PathCommandDataHelper = {
 };
 const { ellipse: ellipse$3, arc: arc$2 } = PathCommandDataHelper;
 
-const { moveTo: moveTo$4, lineTo: lineTo$3, quadraticCurveTo, bezierCurveTo, closePath: closePath$3, beginPath, rect: rect$1, roundRect: roundRect$1, ellipse: ellipse$2, arc: arc$1, arcTo: arcTo$2, drawEllipse, drawArc, drawPoints: drawPoints$2 } = PathCommandDataHelper;
+const { moveTo: moveTo$4, lineTo: lineTo$3, quadraticCurveTo, bezierCurveTo, closePath: closePath$3, beginPath, rect: rect$2, roundRect: roundRect$1, ellipse: ellipse$2, arc: arc$1, arcTo: arcTo$2, drawEllipse, drawArc, drawPoints: drawPoints$2 } = PathCommandDataHelper;
 class PathCreator {
     set path(value) { this.__path = value; }
     get path() { return this.__path; }
@@ -2859,7 +2869,7 @@ class PathCreator {
         return this;
     }
     rect(x, y, width, height) {
-        rect$1(this.__path, x, y, width, height);
+        rect$2(this.__path, x, y, width, height);
         return this;
     }
     roundRect(x, y, width, height, cornerRadius) {
@@ -3954,15 +3964,21 @@ const LeafHelper = {
         }
         return true;
     },
-    moveWorld(t, x, y) {
-        const local = { x, y };
+    moveWorld(t, x, y = 0) {
+        const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
         if (t.parent)
             toInnerPoint$1(t.parent.worldTransform, local, local, true);
         L.moveLocal(t, local.x, local.y);
     },
     moveLocal(t, x, y = 0) {
-        t.x += x;
-        t.y += y;
+        if (typeof x === 'object') {
+            t.x += x.x;
+            t.y += x.y;
+        }
+        else {
+            t.x += x;
+            t.y += y;
+        }
     },
     zoomOfWorld(t, origin, scaleX, scaleY, resize) {
         L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize);
@@ -4524,12 +4540,15 @@ const LeafEventer = {
                     break;
             }
         }
+        this.syncEventer && this.syncEventer.emitEvent(event, capture);
     },
     emitEvent(event, capture) {
         event.current = this;
         this.emit(event.type, event, capture);
     },
     hasEvent(type, capture) {
+        if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
+            return true;
         const { __bubbleMap: b, __captureMap: c } = this;
         const hasB = b && b[type], hasC = c && c[type];
         return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
@@ -4749,7 +4768,7 @@ const LeafDataProxy = {
 };
 
 const { setLayout, multiplyParent: multiplyParent$1, translateInner, defaultWorld } = MatrixHelper;
-const { toPoint, tempPoint } = AroundHelper;
+const { toPoint, tempPoint: tempPoint$1 } = AroundHelper;
 const LeafMatrix = {
     __updateWorldMatrix() {
         multiplyParent$1(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__);
@@ -4766,8 +4785,8 @@ const LeafMatrix = {
             local.e = data.x;
             local.f = data.y;
             if (data.around) {
-                toPoint(data.around, layout.boxBounds, tempPoint);
-                translateInner(local, -tempPoint.x, -tempPoint.y);
+                toPoint(data.around, layout.boxBounds, tempPoint$1);
+                translateInner(local, -tempPoint$1.x, -tempPoint$1.y);
             }
         }
         this.__layout.matrixChanged = false;
@@ -6405,32 +6424,38 @@ class Picker {
         const target = options.target || this.target;
         this.exclude = options.exclude || null;
         this.point = { x: hitPoint.x, y: hitPoint.y, radiusX: hitRadius, radiusY: hitRadius };
-        this.findList = options.findList || [];
+        this.findList = new LeafList(options.findList);
         if (!options.findList)
-            this.eachFind(target.children, target.__onlyHitMask);
-        const list = this.findList;
-        const leaf = this.getBestMatchLeaf();
+            this.hitBranch(target);
+        const { list } = this.findList;
+        const leaf = this.getBestMatchLeaf(list, options.bottomList, ignoreHittable);
         const path = ignoreHittable ? this.getPath(leaf) : this.getHitablePath(leaf);
         this.clear();
         return through ? { path, target: leaf, throughPath: list.length ? this.getThroughPath(list) : path } : { path, target: leaf };
     }
-    getBestMatchLeaf() {
-        const { findList: targets } = this;
-        if (targets.length > 1) {
+    getBestMatchLeaf(list, bottomList, ignoreHittable) {
+        if (list.length) {
             let find;
-            this.findList = [];
+            this.findList = new LeafList();
             const { x, y } = this.point;
             const point = { x, y, radiusX: 0, radiusY: 0 };
-            for (let i = 0, len = targets.length; i < len; i++) {
-                find = targets[i];
-                if (LeafHelper.worldHittable(find)) {
+            for (let i = 0, len = list.length; i < len; i++) {
+                find = list[i];
+                if (ignoreHittable || LeafHelper.worldHittable(find)) {
                     this.hitChild(find, point);
                     if (this.findList.length)
-                        return this.findList[0];
+                        return this.findList.list[0];
                 }
             }
         }
-        return targets[0];
+        if (bottomList) {
+            for (let i = 0, len = bottomList.length; i < len; i++) {
+                this.hitChild(bottomList[i].target, this.point, bottomList[i].proxy);
+                if (this.findList.length)
+                    return this.findList.list[0];
+            }
+        }
+        return list[0];
     }
     getPath(leaf) {
         const path = new LeafList();
@@ -6472,6 +6497,9 @@ class Picker {
         }
         return throughPath;
     }
+    hitBranch(branch) {
+        this.eachFind(branch.children, branch.__onlyHitMask);
+    }
     eachFind(children, hitMask) {
         let child, hit;
         const { point } = this, len = children.length;
@@ -6493,11 +6521,11 @@ class Picker {
             }
         }
     }
-    hitChild(child, point) {
+    hitChild(child, point, proxy) {
         if (this.exclude && this.exclude.has(child))
             return;
         if (child.__hitWorld(point))
-            this.findList.push(child);
+            this.findList.add(proxy || child);
     }
     clear() {
         this.point = null;
@@ -6695,7 +6723,11 @@ function zoomLayerType() {
         defineKey(target, key, {
             set(value) { if (this.isLeafer)
                 this[privateKey] = value; },
-            get() { return this.isLeafer ? (this[privateKey] || this) : this.leafer && this.leafer.zoomLayer; }
+            get() {
+                return this.isApp
+                    ? this.tree.zoomLayer
+                    : (this.isLeafer ? (this[privateKey] || this) : this.leafer && this.leafer.zoomLayer);
+            }
         });
     };
 }
@@ -7101,6 +7133,9 @@ let UI = UI_1 = class UI extends Leaf {
         pen.set(this.path = this.__.path || []);
         return pen;
     }
+    get editConfig() { return undefined; }
+    get editOuter() { return 'EditTool'; }
+    get editInner() { return 'PathEditor'; }
     constructor(data) {
         super(data);
     }
@@ -7162,7 +7197,8 @@ let UI = UI_1 = class UI extends Leaf {
     __drawPathByBox(drawer) {
         const { x, y, width, height } = this.__layout.boxBounds;
         if (this.__.cornerRadius) {
-            drawer.roundRect(x, y, width, height, this.__.cornerRadius);
+            const { cornerRadius } = this.__;
+            drawer.roundRect(x, y, width, height, typeof cornerRadius === 'number' ? [cornerRadius] : cornerRadius);
         }
         else {
             drawer.rect(x, y, width, height);
@@ -7183,6 +7219,9 @@ let UI = UI_1 = class UI extends Leaf {
     static registerData(data) {
         dataProcessor(data)(this.prototype);
     }
+    static setEditConfig(_config) { }
+    static setEditOuter(_toolName) { }
+    static setEditInner(_editorName) { }
     destroy() {
         this.fill = this.stroke = null;
         super.destroy();
@@ -7266,15 +7305,15 @@ __decorate([
 __decorate([
     dataType(false)
 ], UI.prototype, "draggable", void 0);
+__decorate([
+    dataType()
+], UI.prototype, "dragBounds", void 0);
 __decorate([
     dataType(false)
 ], UI.prototype, "editable", void 0);
 __decorate([
     dataType('size')
 ], UI.prototype, "editSize", void 0);
-__decorate([
-    dataType()
-], UI.prototype, "editorStyle", void 0);
 __decorate([
     hitType(true)
 ], UI.prototype, "hittable", void 0);
@@ -7466,7 +7505,6 @@ Group = __decorate([
 var Leafer_1;
 const debug$3 = Debug.get('Leafer');
 let Leafer = Leafer_1 = class Leafer extends Group {
-    static get version() { return '1.0.0-rc.20'; }
     get __tag() { return 'Leafer'; }
     get isApp() { return false; }
     get app() { return this.parent || this; }
@@ -7519,7 +7557,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         if (this.isApp)
             this.__setApp();
         this.__checkAutoLayout(config);
-        this.updateLazyBounds();
         this.view = canvas.view;
         if (parentApp) {
             this.__bindApp(parentApp);
@@ -7763,6 +7800,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     __listenEvents() {
         const runId = Run.start('FirstCreate ' + this.innerName);
         this.once(LeaferEvent.START, () => Run.end(runId));
+        this.once(LayoutEvent.START, () => this.updateLazyBounds());
         this.once(LayoutEvent.END, () => this.__onReady());
         this.once(RenderEvent.START, () => this.__onCreated());
         this.once(RenderEvent.END, () => this.__onViewReady());
@@ -7833,8 +7871,8 @@ Rect = __decorate([
     registerUI()
 ], Rect);
 
-const rect = Rect.prototype;
-const group = Group.prototype;
+const rect$1 = Rect.prototype;
+const group$1 = Group.prototype;
 const bounds$1 = {};
 const { copy: copy$3, add } = BoundsHelper;
 let Box = class Box extends Group {
@@ -7913,28 +7951,28 @@ __decorate([
     affectRenderBoundsType('show')
 ], Box.prototype, "overflow", void 0);
 __decorate([
-    rewrite(rect.__updateStrokeSpread)
+    rewrite(rect$1.__updateStrokeSpread)
 ], Box.prototype, "__updateStrokeSpread", null);
 __decorate([
-    rewrite(rect.__updateRenderSpread)
+    rewrite(rect$1.__updateRenderSpread)
 ], Box.prototype, "__updateRectRenderSpread", null);
 __decorate([
-    rewrite(rect.__updateBoxBounds)
+    rewrite(rect$1.__updateBoxBounds)
 ], Box.prototype, "__updateRectBoxBounds", null);
 __decorate([
-    rewrite(rect.__updateStrokeBounds)
+    rewrite(rect$1.__updateStrokeBounds)
 ], Box.prototype, "__updateStrokeBounds", null);
 __decorate([
-    rewrite(rect.__updateRenderBounds)
+    rewrite(rect$1.__updateRenderBounds)
 ], Box.prototype, "__updateRectRenderBounds", null);
 __decorate([
-    rewrite(rect.__updateChange)
+    rewrite(rect$1.__updateChange)
 ], Box.prototype, "__updateRectChange", null);
 __decorate([
-    rewrite(rect.__render)
+    rewrite(rect$1.__render)
 ], Box.prototype, "__renderRect", null);
 __decorate([
-    rewrite(group.__render)
+    rewrite(group$1.__render)
 ], Box.prototype, "__renderGroup", null);
 Box = __decorate([
     rewriteAble(),
@@ -8281,6 +8319,7 @@ Canvas = __decorate([
 const { copyAndSpread, includes, spread, setList } = BoundsHelper;
 let Text = class Text extends UI {
     get __tag() { return 'Text'; }
+    get editInner() { return 'TextEditor'; }
     get textDrawData() {
         this.__layout.update();
         return this.__.__textDrawData;
@@ -8509,7 +8548,7 @@ function penPathType() {
     };
 }
 
-const version = "1.0.0-rc.20";
+const version = "1.0.0-rc.21";
 
 let App = class App extends Leafer {
     get __tag() { return 'App'; }
@@ -8603,7 +8642,8 @@ let App = class App extends Leafer {
             this.renderer.update();
     }
     __render(canvas, options) {
-        canvas.setWorld(options.matrix || this.__world);
+        if (options.matrix)
+            canvas.setWorld(options.matrix);
         this.children.forEach(leafer => canvas.copyWorld(leafer.canvas));
     }
     __onResize(event) {
@@ -8725,6 +8765,35 @@ let DragEvent = class DragEvent extends PointerEvent {
     static setData(data) {
         this.data = data;
     }
+    static getValidMove(leaf, start, total) {
+        const { draggable, dragBounds, x, y } = leaf;
+        const move = leaf.getLocalPoint(total, null, true);
+        move.x += start.x - x;
+        move.y += start.y - y;
+        if (dragBounds)
+            this.getMoveInDragBounds(leaf.__local, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true);
+        if (draggable === 'x')
+            move.y = 0;
+        if (draggable === 'y')
+            move.x = 0;
+        return move;
+    }
+    static getMoveInDragBounds(box, dragBounds, move, change) {
+        const x = box.x + move.x, y = box.y + move.y;
+        const right = x + box.width, bottom = y + box.height;
+        const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height;
+        if (!change)
+            move = Object.assign({}, move);
+        if (x < dragBounds.x)
+            move.x += dragBounds.x - x;
+        else if (right > boundsRight)
+            move.x += boundsRight - right;
+        if (y < dragBounds.y)
+            move.y += dragBounds.y - y;
+        else if (bottom > boundsBottom)
+            move.y += boundsBottom - bottom;
+        return move;
+    }
     getPageMove(total) {
         this.assignMove(total);
         return this.current.getPagePoint(move, null, true);
@@ -8834,9 +8903,7 @@ function addInteractionWindow(leafer) {
     if (leafer.isApp)
         return;
     leafer.__eventIds.push(leafer.on_(MoveEvent.BEFORE_MOVE, (e) => {
-        const { x, y } = leafer.getValidMove(e.moveX, e.moveY);
-        if (x || y)
-            leafer.zoomLayer.move(x, y);
+        leafer.zoomLayer.move(leafer.getValidMove(e.moveX, e.moveY));
     }), leafer.on_(ZoomEvent.BEFORE_ZOOM, (e) => {
         const { zoomLayer } = leafer;
         const changeScale = leafer.getValidScale(e.scale);
@@ -9105,9 +9172,14 @@ class Dragger {
             if (this.dragging) {
                 this.interaction.emit(DragEvent.START, this.dragData);
                 this.getDragableList(this.dragData.path);
+                this.setDragStartPoints(this.realDragableList = this.getList());
             }
         }
     }
+    setDragStartPoints(list) {
+        this.dragStartPoints = {};
+        list.forEach(leaf => this.dragStartPoints[leaf.innerId] = { x: leaf.x, y: leaf.y });
+    }
     getDragableList(path) {
         let leaf;
         for (let i = 0, len = path.length; i < len; i++) {
@@ -9137,10 +9209,10 @@ class Dragger {
     }
     dragReal() {
         const { running } = this.interaction;
-        const list = this.getList();
+        const list = this.realDragableList;
         if (list.length && running) {
-            const { moveX, moveY } = this.dragData;
-            list.forEach(leaf => leaf.draggable && leaf.moveWorld(moveX, moveY));
+            const { totalX, totalY } = this.dragData;
+            list.forEach(leaf => leaf.draggable && leaf.move(DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })));
         }
     }
     dragOverOrOut(data) {
@@ -9609,7 +9681,8 @@ class InteractionBase {
     }
     findPath(data, options) {
         const { hitRadius, through } = this.config.pointer;
-        const find = this.selector.getByPoint(data, hitRadius, options || { through });
+        const { bottomList } = this;
+        const find = this.selector.getByPoint(data, hitRadius, Object.assign({ bottomList, name: data.type }, (options || { through })));
         if (find.throughPath)
             data.throughPath = find.throughPath;
         data.path = find.path;
@@ -9622,7 +9695,7 @@ class InteractionBase {
         const app = this.target.app;
         if (!app || !app.isApp)
             return false;
-        return app.editor && (!data.path.has(app.editor) && data.path.has(app.tree));
+        return app.editor && (!data.path.has(app.editor) && data.path.has(app.tree) && !data.target.syncEventer);
     }
     checkPath(data, useDefaultPath) {
         if (useDefaultPath || this.canMove(data))
@@ -9688,7 +9761,7 @@ class InteractionBase {
         const { path } = data;
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i];
-            cursor = leaf.cursor;
+            cursor = leaf.syncEventer ? leaf.syncEventer.cursor : leaf.cursor;
             if (cursor)
                 break;
         }
@@ -9846,6 +9919,8 @@ const { toInnerRadiusPointOf, copy: copy$2, setRadius } = PointHelper;
 const inner = {};
 const leaf = Leaf.prototype;
 leaf.__hitWorld = function (point) {
+    if (!this.__.hitSelf)
+        return false;
     if (this.__.hitRadius) {
         copy$2(inner, point), point = inner;
         setRadius(point, this.__.hitRadius);
@@ -9873,8 +9948,8 @@ leaf.__drawHitPath = function (canvas) { if (canvas)
     this.__drawRenderPath(canvas); };
 
 const matrix = new Matrix();
-const ui$1 = UI.prototype;
-ui$1.__updateHitCanvas = function () {
+const ui$2 = UI.prototype;
+ui$2.__updateHitCanvas = function () {
     const data = this.__, { hitCanvasManager } = this.leafer;
     const isHitPixelFill = data.__pixelFill && data.hitFill === 'pixel';
     const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel';
@@ -9901,7 +9976,7 @@ ui$1.__updateHitCanvas = function () {
     this.__drawHitPath(h);
     h.setStrokeOptions(data);
 };
-ui$1.__hit = function (inner) {
+ui$2.__hit = function (inner) {
     if (Platform.name === 'miniapp')
         this.__drawHitPath(this.__hitCanvas);
     const data = this.__;
@@ -9941,22 +10016,24 @@ ui$1.__hit = function (inner) {
     return hitWidth ? this.__hitStroke(inner, hitWidth) : false;
 };
 
-const ui = new UI();
-Rect.prototype.__updateHitCanvas = function () {
+const ui$1 = new UI();
+const rect = Rect.prototype;
+rect.__updateHitCanvas = function () {
     if (this.stroke || this.cornerRadius)
-        ui.__updateHitCanvas.call(this);
+        ui$1.__updateHitCanvas.call(this);
 };
-Rect.prototype.__hitFill = function (inner) {
-    return this.__hitCanvas ? ui.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
+rect.__hitFill = function (inner) {
+    return this.__hitCanvas ? ui$1.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
 };
 
-UI.prototype.find = function (condition, options) {
+const ui = UI.prototype, group = Group.prototype;
+ui.find = function (condition, options) {
     return this.leafer ? this.leafer.selector.getBy(condition, this, false, options) : [];
 };
-UI.prototype.findOne = function (condition, options) {
+ui.findOne = function (condition, options) {
     return this.leafer ? this.leafer.selector.getBy(condition, this, true, options) : null;
 };
-Group.prototype.pick = function (hitPoint, options) {
+group.pick = function (hitPoint, options) {
     this.__layout.update();
     if (!options)
         options = {};
@@ -10373,79 +10450,75 @@ const PaintModule = {
 
 let origin = {};
 const { get: get$4, rotateOfOuter: rotateOfOuter$2, translate: translate$1, scaleOfOuter: scaleOfOuter$2, scale: scaleHelper, rotate } = MatrixHelper;
-function fillOrFitMode(data, mode, box, width, height, rotation) {
+function fillOrFitMode(data, box, x, y, scaleX, scaleY, rotation) {
     const transform = get$4();
-    const swap = rotation && rotation !== 180;
-    const sw = box.width / (swap ? height : width);
-    const sh = box.height / (swap ? width : height);
-    const scale = mode === 'fit' ? Math.min(sw, sh) : Math.max(sw, sh);
-    const x = box.x + (box.width - width * scale) / 2;
-    const y = box.y + (box.height - height * scale) / 2;
-    translate$1(transform, x, y);
-    scaleHelper(transform, scale);
+    translate$1(transform, box.x + x, box.y + y);
+    scaleHelper(transform, scaleX, scaleY);
     if (rotation)
         rotateOfOuter$2(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation);
-    data.scaleX = data.scaleY = scale;
     data.transform = transform;
 }
 function clipMode(data, box, x, y, scaleX, scaleY, rotation) {
     const transform = get$4();
-    translate$1(transform, box.x, box.y);
-    if (x || y)
-        translate$1(transform, x, y);
-    if (scaleX) {
+    translate$1(transform, box.x + x, box.y + y);
+    if (scaleX)
         scaleHelper(transform, scaleX, scaleY);
-        data.scaleX = transform.a;
-        data.scaleY = transform.d;
-    }
     if (rotation)
         rotate(transform, rotation);
     data.transform = transform;
 }
-function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation) {
+function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, around) {
     const transform = get$4();
     if (rotation) {
-        rotate(transform, rotation);
-        switch (rotation) {
-            case 90:
-                translate$1(transform, height, 0);
-                break;
-            case 180:
-                translate$1(transform, width, height);
-                break;
-            case 270:
-                translate$1(transform, 0, width);
-                break;
+        if (around === 'center') {
+            rotateOfOuter$2(transform, { x: width / 2, y: height / 2 }, rotation);
+        }
+        else {
+            rotate(transform, rotation);
+            switch (rotation) {
+                case 90:
+                    translate$1(transform, height, 0);
+                    break;
+                case 180:
+                    translate$1(transform, width, height);
+                    break;
+                case 270:
+                    translate$1(transform, 0, width);
+                    break;
+            }
         }
     }
-    origin.x = box.x;
-    origin.y = box.y;
-    if (x || y)
-        origin.x += x, origin.y += y;
+    origin.x = box.x + x;
+    origin.y = box.y + y;
     translate$1(transform, origin.x, origin.y);
-    if (scaleX) {
+    if (scaleX)
         scaleOfOuter$2(transform, origin, scaleX, scaleY);
-        data.scaleX = scaleX;
-        data.scaleY = scaleY;
-    }
     data.transform = transform;
 }
 
 const { get: get$3, translate } = MatrixHelper;
 const tempBox = new Bounds();
+const tempPoint = {};
 function createData(leafPaint, image, paint, box) {
     let { width, height } = image;
     if (paint.padding)
         box = tempBox.set(box).shrink(paint.padding);
-    const { opacity, mode, offset, scale, size, rotation, blendMode, repeat } = paint;
+    const { opacity, mode, around, offset, scale, size, rotation, blendMode, repeat } = paint;
     const sameBox = box.width === width && box.height === height;
     if (blendMode)
         leafPaint.blendMode = blendMode;
     const data = leafPaint.data = { mode };
-    let x, y, scaleX, scaleY;
-    if (offset)
-        x = offset.x, y = offset.y;
-    if (size) {
+    const swapSize = around !== 'center' && (rotation || 0) % 180 === 90;
+    const swapWidth = swapSize ? height : width, swapHeight = swapSize ? width : height;
+    let x = 0, y = 0, scaleX, scaleY;
+    if (!mode || mode === 'cover' || mode === 'fit') {
+        if (!sameBox || rotation) {
+            const sw = box.width / swapWidth, sh = box.height / swapHeight;
+            scaleX = scaleY = mode === 'fit' ? Math.min(sw, sh) : Math.max(sw, sh);
+            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;
     }
@@ -10453,26 +10526,36 @@ function createData(leafPaint, image, paint, box) {
         scaleX = typeof scale === 'number' ? scale : scale.x;
         scaleY = typeof scale === 'number' ? scale : scale.y;
     }
+    if (around) {
+        const imageBounds = { x, y, width: swapWidth, height: swapHeight };
+        if (scaleX)
+            imageBounds.width *= scaleX, imageBounds.height *= scaleY;
+        AroundHelper.toPoint(around, box, tempPoint, true, imageBounds);
+        x += tempPoint.x, y += tempPoint.y;
+    }
+    if (offset)
+        x += offset.x, y += offset.y;
     switch (mode) {
         case 'strench':
             if (!sameBox)
                 width = box.width, height = box.height;
             break;
+        case 'normal':
         case 'clip':
-            if (offset || scaleX || rotation)
+            if (x || y || scaleX || rotation)
                 clipMode(data, box, x, y, scaleX, scaleY, rotation);
             break;
         case 'repeat':
             if (!sameBox || scaleX || rotation)
-                repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation);
+                repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, around);
             if (!repeat)
                 data.repeat = 'repeat';
             break;
         case 'fit':
         case 'cover':
         default:
-            if (!sameBox || rotation)
-                fillOrFitMode(data, mode, box, width, height, rotation);
+            if (scaleX)
+                fillOrFitMode(data, box, x, y, scaleX, scaleY, rotation);
     }
     if (!data.transform) {
         if (box.x || box.y) {
@@ -10480,6 +10563,10 @@ function createData(leafPaint, image, paint, box) {
             translate(data.transform, box.x, box.y);
         }
     }
+    if (scaleX && mode !== 'strench') {
+        data.scaleX = scaleX;
+        data.scaleY = scaleY;
+    }
     data.width = width;
     data.height = height;
     if (opacity)
@@ -11535,6 +11622,13 @@ const ExportModule = {
                 resolve();
                 this.running = false;
             };
+            if (filename === 'json') {
+                return over({ data: leaf.toJSON() });
+            }
+            else if (FileHelper.fileType(filename) === 'json') {
+                Platform.origin.download('data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(leaf.toJSON())), filename);
+                return over({ data: true });
+            }
             const { leafer } = leaf;
             if (leafer) {
                 leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
@@ -11711,4 +11805,4 @@ LeaferCanvas.prototype.updateViewSize = function () {
     }
 };
 
-export { 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, Interaction, 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, 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, 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$2 as tempPoint, useCanvas, useModule, version, zoomLayerType };
+export { 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, Interaction, 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, 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, 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, zoomLayerType };