leafer-ui 2.2.6 → 2.2.8

package/dist/web.js

@@ -4513,7 +4513,7 @@ var LeaferUI = function(exports) {
     const LeafHelper = {
         updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
             if (checkAutoLayout && leaf.__hasAutoLayout && leaf.__layout.matrixChanged) waitAutoLayout = true;
-            updateMatrix$2(leaf, checkAutoLayout, waitAutoLayout);
+            updateMatrix$1(leaf, checkAutoLayout, waitAutoLayout);
             if (leaf.isBranch) {
                 const {children: children} = leaf;
                 for (let i = 0, len = children.length; i < len; i++) {
@@ -4534,9 +4534,10 @@ var LeaferUI = function(exports) {
             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) {
@@ -4559,7 +4560,7 @@ var LeaferUI = function(exports) {
             }
         },
         updateAllChange(leaf) {
-            updateChange$1(leaf);
+            updateChange(leaf);
             if (leaf.isBranch) {
                 const {children: children} = leaf;
                 for (let i = 0, len = children.length; i < len; i++) {
@@ -4581,6 +4582,13 @@ var LeaferUI = function(exports) {
             if (!fromWorld) fromWorld = leaf.__nowWorld;
             if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform); else currentCanvas.copyWorldToInner(fromCanvas, fromWorld, leaf.__layout.renderBounds, blendMode);
         },
+        clip(leaf, canvas, options) {
+            if (leaf.__worldOpacity) {
+                canvas.setWorld(leaf.__nowWorld = leaf.__getNowWorld(options));
+                leaf.__drawRenderPath(canvas);
+                canvas.clipUI(leaf);
+            }
+        },
         renderComplex(_leaf, _canvas, _options) {},
         updateComplex(_leaf) {},
         checkComplex(_leaf) {},
@@ -4729,7 +4737,7 @@ var LeaferUI = function(exports) {
         }
     };
     const L = LeafHelper;
-    const {updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange$1} = L;
+    const {updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$1, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange$1, updateChange: updateChange} = L;
     function getTempLocal(t, worldPoint) {
         t.updateLayout();
         return t.parent ? PointHelper.tempToInnerOf(worldPoint, t.parent.scrollWorldTransform) : worldPoint;
@@ -4770,7 +4778,7 @@ var LeaferUI = function(exports) {
         if (target.__.mask) findMask = 1;
         return findMask < 0 ? null : (findMask && (findMask = -1), true);
     }
-    const {updateBounds: updateBounds$3} = LeafHelper;
+    const {updateBounds: updateBounds$2} = LeafHelper;
     const BranchHelper = {
         sort(a, b) {
             return a.__.zIndex === b.__.zIndex ? a.__tempNumber - b.__tempNumber : a.__.zIndex - b.__.zIndex;
@@ -4830,10 +4838,10 @@ var LeaferUI = function(exports) {
                 branch = branchStack[i];
                 children = branch.children;
                 for (let j = 0, len = children.length; j < len; j++) {
-                    updateBounds$3(children[j]);
+                    updateBounds$2(children[j]);
                 }
                 if (exclude && exclude === branch) continue;
-                updateBounds$3(branch);
+                updateBounds$2(branch);
             }
         },
         move(branch, x, y) {
@@ -4892,7 +4900,7 @@ var LeaferUI = function(exports) {
             }
         }
     };
-    const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$2} = LeafHelper;
+    const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$1} = LeafHelper;
     const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$4} = BoundsHelper;
     const localContent = "_localContentBounds";
     const worldContent = "_worldContentBounds", worldBox = "_worldBoxBounds", worldStroke = "_worldStrokeBounds";
@@ -4996,7 +5004,7 @@ var LeaferUI = function(exports) {
         }
         update() {
             const {leaf: leaf} = this, {leafer: leafer} = leaf;
-            if (leaf.isApp) return updateBounds$2(leaf);
+            if (leaf.isApp) return updateBounds$1(leaf);
             if (leafer) {
                 if (leafer.ready) leafer.watcher.changed && leafer.layouter.layout(); else leafer.start();
             } else {
@@ -5658,9 +5666,12 @@ var LeaferUI = function(exports) {
             }
         },
         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.__;
@@ -5701,8 +5712,8 @@ var LeaferUI = function(exports) {
             this.__layout.matrixChanged = undefined;
         }
     };
-    const {updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$2} = LeafHelper;
-    const {updateBounds: updateBounds$1} = BranchHelper;
+    const {updateMatrix: updateMatrix, updateAllMatrix: updateAllMatrix$2} = LeafHelper;
+    const {updateBounds: updateBounds} = BranchHelper;
     const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$3} = BoundsHelper;
     const {toBounds: toBounds} = PathBounds;
     const LeafBounds = {
@@ -5802,14 +5813,14 @@ var LeaferUI = function(exports) {
                     if (this.__layout.childrenSortChanged) this.__updateSortChildren();
                     if (this.__layout.boxChanged) this.__updateFlowLayout();
                     updateAllMatrix$2(this);
-                    updateBounds$1(this, this);
+                    updateBounds(this, this);
                     if (this.__.__autoSide) this.__updateBoxBounds(true);
                 } else {
                     updateAllMatrix$2(this);
-                    updateBounds$1(this, this);
+                    updateBounds(this, this);
                 }
             } else {
-                updateMatrix$1(this);
+                updateMatrix(this);
             }
         },
         __updateNaturalSize() {
@@ -5854,11 +5865,7 @@ var LeaferUI = function(exports) {
             }
         },
         __clip(canvas, options) {
-            if (this.__worldOpacity) {
-                canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
-                this.__drawRenderPath(canvas);
-                canvas.clipUI(this);
-            }
+            LeafHelper.clip(this, canvas, options);
         },
         __updateWorldOpacity() {
             this.__worldOpacity = this.__.visible ? this.parent ? this.parent.__worldOpacity * this.__.opacity : this.__.opacity : 0;
@@ -6465,9 +6472,12 @@ var LeaferUI = function(exports) {
             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);
         }
     };
     exports.Branch = __decorate([ useModule(BranchRender) ], exports.Branch);
