@viewfly/core 1.0.0-alpha.6 → 1.0.0-alpha.7

package/bundles/index.esm.js

@@ -591,13 +591,13 @@ function getArrayChanges(left, right) {
     return changes;
 }
 function classToString(config) {
-    if (!config) {
-        return '';
-    }
     if (typeof config === 'string') {
         return config;
     }
-    else if (Array.isArray(config)) {
+    if (!config) {
+        return '';
+    }
+    if (Array.isArray(config)) {
         const classes = [];
         for (const i of config) {
             const v = classToString(i);
@@ -607,7 +607,7 @@ function classToString(config) {
         }
         return classes.join(' ');
     }
-    else if (typeof config === 'object') {
+    if (typeof config === 'object') {
         if (config.toString !== Object.prototype.toString && !config.toString.toString().includes('[native code]')) {
             return config.toString();
         }
@@ -741,30 +741,32 @@ class Component extends ReflectiveInjector {
         };
     }
     update(newProps, forceUpdate = false) {
-        const oldProps = this.props;
-        const { add, remove, replace } = getObjectChanges(newProps, this.props);
-        if (add.length || remove.length || replace.length) {
-            this.invokePropsChangedHooks(newProps);
-        }
-        else if (!this.dirty) {
-            return this.template;
-        }
-        const newRefs = toRefs(newProps.ref);
-        if (this.refs) {
-            for (const oldRef of this.refs) {
-                if (!newRefs.includes(oldRef)) {
-                    oldRef.unBind(this.instance);
+        if (!forceUpdate) {
+            const { add, remove, replace } = getObjectChanges(newProps, this.props);
+            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) {
+                    if (!newRefs.includes(oldRef)) {
+                        oldRef.unBind(this.instance);
+                    }
                 }
             }
+            for (const newRef of newRefs) {
+                newRef.bind(this.instance);
+            }
+            if (newRefs.length) {
+                this.refs = newRefs;
+            }
         }
-        for (const newRef of newRefs) {
-            newRef.bind(this.instance);
-        }
-        if (newRefs.length) {
-            this.refs = newRefs;
-        }
-        if (!forceUpdate && typeof this.instance.$useMemo === 'function') {
-            if (this.instance.$useMemo(newProps, oldProps)) {
+        if (typeof this.instance.$useMemo === 'function') {
+            if (this.instance.$useMemo(newProps, this.props)) {
                 return this.template;
             }
         }
@@ -1386,7 +1388,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
     }
     let dirtyDiffAtom = oldAtom;
     while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom, false);
+        cleanView(nativeRenderer, dirtyDiffAtom, true);
         dirtyDiffAtom = dirtyDiffAtom.sibling;
     }
     let offset = 0;
@@ -1480,7 +1482,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
             let atom = oldAtom.child;
             nativeRenderer.cleanChildren(oldAtom.nativeNode, oldAtom.isSvg);
             while (atom) {
-                cleanView(nativeRenderer, atom, true);
+                cleanView(nativeRenderer, atom, false);
                 atom = atom.sibling;
             }
         }
@@ -1511,7 +1513,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
             while (atom) {
-                cleanView(nativeRenderer, atom, false);
+                cleanView(nativeRenderer, atom, true);
                 atom = atom.sibling;
             }
         }
@@ -1544,9 +1546,9 @@ function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveVi
 }
 function cleanView(nativeRenderer, atom, needClean) {
     if (atom.nativeNode) {
-        if (!needClean) {
+        if (needClean) {
             nativeRenderer.remove(atom.nativeNode, atom.isSvg);
-            needClean = true;
+            needClean = false;
         }
         if (atom.type === 'element') {
             const ref = atom.jsxNode.props[refKey];
@@ -1556,7 +1558,7 @@ function cleanView(nativeRenderer, atom, needClean) {
     let child = atom.child;
     while (child) {
         if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
-            needClean = false;
+            needClean = true;
         }
         cleanView(nativeRenderer, child, needClean);
         child = child.sibling;
@@ -1616,6 +1618,7 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     };
     prevAtom.sibling = atom;
     atom.child = createChildChain(element.props.children, isSvg);
+    element.props.children = null;
     return atom;
 }
 function createChainByNode(jsxNode, prevAtom, isSvg) {

package/bundles/index.js

@@ -593,13 +593,13 @@ function getArrayChanges(left, right) {
     return changes;
 }
 function classToString(config) {
-    if (!config) {
-        return '';
-    }
     if (typeof config === 'string') {
         return config;
     }
-    else if (Array.isArray(config)) {
+    if (!config) {
+        return '';
+    }
+    if (Array.isArray(config)) {
         const classes = [];
         for (const i of config) {
             const v = classToString(i);
@@ -609,7 +609,7 @@ function classToString(config) {
         }
         return classes.join(' ');
     }
-    else if (typeof config === 'object') {
+    if (typeof config === 'object') {
         if (config.toString !== Object.prototype.toString && !config.toString.toString().includes('[native code]')) {
             return config.toString();
         }
@@ -743,30 +743,32 @@ class Component extends ReflectiveInjector {
         };
     }
     update(newProps, forceUpdate = false) {
-        const oldProps = this.props;
-        const { add, remove, replace } = getObjectChanges(newProps, this.props);
-        if (add.length || remove.length || replace.length) {
-            this.invokePropsChangedHooks(newProps);
-        }
-        else if (!this.dirty) {
-            return this.template;
-        }
-        const newRefs = toRefs(newProps.ref);
-        if (this.refs) {
-            for (const oldRef of this.refs) {
-                if (!newRefs.includes(oldRef)) {
-                    oldRef.unBind(this.instance);
+        if (!forceUpdate) {
+            const { add, remove, replace } = getObjectChanges(newProps, this.props);
+            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) {
+                    if (!newRefs.includes(oldRef)) {
+                        oldRef.unBind(this.instance);
+                    }
                 }
             }
+            for (const newRef of newRefs) {
+                newRef.bind(this.instance);
+            }
+            if (newRefs.length) {
+                this.refs = newRefs;
+            }
         }
-        for (const newRef of newRefs) {
-            newRef.bind(this.instance);
-        }
-        if (newRefs.length) {
-            this.refs = newRefs;
-        }
-        if (!forceUpdate && typeof this.instance.$useMemo === 'function') {
-            if (this.instance.$useMemo(newProps, oldProps)) {
+        if (typeof this.instance.$useMemo === 'function') {
+            if (this.instance.$useMemo(newProps, this.props)) {
                 return this.template;
             }
         }
@@ -1388,7 +1390,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
     }
     let dirtyDiffAtom = oldAtom;
     while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom, false);
+        cleanView(nativeRenderer, dirtyDiffAtom, true);
         dirtyDiffAtom = dirtyDiffAtom.sibling;
     }
     let offset = 0;
@@ -1482,7 +1484,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
             let atom = oldAtom.child;
             nativeRenderer.cleanChildren(oldAtom.nativeNode, oldAtom.isSvg);
             while (atom) {
-                cleanView(nativeRenderer, atom, true);
+                cleanView(nativeRenderer, atom, false);
                 atom = atom.sibling;
             }
         }
@@ -1513,7 +1515,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
             while (atom) {
-                cleanView(nativeRenderer, atom, false);
+                cleanView(nativeRenderer, atom, true);
                 atom = atom.sibling;
             }
         }
@@ -1546,9 +1548,9 @@ function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveVi
 }
 function cleanView(nativeRenderer, atom, needClean) {
     if (atom.nativeNode) {
-        if (!needClean) {
+        if (needClean) {
             nativeRenderer.remove(atom.nativeNode, atom.isSvg);
-            needClean = true;
+            needClean = false;
         }
         if (atom.type === 'element') {
             const ref = atom.jsxNode.props[refKey];
@@ -1558,7 +1560,7 @@ function cleanView(nativeRenderer, atom, needClean) {
     let child = atom.child;
     while (child) {
         if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
-            needClean = false;
+            needClean = true;
         }
         cleanView(nativeRenderer, child, needClean);
         child = child.sibling;
@@ -1618,6 +1620,7 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     };
     prevAtom.sibling = atom;
     atom.child = createChildChain(element.props.children, isSvg);
+    element.props.children = null;
     return atom;
 }
 function createChainByNode(jsxNode, prevAtom, isSvg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.7",
   "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",
@@ -47,7 +47,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "f92d3c923b1b9f115b928bc57f4d8adf1f8100c9",
+  "gitHead": "092e986d74477afb6246001ca58962172f926e73",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }