@viewfly/core 1.0.0-alpha.11 → 1.0.0-alpha.13

package/bundles/index.d.ts

@@ -211,45 +211,6 @@ declare abstract class NativeRenderer<ElementNode = NativeNode, TextNode = Nativ
     abstract insertAfter(newNode: ElementNode | TextNode, ref: ElementNode | TextNode, isSvg: boolean): void;
 }
 
-interface ListenDelegate {
-    delegate: () => any;
-    listenFn: ((...args: any[]) => any) | void;
-}
-interface TextAtom {
-    type: 'text';
-    index: number;
-    jsxNode: string;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-interface ElementAtom {
-    type: 'element';
-    index: number;
-    jsxNode: JSXNode<string>;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-interface ComponentAtom {
-    type: 'component';
-    index: number;
-    jsxNode: JSXNode<JSXInternal.ComponentSetup> | Component;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-type Atom = TextAtom | ElementAtom | ComponentAtom;
-interface ComponentView {
-    atom: Atom;
-    host: NativeNode;
-    isParent: boolean;
-    rootHost: NativeNode;
-}
-
 interface Props {
     children?: JSXInternal.ViewNode | JSXInternal.ViewNode[];
 }
@@ -261,7 +222,6 @@ interface JSXNode<T = string | JSXInternal.ComponentSetup> {
     type: T;
     props: Props & Record<string, any>;
     key?: Key;
-    on?: Record<string, ListenDelegate>;
 }
 declare const JSXNodeFactory: {
     createNode<T = string | JSXInternal.ComponentSetup<any>>(type: T, props: Props & Record<string, any>, key?: Key): JSXNode<T>;
@@ -560,6 +520,44 @@ declare global {
     }
 }
 
+declare const TextAtomType: unique symbol;
+declare const ElementAtomType: unique symbol;
+declare const ComponentAtomType: unique symbol;
+interface TextAtom {
+    type: typeof TextAtomType;
+    index: number;
+    jsxNode: string;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    isSvg: boolean;
+}
+interface ElementAtom {
+    type: typeof ElementAtomType;
+    index: number;
+    jsxNode: JSXNode<string>;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    isSvg: boolean;
+}
+interface ComponentAtom {
+    type: typeof ComponentAtomType;
+    index: number;
+    jsxNode: JSXNode<JSXInternal.ComponentSetup> | Component;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    isSvg: boolean;
+}
+type Atom = TextAtom | ElementAtom | ComponentAtom;
+interface ComponentView {
+    atom: Atom;
+    host: NativeNode;
+    isParent: boolean;
+    rootHost: NativeNode;
+}
+
 /**
  * Viewfly 配置项
  */

package/bundles/index.esm.js

@@ -634,6 +634,9 @@ function styleToObject(style) {
     });
     return obj;
 }
+const TextAtomType = Symbol('Text');
+const ElementAtomType = Symbol('Element');
+const ComponentAtomType = Symbol('Component');
 
 const componentSetupStack = [];
 const signalDepsStack = [];
@@ -741,8 +744,9 @@ class Component extends ReflectiveInjector {
         };
     }
     update(newProps, forceUpdate = false) {
+        const oldProps = this.props;
         if (!forceUpdate) {
-            const { add, remove, replace } = getObjectChanges(newProps, this.props);
+            const { add, remove, replace } = getObjectChanges(newProps, oldProps);
             if (add.length || remove.length || replace.length) {
                 this.invokePropsChangedHooks(newProps);
             }
@@ -766,7 +770,7 @@ class Component extends ReflectiveInjector {
             }
         }
         if (typeof this.instance.$useMemo === 'function') {
-            if (this.instance.$useMemo(newProps, this.props)) {
+            if (this.instance.$useMemo(newProps, oldProps)) {
                 return this.template;
             }
         }
@@ -1284,14 +1288,14 @@ function withMemo(canUseMemo, render) {
 }
 
 const componentViewCache = new WeakMap();
-const listenerReg = /^on(?=[A-Z])/;
+const listenerReg = /^on[A-Z]/;
 function createRenderer(component, nativeRenderer) {
     let isInit = true;
     return function render(host) {
         if (isInit) {
             isInit = false;
             const atom = {
-                type: 'component',
+                type: ComponentAtomType,
                 index: 0,
                 jsxNode: component,
                 sibling: null,
@@ -1312,41 +1316,28 @@ function createRenderer(component, nativeRenderer) {
 }
 function buildView(nativeRenderer, parentComponent, atom, context) {
     const { jsxNode, type } = atom;
-    if (type === 'component') {
+    if (type === ComponentAtomType) {
         const component = new Component(parentComponent, jsxNode.type, jsxNode.props, jsxNode.key);
         atom.jsxNode = component;
         componentRender(nativeRenderer, component, atom, context);
     }
+    else if (type === ElementAtomType) {
+        createElement(nativeRenderer, atom, parentComponent, context);
+    }
     else {
-        let nativeNode;
-        let applyRefs = null;
-        if (type === 'element') {
-            const { nativeNode: n, applyRefs: a } = createElement(nativeRenderer, jsxNode, atom.isSvg);
-            nativeNode = n;
-            applyRefs = a;
-        }
-        else {
-            nativeNode = createTextNode(nativeRenderer, jsxNode, atom.isSvg);
-        }
-        atom.nativeNode = nativeNode;
-        insertNode(nativeRenderer, atom, context);
-        if (type === 'element') {
-            const childContext = {
-                isParent: true,
-                host: nativeNode,
-                rootHost: context.rootHost
-            };
-            let child = atom.child;
-            while (child) {
-                buildView(nativeRenderer, parentComponent, child, childContext);
-                child = child.sibling;
-            }
-        }
-        context.host = nativeNode;
-        context.isParent = false;
-        if (applyRefs) {
-            applyRefs();
-        }
+        createTextNode(nativeRenderer, atom, context);
+    }
+}
+function buildElementChildren(atom, nativeRenderer, parentComponent, context) {
+    const childContext = {
+        isParent: true,
+        host: atom.nativeNode,
+        rootHost: context.rootHost
+    };
+    let child = atom.child;
+    while (child) {
+        buildView(nativeRenderer, parentComponent, child, childContext);
+        child = child.sibling;
     }
 }
 function updateView(nativeRenderer, component) {
@@ -1416,7 +1407,7 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
         const diffIndex = oldAtom.index;
         if (type === oldAtom.type) {
             let commit;
-            if (type === 'text') {
+            if (type === TextAtomType) {
                 commit = updateText(newAtom, oldAtom, nativeRenderer, context);
             }
             else {
@@ -1426,7 +1417,7 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
                     oldAtom = oldAtom.sibling;
                     continue;
                 }
-                if (type === 'component') {
+                if (type === ComponentAtomType) {
                     commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
                 }
                 else {
@@ -1472,23 +1463,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         }
         context.host = newAtom.nativeNode;
         context.isParent = false;
-        const applyRefs = updateNativeNodeProperties(nativeRenderer, newAtom.jsxNode, oldAtom.jsxNode, newAtom.nativeNode, newAtom.isSvg);
-        if (newAtom.child) {
-            diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
-                host: newAtom.nativeNode,
-                isParent: true,
-                rootHost: context.rootHost
-            });
-        }
-        else if (oldAtom.child) {
-            let atom = oldAtom.child;
-            nativeRenderer.cleanChildren(oldAtom.nativeNode, oldAtom.isSvg);
-            while (atom) {
-                cleanView(nativeRenderer, atom, false);
-                atom = atom.sibling;
-            }
-        }
-        applyRefs();
+        updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
 function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
@@ -1546,13 +1521,21 @@ function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveVi
         child = child.sibling;
     }
 }
+function cleanElementChildren(atom, nativeRenderer) {
+    let child = atom.child;
+    nativeRenderer.cleanChildren(atom.nativeNode, atom.isSvg);
+    while (child) {
+        cleanView(nativeRenderer, child, false);
+        child = child.sibling;
+    }
+}
 function cleanView(nativeRenderer, atom, needClean) {
     if (atom.nativeNode) {
         if (needClean) {
             nativeRenderer.remove(atom.nativeNode, atom.isSvg);
             needClean = false;
         }
-        if (atom.type === 'element') {
+        if (atom.type === ElementAtomType) {
             const ref = atom.jsxNode.props[refKey];
             applyRefs(ref, atom.nativeNode, false);
         }
@@ -1581,22 +1564,9 @@ function componentRender(nativeRenderer, component, from, context) {
     }
     component.rendered();
 }
-function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
-    const atom = {
-        type: 'component',
-        index: prevAtom.index + 1,
-        jsxNode,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        isSvg
-    };
-    prevAtom.sibling = atom;
-    return atom;
-}
-function createChainByJSXText(jsxNode, prevAtom, isSvg) {
+function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
     const atom = {
-        type: 'text',
+        type,
         index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
@@ -1607,26 +1577,11 @@ function createChainByJSXText(jsxNode, prevAtom, isSvg) {
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByJSXElement(element, prevAtom, isSvg) {
-    isSvg = isSvg || element.type === 'svg';
-    const atom = {
-        type: 'element',
-        index: prevAtom.index + 1,
-        jsxNode: element,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        isSvg
-    };
-    prevAtom.sibling = atom;
-    atom.child = createChildChain(element.props.children, isSvg);
-    return atom;
-}
 function createChainByNode(jsxNode, prevAtom, isSvg) {
     const type = typeof jsxNode;
     if (jsxNode !== null && type !== 'undefined' && type !== 'boolean') {
         if (typeof jsxNode === 'string') {
-            return createChainByJSXText(jsxNode, prevAtom, isSvg);
+            return createChainByJSXNode(TextAtomType, jsxNode, prevAtom, isSvg);
         }
         if (Array.isArray(jsxNode)) {
             return createChainByChildren(jsxNode, prevAtom, isSvg);
@@ -1634,13 +1589,13 @@ function createChainByNode(jsxNode, prevAtom, isSvg) {
         if (type === 'object') {
             const nodeType = typeof jsxNode.type;
             if (nodeType === 'string') {
-                return createChainByJSXElement(jsxNode, prevAtom, isSvg);
+                return createChainByJSXNode(ElementAtomType, jsxNode, prevAtom, isSvg || jsxNode.type === 'svg');
             }
             else if (nodeType === 'function') {
-                return createChainByJSXComponent(jsxNode, prevAtom, isSvg);
+                return createChainByJSXNode(ComponentAtomType, jsxNode, prevAtom, isSvg);
             }
         }
-        return createChainByJSXText(String(jsxNode), prevAtom, isSvg);
+        return createChainByJSXNode(TextAtomType, String(jsxNode), prevAtom, isSvg);
     }
     return prevAtom;
 }
@@ -1668,12 +1623,14 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.isSvg);
     }
 }
-function createElement(nativeRenderer, vNode, isSvg) {
-    const nativeNode = nativeRenderer.createElement(vNode.type, isSvg);
-    const props = vNode.props;
+function createElement(nativeRenderer, atom, parentComponent, context) {
+    const { isSvg, jsxNode } = atom;
+    const nativeNode = nativeRenderer.createElement(jsxNode.type, isSvg);
+    const props = jsxNode.props;
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
+            atom.child = createChildChain(jsxNode.props.children, isSvg);
             continue;
         }
         if (key === 'class') {
@@ -1693,7 +1650,7 @@ function createElement(nativeRenderer, vNode, isSvg) {
         if (listenerReg.test(key)) {
             const listener = props[key];
             if (typeof listener === 'function') {
-                bindEvent(nativeRenderer, vNode, key, nativeNode, listener, isSvg);
+                nativeRenderer.listen(nativeNode, key, listener, isSvg);
             }
             continue;
         }
@@ -1703,28 +1660,39 @@ function createElement(nativeRenderer, vNode, isSvg) {
         }
         nativeRenderer.setProperty(nativeNode, key, props[key], isSvg);
     }
-    return {
-        nativeNode,
-        applyRefs: () => {
-            applyRefs(bindingRefs, nativeNode, true);
-        }
-    };
-}
-function createTextNode(nativeRenderer, text, isSvg) {
-    return nativeRenderer.createTextNode(text, isSvg);
-}
-function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNode, isSvg) {
+    atom.nativeNode = nativeNode;
+    insertNode(nativeRenderer, atom, context);
+    buildElementChildren(atom, nativeRenderer, parentComponent, context);
+    context.host = nativeNode;
+    context.isParent = false;
+    applyRefs(bindingRefs, nativeNode, true);
+}
+function createTextNode(nativeRenderer, atom, context) {
+    const nativeNode = nativeRenderer.createTextNode(atom.jsxNode, atom.isSvg);
+    atom.nativeNode = nativeNode;
+    insertNode(nativeRenderer, atom, context);
+    context.host = nativeNode;
+    context.isParent = false;
+}
+function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context) {
+    const newVNode = newAtom.jsxNode;
+    const isSvg = newAtom.isSvg;
+    const nativeNode = newAtom.nativeNode;
+    const oldVNode = oldAtom.jsxNode;
     if (newVNode === oldVNode) {
-        return () => {
-            //
-        };
+        parentComponent.changedSubComponents.forEach(child => {
+            updateView(nativeRenderer, child);
+        });
+        return;
     }
     const changes = getObjectChanges(newVNode.props, oldVNode.props);
     let unBindRefs;
     let bindRefs;
-    newVNode.on = oldVNode.on;
+    newAtom.child = oldAtom.child;
     for (const [key, value] of changes.remove) {
         if (key === 'children') {
+            cleanElementChildren(oldAtom, nativeRenderer);
+            newAtom.child = null;
             continue;
         }
         if (key === 'class') {
@@ -1739,10 +1707,7 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                const type = key.replace(listenerReg, '').toLowerCase();
-                const oldOn = oldVNode.on;
-                nativeRenderer.unListen(nativeNode, type, oldOn[type].delegate, isSvg);
-                Reflect.deleteProperty(oldOn, type);
+                nativeRenderer.unListen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1754,6 +1719,17 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
     }
     for (const [key, newValue, oldValue] of changes.replace) {
         if (key === 'children') {
+            newAtom.child = createChildChain(newValue, isSvg);
+            if (!newAtom.child) {
+                cleanElementChildren(oldAtom, nativeRenderer);
+            }
+            else {
+                diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
+                    host: newAtom.nativeNode,
+                    isParent: true,
+                    rootHost: context.rootHost
+                });
+            }
             continue;
         }
         if (key === 'class') {
@@ -1775,8 +1751,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
             continue;
         }
         if (listenerReg.test(key)) {
-            const listenType = key.replace(listenerReg, '').toLowerCase();
-            newVNode.on[listenType].listenFn = newValue;
+            nativeRenderer.unListen(nativeNode, key, oldValue, isSvg);
+            nativeRenderer.listen(nativeNode, key, newValue, isSvg);
             continue;
         }
         if (key === refKey) {
@@ -1788,6 +1764,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
     }
     for (const [key, value] of changes.add) {
         if (key === 'children') {
+            newAtom.child = createChildChain(value, isSvg);
+            buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             continue;
         }
         if (key === 'class') {
@@ -1803,7 +1781,7 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                bindEvent(nativeRenderer, newVNode, key, nativeNode, value, isSvg);
+                nativeRenderer.listen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1813,10 +1791,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         nativeRenderer.setProperty(nativeNode, key, value, isSvg);
     }
-    return () => {
-        applyRefs(unBindRefs, nativeNode, false);
-        applyRefs(bindRefs, nativeNode, true);
-    };
+    applyRefs(unBindRefs, nativeNode, false);
+    applyRefs(bindRefs, nativeNode, true);
 }
 function applyRefs(refs, nativeNode, binding) {
     if (refs) {
@@ -1828,21 +1804,6 @@ function applyRefs(refs, nativeNode, binding) {
         }
     }
 }
-function bindEvent(nativeRenderer, vNode, key, nativeNode, listenFn, isSvg) {
-    let on = vNode.on;
-    if (!on) {
-        vNode.on = on = {};
-    }
-    const type = key.replace(listenerReg, '').toLowerCase();
-    const delegateObj = {
-        delegate(...args) {
-            return delegateObj.listenFn.apply(this, args);
-        },
-        listenFn
-    };
-    on[type] = delegateObj;
-    nativeRenderer.listen(nativeNode, type, delegateObj.delegate, isSvg);
-}
 
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知

package/bundles/index.js

@@ -636,6 +636,9 @@ function styleToObject(style) {
     });
     return obj;
 }
+const TextAtomType = Symbol('Text');
+const ElementAtomType = Symbol('Element');
+const ComponentAtomType = Symbol('Component');
 
 const componentSetupStack = [];
 const signalDepsStack = [];
@@ -743,8 +746,9 @@ class Component extends ReflectiveInjector {
         };
     }
     update(newProps, forceUpdate = false) {
+        const oldProps = this.props;
         if (!forceUpdate) {
-            const { add, remove, replace } = getObjectChanges(newProps, this.props);
+            const { add, remove, replace } = getObjectChanges(newProps, oldProps);
             if (add.length || remove.length || replace.length) {
                 this.invokePropsChangedHooks(newProps);
             }
@@ -768,7 +772,7 @@ class Component extends ReflectiveInjector {
             }
         }
         if (typeof this.instance.$useMemo === 'function') {
-            if (this.instance.$useMemo(newProps, this.props)) {
+            if (this.instance.$useMemo(newProps, oldProps)) {
                 return this.template;
             }
         }
@@ -1286,14 +1290,14 @@ function withMemo(canUseMemo, render) {
 }
 
 const componentViewCache = new WeakMap();
-const listenerReg = /^on(?=[A-Z])/;
+const listenerReg = /^on[A-Z]/;
 function createRenderer(component, nativeRenderer) {
     let isInit = true;
     return function render(host) {
         if (isInit) {
             isInit = false;
             const atom = {
-                type: 'component',
+                type: ComponentAtomType,
                 index: 0,
                 jsxNode: component,
                 sibling: null,
@@ -1314,41 +1318,28 @@ function createRenderer(component, nativeRenderer) {
 }
 function buildView(nativeRenderer, parentComponent, atom, context) {
     const { jsxNode, type } = atom;
-    if (type === 'component') {
+    if (type === ComponentAtomType) {
         const component = new Component(parentComponent, jsxNode.type, jsxNode.props, jsxNode.key);
         atom.jsxNode = component;
         componentRender(nativeRenderer, component, atom, context);
     }
+    else if (type === ElementAtomType) {
+        createElement(nativeRenderer, atom, parentComponent, context);
+    }
     else {
-        let nativeNode;
-        let applyRefs = null;
-        if (type === 'element') {
-            const { nativeNode: n, applyRefs: a } = createElement(nativeRenderer, jsxNode, atom.isSvg);
-            nativeNode = n;
-            applyRefs = a;
-        }
-        else {
-            nativeNode = createTextNode(nativeRenderer, jsxNode, atom.isSvg);
-        }
-        atom.nativeNode = nativeNode;
-        insertNode(nativeRenderer, atom, context);
-        if (type === 'element') {
-            const childContext = {
-                isParent: true,
-                host: nativeNode,
-                rootHost: context.rootHost
-            };
-            let child = atom.child;
-            while (child) {
-                buildView(nativeRenderer, parentComponent, child, childContext);
-                child = child.sibling;
-            }
-        }
-        context.host = nativeNode;
-        context.isParent = false;
-        if (applyRefs) {
-            applyRefs();
-        }
+        createTextNode(nativeRenderer, atom, context);
+    }
+}
+function buildElementChildren(atom, nativeRenderer, parentComponent, context) {
+    const childContext = {
+        isParent: true,
+        host: atom.nativeNode,
+        rootHost: context.rootHost
+    };
+    let child = atom.child;
+    while (child) {
+        buildView(nativeRenderer, parentComponent, child, childContext);
+        child = child.sibling;
     }
 }
 function updateView(nativeRenderer, component) {
@@ -1418,7 +1409,7 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
         const diffIndex = oldAtom.index;
         if (type === oldAtom.type) {
             let commit;
-            if (type === 'text') {
+            if (type === TextAtomType) {
                 commit = updateText(newAtom, oldAtom, nativeRenderer, context);
             }
             else {
@@ -1428,7 +1419,7 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
                     oldAtom = oldAtom.sibling;
                     continue;
                 }
-                if (type === 'component') {
+                if (type === ComponentAtomType) {
                     commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
                 }
                 else {
@@ -1474,23 +1465,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         }
         context.host = newAtom.nativeNode;
         context.isParent = false;
-        const applyRefs = updateNativeNodeProperties(nativeRenderer, newAtom.jsxNode, oldAtom.jsxNode, newAtom.nativeNode, newAtom.isSvg);
-        if (newAtom.child) {
-            diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
-                host: newAtom.nativeNode,
-                isParent: true,
-                rootHost: context.rootHost
-            });
-        }
-        else if (oldAtom.child) {
-            let atom = oldAtom.child;
-            nativeRenderer.cleanChildren(oldAtom.nativeNode, oldAtom.isSvg);
-            while (atom) {
-                cleanView(nativeRenderer, atom, false);
-                atom = atom.sibling;
-            }
-        }
-        applyRefs();
+        updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
 function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
@@ -1548,13 +1523,21 @@ function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveVi
         child = child.sibling;
     }
 }
+function cleanElementChildren(atom, nativeRenderer) {
+    let child = atom.child;
+    nativeRenderer.cleanChildren(atom.nativeNode, atom.isSvg);
+    while (child) {
+        cleanView(nativeRenderer, child, false);
+        child = child.sibling;
+    }
+}
 function cleanView(nativeRenderer, atom, needClean) {
     if (atom.nativeNode) {
         if (needClean) {
             nativeRenderer.remove(atom.nativeNode, atom.isSvg);
             needClean = false;
         }
-        if (atom.type === 'element') {
+        if (atom.type === ElementAtomType) {
             const ref = atom.jsxNode.props[refKey];
             applyRefs(ref, atom.nativeNode, false);
         }
@@ -1583,22 +1566,9 @@ function componentRender(nativeRenderer, component, from, context) {
     }
     component.rendered();
 }
-function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
-    const atom = {
-        type: 'component',
-        index: prevAtom.index + 1,
-        jsxNode,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        isSvg
-    };
-    prevAtom.sibling = atom;
-    return atom;
-}
-function createChainByJSXText(jsxNode, prevAtom, isSvg) {
+function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
     const atom = {
-        type: 'text',
+        type,
         index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
@@ -1609,26 +1579,11 @@ function createChainByJSXText(jsxNode, prevAtom, isSvg) {
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByJSXElement(element, prevAtom, isSvg) {
-    isSvg = isSvg || element.type === 'svg';
-    const atom = {
-        type: 'element',
-        index: prevAtom.index + 1,
-        jsxNode: element,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        isSvg
-    };
-    prevAtom.sibling = atom;
-    atom.child = createChildChain(element.props.children, isSvg);
-    return atom;
-}
 function createChainByNode(jsxNode, prevAtom, isSvg) {
     const type = typeof jsxNode;
     if (jsxNode !== null && type !== 'undefined' && type !== 'boolean') {
         if (typeof jsxNode === 'string') {
-            return createChainByJSXText(jsxNode, prevAtom, isSvg);
+            return createChainByJSXNode(TextAtomType, jsxNode, prevAtom, isSvg);
         }
         if (Array.isArray(jsxNode)) {
             return createChainByChildren(jsxNode, prevAtom, isSvg);
@@ -1636,13 +1591,13 @@ function createChainByNode(jsxNode, prevAtom, isSvg) {
         if (type === 'object') {
             const nodeType = typeof jsxNode.type;
             if (nodeType === 'string') {
-                return createChainByJSXElement(jsxNode, prevAtom, isSvg);
+                return createChainByJSXNode(ElementAtomType, jsxNode, prevAtom, isSvg || jsxNode.type === 'svg');
             }
             else if (nodeType === 'function') {
-                return createChainByJSXComponent(jsxNode, prevAtom, isSvg);
+                return createChainByJSXNode(ComponentAtomType, jsxNode, prevAtom, isSvg);
             }
         }
-        return createChainByJSXText(String(jsxNode), prevAtom, isSvg);
+        return createChainByJSXNode(TextAtomType, String(jsxNode), prevAtom, isSvg);
     }
     return prevAtom;
 }
@@ -1670,12 +1625,14 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.isSvg);
     }
 }
-function createElement(nativeRenderer, vNode, isSvg) {
-    const nativeNode = nativeRenderer.createElement(vNode.type, isSvg);
-    const props = vNode.props;
+function createElement(nativeRenderer, atom, parentComponent, context) {
+    const { isSvg, jsxNode } = atom;
+    const nativeNode = nativeRenderer.createElement(jsxNode.type, isSvg);
+    const props = jsxNode.props;
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
+            atom.child = createChildChain(jsxNode.props.children, isSvg);
             continue;
         }
         if (key === 'class') {
@@ -1695,7 +1652,7 @@ function createElement(nativeRenderer, vNode, isSvg) {
         if (listenerReg.test(key)) {
             const listener = props[key];
             if (typeof listener === 'function') {
-                bindEvent(nativeRenderer, vNode, key, nativeNode, listener, isSvg);
+                nativeRenderer.listen(nativeNode, key, listener, isSvg);
             }
             continue;
         }
@@ -1705,28 +1662,39 @@ function createElement(nativeRenderer, vNode, isSvg) {
         }
         nativeRenderer.setProperty(nativeNode, key, props[key], isSvg);
     }
-    return {
-        nativeNode,
-        applyRefs: () => {
-            applyRefs(bindingRefs, nativeNode, true);
-        }
-    };
-}
-function createTextNode(nativeRenderer, text, isSvg) {
-    return nativeRenderer.createTextNode(text, isSvg);
-}
-function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNode, isSvg) {
+    atom.nativeNode = nativeNode;
+    insertNode(nativeRenderer, atom, context);
+    buildElementChildren(atom, nativeRenderer, parentComponent, context);
+    context.host = nativeNode;
+    context.isParent = false;
+    applyRefs(bindingRefs, nativeNode, true);
+}
+function createTextNode(nativeRenderer, atom, context) {
+    const nativeNode = nativeRenderer.createTextNode(atom.jsxNode, atom.isSvg);
+    atom.nativeNode = nativeNode;
+    insertNode(nativeRenderer, atom, context);
+    context.host = nativeNode;
+    context.isParent = false;
+}
+function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context) {
+    const newVNode = newAtom.jsxNode;
+    const isSvg = newAtom.isSvg;
+    const nativeNode = newAtom.nativeNode;
+    const oldVNode = oldAtom.jsxNode;
     if (newVNode === oldVNode) {
-        return () => {
-            //
-        };
+        parentComponent.changedSubComponents.forEach(child => {
+            updateView(nativeRenderer, child);
+        });
+        return;
     }
     const changes = getObjectChanges(newVNode.props, oldVNode.props);
     let unBindRefs;
     let bindRefs;
-    newVNode.on = oldVNode.on;
+    newAtom.child = oldAtom.child;
     for (const [key, value] of changes.remove) {
         if (key === 'children') {
+            cleanElementChildren(oldAtom, nativeRenderer);
+            newAtom.child = null;
             continue;
         }
         if (key === 'class') {
@@ -1741,10 +1709,7 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                const type = key.replace(listenerReg, '').toLowerCase();
-                const oldOn = oldVNode.on;
-                nativeRenderer.unListen(nativeNode, type, oldOn[type].delegate, isSvg);
-                Reflect.deleteProperty(oldOn, type);
+                nativeRenderer.unListen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1756,6 +1721,17 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
     }
     for (const [key, newValue, oldValue] of changes.replace) {
         if (key === 'children') {
+            newAtom.child = createChildChain(newValue, isSvg);
+            if (!newAtom.child) {
+                cleanElementChildren(oldAtom, nativeRenderer);
+            }
+            else {
+                diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
+                    host: newAtom.nativeNode,
+                    isParent: true,
+                    rootHost: context.rootHost
+                });
+            }
             continue;
         }
         if (key === 'class') {
@@ -1777,8 +1753,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
             continue;
         }
         if (listenerReg.test(key)) {
-            const listenType = key.replace(listenerReg, '').toLowerCase();
-            newVNode.on[listenType].listenFn = newValue;
+            nativeRenderer.unListen(nativeNode, key, oldValue, isSvg);
+            nativeRenderer.listen(nativeNode, key, newValue, isSvg);
             continue;
         }
         if (key === refKey) {
@@ -1790,6 +1766,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
     }
     for (const [key, value] of changes.add) {
         if (key === 'children') {
+            newAtom.child = createChildChain(value, isSvg);
+            buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             continue;
         }
         if (key === 'class') {
@@ -1805,7 +1783,7 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                bindEvent(nativeRenderer, newVNode, key, nativeNode, value, isSvg);
+                nativeRenderer.listen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1815,10 +1793,8 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         nativeRenderer.setProperty(nativeNode, key, value, isSvg);
     }
-    return () => {
-        applyRefs(unBindRefs, nativeNode, false);
-        applyRefs(bindRefs, nativeNode, true);
-    };
+    applyRefs(unBindRefs, nativeNode, false);
+    applyRefs(bindRefs, nativeNode, true);
 }
 function applyRefs(refs, nativeNode, binding) {
     if (refs) {
@@ -1830,21 +1806,6 @@ function applyRefs(refs, nativeNode, binding) {
         }
     }
 }
-function bindEvent(nativeRenderer, vNode, key, nativeNode, listenFn, isSvg) {
-    let on = vNode.on;
-    if (!on) {
-        vNode.on = on = {};
-    }
-    const type = key.replace(listenerReg, '').toLowerCase();
-    const delegateObj = {
-        delegate(...args) {
-            return delegateObj.listenFn.apply(this, args);
-        },
-        listenFn
-    };
-    on[type] = delegateObj;
-    nativeRenderer.listen(nativeNode, type, delegateObj.delegate, isSvg);
-}
 
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Viewfly is a simple and easy-to-use JavaScript framework with an intuitive development experience.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -50,7 +50,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "723da75a9e8e13e8addbe4646358667f476e06f3",
+  "gitHead": "ef79169385a2b104fc58cb0b38123443e5baccd7",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }