@leafer/miniapp 2.1.7 → 2.1.8

package/dist/miniapp.module.js

@@ -913,12 +913,12 @@ class Point {
         PointHelper.scaleOf(this, origin, scaleX, scaleY);
         return this;
     }
-    rotate(rotation, origin) {
-        PointHelper.rotate(this, rotation, origin);
+    rotate(rotation, origin, radiusX, radiusY) {
+        PointHelper.rotate(this, rotation, origin, radiusX, radiusY);
         return this;
     }
-    rotateOf(origin, rotation) {
-        PointHelper.rotate(this, rotation, origin);
+    rotateOf(origin, rotation, radiusX, radiusY) {
+        PointHelper.rotate(this, rotation, origin, radiusX, radiusY);
         return this;
     }
     getRotation(origin, to, toOrigin) {
@@ -941,11 +941,11 @@ class Point {
     getDistancePoint(to, distance, changeTo, fromTo) {
         return new Point(PointHelper.getDistancePoint(this, to, distance, changeTo, fromTo));
     }
-    getAngle(to) {
-        return PointHelper.getAngle(this, to);
+    getAngle(to, radiusX, radiusY) {
+        return PointHelper.getAngle(this, to, radiusX, radiusY);
     }
-    getAtan2(to) {
-        return PointHelper.getAtan2(this, to);
+    getAtan2(to, radiusX, radiusY) {
+        return PointHelper.getAtan2(this, to, radiusX, radiusY);
     }
     isSame(point, quick) {
         return PointHelper.isSame(this, point, quick);
@@ -4586,7 +4586,9 @@ function sortType(defaultValue) {
         set(value) {
             if (this.__setAttr(key, value)) {
                 this.waitParent(() => {
-                    this.parent.__layout.childrenSortChange();
+                    const {parent: parent} = this;
+                    parent.__layout.childrenSortChange();
+                    if (parent.__.flow) parent.__layout.boxChange();
                 });
             }
         }
@@ -4988,7 +4990,7 @@ const LeafHelper = {
             p = p.parent;
         }
     },
-    animateMove(t, move, speed = .3) {
+    animateMove(t, move, speed = .3, onAnimate) {
         if (!move.x && !move.y) return;
         if (Math.abs(move.x) < 1 && Math.abs(move.y) < 1) {
             t.move(move);
@@ -4996,8 +4998,9 @@ const LeafHelper = {
             const x = move.x * speed, y = move.y * speed;
             move.x -= x, move.y -= y;
             t.move(x, y);
-            Platform.requestRender(() => L$5.animateMove(t, move, speed));
+            Platform.requestRender(() => L$5.animateMove(t, move, speed, onAnimate));
         }
+        onAnimate && onAnimate();
     }
 };
 
@@ -6169,6 +6172,7 @@ const LeafBounds = {
         if (this.isBranch) {
             this.__extraUpdate();
             if (this.__.flow) {
+                if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                 if (this.__layout.boxChanged) this.__updateFlowLayout();
                 updateAllMatrix$3(this);
                 updateBounds$2(this, this);
@@ -6240,11 +6244,7 @@ const {excludeRenderBounds: excludeRenderBounds$1} = LeafBoundsHelper, {hasSize:
 
 const BranchRender = {
     __updateChange() {
-        const {__layout: layout} = this;
-        if (layout.childrenSortChanged) {
-            this.__updateSortChildren();
-            layout.childrenSortChanged = false;
-        }
+        if (this.__layout.childrenSortChanged) this.__updateSortChildren();
         this.__.__checkSingle();
     },
     __render(canvas, options) {
@@ -6748,6 +6748,7 @@ let Branch = class Branch extends Leaf {
             children.sort(sort);
             this.__layout.affectChildrenSort = affectSort;
         }
+        this.__layout.childrenSortChanged = false;
     }
     add(child, index) {
         if (child === this || child.destroyed) return debug$8.warn("add self or destroyed");
@@ -6983,7 +6984,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.7";
+const version = "2.1.8";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -9513,7 +9514,10 @@ let Ellipse = class Ellipse extends UI {
             ellipse$1(path, rx, ry, rx, ry, 0, outerStartAngle, outerEndAngle, outerAnticlockwise);
         } else {
             if (hasAngle) {
-                if (!closedAngle) moveTo$3(path, rx, ry);
+                if (!closedAngle) {
+                    if (!closed) open = true;
+                    if (!open) moveTo$3(path, rx, ry);
+                }
                 ellipse$1(path, rx, ry, rx, ry, 0, startAngle, endAngle);
             } else {
                 ellipse$1(path, rx, ry, rx, ry);
@@ -10191,8 +10195,8 @@ const DragBoundsHelper = {
         if (!change) scale = Object.assign({}, scale);
         tempDragBounds.set(dragBounds);
         tempContent.set(content).scaleOf(origin, scale.x, scale.y);
-        const originLeftScale = (origin.x - content.x) / content.width, originRightScale = 1 - originLeftScale;
-        const originTopScale = (origin.y - content.y) / content.height, originBottomScale = 1 - originTopScale;
+        const originLeftScale = float$3((origin.x - content.x) / content.width), originRightScale = float$3(1 - originLeftScale);
+        const originTopScale = float$3((origin.y - content.y) / content.height), originBottomScale = float$3(1 - originTopScale);
         let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
         if (D$2.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
             if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
@@ -10203,7 +10207,13 @@ const DragBoundsHelper = {
             correctScaleX *= max$3(aScale, bScale);
         } else {
             if (scale.x < 0) {
-                if (float$3(minX(content) - minX(dragBounds)) <= 0 || float$3(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
+                if (float$3(minX(content) - minX(dragBounds), 2) <= 0 || float$3(maxX(dragBounds) - maxX(content), 2) <= 0) {
+                    tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
+                    if (tempContent.width > 1) {
+                        correctScaleX *= 1 / tempContent.width;
+                        tempContent.width = 1;
+                    }
+                }
                 tempContent.unsign();
             }
             aSize = float$3(tempDragBounds.minX - tempContent.minX);
@@ -10226,7 +10236,13 @@ const DragBoundsHelper = {
             }
         } else {
             if (scale.y < 0) {
-                if (float$3(minY(content) - minY(dragBounds)) <= 0 || float$3(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
+                if (float$3(minY(content) - minY(dragBounds), 2) <= 0 || float$3(maxY(dragBounds) - maxY(content), 2) <= 0) {
+                    tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
+                    if (tempContent.height > 1) {
+                        correctScaleY *= 1 / tempContent.height;
+                        tempContent.height = 1;
+                    }
+                }
                 tempContent.unsign();
             }
             aSize = float$3(tempDragBounds.minY - tempContent.minY);
@@ -10357,6 +10373,8 @@ DragEvent.ENTER = "drag.enter";
 
 DragEvent.LEAVE = "drag.leave";
 
+DragEvent.ANIMATE = "drag.animate";
+
 DragEvent = __decorate([ registerUIEvent() ], DragEvent);
 
 const MyDragEvent = DragEvent;
@@ -10611,7 +10629,7 @@ class Dragger {
                         x: totalX,
                         y: totalY
                     }, checkLimitMove || axisDrag);
-                    if (dragLimitAnimate && !axisDrag && isDragEnd) LeafHelper.animateMove(leaf, move, isNumber(dragLimitAnimate) ? dragLimitAnimate : .3); else leaf.move(move);
+                    if (dragLimitAnimate && !axisDrag && isDragEnd) LeafHelper.animateMove(leaf, move, isNumber(dragLimitAnimate) ? dragLimitAnimate : .3, () => leaf.emit(DragEvent.ANIMATE)); else leaf.move(move);
                 }
             });
         }
@@ -14833,10 +14851,11 @@ const registerInnerEditor = registerEditTool;
 
 const EditToolCreator = {
     list: {},
-    register(EditTool) {
+    register(EditTool, name) {
         const {tag: tag} = EditTool.prototype;
-        list$1[tag] && debug$2.repeat(tag);
-        list$1[tag] = EditTool;
+        name || (name = tag);
+        list$1[name] && debug$2.repeat(name);
+        list$1[name] = EditTool;
     },
     get(tag, editor) {
         return new list$1[tag](editor);
@@ -15651,8 +15670,8 @@ class InnerEditor {
 }
 
 let EditTool = class EditTool extends InnerEditor {
-    static registerEditTool() {
-        EditToolCreator.register(this);
+    static registerEditTool(name) {
+        EditToolCreator.register(this, name);
     }
     get tag() {
         return "EditTool";
@@ -16018,14 +16037,14 @@ leaf.__scaleResize = function(scaleX, scaleY) {
     scaleResize(this, scaleX, scaleY);
 };
 
-leaf.resizeWidth = function(width) {
-    const scale = width / this.getBounds("box", "local").width || 1;
-    this.scaleOf(this.__layout.boxBounds, scale, this.__.lockRatio ? scale : 1, true);
+leaf.resizeWidth = function(width, relative = "inner") {
+    const scale = width / this.getBounds("box", relative).width || 1;
+    this.scaleOf("top-left", scale, this.__.lockRatio ? scale : 1, true);
 };
 
-leaf.resizeHeight = function(height) {
-    const scale = height / this.getBounds("box", "local").height || 1;
-    this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
+leaf.resizeHeight = function(height, relative = "inner") {
+    const scale = height / this.getBounds("box", relative).height || 1;
+    this.scaleOf("top-left", this.__.lockRatio ? scale : 1, scale, true);
 };
 
 Text.prototype.__scaleResize = function(scaleX, scaleY) {