leafer-ui 2.1.6 → 2.1.7

package/dist/web.js

@@ -268,7 +268,7 @@ var LeaferUI = function(exports) {
             return to;
         },
         setTemp(top, right, bottom, left) {
-            return set$2(tempFour, top, right, bottom, left);
+            return set$3(tempFour, top, right, bottom, left);
         },
         toTempAB(a, b, change) {
             tempTo = change ? isNumber(a) ? b : a : [];
@@ -308,21 +308,21 @@ var LeaferUI = function(exports) {
         max(t, other, change) {
             if (isNumber(t) && isNumber(other)) return max$5(t, other);
             toTempAB(t, other, change);
-            return set$2(tempTo, max$5(tempA[0], tempB[0]), max$5(tempA[1], tempB[1]), max$5(tempA[2], tempB[2]), max$5(tempA[3], tempB[3]));
+            return set$3(tempTo, max$5(tempA[0], tempB[0]), max$5(tempA[1], tempB[1]), max$5(tempA[2], tempB[2]), max$5(tempA[3], tempB[3]));
         },
         add(t, other, change) {
             if (isNumber(t) && isNumber(other)) return t + other;
             toTempAB(t, other, change);
-            return set$2(tempTo, tempA[0] + tempB[0], tempA[1] + tempB[1], tempA[2] + tempB[2], tempA[3] + tempB[3]);
+            return set$3(tempTo, tempA[0] + tempB[0], tempA[1] + tempB[1], tempA[2] + tempB[2], tempA[3] + tempB[3]);
         },
         swapAndScale(t, scaleX, scaleY, change) {
             if (isNumber(t)) return scaleX === scaleY ? t * scaleX : [ t * scaleY, t * scaleX ];
             const to = change ? t : [];
             const [top, right, bottom, left] = t.length === 4 ? t : get$5(t);
-            return set$2(to, bottom * scaleY, left * scaleX, top * scaleY, right * scaleX);
+            return set$3(to, bottom * scaleY, left * scaleX, top * scaleY, right * scaleX);
         }
     };
-    const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
+    const {set: set$3, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
     const {round: round$3, pow: pow$1, max: max$4, floor: floor$2, PI: PI$3} = Math;
     const tempScaleData$1 = {};
     const MathHelper = {
@@ -434,7 +434,7 @@ var LeaferUI = function(exports) {
     }
     const {sin: sin$5, cos: cos$5, acos: acos, sqrt: sqrt$3} = Math;
     const {float: float$3} = MathHelper;
-    const tempPoint$4 = {};
+    const tempPoint$5 = {};
     function getWorld() {
         return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
             scaleX: 1,
@@ -491,8 +491,8 @@ var LeaferUI = function(exports) {
             to.f = t.f * pixelRatio;
         },
         scaleOfOuter(t, origin, scaleX, scaleY) {
-            M$6.toInnerPoint(t, origin, tempPoint$4);
-            M$6.scaleOfInner(t, tempPoint$4, scaleX, scaleY);
+            M$6.toInnerPoint(t, origin, tempPoint$5);
+            M$6.scaleOfInner(t, tempPoint$5, scaleX, scaleY);
         },
         scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
             M$6.translateInner(t, origin.x, origin.y);
@@ -510,8 +510,8 @@ var LeaferUI = function(exports) {
             t.d = c * sinR + d * cosR;
         },
         rotateOfOuter(t, origin, rotation) {
-            M$6.toInnerPoint(t, origin, tempPoint$4);
-            M$6.rotateOfInner(t, tempPoint$4, rotation);
+            M$6.toInnerPoint(t, origin, tempPoint$5);
+            M$6.rotateOfInner(t, tempPoint$5, rotation);
         },
         rotateOfInner(t, origin, rotation) {
             M$6.translateInner(t, origin.x, origin.y);
@@ -532,8 +532,8 @@ var LeaferUI = function(exports) {
             }
         },
         skewOfOuter(t, origin, skewX, skewY) {
-            M$6.toInnerPoint(t, origin, tempPoint$4);
-            M$6.skewOfInner(t, tempPoint$4, skewX, skewY);
+            M$6.toInnerPoint(t, origin, tempPoint$5);
+            M$6.skewOfInner(t, tempPoint$5, skewX, skewY);
         },
         skewOfInner(t, origin, skewX, skewY = 0) {
             M$6.translateInner(t, origin.x, origin.y);
@@ -730,7 +730,7 @@ var LeaferUI = function(exports) {
     const M$6 = MatrixHelper;
     const {float: float$2} = MathHelper;
     const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
-    const {sin: sin$4, cos: cos$4, abs: abs$5, sqrt: sqrt$2, atan2: atan2$2, min: min$2, round: round$2} = Math;
+    const {sin: sin$4, cos: cos$4, abs: abs$6, sqrt: sqrt$2, atan2: atan2$2, min: min$2, round: round$2} = Math;
     const PointHelper = {
         defaultPoint: getPointData(),
         tempPoint: {},
@@ -766,15 +766,15 @@ var LeaferUI = function(exports) {
             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$4(rotation);
             const sinR = sin$4(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;
@@ -827,15 +827,15 @@ var LeaferUI = function(exports) {
             return getDistanceFrom(t.x, t.y, point.x, point.y);
         },
         getDistanceFrom(x1, y1, x2, y2) {
-            const x = abs$5(x2 - x1);
-            const y = abs$5(y2 - y1);
+            const x = abs$6(x2 - x1);
+            const y = abs$6(y2 - y1);
             return sqrt$2(x * x + y * y);
         },
         getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
             return min$2(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;
@@ -849,8 +849,8 @@ var LeaferUI = function(exports) {
             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);
@@ -946,7 +946,7 @@ var LeaferUI = function(exports) {
             return this;
         }
     }
-    const tempPoint$3 = new Point;
+    const tempPoint$4 = new Point;
     class Matrix {
         constructor(a, b, c, d, e, f) {
             this.set(a, b, c, d, e, f);
@@ -2520,11 +2520,11 @@ var LeaferUI = function(exports) {
             data[0] ? drawer.arcTo(x, y, right, y, data[0]) : drawer.lineTo(x, y);
         }
     };
-    const {sin: sin$3, cos: cos$3, hypot: hypot, atan2: atan2$1, ceil: ceil, abs: abs$4, PI: PI$2, sqrt: sqrt$1, pow: pow} = Math;
+    const {sin: sin$3, cos: cos$3, hypot: hypot, atan2: atan2$1, ceil: ceil, abs: abs$5, PI: PI$2, sqrt: sqrt$1, pow: pow} = Math;
     const {setPoint: setPoint$1, addPoint: addPoint$1} = TwoPointBoundsHelper;
-    const {set: set$1, toNumberPoints: toNumberPoints} = PointHelper;
+    const {set: set$2, toNumberPoints: toNumberPoints} = PointHelper;
     const {M: M$5, L: L$6, C: C$4, Q: Q$4, Z: Z$5} = PathCommandMap;
-    const tempPoint$2 = {};
+    const tempPoint$3 = {};
     const BezierHelper = {
         points(data, originPoints, curve, close) {
             let points = toNumberPoints(originPoints);
@@ -2592,14 +2592,14 @@ var LeaferUI = function(exports) {
             const lenCB = hypot(CBx, CBy);
             let totalRadian = endRadian - startRadian;
             if (totalRadian < 0) totalRadian += PI2;
-            if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs$4(totalRadian - PI$2) < 1e-12) {
+            if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs$5(totalRadian - PI$2) < 1e-12) {
                 if (data) data.push(L$6, x1, y1);
                 if (setPointBounds) {
                     setPoint$1(setPointBounds, fromX, fromY);
                     addPoint$1(setPointBounds, x1, y1);
                 }
-                if (setStartPoint) set$1(setStartPoint, fromX, fromY);
-                if (setEndPoint) set$1(setEndPoint, x1, y1);
+                if (setStartPoint) set$2(setStartPoint, fromX, fromY);
+                if (setEndPoint) set$2(setEndPoint, x1, y1);
                 return;
             }
             const anticlockwise = BAx * CBy - CBx * BAy < 0;
@@ -2625,7 +2625,7 @@ var LeaferUI = function(exports) {
             let totalRadian = endRadian - startRadian;
             if (totalRadian < 0) totalRadian += PI2; else if (totalRadian > PI2) totalRadian -= PI2;
             if (anticlockwise) totalRadian -= PI2;
-            const parts = ceil(abs$4(totalRadian / PI_2));
+            const parts = ceil(abs$5(totalRadian / PI_2));
             const partRadian = totalRadian / parts;
             const partRadian4Sin = sin$3(partRadian / 4);
             const control = 8 / 3 * partRadian4Sin * partRadian4Sin / sin$3(partRadian / 2);
@@ -2639,7 +2639,7 @@ var LeaferUI = function(exports) {
             let fromX = cx + x, fromY = cy + y;
             if (data) data.push(data.length ? L$6 : M$5, fromX, fromY);
             if (setPointBounds) setPoint$1(setPointBounds, fromX, fromY);
-            if (setStartPoint) set$1(setStartPoint, fromX, fromY);
+            if (setStartPoint) set$2(setStartPoint, fromX, fromY);
             for (let i = 0; i < parts; i++) {
                 endCos = cos$3(endRadian);
                 endSin = sin$3(endRadian);
@@ -2658,7 +2658,7 @@ var LeaferUI = function(exports) {
                 startRadian = endRadian;
                 endRadian += partRadian;
             }
-            if (setEndPoint) set$1(setEndPoint, cx + x, cy + y);
+            if (setEndPoint) set$2(setEndPoint, cx + x, cy + y);
         },
         quadraticCurveTo(data, fromX, fromY, x1, y1, toX, toY) {
             data.push(C$4, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY);
@@ -2694,8 +2694,8 @@ var LeaferUI = function(exports) {
             addMode ? addPoint$1(pointBounds, fromX, fromY) : setPoint$1(pointBounds, fromX, fromY);
             addPoint$1(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$2);
-                addPoint$1(pointBounds, tempPoint$2.x, tempPoint$2.y);
+                getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$3);
+                addPoint$1(pointBounds, tempPoint$3.x, tempPoint$3.y);
             }
         },
         getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
@@ -3119,7 +3119,7 @@ var LeaferUI = function(exports) {
     const {current: current, pushData: pushData, copyData: copyData} = PathConvert;
     const {M: M$3, L: L$4, C: C$2, Q: Q$2, Z: Z$3, N: N$2, D: D$3, X: X$2, G: G$2, F: F$3, O: O$2, P: P$2, U: U$2} = PathCommandMap;
     const {getMinDistanceFrom: getMinDistanceFrom, getRadianFrom: getRadianFrom} = PointHelper;
-    const {tan: tan, min: min$1, abs: abs$3} = Math;
+    const {tan: tan, min: min$1, abs: abs$4} = Math;
     const startPoint = {};
     const PathCommandDataHelper = {
         beginPath(data) {
@@ -3177,7 +3177,7 @@ var LeaferUI = function(exports) {
         arcTo(data, x1, y1, x2, y2, radius, lastX, lastY, fullRadius) {
             if (!isUndefined(lastX)) {
                 const r = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2) / (fullRadius ? 1 : 2);
-                radius = min$1(radius, min$1(r, r * abs$3(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
+                radius = min$1(radius, min$1(r, r * abs$4(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
             }
             data.push(U$2, x1, y1, x2, y2, radius);
         },
@@ -5649,7 +5649,7 @@ var LeaferUI = function(exports) {
         }
     };
     const {setLayout: setLayout, multiplyParent: multiplyParent$2, translateInner: translateInner, defaultWorld: defaultWorld} = MatrixHelper;
-    const {toPoint: toPoint$3, tempPoint: tempPoint$1} = AroundHelper;
+    const {toPoint: toPoint$3, tempPoint: tempPoint$2} = AroundHelper;
     const LeafMatrix = {
         __updateWorldMatrix() {
             const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
@@ -5669,8 +5669,8 @@ var LeaferUI = function(exports) {
                 local.e = data.x + data.offsetX;
                 local.f = data.y + data.offsetY;
                 if (data.around || data.origin) {
-                    toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$1);
-                    translateInner(local, -tempPoint$1.x, -tempPoint$1.y, !data.around);
+                    toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$2);
+                    translateInner(local, -tempPoint$2.x, -tempPoint$2.y, !data.around);
                 }
             }
             this.__layout.matrixChanged = undefined;
@@ -6567,7 +6567,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.6";
+    const version = "2.1.7";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7390,7 +7390,7 @@ var LeaferUI = function(exports) {
         }
     }
     Renderer.clipSpread = 10;
-    const tempPoint = {};
+    const tempPoint$1 = {};
     const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
     const {hitRadiusPoint: hitRadiusPoint$1} = BoundsHelper;
     class Picker {
@@ -7522,7 +7522,7 @@ var LeaferUI = function(exports) {
             for (let i = len - 1; i > -1; i--) {
                 child = children[i], data = child.__;
                 if (!data.visible || hitMask && !data.mask) continue;
-                hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint, point, data.hitRadius) : point);
+                hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$1, point, data.hitRadius) : point);
                 if (child.isBranch) {
                     if (hit || child.__ignoreHitWorld) {
                         if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
@@ -8246,6 +8246,7 @@ var LeaferUI = function(exports) {
             this.set(keyframe);
             return Plugin.need("animate");
         }
+        killAnimate(_type, _nextStyle) {}
         export(_filename, _options) {
             return Plugin.need("export");
         }
@@ -8893,31 +8894,52 @@ var LeaferUI = function(exports) {
     __decorate([ surfaceType("#FFFFFF") ], exports.Frame.prototype, "fill", void 0);
     __decorate([ affectRenderBoundsType("hide") ], exports.Frame.prototype, "overflow", void 0);
     exports.Frame = __decorate([ registerUI() ], exports.Frame);
-    const {moveTo: moveTo$3, closePath: closePath$2, ellipse: ellipse} = PathCommandDataHelper;
+    const {moveTo: moveTo$3, closePath: closePath$2, ellipse: ellipse} = PathCommandDataHelper, {tempPoint: tempPoint, set: set$1, rotate: rotate$2} = PointHelper, {abs: abs$3} = Math, tempCenter = {};
     exports.Ellipse = class Ellipse extends exports.UI {
         get __tag() {
             return "Ellipse";
         }
         __updatePath() {
-            const data = this.__, {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = data;
+            const data = this.__, {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle, closed: closed} = data;
             const rx = width / 2, ry = height / 2;
             const path = data.path = [];
-            let open;
+            let open, hasAngle, closedAngle;
+            if (startAngle || endAngle) hasAngle = true;
+            if (hasAngle) closedAngle = abs$3(endAngle - startAngle) === 360;
             if (innerRadius) {
-                if (startAngle || endAngle) {
-                    if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false); else open = true;
-                    ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true);
+                const drawInnerEllipse = innerRadius < 1 || closed;
+                let outerStartAngle = startAngle, outerEndAngle = endAngle, outerAnticlockwise;
+                if (hasAngle) {
+                    if (drawInnerEllipse) {
+                        ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle);
+                        if (closedAngle) {
+                            set$1(tempPoint, width, ry);
+                            set$1(tempCenter, rx, ry);
+                            rotate$2(tempPoint, endAngle, tempCenter, rx, ry);
+                            moveTo$3(path, tempPoint.x, tempPoint.y);
+                        }
+                        outerStartAngle = endAngle;
+                        outerEndAngle = startAngle;
+                        outerAnticlockwise = true;
+                    } else {
+                        if (!closedAngle) open = true;
+                    }
                 } else {
-                    if (innerRadius < 1) {
+                    if (drawInnerEllipse) {
                         ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius);
+                        closePath$2(path);
                         moveTo$3(path, width, ry);
+                        outerStartAngle = 360;
+                        outerAnticlockwise = true;
+                    } else {
+                        outerEndAngle = 360;
                     }
-                    ellipse(path, rx, ry, rx, ry, 0, 360, 0, true);
                 }
+                ellipse(path, rx, ry, rx, ry, 0, outerStartAngle, outerEndAngle, outerAnticlockwise);
             } else {
-                if (startAngle || endAngle) {
-                    moveTo$3(path, rx, ry);
-                    ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false);
+                if (hasAngle) {
+                    if (!closedAngle) moveTo$3(path, rx, ry);
+                    ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle);
                 } else {
                     ellipse(path, rx, ry, rx, ry);
                 }
@@ -11392,6 +11414,7 @@ var LeaferUI = function(exports) {
             if (data.__autoSide) {
                 ui.forceUpdate("width");
                 LeafHelper.updateBounds(ui);
+                ui.__layout.boundsChanged = true;
                 if (ui.__proxyData) {
                     ui.setProxyAttr("width", data.width);
                     ui.setProxyAttr("height", data.height);
@@ -11399,7 +11422,7 @@ var LeaferUI = function(exports) {
                 needUpdate = false;
             }
         }
-        if (paint.mode === "brush") PaintImage.brush(leafPaint, ui, attrName);
+        if (paint.mode === "brush") PaintImage.brush(ui, attrName, leafPaint);
         if (!leafPaint.data) {
             PaintImage.createData(leafPaint, image, paint, boxBounds);
             const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
@@ -12727,7 +12750,7 @@ var LeaferUI = function(exports) {
     exports.surfaceType = surfaceType;
     exports.tempBounds = tempBounds$2;
     exports.tempMatrix = tempMatrix$2;
-    exports.tempPoint = tempPoint$3;
+    exports.tempPoint = tempPoint$4;
     exports.tryToNumber = tryToNumber;
     exports.useCanvas = useCanvas;
     exports.useModule = useModule;