@leafer/core 1.0.2 → 1.0.4

package/lib/core.esm.js

@@ -119,11 +119,18 @@ const MathHelper = {
             scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
             scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
         }
-        else if (scale) {
-            scaleData.scaleX = typeof scale === 'number' ? scale : scale.x;
-            scaleData.scaleY = typeof scale === 'number' ? scale : scale.y;
-        }
+        else if (scale)
+            MathHelper.assignScale(scaleData, scale);
         return scaleData;
+    },
+    assignScale(scaleData, scale) {
+        if (typeof scale === 'number') {
+            scaleData.scaleX = scaleData.scaleY = scale;
+        }
+        else {
+            scaleData.scaleX = scale.x;
+            scaleData.scaleY = scale.y;
+        }
     }
 };
 const OneRadian = PI$2 / 180;
@@ -1255,7 +1262,6 @@ const AroundHelper = {
     tempPoint: {},
     get,
     toPoint(around, bounds, to, onlySize, pointBounds) {
-        to || (to = {});
         const point = get(around);
         to.x = point.x;
         to.y = point.y;
@@ -1390,6 +1396,10 @@ const Run = {
 };
 const R = Run;
 
+function needPlugin(name) {
+    console.error('need plugin: @leafer-in/' + name);
+}
+
 const debug$7 = Debug.get('UICreator');
 const UICreator = {
     list: {},
@@ -1652,6 +1662,9 @@ var Answer;
     Answer[Answer["YesAndSkip"] = 3] = "YesAndSkip";
 })(Answer || (Answer = {}));
 const emptyData = {};
+function isNull(value) {
+    return value === undefined || value === null;
+}
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2417,7 +2430,7 @@ const BezierHelper = {
         let startY = y = rotationSin * radiusX * startCos + rotationCos * radiusY * startSin;
         let fromX = cx + x, fromY = cy + y;
         if (data)
-            data.push(L$6, fromX, fromY);
+            data.push(data.length ? L$6 : M$5, fromX, fromY);
         if (setPointBounds)
             setPoint$1(setPointBounds, fromX, fromY);
         if (setStartPoint)
@@ -3086,8 +3099,7 @@ const PathBounds = {
     toTwoPointBounds(data, setPointBounds) {
         if (!data || !data.length)
             return setPoint(setPointBounds, 0, 0);
-        let command;
-        let i = 0, x = 0, y = 0, x1, y1, toX, toY;
+        let i = 0, x = 0, y = 0, x1, y1, toX, toY, command;
         const len = data.length;
         while (i < len) {
             command = data[i];
@@ -3743,7 +3755,7 @@ function autoLayoutType(defaultValue) {
         set(value) {
             if (this.__setAttr(key, value)) {
                 this.__layout.matrixChanged || this.__layout.matrixChange();
-                this.__hasAutoLayout = !!value;
+                this.__hasAutoLayout = !!(this.origin || this.around || this.flow);
                 if (!this.__local)
                     this.__layout.createLocal();
             }
@@ -3836,14 +3848,25 @@ function visibleType(defaultValue) {
     return decorateLeafAttr(defaultValue, (key) => attr({
         set(value) {
             const oldValue = this.visible;
-            if (this.__setAttr(key, value)) {
-                this.__layout.opacityChanged || this.__layout.opacityChange();
-                if (oldValue === 0 || value === 0)
-                    doBoundsType(this);
+            if (oldValue === true && value === 0) {
+                if (this.animationOut)
+                    return this.__runAnimation('out', () => doVisible(this, key, value, oldValue));
+            }
+            else if (oldValue === 0 && value === true) {
+                if (this.animation)
+                    this.__runAnimation('in');
             }
+            doVisible(this, key, value, oldValue);
         }
     }));
 }
+function doVisible(leaf, key, value, oldValue) {
+    if (leaf.__setAttr(key, value)) {
+        leaf.__layout.opacityChanged || leaf.__layout.opacityChange();
+        if (oldValue === 0 || value === 0)
+            doBoundsType(leaf);
+    }
+}
 function sortType(defaultValue) {
     return decorateLeafAttr(defaultValue, (key) => attr({
         set(value) {
@@ -3927,7 +3950,16 @@ function defineDataProcessor(target, key, defaultValue) {
     if (defaultValue === undefined) {
         property.get = function () { return this[computedKey]; };
     }
-    else if (key === 'width') {
+    else if (typeof defaultValue === 'object') {
+        const { clone } = DataHelper;
+        property.get = function () {
+            let v = this[computedKey];
+            if (v === undefined)
+                this[computedKey] = v = clone(defaultValue);
+            return v;
+        };
+    }
+    if (key === 'width') {
         property.get = function () {
             const v = this[computedKey];
             if (v === undefined) {
@@ -4451,15 +4483,16 @@ class LeafLayout {
     }
     getLayoutBounds(type, relative = 'world', unscale) {
         const { leaf } = this;
-        let point, matrix, bounds = this.getInnerBounds(type);
+        let point, matrix, layoutBounds, bounds = this.getInnerBounds(type);
         switch (relative) {
             case 'world':
                 point = leaf.getWorldPoint(bounds);
                 matrix = leaf.__world;
                 break;
             case 'local':
+                const { scaleX, scaleY, rotation, skewX, skewY } = leaf.__;
+                layoutBounds = { scaleX, scaleY, rotation, skewX, skewY };
                 point = leaf.getLocalPointByInner(bounds);
-                matrix = leaf.__localMatrix;
                 break;
             case 'inner':
                 point = bounds;
@@ -4471,7 +4504,8 @@ class LeafLayout {
                 point = leaf.getWorldPoint(bounds, relative);
                 matrix = getRelativeWorld$1(leaf, relative, true);
         }
-        const layoutBounds = MatrixHelper.getLayout(matrix);
+        if (!layoutBounds)
+            layoutBounds = MatrixHelper.getLayout(matrix);
         copy$2(layoutBounds, bounds);
         PointHelper.copy(layoutBounds, point);
         if (unscale) {
@@ -4594,144 +4628,6 @@ class LeafLayout {
     destroy() { }
 }
 
-const empty = {};
-const LeafEventer = {
-    on(type, listener, options) {
-        let capture, once;
-        if (options) {
-            if (options === 'once') {
-                once = true;
-            }
-            else if (typeof options === 'boolean') {
-                capture = options;
-            }
-            else {
-                capture = options.capture;
-                once = options.once;
-            }
-        }
-        let events;
-        const map = __getListenerMap(this, capture, true);
-        const typeList = typeof type === 'string' ? type.split(' ') : type;
-        const item = once ? { listener, once } : { listener };
-        typeList.forEach(type => {
-            if (type) {
-                events = map[type];
-                if (events) {
-                    if (events.findIndex(item => item.listener === listener) === -1)
-                        events.push(item);
-                }
-                else {
-                    map[type] = [item];
-                }
-            }
-        });
-    },
-    off(type, listener, options) {
-        if (type) {
-            const typeList = typeof type === 'string' ? type.split(' ') : type;
-            if (listener) {
-                let capture;
-                if (options)
-                    capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
-                let events, index;
-                const map = __getListenerMap(this, capture);
-                typeList.forEach(type => {
-                    if (type) {
-                        events = map[type];
-                        if (events) {
-                            index = events.findIndex(item => item.listener === listener);
-                            if (index > -1)
-                                events.splice(index, 1);
-                            if (!events.length)
-                                delete map[type];
-                        }
-                    }
-                });
-            }
-            else {
-                const { __bubbleMap: b, __captureMap: c } = this;
-                typeList.forEach(type => {
-                    if (b)
-                        delete b[type];
-                    if (c)
-                        delete c[type];
-                });
-            }
-        }
-        else {
-            this.__bubbleMap = this.__captureMap = undefined;
-        }
-    },
-    on_(type, listener, bind, options) {
-        if (bind)
-            listener = listener.bind(bind);
-        this.on(type, listener, options);
-        return { type, current: this, listener, options };
-    },
-    off_(id) {
-        if (!id)
-            return;
-        const list = id instanceof Array ? id : [id];
-        list.forEach(item => item.current.off(item.type, item.listener, item.options));
-        list.length = 0;
-    },
-    once(type, listener, capture) {
-        this.on(type, listener, { once: true, capture });
-    },
-    emit(type, event, capture) {
-        if (!event && EventCreator.has(type))
-            event = EventCreator.get(type, { type, target: this, current: this });
-        const map = __getListenerMap(this, capture);
-        const list = map[type];
-        if (list) {
-            let item;
-            for (let i = 0, len = list.length; i < len; i++) {
-                item = list[i];
-                item.listener(event);
-                if (item.once) {
-                    this.off(type, item.listener, capture);
-                    i--, len--;
-                }
-                if (event && event.isStopNow)
-                    break;
-            }
-        }
-        this.syncEventer && this.syncEventer.emitEvent(event, capture);
-    },
-    emitEvent(event, capture) {
-        event.current = this;
-        this.emit(event.type, event, capture);
-    },
-    hasEvent(type, capture) {
-        if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
-            return true;
-        const { __bubbleMap: b, __captureMap: c } = this;
-        const hasB = b && b[type], hasC = c && c[type];
-        return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
-    },
-};
-function __getListenerMap(eventer, capture, create) {
-    if (capture) {
-        const { __captureMap: c } = eventer;
-        if (c) {
-            return c;
-        }
-        else {
-            return create ? eventer.__captureMap = {} : empty;
-        }
-    }
-    else {
-        const { __bubbleMap: b } = eventer;
-        if (b) {
-            return b;
-        }
-        else {
-            return create ? eventer.__bubbleMap = {} : empty;
-        }
-    }
-}
-
 class Event {
     constructor(type, target) {
         this.bubbles = false;
@@ -4766,7 +4662,10 @@ class ChildEvent extends Event {
 }
 ChildEvent.ADD = 'child.add';
 ChildEvent.REMOVE = 'child.remove';
-ChildEvent.DESTROY = 'child.destroy';
+ChildEvent.CREATED = 'created';
+ChildEvent.MOUNTED = 'mounted';
+ChildEvent.UNMOUNTED = 'unmounted';
+ChildEvent.DESTROY = 'destroy';
 
 class PropertyEvent extends Event {
     constructor(type, target, attrName, oldValue, newValue) {
@@ -4844,10 +4743,6 @@ LayoutEvent.AFTER = 'layout.after';
 LayoutEvent.AGAIN = 'layout.again';
 LayoutEvent.END = 'layout.end';
 
-class AnimateEvent extends Event {
-}
-AnimateEvent.FRAME = 'animate.frame';
-
 class RenderEvent extends Event {
     constructor(type, times, bounds, options) {
         super(type);
@@ -4880,6 +4775,157 @@ LeaferEvent.STOP = 'leafer.stop';
 LeaferEvent.RESTART = 'leafer.restart';
 LeaferEvent.END = 'leafer.end';
 
+const empty = {};
+class Eventer {
+    set event(map) { this.on(map); }
+    on(type, listener, options) {
+        if (!listener) {
+            let event, map = type;
+            for (let key in map)
+                event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event);
+            return;
+        }
+        let capture, once;
+        if (options) {
+            if (options === 'once') {
+                once = true;
+            }
+            else if (typeof options === 'boolean') {
+                capture = options;
+            }
+            else {
+                capture = options.capture;
+                once = options.once;
+            }
+        }
+        let events;
+        const map = __getListenerMap(this, capture, true);
+        const typeList = typeof type === 'string' ? type.split(' ') : type;
+        const item = once ? { listener, once } : { listener };
+        typeList.forEach(type => {
+            if (type) {
+                events = map[type];
+                if (events) {
+                    if (events.findIndex(item => item.listener === listener) === -1)
+                        events.push(item);
+                }
+                else {
+                    map[type] = [item];
+                }
+            }
+        });
+    }
+    off(type, listener, options) {
+        if (type) {
+            const typeList = typeof type === 'string' ? type.split(' ') : type;
+            if (listener) {
+                let capture;
+                if (options)
+                    capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
+                let events, index;
+                const map = __getListenerMap(this, capture);
+                typeList.forEach(type => {
+                    if (type) {
+                        events = map[type];
+                        if (events) {
+                            index = events.findIndex(item => item.listener === listener);
+                            if (index > -1)
+                                events.splice(index, 1);
+                            if (!events.length)
+                                delete map[type];
+                        }
+                    }
+                });
+            }
+            else {
+                const { __bubbleMap: b, __captureMap: c } = this;
+                typeList.forEach(type => {
+                    if (b)
+                        delete b[type];
+                    if (c)
+                        delete c[type];
+                });
+            }
+        }
+        else {
+            this.__bubbleMap = this.__captureMap = undefined;
+        }
+    }
+    on_(type, listener, bind, options) {
+        if (bind)
+            listener = listener.bind(bind);
+        this.on(type, listener, options);
+        return { type, current: this, listener, options };
+    }
+    off_(id) {
+        if (!id)
+            return;
+        const list = id instanceof Array ? id : [id];
+        list.forEach(item => item.current.off(item.type, item.listener, item.options));
+        list.length = 0;
+    }
+    once(type, listener, capture) {
+        this.on(type, listener, { once: true, capture });
+    }
+    emit(type, event, capture) {
+        if (!event && EventCreator.has(type))
+            event = EventCreator.get(type, { type, target: this, current: this });
+        const map = __getListenerMap(this, capture);
+        const list = map[type];
+        if (list) {
+            let item;
+            for (let i = 0, len = list.length; i < len; i++) {
+                item = list[i];
+                item.listener(event);
+                if (item.once) {
+                    this.off(type, item.listener, capture);
+                    i--, len--;
+                }
+                if (event && event.isStopNow)
+                    break;
+            }
+        }
+        this.syncEventer && this.syncEventer.emitEvent(event, capture);
+    }
+    emitEvent(event, capture) {
+        event.current = this;
+        this.emit(event.type, event, capture);
+    }
+    hasEvent(type, capture) {
+        if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
+            return true;
+        const { __bubbleMap: b, __captureMap: c } = this;
+        const hasB = b && b[type], hasC = c && c[type];
+        return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
+    }
+    destroy() {
+        this.__captureMap = this.__bubbleMap = this.syncEventer = null;
+    }
+}
+function __getListenerMap(eventer, capture, create) {
+    if (capture) {
+        const { __captureMap: c } = eventer;
+        if (c) {
+            return c;
+        }
+        else {
+            return create ? eventer.__captureMap = {} : empty;
+        }
+    }
+    else {
+        const { __bubbleMap: b } = eventer;
+        if (b) {
+            return b;
+        }
+        else {
+            return create ? eventer.__bubbleMap = {} : empty;
+        }
+    }
+}
+
+const { on, on_, off, off_, once, emit, emitEvent, hasEvent, destroy } = Eventer.prototype;
+const LeafEventer = { on, on_, off, off_, once, emit, emitEvent, hasEvent, destroyEventer: destroy };
+
 const { isFinite } = Number;
 const debug = Debug.get('setAttr');
 const LeafDataProxy = {
@@ -4891,9 +4937,7 @@ const LeafDataProxy = {
                 newValue = undefined;
             }
             if (typeof newValue === 'object' || oldValue !== newValue) {
-                this.__[name] = newValue;
-                if (this.__proxyData)
-                    this.setProxyAttr(name, newValue);
+                this.__realSetAttr(name, newValue);
                 const { CHANGE } = PropertyEvent;
                 const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue);
                 if (this.isLeafer) {
@@ -4911,12 +4955,18 @@ const LeafDataProxy = {
             }
         }
         else {
-            this.__[name] = newValue;
-            if (this.__proxyData)
-                this.setProxyAttr(name, newValue);
+            this.__realSetAttr(name, newValue);
             return true;
         }
     },
+    __realSetAttr(name, newValue) {
+        const data = this.__;
+        data[name] = newValue;
+        if (this.__proxyData)
+            this.setProxyAttr(name, newValue);
+        if (data.normalStyle)
+            this.lockNormalStyle || data.normalStyle[name] === undefined || (data.normalStyle[name] = newValue);
+    },
     __getAttr(name) {
         if (this.__proxyData)
             return this.getProxyAttr(name);
@@ -5019,6 +5069,8 @@ const LeafBounds = {
         layout.boundsChanged = false;
     },
     __updateLocalBoxBounds() {
+        if (this.__hasMotionPath)
+            this.__updateMotionPath();
         if (this.__hasAutoLayout)
             this.__updateAutoLayout();
         toOuterOf$1(this.__layout.boxBounds, this.__local, this.__local);
@@ -5171,7 +5223,7 @@ const BranchRender = {
 const { LEAF, create } = IncrementId;
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
-const { copy } = PointHelper;
+const { copy, move } = PointHelper;
 const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
 let Leaf = class Leaf {
     get tag() { return this.__tag; }
@@ -5198,13 +5250,16 @@ let Leaf = class Leaf {
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
     get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
-    set event(map) { let event; for (let key in map)
-        event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event); }
+    set event(map) { this.on(map); }
     constructor(data) {
         this.innerId = create(LEAF);
         this.reset(data);
+        if (this.__bubbleMap)
+            this.__emitLifeEvent(ChildEvent.CREATED);
     }
     reset(data) {
+        if (this.leafer)
+            this.leafer.forceRender(this.__world);
         this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1 };
         if (data !== null)
             this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
@@ -5226,12 +5281,12 @@ let Leaf = class Leaf {
     waitParent(item, bind) {
         if (bind)
             item = item.bind(bind);
-        this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item]);
+        this.parent ? item() : this.on(ChildEvent.ADD, item, 'once');
     }
     waitLeafer(item, bind) {
         if (bind)
             item = item.bind(bind);
-        this.leafer ? item() : (this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item]);
+        this.leafer ? item() : this.on(ChildEvent.MOUNTED, item, 'once');
     }
     nextRender(item, bind, off) {
         this.leafer ? this.leafer.nextRender(item, bind, off) : this.waitLeafer(() => this.leafer.nextRender(item, bind, off));
@@ -5240,18 +5295,21 @@ let Leaf = class Leaf {
         this.nextRender(item, null, 'off');
     }
     __bindLeafer(leafer) {
-        if (this.isLeafer) {
-            if (leafer !== null)
-                leafer = this;
-        }
+        if (this.isLeafer && leafer !== null)
+            leafer = this;
         if (this.leafer && !leafer)
             this.leafer.leafs--;
         this.leafer = leafer;
         if (leafer) {
             leafer.leafs++;
             this.__level = this.parent ? this.parent.__level + 1 : 1;
-            if (this.__leaferWait)
-                WaitHelper.run(this.__leaferWait);
+            if (this.animation)
+                this.__runAnimation('in');
+            if (this.__bubbleMap)
+                this.__emitLifeEvent(ChildEvent.MOUNTED);
+        }
+        else {
+            this.__emitLifeEvent(ChildEvent.UNMOUNTED);
         }
         if (this.isBranch) {
             const { children } = this;
@@ -5260,7 +5318,7 @@ let Leaf = class Leaf {
             }
         }
     }
-    set(_data) { }
+    set(_data, _isTemp) { }
     get(_name) { return undefined; }
     setAttr(name, value) { this[name] = value; }
     getAttr(name) { return this[name]; }
@@ -5285,6 +5343,7 @@ let Leaf = class Leaf {
     findOne(_condition, _options) { return undefined; }
     findId(_id) { return undefined; }
     focus(_value) { }
+    updateState() { }
     updateLayout() {
         this.__layout.update();
     }
@@ -5392,11 +5451,24 @@ let Leaf = class Leaf {
         if (relative)
             relative.worldToInner(to ? to : inner, null, distance);
     }
+    getBoxPoint(world, relative, distance, change) {
+        return this.getBoxPointByInner(this.getInnerPoint(world, relative, distance, change), null, null, true);
+    }
+    getBoxPointByInner(inner, _relative, _distance, change) {
+        const point = change ? inner : Object.assign({}, inner), { x, y } = this.boxBounds;
+        move(point, -x, -y);
+        return point;
+    }
     getInnerPoint(world, relative, distance, change) {
         const point = change ? world : {};
         this.worldToInner(world, point, distance, relative);
         return point;
     }
+    getInnerPointByBox(box, _relative, _distance, change) {
+        const point = change ? box : Object.assign({}, box), { x, y } = this.boxBounds;
+        move(point, x, y);
+        return point;
+    }
     getInnerPointByLocal(local, _relative, distance, change) {
         return this.getInnerPoint(local, this.parent, distance, change);
     }
@@ -5408,20 +5480,23 @@ let Leaf = class Leaf {
     getLocalPointByInner(inner, _relative, distance, change) {
         return this.getWorldPoint(inner, this.parent, distance, change);
     }
+    getPagePoint(world, relative, distance, change) {
+        const layer = this.leafer ? this.leafer.zoomLayer : this;
+        return layer.getInnerPoint(world, relative, distance, change);
+    }
     getWorldPoint(inner, relative, distance, change) {
         const point = change ? inner : {};
         this.innerToWorld(inner, point, distance, relative);
         return point;
     }
+    getWorldPointByBox(box, relative, distance, change) {
+        return this.getWorldPoint(this.getInnerPointByBox(box, null, null, change), relative, distance, true);
+    }
     getWorldPointByLocal(local, relative, distance, change) {
         const point = change ? local : {};
         this.localToWorld(local, point, distance, relative);
         return point;
     }
-    getPagePoint(world, relative, distance, change) {
-        const layer = this.leafer ? this.leafer.zoomLayer : this;
-        return layer.getInnerPoint(world, relative, distance, change);
-    }
     getWorldPointByPage(page, relative, distance, change) {
         const layer = this.leafer ? this.leafer.zoomLayer : this;
         return layer.getWorldPoint(page, relative, distance, change);
@@ -5490,6 +5565,17 @@ let Leaf = class Leaf {
     __drawRenderPath(_canvas) { }
     __updatePath() { }
     __updateRenderPath() { }
+    getMotionPathData() {
+        return needPlugin('path');
+    }
+    getMotionPoint(_motionDistance) {
+        return needPlugin('path');
+    }
+    getMotionTotal() {
+        return 0;
+    }
+    __updateMotionPath() { }
+    __runAnimation(_type, _complete) { }
     __updateSortChildren() { }
     add(_child, _index) { }
     remove(_child, destroy) {
@@ -5515,6 +5601,10 @@ let Leaf = class Leaf {
             fn = boundsType;
         fn(defaultValue)(this.prototype, attrName);
     }
+    __emitLifeEvent(type) {
+        if (this.hasEvent(type))
+            this.emitEvent(new ChildEvent(type, this, this.parent));
+    }
     destroy() {
         if (!this.destroyed) {
             const { parent } = this;
@@ -5522,11 +5612,10 @@ let Leaf = class Leaf {
                 this.remove();
             if (this.children)
                 this.removeAll(true);
-            if (this.hasEvent(ChildEvent.DESTROY))
-                this.emitEvent(new ChildEvent(ChildEvent.DESTROY, this, parent));
+            this.__emitLifeEvent(ChildEvent.DESTROY);
             this.__.destroy();
             this.__layout.destroy();
-            this.__captureMap = this.__bubbleMap = this.__parentWait = this.__leaferWait = null;
+            this.destroyEventer();
             this.destroyed = true;
         }
     }
@@ -5592,8 +5681,8 @@ let Branch = class Branch extends Leaf {
             this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
         child.__layout.boxChanged || child.__layout.boxChange();
         child.__layout.matrixChanged || child.__layout.matrixChange();
-        if (child.__parentWait)
-            WaitHelper.run(child.__parentWait);
+        if (child.__bubbleMap)
+            child.__emitLifeEvent(ChildEvent.ADD);
         if (this.leafer) {
             child.__bindLeafer(this.leafer);
             if (this.leafer.created)
@@ -5606,16 +5695,10 @@ let Branch = class Branch extends Leaf {
     }
     remove(child, destroy) {
         if (child) {
-            const index = this.children.indexOf(child);
-            if (index > -1) {
-                this.children.splice(index, 1);
-                if (child.isBranch)
-                    this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
-                this.__preRemove();
-                this.__realRemoveChild(child);
-                if (destroy)
-                    child.destroy();
-            }
+            if (child.animationOut)
+                child.__runAnimation('out', () => this.__remove(child, destroy));
+            else
+                this.__remove(child, destroy);
         }
         else if (child === undefined) {
             super.remove(null, destroy);
@@ -5637,6 +5720,18 @@ let Branch = class Branch extends Leaf {
     clear() {
         this.removeAll(true);
     }
+    __remove(child, destroy) {
+        const index = this.children.indexOf(child);
+        if (index > -1) {
+            this.children.splice(index, 1);
+            if (child.isBranch)
+                this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
+            this.__preRemove();
+            this.__realRemoveChild(child);
+            if (destroy)
+                child.destroy();
+        }
+    }
     __preRemove() {
         if (this.__hasMask)
             this.__updateMask();
@@ -5646,6 +5741,7 @@ let Branch = class Branch extends Leaf {
         this.__layout.affectChildrenSort && this.__layout.childrenSortChange();
     }
     __realRemoveChild(child) {
+        child.__emitLifeEvent(ChildEvent.REMOVE);
         child.parent = null;
         if (this.leafer) {
             child.__bindLeafer(null);
@@ -5658,8 +5754,6 @@ let Branch = class Branch extends Leaf {
     }
     __emitChildEvent(type, child) {
         const event = new ChildEvent(type, child, this);
-        if (child.hasEvent(type))
-            child.emitEvent(event);
         if (this.hasEvent(type) && !this.isLeafer)
             this.emitEvent(event);
         this.leafer.emitEvent(event);
@@ -5822,7 +5916,6 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.1";
-const inviteCode = {};
+const version = "1.0.4";
 
-export { AlignHelper, AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, useModule, version, visibleType };
+export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, needPlugin, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, useModule, version, visibleType };