@@ -6616,7 +6626,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.2.6";
+    const version = "2.2.8";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -6930,6 +6940,7 @@ var LeaferUI = function(exports) {
         }
         constructor(target, userConfig) {
             this.totalTimes = 0;
+            this.changed = 0;
             this.config = {};
             this.__updatedList = new LeafList;
             this.target = target;
@@ -6949,8 +6960,10 @@ var LeaferUI = function(exports) {
             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);
@@ -6959,18 +6972,21 @@ var LeaferUI = function(exports) {
             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);
@@ -6985,7 +7001,8 @@ var LeaferUI = function(exports) {
             }));
             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 ] ]) ];
@@ -7003,45 +7020,56 @@ var LeaferUI = function(exports) {
     }
     const {updateAllMatrix: updateAllMatrix$1, updateBounds: updateOneBounds, updateChange: updateOneChange} = LeafHelper;
     const {pushAllChildBranch: pushAllChildBranch, pushAllParent: pushAllParent} = BranchHelper;
-    function updateMatrix(updateList, levelList) {
-        let layout;
-        updateList.list.forEach(leaf => {
-            layout = leaf.__layout;
-            if (levelList.without(leaf) && !layout.proxyZoom) {
-                if (layout.matrixChanged) {
-                    updateAllMatrix$1(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$1(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(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++;
             }
-        });
-    }
-    function updateChange(updateList) {
-        updateList.list.forEach(updateOneChange);
+        },
+        updateChange(updateList) {
+            updateList.list.forEach(updateOneChange);
+        },
+        push: push
+    };
+    function push(leaf, levelList) {
+        levelList.add(leaf);
+        pushAllParent(leaf, levelList);
     }
     const {worldBounds: worldBounds} = LeafBoundsHelper;
     class LayoutBlockData {
@@ -7143,9 +7171,9 @@ var LeaferUI = function(exports) {
             target.emitEvent(new LayoutEvent(BEFORE, blocks, this.times));
             this.extraBlock = null;
             updateList.sort();
-            updateMatrix(updateList, this.__levelList);
-            updateBounds(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));
@@ -7175,11 +7203,16 @@ var LeaferUI = function(exports) {
             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) {
@@ -7497,7 +7530,7 @@ var LeaferUI = function(exports) {
                 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();
@@ -7596,7 +7629,7 @@ var LeaferUI = function(exports) {
                 }
                 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);
@@ -7656,7 +7689,17 @@ var LeaferUI = function(exports) {
         });
         options.topList = new LeafList;
         target.__render(canvas, options);
-        if (options.topList.length) options.topList.forEach(item => item.__render(canvas, topOptions));
+        if (options.topList.length) options.topList.forEach(item => {
+            const {parent: parent} = item;
+            if (parent && parent.isBranchLeaf && parent.overflow !== "show") {
+                canvas.save();
+                LeafHelper.clip(parent, canvas, topOptions);
+                item.__render(canvas, topOptions);
+                canvas.restore();
+            } else {
+                item.__render(canvas, topOptions);
+            }
+        });
     };
     function effectType(defaultValue) {
         return decorateLeafAttr(defaultValue, key => attr({
@@ -8492,6 +8535,7 @@ var LeaferUI = function(exports) {
                 start: true,
                 hittable: true,
                 smooth: true,
+                trackChanges: true,
                 lazySpeard: 100
             };
             this.leafs = 0;
@@ -11485,7 +11529,7 @@ var LeaferUI = function(exports) {
             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);
@@ -12677,6 +12721,7 @@ var LeaferUI = function(exports) {
     exports.Keyboard = Keyboard;
     exports.LayoutEvent = LayoutEvent;
     exports.Layouter = Layouter;
+    exports.LayouterHelper = LayouterHelper;
     exports.LeafBounds = LeafBounds;
     exports.LeafBoundsHelper = LeafBoundsHelper;
     exports.LeafData = LeafData;