@leafer-game/miniapp 2.2.6 → 2.2.7

package/dist/miniapp.module.js

@@ -4814,7 +4814,7 @@ const matrix$1 = {}, {round: round$3} = Math;
 const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
         if (checkAutoLayout && leaf.__hasAutoLayout && leaf.__layout.matrixChanged) waitAutoLayout = true;
-        updateMatrix$3(leaf, checkAutoLayout, waitAutoLayout);
+        updateMatrix$2(leaf, checkAutoLayout, waitAutoLayout);
         if (leaf.isBranch) {
             const {children: children} = leaf;
             for (let i = 0, len = children.length; i < len; i++) {
@@ -4835,9 +4835,10 @@ const LeafHelper = {
         if (layout.matrixChanged) leaf.__updateLocalMatrix();
         if (!layout.waitAutoLayout) leaf.__updateWorldMatrix();
     },
-    updateBounds(leaf) {
+    updateBounds(leaf, noUpdateSize) {
         const layout = leaf.__layout;
         if (layout.boundsChanged) leaf.__updateLocalBounds();
+        if (noUpdateSize) layout.resized = undefined;
         if (!layout.waitAutoLayout) leaf.__updateWorldBounds();
     },
     updateAllWorldOpacity(leaf) {
@@ -4860,7 +4861,7 @@ const LeafHelper = {
         }
     },
     updateAllChange(leaf) {
-        updateChange$1(leaf);
+        updateChange(leaf);
         if (leaf.isBranch) {
             const {children: children} = leaf;
             for (let i = 0, len = children.length; i < len; i++) {
@@ -5032,7 +5033,7 @@ const LeafHelper = {
 
 const L$1 = LeafHelper;
 
-const {updateAllMatrix: updateAllMatrix$4, updateMatrix: updateMatrix$3, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange$1} = L$1;
+const {updateAllMatrix: updateAllMatrix$4, updateMatrix: updateMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange} = L$1;
 
 function getTempLocal(t, worldPoint) {
     t.updateLayout();
@@ -5078,7 +5079,7 @@ function checkMask(target, index) {
     return findMask < 0 ? null : (findMask && (findMask = -1), true);
 }
 
-const {updateBounds: updateBounds$4} = LeafHelper;
+const {updateBounds: updateBounds$3} = LeafHelper;
 
 const BranchHelper = {
     sort(a, b) {
@@ -5139,10 +5140,10 @@ const BranchHelper = {
             branch = branchStack[i];
             children = branch.children;
             for (let j = 0, len = children.length; j < len; j++) {
-                updateBounds$4(children[j]);
+                updateBounds$3(children[j]);
             }
             if (exclude && exclude === branch) continue;
-            updateBounds$4(branch);
+            updateBounds$3(branch);
         }
     },
     move(branch, x, y) {
@@ -5204,7 +5205,7 @@ const WaitHelper = {
     }
 };
 
-const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$3} = LeafHelper;
+const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$2} = LeafHelper;
 
 const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$4} = BoundsHelper;
 
@@ -5312,7 +5313,7 @@ class LeafLayout {
     }
     update() {
         const {leaf: leaf} = this, {leafer: leafer} = leaf;
-        if (leaf.isApp) return updateBounds$3(leaf);
+        if (leaf.isApp) return updateBounds$2(leaf);
         if (leafer) {
             if (leafer.ready) leafer.watcher.changed && leafer.layouter.layout(); else leafer.start();
         } else {
@@ -6049,9 +6050,12 @@ const LeafDataProxy = {
         }
     },
     emitPropertyEvent(type, name, oldValue, newValue) {
-        const event = new PropertyEvent(type, this, name, oldValue, newValue);
-        this.isLeafer || this.hasEvent(type) && this.emitEvent(event);
-        this.leafer.emitEvent(event);
+        const {leafer: leafer} = this;
+        if (leafer.config.trackChanges || leafer.zoomLayer === this) {
+            const event = new PropertyEvent(type, this, name, oldValue, newValue);
+            this.isLeafer || this.hasEvent(type) && this.emitEvent(event);
+            leafer.emitEvent(event);
+        } else leafer.watcher.add(this);
     },
     __realSetAttr(name, newValue) {
         const data = this.__;
@@ -6096,9 +6100,9 @@ const LeafMatrix = {
     }
 };
 
-const {updateMatrix: updateMatrix$2, updateAllMatrix: updateAllMatrix$3} = LeafHelper;
+const {updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$3} = LeafHelper;
 
-const {updateBounds: updateBounds$2} = BranchHelper;
+const {updateBounds: updateBounds$1} = BranchHelper;
 
 const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$3} = BoundsHelper;
 
@@ -6201,14 +6205,14 @@ const LeafBounds = {
                 if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                 if (this.__layout.boxChanged) this.__updateFlowLayout();
                 updateAllMatrix$3(this);
-                updateBounds$2(this, this);
+                updateBounds$1(this, this);
                 if (this.__.__autoSide) this.__updateBoxBounds(true);
             } else {
                 updateAllMatrix$3(this);
-                updateBounds$2(this, this);
+                updateBounds$1(this, this);
             }
         } else {
-            updateMatrix$2(this);
+            updateMatrix$1(this);
         }
     },
     __updateNaturalSize() {
@@ -6881,9 +6885,12 @@ let Branch = class Branch extends Leaf {
         if (this.isFrame) child.__bindFrame(null);
     }
     __emitChildEvent(type, child) {
-        const event = new ChildEvent(type, child, this);
-        if (this.hasEvent(type) && !this.isLeafer) this.emitEvent(event);
-        this.leafer.emitEvent(event);
+        const {leafer: leafer} = this;
+        if (leafer.config.trackChanges || leafer.zoomLayer === this) {
+            const event = new ChildEvent(type, child, this);
+            if (this.hasEvent(type) && !this.isLeafer) this.emitEvent(event);
+            leafer.emitEvent(event);
+        } else leafer.watcher.addChild(child, this, type);
     }
 };
 
@@ -7036,7 +7043,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.6";
+const version = "2.2.7";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -7329,6 +7336,7 @@ class Watcher {
     }
     constructor(target, userConfig) {
         this.totalTimes = 0;
+        this.changed = 0;
         this.config = {};
         this.__updatedList = new LeafList;
         this.target = target;
@@ -7348,8 +7356,10 @@ class Watcher {
         this.disabled = true;
     }
     update() {
-        this.changed = true;
-        if (this.running) this.target.emit(RenderEvent.REQUEST);
+        if (this.changed < 100) {
+            this.changed++;
+            if (this.running) this.target.emit(RenderEvent.REQUEST);
+        }
     }
     __onAttrChange(event) {
         this.add(event.target);
@@ -7358,18 +7368,21 @@ class Watcher {
         if (this.config.usePartLayout) this.__updatedList.add(leaf);
         this.update();
     }
-    __onChildEvent(event) {
+    addChild(child, parent, eventType) {
         if (this.config.usePartLayout) {
-            if (event.type === ChildEvent.ADD) {
+            if (eventType === ChildEvent.ADD) {
                 this.hasAdd = true;
-                this.__pushChild(event.child);
+                this.__pushChild(child);
             } else {
                 this.hasRemove = true;
-                this.__updatedList.add(event.parent);
+                this.__updatedList.add(parent);
             }
         }
         this.update();
     }
+    __onChildEvent(event) {
+        this.addChild(event.child, event.parent, event.type);
+    }
     __pushChild(child) {
         this.__updatedList.add(child);
         if (child.isBranch) this.__loopChildren(child);
@@ -7384,7 +7397,8 @@ class Watcher {
         }));
         this.__updatedList = new LeafList;
         this.totalTimes++;
-        this.changed = this.hasVisible = this.hasRemove = this.hasAdd = false;
+        this.hasVisible = this.hasRemove = this.hasAdd = false;
+        this.changed = 0;
     }
     __listenEvents() {
         this.__eventIds = [ this.target.on_([ [ PropertyEvent.CHANGE, this.__onAttrChange, this ], [ [ ChildEvent.ADD, ChildEvent.REMOVE ], this.__onChildEvent, this ], [ WatchEvent.REQUEST, this.__onRquestData, this ] ]) ];
@@ -7405,47 +7419,57 @@ const {updateAllMatrix: updateAllMatrix$2, updateBounds: updateOneBounds, update
 
 const {pushAllChildBranch: pushAllChildBranch, pushAllParent: pushAllParent} = BranchHelper;
 
-function updateMatrix$1(updateList, levelList) {
-    let layout;
-    updateList.list.forEach(leaf => {
-        layout = leaf.__layout;
-        if (levelList.without(leaf) && !layout.proxyZoom) {
-            if (layout.matrixChanged) {
-                updateAllMatrix$2(leaf, true);
-                levelList.add(leaf);
-                if (leaf.isBranch) pushAllChildBranch(leaf, levelList);
-                pushAllParent(leaf, levelList);
-            } else if (layout.boundsChanged) {
-                levelList.add(leaf);
-                if (leaf.isBranch) leaf.__tempNumber = 0;
-                pushAllParent(leaf, levelList);
+const LayouterHelper = {
+    updateMatrix(updateList, levelList) {
+        let index = 0, leaf, layout;
+        const {list: list} = updateList;
+        while (index < list.length) {
+            leaf = list[index];
+            layout = leaf.__layout;
+            if (levelList.without(leaf) && !layout.proxyZoom) {
+                if (layout.matrixChanged) {
+                    updateAllMatrix$2(leaf, true);
+                    if (leaf.isBranch) pushAllChildBranch(leaf, levelList);
+                    push(leaf, levelList);
+                } else if (layout.boundsChanged) {
+                    if (leaf.isBranch) leaf.__tempNumber = 0;
+                    push(leaf, levelList);
+                }
             }
+            index++;
         }
-    });
-}
-
-function updateBounds$1(boundsList) {
-    let list, branch, children;
-    boundsList.sort(true);
-    boundsList.levels.forEach(level => {
-        list = boundsList.levelMap[level];
-        for (let i = 0, len = list.length; i < len; i++) {
-            branch = list[i];
-            if (branch.isBranch && branch.__tempNumber) {
-                children = branch.children;
-                for (let j = 0, jLen = children.length; j < jLen; j++) {
-                    if (!children[j].isBranch) {
-                        updateOneBounds(children[j]);
+    },
+    updateBounds(boundsList) {
+        let index = 0, level, list, branch, children;
+        const {levels: levels, levelMap: levelMap} = boundsList;
+        boundsList.sort(true);
+        while (index < levels.length) {
+            level = levels[index];
+            list = levelMap[level];
+            for (let i = 0, len = list.length; i < len; i++) {
+                branch = list[i];
+                if (branch.isBranch && branch.__tempNumber) {
+                    children = branch.children;
+                    for (let j = 0, jLen = children.length; j < jLen; j++) {
+                        if (!children[j].isBranch) {
+                            updateOneBounds(children[j]);
+                        }
                     }
                 }
+                updateOneBounds(branch);
             }
-            updateOneBounds(branch);
+            index++;
         }
-    });
-}
+    },
+    updateChange(updateList) {
+        updateList.list.forEach(updateOneChange);
+    },
+    push: push
+};
 
-function updateChange(updateList) {
-    updateList.list.forEach(updateOneChange);
+function push(leaf, levelList) {
+    levelList.add(leaf);
+    pushAllParent(leaf, levelList);
 }
 
 const {worldBounds: worldBounds} = LeafBoundsHelper;
@@ -7552,9 +7576,9 @@ class Layouter {
         target.emitEvent(new LayoutEvent(BEFORE, blocks, this.times));
         this.extraBlock = null;
         updateList.sort();
-        updateMatrix$1(updateList, this.__levelList);
-        updateBounds$1(this.__levelList);
-        updateChange(updateList);
+        LayouterHelper.updateMatrix(updateList, this.__levelList);
+        LayouterHelper.updateBounds(this.__levelList);
+        LayouterHelper.updateChange(updateList);
         if (this.extraBlock) blocks.push(this.extraBlock);
         blocks.forEach(item => item.setAfter());
         target.emitEvent(new LayoutEvent(LAYOUT, blocks, this.times));
@@ -7584,11 +7608,16 @@ class Layouter {
         if (target.isBranch) BranchHelper.updateBounds(target); else LeafHelper.updateBounds(target);
         updateAllChange(target);
     }
-    addExtra(leaf) {
+    addExtra(leaf, updateBounds) {
         if (!this.__updatedList.has(leaf)) {
             const {updatedList: updatedList, beforeBounds: beforeBounds} = this.extraBlock || (this.extraBlock = new LayoutBlockData([]));
             updatedList.length ? beforeBounds.add(leaf.__world) : beforeBounds.set(leaf.__world);
             updatedList.add(leaf);
+            if (updateBounds) {
+                const list = this.__levelList;
+                LayouterHelper.push(leaf, list);
+                list.sort(true);
+            }
         }
     }
     createBlock(data) {
@@ -7913,7 +7942,7 @@ class Picker {
             for (let i = 0, len = list.length; i < len; i++) {
                 find = list[i];
                 if (ignoreHittable || LeafHelper.worldHittable(find)) {
-                    this.hitChild(find, find.hitThrough ? this.point : point);
+                    this.hitChild(find, find.hitThrough ? this.point : point, find.mask && find.parent && find.parent.__onlyHitMask);
                     if (findList.length) {
                         if (find.isBranchLeaf && list.some(item => item !== find && LeafHelper.hasParent(item, find))) {
                             findList.reset();
@@ -8012,7 +8041,7 @@ class Picker {
             }
             const leaf = proxy || child, {hitThrough: hitThrough} = child, {findList: findList} = this;
             if (hitThrough) {
-                const index = findList.list.findIndex(item => item[hitThrough] === child[hitThrough]);
+                const index = findList.list.findIndex(item => hitThrough === "parent" ? LeafHelper.hasParent(item.parent, child.parent) : item[hitThrough] === child[hitThrough]);
                 if (index > 0) return findList.addAt(leaf, index);
             }
             findList.add(leaf);
@@ -9040,6 +9069,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
             start: true,
             hittable: true,
             smooth: true,
+            trackChanges: true,
             lazySpeard: 100
         };
         this.leafs = 0;
@@ -12087,7 +12117,7 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
         data.__naturalHeight = image.height / data.pixelRatio;
         if (data.__autoSide) {
             ui.forceUpdate();
-            LeafHelper.updateBounds(ui);
+            LeafHelper.updateBounds(ui, true);
             ui.__layout.boundsChanged = true;
             if (ui.__proxyData) {
                 ui.setProxyAttr("width", data.width);
@@ -15336,12 +15366,12 @@ ui$1.getMotionContentHeight = function() {
     return this.__layout.boxBounds.height;
 };
 
-ui$1.getMotionPoint = function(motionDistance, motionVertical, pathElement, offsetX = 0, offsetY = 0) {
+ui$1.getMotionPoint = function(motionDistance, motionAround, motionVertical, offsetX = 0, offsetY = 0, pathElement) {
     if (!pathElement) pathElement = getMotionPath(this);
     const data = getMotionPathData(pathElement);
     if (!data.total) return {};
     const point = HighCurveHelper.getDistancePoint(data, motionDistance, pathElement.motionPrecision, offsetX);
-    const {motionRotation: motionRotation, motionAround: motionAround} = this;
+    const {motionRotation: motionRotation} = this;
     if (isNumber(motionRotation)) point.rotation += motionRotation;
     if (motionAround && motionAround !== "top-left") {
         AroundHelper.toPoint(motionAround, this.__layout.boxBounds, tempPoint);
@@ -15401,7 +15431,7 @@ function updateMotion(leaf) {
         if (data.total) leaf.__.__pathForRender = HighCurveHelper.getDistancePath(data, motion, leaf.motionPrecision);
     } else {
         if (leaf.motionText) leaf.__updateMotionText(); else {
-            const point = leaf.getMotionPoint(motion);
+            const point = leaf.getMotionPoint(motion, leaf.motionAround);
             if (leaf.motionRotation === false) delete point.rotation;
             leaf.set(point);
         }
@@ -15588,4 +15618,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, 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, 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 };