@viewfly/core 1.0.0-alpha.9 → 1.0.0

package/bundles/index.esm.js

@@ -234,9 +234,8 @@ const THROW_IF_NOT_FOUND = {
 const nullInjectorErrorFn = (token) => {
     return makeError('NullInjector')(`No provide for \`${stringify(token)}\`!`);
 };
-class NullInjector extends Injector {
+class NullInjector {
     constructor() {
-        super(...arguments);
         this.parentInjector = null;
     }
     /* eslint-disable-next-line */
@@ -411,11 +410,9 @@ const provideScopeError = (token) => {
 /**
  * 反射注入器
  */
-class ReflectiveInjector extends Injector {
+class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        super();
         this.parentInjector = parentInjector;
-        this.staticProviders = staticProviders;
         this.scope = scope;
         this.recordValues = new Map();
         this.normalizedProviders = staticProviders.map(provide => {
@@ -634,6 +631,9 @@ function styleToObject(style) {
     });
     return obj;
 }
+const TextAtomType = Symbol('Text');
+const ElementAtomType = Symbol('Element');
+const ComponentAtomType = Symbol('Component');
 
 const componentSetupStack = [];
 const signalDepsStack = [];
@@ -740,16 +740,13 @@ class Component extends ReflectiveInjector {
             portalHost: this.instance.$portalHost
         };
     }
-    update(newProps, forceUpdate = false) {
-        if (!forceUpdate) {
-            const { add, remove, replace } = getObjectChanges(newProps, this.props);
+    update(newProps) {
+        const oldProps = this.props;
+        if (newProps !== oldProps) {
+            const { add, remove, replace } = getObjectChanges(newProps, oldProps);
             if (add.length || remove.length || replace.length) {
                 this.invokePropsChangedHooks(newProps);
             }
-            else if (!this.dirty) {
-                this.props = newProps;
-                return this.template;
-            }
             const newRefs = toRefs(newProps.ref);
             if (this.refs) {
                 for (const oldRef of this.refs) {
@@ -766,7 +763,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,15 +1281,16 @@ 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,
+                nodeType: component.type,
                 jsxNode: component,
                 sibling: null,
                 child: null,
@@ -1312,41 +1310,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) {
@@ -1364,14 +1349,14 @@ function updateView(nativeRenderer, component) {
 function applyChanges(nativeRenderer, component) {
     const { atom, host, isParent, rootHost } = componentViewCache.get(component);
     const diffAtom = atom.child;
-    const template = component.update(component.props, true);
+    const template = component.update(component.props);
     atom.child = createChildChain(template, atom.isSvg);
     const context = {
         host,
         isParent,
         rootHost
     };
-    diff(nativeRenderer, component, atom.child, diffAtom, context);
+    diff(nativeRenderer, component, atom.child, diffAtom, context, false);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
         const view = componentViewCache.get(next.jsxNode);
@@ -1379,7 +1364,7 @@ function applyChanges(nativeRenderer, component) {
         view.isParent = context.isParent;
     }
 }
-function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
+function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
     const commits = [];
     function changeOffset() {
         offset++;
@@ -1404,34 +1389,24 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
             }
             break;
         }
-        commit(offset);
+        commit(offset, needMove);
     }
 }
 function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
     const startDiffAtom = oldAtom;
-    const { jsxNode: newJsxNode, type } = newAtom;
-    const key = newJsxNode.key;
     let prev = null;
     while (oldAtom) {
-        const diffIndex = oldAtom.index;
-        if (type === oldAtom.type) {
+        const newAtomType = newAtom.type;
+        if (oldAtom.type === newAtomType && oldAtom.nodeType === newAtom.nodeType && oldAtom.key === newAtom.key) {
             let commit;
-            if (type === 'text') {
+            if (newAtomType === TextAtomType) {
                 commit = updateText(newAtom, oldAtom, nativeRenderer, context);
             }
+            else if (newAtomType === ComponentAtomType) {
+                commit = updateComponent(newAtom, oldAtom, nativeRenderer, context);
+            }
             else {
-                const { key: diffKey, type: diffType } = oldAtom.jsxNode;
-                if (diffKey !== key || newJsxNode.type !== diffType) {
-                    prev = oldAtom;
-                    oldAtom = oldAtom.sibling;
-                    continue;
-                }
-                if (type === 'component') {
-                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
-                }
-                else {
-                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
-                }
+                commit = updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent);
             }
             commits.push(commit);
             const next = oldAtom.sibling;
@@ -1454,49 +1429,29 @@ function createNewView(start, nativeRenderer, context, parentComponent, effect)
     };
 }
 function updateText(newAtom, oldAtom, nativeRenderer, context) {
-    return function () {
+    return function (offset, needMove) {
         const nativeNode = oldAtom.nativeNode;
-        if (newAtom.jsxNode !== oldAtom.jsxNode) {
-            nativeRenderer.syncTextContent(nativeNode, newAtom.jsxNode, newAtom.isSvg);
-        }
         newAtom.nativeNode = nativeNode;
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
+            insertNode(nativeRenderer, newAtom, context);
+        }
         context.host = nativeNode;
         context.isParent = false;
     };
 }
-function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer, context, parentComponent) {
-    return function (offset) {
+function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent) {
+    return function (offset, needMove) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (expectIndex - offset !== oldIndex) {
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
         context.isParent = false;
-        if (newAtom.jsxNode === oldAtom.jsxNode) {
-            newAtom.child = oldAtom.child;
-            return;
-        }
-        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) {
-    return function (offset) {
+function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
+    return function (offset, needMove) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
         const oldTemplate = component.template;
@@ -1506,15 +1461,16 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
-            updateView(nativeRenderer, component);
+            newAtom.child = reusedAtom.child;
+            reuseComponentView(nativeRenderer, newAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
+            component.rendered();
             return;
         }
         if (newTemplate) {
             newAtom.child = createChildChain(newTemplate, newAtom.isSvg);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1526,9 +1482,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         component.rendered();
     };
 }
-function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
-    let child = reusedAtom.child;
-    newAtom.child = child;
+function reuseComponentView(nativeRenderer, child, context, moveView) {
     const updateContext = (atom) => {
         if (atom.jsxNode instanceof Component) {
             let child = atom.child;
@@ -1550,13 +1504,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);
         }
@@ -1585,52 +1547,26 @@ 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, nodeType, prevAtom, isSvg, key) {
     const atom = {
-        type: 'text',
+        type,
         index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
         child: null,
         nativeNode: null,
-        isSvg
+        isSvg,
+        nodeType,
+        key
     };
     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, jsxNode, prevAtom, isSvg);
         }
         if (Array.isArray(jsxNode)) {
             return createChainByChildren(jsxNode, prevAtom, isSvg);
@@ -1638,13 +1574,14 @@ 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, jsxNode.type, prevAtom, isSvg || jsxNode.type === 'svg', jsxNode.key);
             }
             else if (nodeType === 'function') {
-                return createChainByJSXComponent(jsxNode, prevAtom, isSvg);
+                return createChainByJSXNode(ComponentAtomType, jsxNode, jsxNode.type, prevAtom, isSvg, jsxNode.key);
             }
         }
-        return createChainByJSXText(String(jsxNode), prevAtom, isSvg);
+        const text = String(jsxNode);
+        return createChainByJSXNode(TextAtomType, text, text, prevAtom, isSvg);
     }
     return prevAtom;
 }
@@ -1672,12 +1609,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') {
@@ -1697,7 +1636,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;
         }
@@ -1707,21 +1646,32 @@ 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) {
+        updateElementChildren(newAtom, oldAtom, nativeRenderer, parentComponent, context, isSvg);
+        return;
+    }
     const changes = getObjectChanges(newVNode.props, oldVNode.props);
     let unBindRefs;
     let bindRefs;
-    newVNode.on = oldVNode.on;
     for (const [key, value] of changes.remove) {
         if (key === 'children') {
             continue;
@@ -1738,10 +1688,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;
         }
@@ -1774,8 +1721,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) {
@@ -1802,7 +1749,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;
         }
@@ -1812,10 +1759,39 @@ function updateNativeNodeProperties(nativeRenderer, newVNode, oldVNode, nativeNo
         }
         nativeRenderer.setProperty(nativeNode, key, value, isSvg);
     }
-    return () => {
-        applyRefs(unBindRefs, nativeNode, false);
-        applyRefs(bindRefs, nativeNode, true);
-    };
+    updateElementChildren(newAtom, oldAtom, nativeRenderer, parentComponent, context, isSvg);
+    applyRefs(unBindRefs, nativeNode, false);
+    applyRefs(bindRefs, nativeNode, true);
+}
+function updateElementChildren(newAtom, oldAtom, nativeRenderer, parentComponent, context, isSvg) {
+    /**
+     * 不能仅依赖 children 是否相等的判断来确定是否要继续向下 diff
+     * 如：
+     * ```tsx
+     * <Comp>
+     *   <div>
+     *     {props.children}
+     *   </div>
+     * </Comp>
+     * ```
+     * 其中当 Comp 产生变化时，children 来自父组件，这时 children 是相等的，
+     * 但，children 内可能有子组件也发生了变化，如果不继续 diff，那么，子组件
+     * 的视图更新将不会发生
+     */
+    newAtom.child = createChildChain(newAtom.jsxNode.props.children, isSvg);
+    if (!newAtom.child) {
+        // 防止删除用户手动添加的元素
+        if (oldAtom.child) {
+            cleanElementChildren(oldAtom, nativeRenderer);
+        }
+    }
+    else {
+        diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
+            host: newAtom.nativeNode,
+            isParent: true,
+            rootHost: context.rootHost
+        }, false);
+    }
 }
 function applyRefs(refs, nativeNode, binding) {
     if (refs) {
@@ -1827,21 +1803,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 根组件，用于实现组件状态更新事件通知