@viewfly/core 1.0.0-alpha.17 → 1.0.0-alpha.19

package/bundles/index.esm.js

@@ -1679,13 +1679,8 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     const changes = getObjectChanges(newVNode.props, oldVNode.props);
     let unBindRefs;
     let bindRefs;
-    newAtom.child = oldAtom.child;
-    let updatedSubComponent = false;
     for (const [key, value] of changes.remove) {
         if (key === 'children') {
-            cleanElementChildren(oldAtom, nativeRenderer);
-            newAtom.child = null;
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1712,18 +1707,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }
     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
-                });
-            }
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1758,9 +1741,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }
     for (const [key, value] of changes.add) {
         if (key === 'children') {
-            newAtom.child = createChildChain(value, isSvg);
-            buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1786,9 +1766,29 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.setProperty(nativeNode, key, value, isSvg);
     }
-    if (!updatedSubComponent) {
-        parentComponent.changedSubComponents.forEach(child => {
-            updateView(nativeRenderer, child);
+    /**
+     * 不能仅依赖 children 是否相等的判断来确定是否要继续向下 diff
+     * 如：
+     * ```tsx
+     * <Comp>
+     *   <div>
+     *     {props.children}
+     *   </div>
+     * </Comp>
+     * ```
+     * 其中当 Comp 产生变化时，children 来自父组件，这时 children 是相等的，
+     * 但，children 内可能有子组件也发生了变化，如果不继续 diff，那么，子组件
+     * 的视图更新将不会发生
+     */
+    newAtom.child = createChildChain(newVNode.props.children, isSvg);
+    if (!newAtom.child) {
+        cleanElementChildren(oldAtom, nativeRenderer);
+    }
+    else {
+        diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
+            host: newAtom.nativeNode,
+            isParent: true,
+            rootHost: context.rootHost
         });
     }
     applyRefs(unBindRefs, nativeNode, false);

package/bundles/index.js

@@ -1681,13 +1681,8 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     const changes = getObjectChanges(newVNode.props, oldVNode.props);
     let unBindRefs;
     let bindRefs;
-    newAtom.child = oldAtom.child;
-    let updatedSubComponent = false;
     for (const [key, value] of changes.remove) {
         if (key === 'children') {
-            cleanElementChildren(oldAtom, nativeRenderer);
-            newAtom.child = null;
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1714,18 +1709,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }
     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
-                });
-            }
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1760,9 +1743,6 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }
     for (const [key, value] of changes.add) {
         if (key === 'children') {
-            newAtom.child = createChildChain(value, isSvg);
-            buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
-            updatedSubComponent = true;
             continue;
         }
         if (key === 'class') {
@@ -1788,9 +1768,29 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.setProperty(nativeNode, key, value, isSvg);
     }
-    if (!updatedSubComponent) {
-        parentComponent.changedSubComponents.forEach(child => {
-            updateView(nativeRenderer, child);
+    /**
+     * 不能仅依赖 children 是否相等的判断来确定是否要继续向下 diff
+     * 如：
+     * ```tsx
+     * <Comp>
+     *   <div>
+     *     {props.children}
+     *   </div>
+     * </Comp>
+     * ```
+     * 其中当 Comp 产生变化时，children 来自父组件，这时 children 是相等的，
+     * 但，children 内可能有子组件也发生了变化，如果不继续 diff，那么，子组件
+     * 的视图更新将不会发生
+     */
+    newAtom.child = createChildChain(newVNode.props.children, isSvg);
+    if (!newAtom.child) {
+        cleanElementChildren(oldAtom, nativeRenderer);
+    }
+    else {
+        diff(nativeRenderer, parentComponent, newAtom.child, oldAtom.child, {
+            host: newAtom.nativeNode,
+            isParent: true,
+            rootHost: context.rootHost
         });
     }
     applyRefs(unBindRefs, nativeNode, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.17",
+  "version": "1.0.0-alpha.19",
   "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": "4fd97b73e7808b45660f2b802f4b327a67366a7e",
+  "gitHead": "447225f74fc666916194372ba5f710a94c297541",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }