leafer-ui 2.2.5 → 2.2.7

package/dist/web.js

@@ -1814,7 +1814,7 @@ var LeaferUI = function(exports) {
         return name;
     }
     const D$5 = Debug;
-    const debug$g = Debug.get("RunTime");
+    const debug$h = Debug.get("RunTime");
     const Run = {
         currentId: 0,
         currentName: "",
@@ -1832,7 +1832,7 @@ var LeaferUI = function(exports) {
             const time = R$1.idMap[id], name = R$1.nameMap[id];
             const duration = microsecond ? (performance.now() - time) / 1e3 : Date.now() - time;
             R$1.idMap[id] = R$1.nameMap[id] = R$1.nameToIdMap[name] = undefined;
-            debug$g.log(name, duration, "ms");
+            debug$h.log(name, duration, "ms");
         },
         endOfName(name, microsecond) {
             const id = R$1.nameToIdMap[name];
@@ -1862,17 +1862,17 @@ var LeaferUI = function(exports) {
             return Plugin.need("editor");
         }
     };
-    const debug$f = Debug.get("UICreator");
+    const debug$g = Debug.get("UICreator");
     const UICreator = {
         list: {},
         register(UI) {
             const {__tag: tag} = UI.prototype;
-            if (list$1[tag]) debug$f.repeat(tag);
+            if (list$1[tag]) debug$g.repeat(tag);
             list$1[tag] = UI;
         },
         get(tag, data, x, y, width, height) {
             if (!list$1[tag]) {
-                debug$f.warn("not register " + tag);
+                debug$g.warn("not register " + tag);
                 return undefined;
             }
             const ui = new list$1[tag](data);
@@ -1886,14 +1886,14 @@ var LeaferUI = function(exports) {
         }
     };
     const {list: list$1} = UICreator;
-    const debug$e = Debug.get("EventCreator");
+    const debug$f = Debug.get("EventCreator");
     const EventCreator = {
         nameList: {},
         register(Event) {
             let name;
             Object.keys(Event).forEach(key => {
                 name = Event[key];
-                if (isString(name)) nameList[name] && debug$e.repeat(name), nameList[name] = Event;
+                if (isString(name)) nameList[name] && debug$f.repeat(name), nameList[name] = Event;
             });
         },
         changeName(oldName, newName) {
@@ -2807,7 +2807,7 @@ var LeaferUI = function(exports) {
     const {M: M$4, m: m, L: L$5, l: l, H: H, h: h, V: V, v: v, C: C$3, c: c, S: S, s: s, Q: Q$3, q: q, T: T, t: t, A: A, a: a, Z: Z$4, z: z, N: N$3, D: D$4, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3} = PathCommandMap;
     const {rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1} = BezierHelper;
     const {ellipticalArc: ellipticalArc} = EllipseHelper;
-    const debug$d = Debug.get("PathConvert");
+    const debug$e = Debug.get("PathConvert");
     const setEndPoint$1 = {};
     const PathConvert = {
         current: {
@@ -3072,7 +3072,7 @@ var LeaferUI = function(exports) {
                     break;
 
                   default:
-                    debug$d.error(`command: ${command} [index:${i}]`, old);
+                    debug$e.error(`command: ${command} [index:${i}]`, old);
                     return data;
                 }
                 lastCommand = command;
@@ -3129,7 +3129,9 @@ var LeaferUI = function(exports) {
     const {getMinDistanceFrom: getMinDistanceFrom, getRadianFrom: getRadianFrom} = PointHelper;
     const {tan: tan, min: min$1, abs: abs$4} = Math;
     const startPoint = {};
+    const debug$d = Debug.get("PointsCurve");
     const PathCommandDataHelper = {
+        pointsCurveList: {},
         beginPath(data) {
             data.length = 0;
         },
@@ -3199,11 +3201,19 @@ var LeaferUI = function(exports) {
             data.push(M$3, startPoint.x, startPoint.y);
             arc$2(data, x, y, radius, startAngle, endAngle, anticlockwise);
         },
-        drawPoints(data, points, curve, close) {
-            BezierHelper.points(data, points, curve, close);
+        drawPoints(data, points, curve, close, options) {
+            let type = "Q";
+            if (isObject(curve)) type = curve.type, curve = curve.value;
+            if (!pointsCurveList[type]) debug$d.warn("not found:", type), type = "Q";
+            pointsCurveList[type](data, points, curve, close, options);
         }
     };
-    const {ellipse: ellipse$3, arc: arc$2} = PathCommandDataHelper;
+    const {ellipse: ellipse$3, arc: arc$2, pointsCurveList: pointsCurveList} = PathCommandDataHelper;
+    function registerPointsCurve(type, fn) {
+        if (pointsCurveList[type]) debug$d.repeat(type);
+        pointsCurveList[type] = fn;
+    }
+    registerPointsCurve("Q", BezierHelper.points);
     const {moveTo: moveTo$4, lineTo: lineTo$3, quadraticCurveTo: quadraticCurveTo, bezierCurveTo: bezierCurveTo, closePath: closePath$3, beginPath: beginPath, rect: rect$2, roundRect: roundRect$1, ellipse: ellipse$2, arc: arc$1, arcTo: arcTo$2, drawEllipse: drawEllipse, drawArc: drawArc, drawPoints: drawPoints$2} = PathCommandDataHelper;
     class PathCreator {
         set path(value) {
@@ -4503,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++) {
@@ -4524,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) {
@@ -4549,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++) {
@@ -4719,7 +4730,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;
@@ -4760,7 +4771,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;
@@ -4820,10 +4831,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) {
@@ -4882,7 +4893,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";
@@ -4986,7 +4997,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 {
@@ -5648,9 +5659,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.__;
@@ -5691,8 +5705,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 = {
@@ -5792,14 +5806,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() {
@@ -6455,9 +6469,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);
@@ -6606,7 +6623,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.2.5";
+    const version = "2.2.7";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -6920,6 +6937,7 @@ var LeaferUI = function(exports) {
         }
         constructor(target, userConfig) {
             this.totalTimes = 0;
+            this.changed = 0;
             this.config = {};
             this.__updatedList = new LeafList;
             this.target = target;
@@ -6939,8 +6957,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);
@@ -6949,18 +6969,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);
@@ -6975,7 +6998,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 ] ]) ];
@@ -6993,45 +7017,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 {
@@ -7133,9 +7168,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));
@@ -7165,11 +7200,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) {
@@ -7487,7 +7527,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();
@@ -7586,7 +7626,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);
@@ -8073,7 +8113,7 @@ var LeaferUI = function(exports) {
             }
             if (data.__useEffect) {
                 const {shadow: shadow, fill: fill, stroke: stroke} = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter;
-                stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
+                stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && !(shadow[0].blendMode && shadow[0].blendMode !== "pass-through") && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
                 data.__useEffect = !!(shadow || otherEffect);
             }
             data.__checkSingle();
@@ -8482,6 +8522,7 @@ var LeaferUI = function(exports) {
                 start: true,
                 hittable: true,
                 smooth: true,
+                trackChanges: true,
                 lazySpeard: 100
             };
             this.leafs = 0;
@@ -9005,7 +9046,7 @@ var LeaferUI = function(exports) {
             const data = this.__;
             const path = data.path = [];
             if (data.points) {
-                drawPoints$1(path, data.points, data.curve, data.closed);
+                drawPoints$1(path, data.points, data.curve, data.closed, data);
             } else {
                 const {width: width, height: height, sides: sides, startAngle: startAngle} = data;
                 const rx = width / 2, ry = height / 2;
@@ -9080,7 +9121,7 @@ var LeaferUI = function(exports) {
             const data = this.__;
             const path = data.path = [];
             if (data.points) {
-                drawPoints(path, data.points, data.curve, data.closed);
+                drawPoints(path, data.points, data.curve, data.closed, data);
             } else {
                 moveTo(path, 0, 0);
                 lineTo(path, this.width, 0);
@@ -11475,7 +11516,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);
@@ -12667,6 +12708,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;
@@ -12798,6 +12840,7 @@ var LeaferUI = function(exports) {
     exports.pathType = pathType;
     exports.pen = pen;
     exports.positionType = positionType;
+    exports.registerPointsCurve = registerPointsCurve;
     exports.registerUI = registerUI;
     exports.registerUIEvent = registerUIEvent;
     exports.resizeType = resizeType;