leafer-ui 2.2.2 → 2.2.4

package/dist/web.module.js

@@ -2816,7 +2816,10 @@ const BezierHelper = {
         if (endRadian < 0) endRadian += PI2;
         let totalRadian = endRadian - startRadian;
         if (totalRadian < 0) totalRadian += PI2; else if (totalRadian > PI2) totalRadian -= PI2;
-        if (anticlockwise) totalRadian -= PI2;
+        if (anticlockwise) {
+            const closedAngle = abs$5(endAngle - startAngle) === 360;
+            if (closedAngle) totalRadian = -PI2; else totalRadian -= PI2;
+        }
         const parts = ceil(abs$5(totalRadian / PI_2));
         const partRadian = totalRadian / parts;
         const partRadian4Sin = sin$3(partRadian / 4);
@@ -4168,7 +4171,7 @@ const ImageManager = {
     patternTasker: Resource.queue,
     get(config, type) {
         let image = Resource.get(config.url);
-        if (!image) Resource.set(config.url, image = type === "film" ? Creator.film(config) : Creator.image(config));
+        if (!image) Resource.set(config.url, image = Creator[type || "image"](config));
         image.use++;
         return image;
     },
@@ -6340,6 +6343,9 @@ let Leaf = class Leaf {
     get isLeafer() {
         return false;
     }
+    get isFrame() {
+        return false;
+    }
     get isBranch() {
         return false;
     }
@@ -6481,6 +6487,16 @@ let Leaf = class Leaf {
             }
         }
     }
+    __bindFrame(frame) {
+        if (this.isFrame && frame !== null) frame = this;
+        this.frame = frame;
+        if (this.isBranch) {
+            const {children: children} = this;
+            for (let i = 0, len = children.length; i < len; i++) {
+                children[i].__bindFrame(frame);
+            }
+        }
+    }
     setAttr(name, value) {
         this[name] = value;
     }
@@ -6789,6 +6805,7 @@ let Branch = class Branch extends Leaf {
         childLayout.boxChanged || childLayout.boxChange();
         childLayout.matrixChanged || childLayout.matrixChange();
         if (child.__bubbleMap) child.__emitLifeEvent(ChildEvent.ADD);
+        if (this.isFrame) child.__bindFrame(this);
         if (this.leafer) {
             child.__bindLeafer(this.leafer);
             if (this.leafer.created) this.__emitChildEvent(ChildEvent.ADD, child);
@@ -6848,6 +6865,7 @@ let Branch = class Branch extends Leaf {
                 if (this.leafer.hitCanvasManager) this.leafer.hitCanvasManager.clear();
             }
         }
+        if (this.isFrame) child.__bindFrame(null);
     }
     __emitChildEvent(type, child) {
         const event = new ChildEvent(type, child, this);
@@ -7005,7 +7023,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.1";
+const version = "2.2.4";
 
 const debug$5 = Debug.get("LeaferCanvas");
 
@@ -8652,9 +8670,6 @@ let UI = UI_1 = class UI extends Leaf {
     get app() {
         return this.leafer && this.leafer.app;
     }
-    get isFrame() {
-        return false;
-    }
     set strokeWidthFixed(value) {
         this.strokeScaleFixed = value;
     }
@@ -9538,34 +9553,28 @@ let Ellipse = class Ellipse extends UI {
         if (hasAngle) closedAngle = abs$3(endAngle - startAngle) === 360;
         if (innerRadius) {
             const drawInnerEllipse = innerRadius < 1 || closed;
-            let outerStartAngle = startAngle, outerEndAngle = endAngle, outerAnticlockwise;
+            const innerRx = rx * innerRadius, innerRy = ry * innerRadius;
             if (hasAngle) {
+                ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle);
                 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);
+                        closePath$2(path);
+                        set$1(tempPoint, rx + innerRx, 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;
+                    ellipse(path, rx, ry, innerRx, innerRy, 0, endAngle, startAngle, true);
                 } else {
                     if (!closedAngle) open = true;
                 }
             } else {
+                ellipse(path, rx, ry, rx, ry);
                 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;
+                    moveTo$3(path, rx + innerRx, ry);
+                    ellipse(path, rx, ry, innerRx, innerRy, 0, 360, 0, true);
                 }
             }
-            ellipse(path, rx, ry, rx, ry, 0, outerStartAngle, outerEndAngle, outerAnticlockwise);
         } else {
             if (hasAngle) {
                 if (!closedAngle) {
@@ -11465,7 +11474,8 @@ ui$1.__hit = function(inner, forceHitFill) {
     const {hitFill: hitFill} = data;
     const needHitFillPath = (data.fill || data.__isCanvas) && (hitFill === "path" || hitFill === "pixel" && !(data.__isAlphaPixelFill || data.__isCanvas)) || hitFill === "all" || forceHitFill;
     if (needHitFillPath && this.__hitFill(inner)) return true;
-    const {hitStroke: hitStroke, __maxStrokeWidth: strokeWidth} = data;
+    const {hitStroke: hitStroke, strokeScaleFixed: strokeScaleFixed} = data;
+    const strokeWidth = data.__maxStrokeWidth * (strokeScaleFixed ? this.getRenderScaleData(true, strokeScaleFixed, false).scaleX : 1);
     const needHitStrokePath = data.stroke && (hitStroke === "path" || hitStroke === "pixel" && !data.__isAlphaPixelStroke) || hitStroke === "all";
     if (!needHitFillPath && !needHitStrokePath) return false;
     const radiusWidth = inner.radiusX * 2;