leafer-ui 2.2.6 → 2.2.7

package/dist/web.cjs

@@ -374,6 +374,7 @@ class Watcher {
     }
     constructor(target, userConfig) {
         this.totalTimes = 0;
+        this.changed = 0;
         this.config = {};
         this.__updatedList = new core.LeafList;
         this.target = target;
@@ -393,8 +394,10 @@ class Watcher {
         this.disabled = true;
     }
     update() {
-        this.changed = true;
-        if (this.running) this.target.emit(core.RenderEvent.REQUEST);
+        if (this.changed < 100) {
+            this.changed++;
+            if (this.running) this.target.emit(core.RenderEvent.REQUEST);
+        }
     }
     __onAttrChange(event) {
         this.add(event.target);
@@ -403,18 +406,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 === core.ChildEvent.ADD) {
+            if (eventType === core.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);
@@ -429,7 +435,8 @@ class Watcher {
         }));
         this.__updatedList = new core.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_([ [ core.PropertyEvent.CHANGE, this.__onAttrChange, this ], [ [ core.ChildEvent.ADD, core.ChildEvent.REMOVE ], this.__onChildEvent, this ], [ core.WatchEvent.REQUEST, this.__onRquestData, this ] ]) ];
@@ -450,47 +457,57 @@ const {updateAllMatrix: updateAllMatrix$1, updateBounds: updateOneBounds, update
 
 const {pushAllChildBranch: pushAllChildBranch, pushAllParent: pushAllParent} = core.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++;
         }
-    });
-}
+    },
+    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} = core.LeafBoundsHelper;
@@ -597,9 +614,9 @@ class Layouter {
         target.emitEvent(new core.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 core.LayoutEvent(LAYOUT, blocks, this.times));
@@ -629,11 +646,16 @@ class Layouter {
         if (target.isBranch) core.BranchHelper.updateBounds(target); else core.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) {
@@ -958,7 +980,7 @@ class Picker {
             for (let i = 0, len = list.length; i < len; i++) {
                 find = list[i];
                 if (ignoreHittable || core.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 && core.LeafHelper.hasParent(item, find))) {
                             findList.reset();
@@ -1057,7 +1079,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" ? core.LeafHelper.hasParent(item.parent, child.parent) : item[hitThrough] === child[hitThrough]);
                 if (index > 0) return findList.addAt(leaf, index);
             }
             findList.add(leaf);
@@ -1892,7 +1914,7 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
         data.__naturalHeight = image.height / data.pixelRatio;
         if (data.__autoSide) {
             ui.forceUpdate();
-            core.LeafHelper.updateBounds(ui);
+            core.LeafHelper.updateBounds(ui, true);
             ui.__layout.boundsChanged = true;
             if (ui.__proxyData) {
                 ui.setProxyAttr("width", data.width);
@@ -3196,6 +3218,8 @@ exports.Interaction = Interaction;
 
 exports.Layouter = Layouter;
 
+exports.LayouterHelper = LayouterHelper;
+
 exports.LeaferCanvas = LeaferCanvas;
 
 exports.Picker = Picker;

package/dist/web.esm.js

@@ -378,6 +378,7 @@ class Watcher {
     }
     constructor(target, userConfig) {
         this.totalTimes = 0;
+        this.changed = 0;
         this.config = {};
         this.__updatedList = new LeafList;
         this.target = target;
@@ -397,8 +398,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);
@@ -407,18 +410,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);
@@ -433,7 +439,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 ] ]) ];
@@ -454,47 +461,57 @@ const {updateAllMatrix: updateAllMatrix$1, updateBounds: updateOneBounds, update
 
 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++;
         }
-    });
-}
+    },
+    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;
@@ -601,9 +618,9 @@ class Layouter {
         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));
@@ -633,11 +650,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) {
@@ -962,7 +984,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();
@@ -1061,7 +1083,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);
@@ -1896,7 +1918,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);
@@ -3175,4 +3197,4 @@ Object.assign(Creator, {
 
 useCanvas();
 
-export { Interaction, Layouter, LeaferCanvas, PathNodeHandleType, Picker, Renderer, Selector, Watcher, useCanvas };
+export { Interaction, Layouter, LayouterHelper, LeaferCanvas, PathNodeHandleType, Picker, Renderer, Selector, Watcher, useCanvas };