@leafer-game/miniapp 2.2.11 → 2.3.0

package/dist/miniapp.module.js

@@ -431,7 +431,7 @@ function getMatrixData() {
 
 const {sin: sin$6, cos: cos$6, acos: acos, sqrt: sqrt$5} = Math;
 
-const {float: float$5} = MathHelper;
+const {float: float$6} = MathHelper;
 
 const tempPoint$7 = {};
 
@@ -682,12 +682,12 @@ const MatrixHelper = {
                 const cosR = c / scaleY;
                 rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
             }
-            const cosR = float$5(cos$6(rotation));
+            const cosR = float$6(cos$6(rotation));
             const sinR = sin$6(rotation);
-            scaleX = float$5(scaleX), scaleY = float$5(scaleY);
-            skewX = cosR ? float$5((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
-            skewY = cosR ? float$5((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
-            rotation = float$5(rotation / OneRadian);
+            scaleX = float$6(scaleX), scaleY = float$6(scaleY);
+            skewX = cosR ? float$6((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
+            skewY = cosR ? float$6((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
+            rotation = float$6(rotation / OneRadian);
         } else {
             scaleX = a;
             scaleY = d;
@@ -731,7 +731,7 @@ const MatrixHelper = {
 
 const M$7 = MatrixHelper;
 
-const {float: float$4} = MathHelper;
+const {float: float$5} = MathHelper;
 
 const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
 
@@ -877,7 +877,7 @@ const PointHelper = {
         return points;
     },
     isSame(t, point, quick) {
-        return quick ? t.x === point.x && t.y === point.y : float$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
+        return quick ? t.x === point.x && t.y === point.y : float$5(t.x) === float$5(point.x) && float$5(t.y) === float$5(point.y);
     },
     reset(t) {
         t.x = t.y = 0;
@@ -1233,7 +1233,7 @@ const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPo
 
 const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
 
-const {float: float$3, fourNumber: fourNumber$1} = MathHelper;
+const {float: float$4, fourNumber: fourNumber$1} = MathHelper;
 
 const {floor: floor$2, ceil: ceil$2} = Math;
 
@@ -1408,10 +1408,10 @@ const BoundsHelper = {
         }
     },
     float(t, maxLength) {
-        t.x = float$3(t.x, maxLength);
-        t.y = float$3(t.y, maxLength);
-        t.width = float$3(t.width, maxLength);
-        t.height = float$3(t.height, maxLength);
+        t.x = float$4(t.x, maxLength);
+        t.y = float$4(t.y, maxLength);
+        t.width = float$4(t.width, maxLength);
+        t.height = float$4(t.height, maxLength);
     },
     add(t, bounds, isPoint) {
         right$1 = t.x + t.width;
@@ -3742,6 +3742,8 @@ const {getCenterX: getCenterX, getCenterY: getCenterY} = PointHelper;
 
 const {arcTo: arcTo} = PathCommandDataHelper;
 
+const {float: float$3} = MathHelper;
+
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
         let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
@@ -3782,7 +3784,8 @@ const PathCorner = {
                     break;
 
                   case Z$1:
-                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
+                    if (float$3(x) === float$3(startX) && float$3(y) === float$3(startY)) x = lastX, 
+                    y = lastY; else arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
                     break;
 
                   default:
@@ -5022,10 +5025,11 @@ const LeafHelper = {
     hasOffset(t) {
         return t.offsetX || t.offsetY;
     },
-    hasParent(p, parent) {
+    hasParent(p, parent, minLevel) {
         if (!parent) return false;
         while (p) {
             if (parent === p) return true;
+            if (minLevel && p.__level === minLevel) return;
             p = p.parent;
         }
     },
@@ -5043,6 +5047,10 @@ const LeafHelper = {
     }
 };
 
+function isTrackChanges(leafer) {
+    return leafer && leafer.config.trackChanges;
+}
+
 const L$1 = LeafHelper;
 
 const {updateAllMatrix: updateAllMatrix$4, updateMatrix: updateMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange} = L$1;
@@ -5097,6 +5105,16 @@ const BranchHelper = {
     sort(a, b) {
         return a.__.zIndex === b.__.zIndex ? a.__tempNumber - b.__tempNumber : a.__.zIndex - b.__.zIndex;
     },
+    zIndex(branch, child, index) {
+        const {children: children} = branch, before = children[index - 1], after = children[index];
+        if (before && after) {
+            if (child.zIndex < before.zIndex || child.zIndex > after.zIndex) child.zIndex = (before.zIndex + after.zIndex) / 2;
+        } else if (before) {
+            if (child.zIndex < before.zIndex) child.zIndex = before.zIndex + 1;
+        } else if (after) {
+            if (child.zIndex > after.zIndex) child.zIndex = after.zIndex - 1;
+        }
+    },
     pushAllChildBranch(branch, leafList) {
         branch.__tempNumber = 1;
         if (branch.__.__childBranchNumber) {
@@ -6063,7 +6081,7 @@ const LeafDataProxy = {
     },
     emitPropertyEvent(type, name, oldValue, newValue) {
         const {leafer: leafer} = this;
-        if (leafer.config.trackChanges || leafer.zoomLayer === this) {
+        if (isTrackChanges(leafer) || leafer.zoomLayer === this) {
             const event = new PropertyEvent(type, this, name, oldValue, newValue);
             this.isLeafer || this.hasEvent(type) && this.emitEvent(event);
             leafer.emitEvent(event);
@@ -6518,7 +6536,6 @@ let Leaf = class Leaf {
         }
     }
     __bindFrame(frame) {
-        if (this.isFrame && frame !== null) frame = this;
         this.frame = frame;
         if (this.isBranch) {
             const {children: children} = this;
@@ -6829,14 +6846,17 @@ let Branch = class Branch extends Leaf {
         }
         if (child.parent) child.parent.remove(child);
         child.parent = this;
-        noIndex ? this.children.push(child) : this.children.splice(index, 0, child);
+        if (noIndex) this.children.push(child); else {
+            BranchHelper.zIndex(this, child, index);
+            this.children.splice(index, 0, child);
+        }
         if (child.isBranch) this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
         const childLayout = child.__layout;
         childLayout.boxChanged || childLayout.boxChange();
         childLayout.matrixChanged || childLayout.matrixChange();
         if (child.__parentChange) child.__parentChange.forEach(item => item(this, child));
         if (child.__bubbleMap) child.__emitLifeEvent(ChildEvent.ADD);
-        if (this.isFrame) child.__bindFrame(this);
+        if (this.frame) child.__bindFrame(this.frame);
         if (this.leafer) {
             child.__bindLeafer(this.leafer);
             if (this.leafer.created) this.__emitChildEvent(ChildEvent.ADD, child);
@@ -6896,11 +6916,11 @@ let Branch = class Branch extends Leaf {
                 if (this.leafer.hitCanvasManager) this.leafer.hitCanvasManager.clear();
             }
         }
-        if (this.isFrame) child.__bindFrame(null);
+        if (child.frame && !child.isFrame) child.__bindFrame(null);
     }
     __emitChildEvent(type, child) {
         const {leafer: leafer} = this;
-        if (leafer.config.trackChanges || leafer.zoomLayer === this) {
+        if (isTrackChanges(leafer) || leafer.zoomLayer === this) {
             const event = new ChildEvent(type, child, this);
             if (this.hasEvent(type) && !this.isLeafer) this.emitEvent(event);
             leafer.emitEvent(event);
@@ -7057,7 +7077,13 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.11";
+const version = "2.3.0";
+
+if (typeof globalThis !== "undefined") {
+    const globalLeafer = globalThis.Leafer || (globalThis.Leafer = {});
+    globalLeafer.version = version;
+    globalLeafer.Plugin = Plugin;
+}
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -8168,6 +8194,17 @@ function zoomLayerType() {
     };
 }
 
+function frameType() {
+    return (target, key) => {
+        defineKey(target, key, {
+            set(_value) {},
+            get() {
+                return this;
+            }
+        });
+    };
+}
+
 function createAttr(defaultValue) {
     return (target, key) => {
         defineKey(target, key, createDescriptor(key, defaultValue));
@@ -9571,6 +9608,8 @@ let Frame = class Frame extends Box {
     }
 };
 
+__decorate([ frameType() ], Frame.prototype, "frame", void 0);
+
 __decorate([ dataProcessor(FrameData) ], Frame.prototype, "__", void 0);
 
 __decorate([ surfaceType("#FFFFFF") ], Frame.prototype, "fill", void 0);
@@ -14987,15 +15026,21 @@ function number(from, to, t, roundValue) {
     return roundValue ? round(value) : value;
 }
 
-function color(from, to, t) {
-    from = ColorConvert.object(from), to = ColorConvert.object(to);
+function color(fromColor, toColor, t) {
+    let from = ColorConvert.object(fromColor), to = ColorConvert.object(toColor);
+    if (!fromColor) from = Object.assign(Object.assign({}, to), {
+        a: 0
+    });
+    if (!toColor) to = Object.assign(Object.assign({}, from), {
+        a: 0
+    });
     const rgb = number(from.r, to.r, t, 1) + "," + number(from.g, to.g, t, 1) + "," + number(from.b, to.b, t, 1);
     const a = number(from.a, to.a, t);
     return a === 1 ? "rgb(" + rgb + ")" : "rgba(" + rgb + "," + a + ")";
 }
 
 function paint(from, to, t) {
-    return isString(from) && isString(to) ? color(from, to, t) : to;
+    return (isString(from) || !from) && (isString(to) || !to) ? color(from, to, t) : to;
 }
 
 function shadow(from, to, t) {
@@ -15659,4 +15704,4 @@ LeafHelper.cacheId = function(t) {
     if (leafer.cacheInnerId) leafer.app.innerIdMap[t.innerId] = t;
 };
 
-export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, LayouterHelper, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerPointsCurve, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$6 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, LayouterHelper, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, frameType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isTrackChanges, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerPointsCurve, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$6 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };