leafer-game 2.2.11 → 2.3.0

package/dist/web.js

@@ -433,7 +433,7 @@ var LeaferUI = function(exports) {
         };
     }
     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 = {};
     function getWorld() {
         return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
@@ -681,12 +681,12 @@ var LeaferUI = function(exports) {
                     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;
@@ -728,7 +728,7 @@ var LeaferUI = function(exports) {
         }
     };
     const M$7 = MatrixHelper;
-    const {float: float$4} = MathHelper;
+    const {float: float$5} = MathHelper;
     const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
     const {sin: sin$5, cos: cos$5, abs: abs$7, sqrt: sqrt$4, atan2: atan2$2, min: min$2, round: round$5} = Math;
     const PointHelper = {
@@ -871,7 +871,7 @@ var LeaferUI = function(exports) {
             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;
@@ -1206,7 +1206,7 @@ var LeaferUI = function(exports) {
     };
     const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPoint$2, toBounds: toBounds$2} = TwoPointBoundsHelper;
     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;
     let right$1, bottom$1, boundsRight, boundsBottom;
     const point = {};
@@ -1375,10 +1375,10 @@ var LeaferUI = function(exports) {
             }
         },
         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;
@@ -3516,6 +3516,7 @@ var LeaferUI = function(exports) {
     const {M: M$1, L: L$2, Z: Z$1} = PathCommandMap;
     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;
@@ -3556,7 +3557,8 @@ var LeaferUI = function(exports) {
                         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:
@@ -4718,10 +4720,11 @@ var LeaferUI = function(exports) {
         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;
             }
         },
@@ -4738,6 +4741,9 @@ var LeaferUI = function(exports) {
             onAnimate && onAnimate();
         }
     };
+    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;
     function getTempLocal(t, worldPoint) {
@@ -4785,6 +4791,16 @@ var LeaferUI = function(exports) {
         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) {
@@ -5669,7 +5685,7 @@ var LeaferUI = function(exports) {
         },
         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);
@@ -6105,7 +6121,6 @@ var LeaferUI = function(exports) {
             }
         }
         __bindFrame(frame) {
-            if (this.isFrame && frame !== null) frame = this;
             this.frame = frame;
             if (this.isBranch) {
                 const {children: children} = this;
@@ -6410,14 +6425,17 @@ var LeaferUI = function(exports) {
             }
             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);
@@ -6477,11 +6495,11 @@ var LeaferUI = function(exports) {
                     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);
@@ -6634,7 +6652,12 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    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;
+    }
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7742,6 +7765,16 @@ var LeaferUI = function(exports) {
             });
         };
     }
+    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));
@@ -8994,6 +9027,7 @@ var LeaferUI = function(exports) {
             return true;
         }
     };
+    __decorate([ frameType() ], exports.Frame.prototype, "frame", void 0);
     __decorate([ dataProcessor(FrameData) ], exports.Frame.prototype, "__", void 0);
     __decorate([ surfaceType("#FFFFFF") ], exports.Frame.prototype, "fill", void 0);
     __decorate([ affectRenderBoundsType("hide") ], exports.Frame.prototype, "overflow", void 0);
@@ -14111,14 +14145,20 @@ var LeaferUI = function(exports) {
         const value = from + (to - from) * t;
         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) {
         if (isArray(from) || isArray(to)) return to;
@@ -14882,6 +14922,7 @@ var LeaferUI = function(exports) {
     exports.emptyData = emptyData;
     exports.eraserType = eraserType;
     exports.extraPropertyEventMap = extraPropertyEventMap;
+    exports.frameType = frameType;
     exports.getBoundsData = getBoundsData;
     exports.getDescriptor = getDescriptor;
     exports.getMatrixData = getMatrixData;
@@ -14895,6 +14936,7 @@ var LeaferUI = function(exports) {
     exports.isNumber = isNumber;
     exports.isObject = isObject;
     exports.isString = isString;
+    exports.isTrackChanges = isTrackChanges;
     exports.isUndefined = isUndefined;
     exports.layoutProcessor = layoutProcessor;
     exports.leaferTransformAttrMap = leaferTransformAttrMap;