@leafer-draw/worker 2.2.11 → 2.3.1

package/dist/worker.js

@@ -433,7 +433,7 @@ var LeaferUI = function(exports) {
         };
     }
     const {sin: sin$5, cos: cos$5, acos: acos, sqrt: sqrt$3} = Math;
-    const {float: float$2} = MathHelper;
+    const {float: float$3} = MathHelper;
     const tempPoint$4 = {};
     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$2(cos$5(rotation));
+                const cosR = float$3(cos$5(rotation));
                 const sinR = sin$5(rotation);
-                scaleX = float$2(scaleX), scaleY = float$2(scaleY);
-                skewX = cosR ? float$2((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
-                skewY = cosR ? float$2((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
-                rotation = float$2(rotation / OneRadian);
+                scaleX = float$3(scaleX), scaleY = float$3(scaleY);
+                skewX = cosR ? float$3((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
+                skewY = cosR ? float$3((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
+                rotation = float$3(rotation / OneRadian);
             } else {
                 scaleX = a;
                 scaleY = d;
@@ -728,7 +728,7 @@ var LeaferUI = function(exports) {
         }
     };
     const M$6 = MatrixHelper;
-    const {float: float$1} = MathHelper;
+    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$1, round: round$2} = 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$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
+            return quick ? t.x === point.x && t.y === point.y : float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(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, fourNumber: fourNumber} = MathHelper;
+    const {float: float$1, fourNumber: fourNumber} = MathHelper;
     const {floor: floor$1, ceil: ceil$1} = Math;
     let right$1, bottom$1, boundsRight, boundsBottom;
     const point = {};
@@ -1375,10 +1375,10 @@ var LeaferUI = function(exports) {
             }
         },
         float(t, maxLength) {
-            t.x = float(t.x, maxLength);
-            t.y = float(t.y, maxLength);
-            t.width = float(t.width, maxLength);
-            t.height = float(t.height, maxLength);
+            t.x = float$1(t.x, maxLength);
+            t.y = float$1(t.y, maxLength);
+            t.width = float$1(t.width, maxLength);
+            t.height = float$1(t.height, maxLength);
         },
         add(t, bounds, isPoint) {
             right$1 = t.x + t.width;
@@ -3516,6 +3516,7 @@ var LeaferUI = function(exports) {
     const {M: M, L: L$1, Z: Z} = PathCommandMap;
     const {getCenterX: getCenterX, getCenterY: getCenterY} = PointHelper;
     const {arcTo: arcTo} = PathCommandDataHelper;
+    const {float: float} = MathHelper;
     const PathCorner = {
         smooth(data, cornerRadius, _cornerSmoothing) {
             let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
@@ -3556,7 +3557,7 @@ var LeaferUI = function(exports) {
                         break;
 
                       case Z:
-                        arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
+                        if (float(x) === float(startX) && float(y) === float(startY)) x = lastX, y = lastY; else arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
                         break;
 
                       default:
@@ -4718,10 +4719,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 +4740,9 @@ var LeaferUI = function(exports) {
             onAnimate && onAnimate();
         }
     };
+    function isTrackChanges(leafer) {
+        return leafer && leafer.config.trackChanges;
+    }
     const L = LeafHelper;
     const {updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$1, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange} = L;
     function getTempLocal(t, worldPoint) {
@@ -4785,6 +4790,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 +5684,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 +6120,6 @@ var LeaferUI = function(exports) {
             }
         }
         __bindFrame(frame) {
-            if (this.isFrame && frame !== null) frame = this;
             this.frame = frame;
             if (this.isBranch) {
                 const {children: children} = this;
@@ -6138,6 +6152,7 @@ var LeaferUI = function(exports) {
             this.__layout.update();
         }
         forceUpdate(typeOrAttrName) {
+            if (this.__hasComplex) LeafHelper.updateComplex(this);
             let quick;
             if (!typeOrAttrName || typeOrAttrName === "bounds") doBoundsType(this), quick = true; else if (typeOrAttrName === "surface") doSurfaceType(this), 
             quick = true; else if (typeOrAttrName === "stroke") doStrokeType(this), quick = true;
@@ -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.1";
+    if (typeof globalThis !== "undefined") {
+        const globalLeafer = globalThis.Leafer || (globalThis.Leafer = {});
+        globalLeafer.version = version;
+        globalLeafer.Plugin = Plugin;
+    }
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -7338,6 +7361,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));
@@ -8590,6 +8623,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);
@@ -10709,6 +10743,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;
@@ -10722,6 +10757,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;