leafer-ui 2.1.7 → 2.1.8

package/dist/web.js

@@ -904,12 +904,12 @@ var LeaferUI = function(exports) {
             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) {
@@ -932,11 +932,11 @@ var LeaferUI = function(exports) {
         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);
@@ -4310,7 +4310,9 @@ var LeaferUI = function(exports) {
             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();
                     });
                 }
             }
@@ -4691,7 +4693,7 @@ var LeaferUI = function(exports) {
                 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);
@@ -4699,8 +4701,9 @@ var LeaferUI = function(exports) {
                 const x = move.x * speed, y = move.y * speed;
                 move.x -= x, move.y -= y;
                 t.move(x, y);
-                Platform.requestRender(() => L.animateMove(t, move, speed));
+                Platform.requestRender(() => L.animateMove(t, move, speed, onAnimate));
             }
+            onAnimate && onAnimate();
         }
     };
     const L = LeafHelper;
@@ -5774,6 +5777,7 @@ var LeaferUI = function(exports) {
             if (this.isBranch) {
                 this.__extraUpdate();
                 if (this.__.flow) {
+                    if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                     if (this.__layout.boxChanged) this.__updateFlowLayout();
                     updateAllMatrix$2(this);
                     updateBounds$1(this, this);
@@ -5842,11 +5846,7 @@ var LeaferUI = function(exports) {
     const {excludeRenderBounds: excludeRenderBounds$1} = LeafBoundsHelper, {hasSize: hasSize} = BoundsHelper;
     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) {
@@ -6336,6 +6336,7 @@ var LeaferUI = function(exports) {
                 children.sort(sort);
                 this.__layout.affectChildrenSort = affectSort;
             }
+            this.__layout.childrenSortChanged = false;
         }
         add(child, index) {
             if (child === this || child.destroyed) return debug$6.warn("add self or destroyed");
@@ -6567,7 +6568,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.7";
+    const version = "2.1.8";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -8938,7 +8939,10 @@ var LeaferUI = function(exports) {
                 ellipse(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(path, rx, ry, rx, ry, 0, startAngle, endAngle);
                 } else {
                     ellipse(path, rx, ry, rx, ry);
@@ -9522,8 +9526,8 @@ var LeaferUI = function(exports) {
             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((origin.x - content.x) / content.width), originRightScale = float(1 - originLeftScale);
+            const originTopScale = float((origin.y - content.y) / content.height), originBottomScale = float(1 - originTopScale);
             let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
             if (D.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
                 if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
@@ -9534,7 +9538,13 @@ var LeaferUI = function(exports) {
                 correctScaleX *= max$1(aScale, bScale);
             } else {
                 if (scale.x < 0) {
-                    if (float(minX(content) - minX(dragBounds)) <= 0 || float(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
+                    if (float(minX(content) - minX(dragBounds), 2) <= 0 || float(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(tempDragBounds.minX - tempContent.minX);
@@ -9557,7 +9567,13 @@ var LeaferUI = function(exports) {
                 }
             } else {
                 if (scale.y < 0) {
-                    if (float(minY(content) - minY(dragBounds)) <= 0 || float(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
+                    if (float(minY(content) - minY(dragBounds), 2) <= 0 || float(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(tempDragBounds.minY - tempContent.minY);
@@ -9654,6 +9670,7 @@ var LeaferUI = function(exports) {
     exports.DragEvent.OUT = "drag.out";
     exports.DragEvent.ENTER = "drag.enter";
     exports.DragEvent.LEAVE = "drag.leave";
+    exports.DragEvent.ANIMATE = "drag.animate";
     exports.DragEvent = __decorate([ registerUIEvent() ], exports.DragEvent);
     const MyDragEvent = exports.DragEvent;
     exports.DropEvent = class DropEvent extends exports.PointerEvent {
@@ -9861,7 +9878,7 @@ var LeaferUI = function(exports) {
                             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(exports.DragEvent.ANIMATE)); else leaf.move(move);
                     }
                 });
             }