@leafer/core 2.1.6 → 2.1.8

package/lib/core.cjs

@@ -765,15 +765,15 @@ const PointHelper = {
         t.x += (t.x - origin.x) * (scaleX - 1);
         t.y += (t.y - origin.y) * (scaleY - 1);
     },
-    rotate(t, rotation, origin) {
+    rotate(t, rotation, origin, radiusX = 1, radiusY = 1) {
         if (!origin) origin = P$5.defaultPoint;
         rotation *= OneRadian;
         const cosR = cos$2(rotation);
         const sinR = sin$2(rotation);
-        const rx = t.x - origin.x;
-        const ry = t.y - origin.y;
-        t.x = origin.x + rx * cosR - ry * sinR;
-        t.y = origin.y + rx * sinR + ry * cosR;
+        const rx = (t.x - origin.x) / radiusX;
+        const ry = (t.y - origin.y) / radiusY;
+        t.x = origin.x + (rx * cosR - ry * sinR) * radiusX;
+        t.y = origin.y + (rx * sinR + ry * cosR) * radiusY;
     },
     tempToInnerOf(t, matrix) {
         const {tempPoint: temp} = P$5;
@@ -833,8 +833,8 @@ const PointHelper = {
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
         return min$1(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
     },
-    getAngle(t, to) {
-        return getAtan2(t, to) / OneRadian;
+    getAngle(t, to, radiusX, radiusY) {
+        return getAtan2(t, to, radiusX, radiusY) / OneRadian;
     },
     getRotation(t, origin, to, toOrigin) {
         if (!toOrigin) toOrigin = origin;
@@ -848,8 +848,8 @@ const PointHelper = {
         const d = toY - toOriginY;
         return Math.atan2(a * d - b * c, a * c + b * d);
     },
-    getAtan2(t, to) {
-        return atan2$2(to.y - t.y, to.x - t.x);
+    getAtan2(t, to, radiusX = 1, radiusY = 1) {
+        return atan2$2((to.y - t.y) / radiusY, (to.x - t.x) / radiusX);
     },
     getDistancePoint(t, to, distance, changeTo, fromTo) {
         const r = getAtan2(t, to);
@@ -906,12 +906,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) {
@@ -934,11 +934,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);
@@ -4579,7 +4579,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();
                 });
             }
         }
@@ -4981,7 +4983,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);
@@ -4989,8 +4991,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.animateMove(t, move, speed));
+            Platform.requestRender(() => L.animateMove(t, move, speed, onAnimate));
         }
+        onAnimate && onAnimate();
     }
 };
 
@@ -6162,6 +6165,7 @@ const LeafBounds = {
         if (this.isBranch) {
             this.__extraUpdate();
             if (this.__.flow) {
+                if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                 if (this.__layout.boxChanged) this.__updateFlowLayout();
                 updateAllMatrix(this);
                 updateBounds(this, this);
@@ -6233,11 +6237,7 @@ const {excludeRenderBounds: excludeRenderBounds} = LeafBoundsHelper, {hasSize: h
 
 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) {
@@ -6741,6 +6741,7 @@ exports.Branch = class Branch extends exports.Leaf {
             children.sort(sort);
             this.__layout.affectChildrenSort = affectSort;
         }
+        this.__layout.childrenSortChanged = false;
     }
     add(child, index) {
         if (child === this || child.destroyed) return debug.warn("add self or destroyed");
@@ -6976,7 +6977,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.6";
+const version = "2.1.8";
 
 exports.AlignHelper = AlignHelper;
 

package/lib/core.esm.js

@@ -763,15 +763,15 @@ const PointHelper = {
         t.x += (t.x - origin.x) * (scaleX - 1);
         t.y += (t.y - origin.y) * (scaleY - 1);
     },
-    rotate(t, rotation, origin) {
+    rotate(t, rotation, origin, radiusX = 1, radiusY = 1) {
         if (!origin) origin = P$5.defaultPoint;
         rotation *= OneRadian;
         const cosR = cos$2(rotation);
         const sinR = sin$2(rotation);
-        const rx = t.x - origin.x;
-        const ry = t.y - origin.y;
-        t.x = origin.x + rx * cosR - ry * sinR;
-        t.y = origin.y + rx * sinR + ry * cosR;
+        const rx = (t.x - origin.x) / radiusX;
+        const ry = (t.y - origin.y) / radiusY;
+        t.x = origin.x + (rx * cosR - ry * sinR) * radiusX;
+        t.y = origin.y + (rx * sinR + ry * cosR) * radiusY;
     },
     tempToInnerOf(t, matrix) {
         const {tempPoint: temp} = P$5;
@@ -831,8 +831,8 @@ const PointHelper = {
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
         return min$1(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
     },
-    getAngle(t, to) {
-        return getAtan2(t, to) / OneRadian;
+    getAngle(t, to, radiusX, radiusY) {
+        return getAtan2(t, to, radiusX, radiusY) / OneRadian;
     },
     getRotation(t, origin, to, toOrigin) {
         if (!toOrigin) toOrigin = origin;
@@ -846,8 +846,8 @@ const PointHelper = {
         const d = toY - toOriginY;
         return Math.atan2(a * d - b * c, a * c + b * d);
     },
-    getAtan2(t, to) {
-        return atan2$2(to.y - t.y, to.x - t.x);
+    getAtan2(t, to, radiusX = 1, radiusY = 1) {
+        return atan2$2((to.y - t.y) / radiusY, (to.x - t.x) / radiusX);
     },
     getDistancePoint(t, to, distance, changeTo, fromTo) {
         const r = getAtan2(t, to);
@@ -904,12 +904,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) {
@@ -932,11 +932,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);
@@ -4577,7 +4577,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();
                 });
             }
         }
@@ -4979,7 +4981,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);
@@ -4987,8 +4989,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.animateMove(t, move, speed));
+            Platform.requestRender(() => L.animateMove(t, move, speed, onAnimate));
         }
+        onAnimate && onAnimate();
     }
 };
 
@@ -6160,6 +6163,7 @@ const LeafBounds = {
         if (this.isBranch) {
             this.__extraUpdate();
             if (this.__.flow) {
+                if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                 if (this.__layout.boxChanged) this.__updateFlowLayout();
                 updateAllMatrix(this);
                 updateBounds(this, this);
@@ -6231,11 +6235,7 @@ const {excludeRenderBounds: excludeRenderBounds} = LeafBoundsHelper, {hasSize: h
 
 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) {
@@ -6739,6 +6739,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.warn("add self or destroyed");
@@ -6974,6 +6975,6 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.6";
+const version = "2.1.8";
 
 export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };