@viewfly/core 1.0.0-alpha.12 → 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;
             }
         }
@@ -1291,7 +1295,7 @@ function createRenderer(component, nativeRenderer) {
         if (isInit) {
             isInit = false;
             const atom = {
-                type: 'component',
+                type: ComponentAtomType,
                 index: 0,
                 jsxNode: component,
                 sibling: null,
@@ -1312,12 +1316,12 @@ 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 === 'element') {
+    else if (type === ElementAtomType) {
         createElement(nativeRenderer, atom, parentComponent, context);
     }
     else {
@@ -1403,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 {
@@ -1413,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 {
@@ -1531,7 +1535,7 @@ function cleanView(nativeRenderer, atom, 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);
         }
@@ -1560,9 +1564,9 @@ function componentRender(nativeRenderer, component, from, context) {
     }
     component.rendered();
 }
-function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
+function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
     const atom = {
-        type: 'component',
+        type,
         index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
@@ -1573,38 +1577,11 @@ function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByJSXText(jsxNode, prevAtom, isSvg) {
-    const atom = {
-        type: 'text',
-        index: prevAtom.index + 1,
-        jsxNode,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        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;
-    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);
@@ -1612,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;
 }
@@ -1673,7 +1650,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
         if (listenerReg.test(key)) {
             const listener = props[key];
             if (typeof listener === 'function') {
-                bindEvent(nativeRenderer, jsxNode, key, nativeNode, listener, isSvg);
+                nativeRenderer.listen(nativeNode, key, listener, isSvg);
             }
             continue;
         }
@@ -1711,7 +1688,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     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') {
@@ -1731,9 +1707,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                const oldOn = oldVNode.on;
-                nativeRenderer.unListen(nativeNode, key, oldOn[key].delegate, isSvg);
-                Reflect.deleteProperty(oldOn, key);
+                nativeRenderer.unListen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1777,7 +1751,8 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
             continue;
         }
         if (listenerReg.test(key)) {
-            newVNode.on[key].listenFn = newValue;
+            nativeRenderer.unListen(nativeNode, key, oldValue, isSvg);
+            nativeRenderer.listen(nativeNode, key, newValue, isSvg);
             continue;
         }
         if (key === refKey) {
@@ -1806,7 +1781,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                bindEvent(nativeRenderer, newVNode, key, nativeNode, value, isSvg);
+                nativeRenderer.listen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1829,20 +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 delegateObj = {
-        delegate(...args) {
-            return delegateObj.listenFn.apply(this, args);
-        },
-        listenFn
-    };
-    on[key] = delegateObj;
-    nativeRenderer.listen(nativeNode, key, 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;
             }
         }
@@ -1293,7 +1297,7 @@ function createRenderer(component, nativeRenderer) {
         if (isInit) {
             isInit = false;
             const atom = {
-                type: 'component',
+                type: ComponentAtomType,
                 index: 0,
                 jsxNode: component,
                 sibling: null,
@@ -1314,12 +1318,12 @@ 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 === 'element') {
+    else if (type === ElementAtomType) {
         createElement(nativeRenderer, atom, parentComponent, context);
     }
     else {
@@ -1405,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 {
@@ -1415,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 {
@@ -1533,7 +1537,7 @@ function cleanView(nativeRenderer, atom, 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);
         }
@@ -1562,9 +1566,9 @@ function componentRender(nativeRenderer, component, from, context) {
     }
     component.rendered();
 }
-function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
+function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
     const atom = {
-        type: 'component',
+        type,
         index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
@@ -1575,38 +1579,11 @@ function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByJSXText(jsxNode, prevAtom, isSvg) {
-    const atom = {
-        type: 'text',
-        index: prevAtom.index + 1,
-        jsxNode,
-        sibling: null,
-        child: null,
-        nativeNode: null,
-        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;
-    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);
@@ -1614,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;
 }
@@ -1675,7 +1652,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
         if (listenerReg.test(key)) {
             const listener = props[key];
             if (typeof listener === 'function') {
-                bindEvent(nativeRenderer, jsxNode, key, nativeNode, listener, isSvg);
+                nativeRenderer.listen(nativeNode, key, listener, isSvg);
             }
             continue;
         }
@@ -1713,7 +1690,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     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') {
@@ -1733,9 +1709,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                const oldOn = oldVNode.on;
-                nativeRenderer.unListen(nativeNode, key, oldOn[key].delegate, isSvg);
-                Reflect.deleteProperty(oldOn, key);
+                nativeRenderer.unListen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1779,7 +1753,8 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
             continue;
         }
         if (listenerReg.test(key)) {
-            newVNode.on[key].listenFn = newValue;
+            nativeRenderer.unListen(nativeNode, key, oldValue, isSvg);
+            nativeRenderer.listen(nativeNode, key, newValue, isSvg);
             continue;
         }
         if (key === refKey) {
@@ -1808,7 +1783,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         if (listenerReg.test(key)) {
             if (typeof value === 'function') {
-                bindEvent(nativeRenderer, newVNode, key, nativeNode, value, isSvg);
+                nativeRenderer.listen(nativeNode, key, value, isSvg);
             }
             continue;
         }
@@ -1831,20 +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 delegateObj = {
-        delegate(...args) {
-            return delegateObj.listenFn.apply(this, args);
-        },
-        listenFn
-    };
-    on[key] = delegateObj;
-    nativeRenderer.listen(nativeNode, key, delegateObj.delegate, isSvg);
-}
 
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.12",
+  "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": "9e55375068bc3657f348f4b0be498111b61eee3c",
+  "gitHead": "ef79169385a2b104fc58cb0b38123443e5baccd7",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }