@reckona/mreact-compat 0.0.160 → 0.0.162

package/dist/host-reconciler.js

@@ -734,7 +734,7 @@ function createHostFiberImpl(parent, current, node, key, runtime, path, options
             !hasUnflushedMountEffectInstance(runtime, previousMemoState.instanceKeys) &&
             areMemoPropsEqual(memoType, previousMemoState.props, node.props)) {
             markActiveInstanceKeys(runtime, previousMemoState.instanceKeys);
-            fiber.child = current?.child;
+            fiber.child = getSkippedChild(current);
             fiber.memoizedState = previousMemoState;
             return { fiber, consumed: options.previousNodes?.length ?? 0 };
         }
@@ -815,15 +815,17 @@ function createHostFiberImpl(parent, current, node, key, runtime, path, options
         const currentClassInstance = current?.tag === "class-component" && current.type === classType
             ? current.stateNode
             : undefined;
+        const hasCurrentClassFiber = current?.tag === "class-component" && current.type === classType;
         const rendered = renderClassComponentWithRuntime(classType, node.props, runtime, path, {
             ...(currentClassInstance === undefined
                 ? {}
                 : { currentInstance: currentClassInstance }),
             hasDirtyDescendant: hasDirtyInstance(runtime, previousClassChildKeys, `${path}.class`),
+            allowSkip: hasCurrentClassFiber,
         });
         applyRef(node.ref, rendered.kind === "skip" ? current?.stateNode : rendered.instance);
         if (rendered.kind === "skip") {
-            fiber.child = current?.child;
+            fiber.child = getSkippedChild(current);
             return { fiber, consumed: options.previousNodes?.length ?? 0 };
         }
         const childOptions = withHydrationComponentStack(options, getComponentName(classType));
@@ -867,7 +869,7 @@ function createHostFiberImpl(parent, current, node, key, runtime, path, options
             !hasUnflushedMountEffectInstance(runtime, previousFunctionState.instanceKeys) &&
             !hasPendingAsyncChild(current?.child)) {
             markActiveInstanceKeys(runtime, previousFunctionState.instanceKeys);
-            fiber.child = current?.child;
+            fiber.child = getSkippedChild(current);
             fiber.memoizedState = current?.memoizedState;
             fiber.stateNode = previousFunctionState;
             return { fiber, consumed: options.previousNodes?.length ?? 0 };
@@ -1026,6 +1028,15 @@ function commitHostDirtyFiber(fiber, parent, eventRoot, path, options = {}) {
             const text = syncDirectHostTextChild(element, directTextChild);
             subscribeReactiveHostTextBinding(props, text);
         }
+        else if (fiber.hostChildListChanged ||
+            fiber.childListChanged ||
+            fiber.subtreeChildListChanged) {
+            const childNodes = commitHostChildren(fiber.child, element, eventRoot, `${path}.c`, options);
+            if (!(childNodes.length === 0 && committedPortalContainers.has(element)) &&
+                !shouldPreserveContentEditableChildren(element, props, childNodes)) {
+                syncChildNodes(element, childNodes);
+            }
+        }
         else if (fiber.subtreeFlags !== NoFlags) {
             commitHostDirtyChildren(fiber.child, element, eventRoot, `${path}.c`, options);
         }
@@ -1119,7 +1130,7 @@ function commitHostKeyedChildListMutationFiber(fiber, parent, eventRoot, path, o
     return true;
 }
 function commitHostAppendSuffix(fiber, parent, eventRoot, path, options) {
-    const append = getPlacementAppendSuffix(fiber.child) ?? getAppendSuffix(fiber.alternate?.child, fiber.child);
+    const append = getAppendSuffix(fiber.alternate?.child, fiber.child);
     if (append === undefined) {
         return false;
     }
@@ -1134,31 +1145,6 @@ function commitHostAppendSuffix(fiber, parent, eventRoot, path, options) {
     }
     return true;
 }
-function getPlacementAppendSuffix(next) {
-    let nextCursor = next;
-    let index = 0;
-    while (nextCursor !== undefined) {
-        if ((nextCursor.flags & Placement) !== NoFlags) {
-            if (index === 0) {
-                return undefined;
-            }
-            let appendCursor = nextCursor;
-            while (appendCursor !== undefined) {
-                if ((appendCursor.flags & Placement) === NoFlags) {
-                    return undefined;
-                }
-                appendCursor = appendCursor.sibling;
-            }
-            return { fiber: nextCursor, index };
-        }
-        if (hasHostCommitWork(nextCursor)) {
-            return undefined;
-        }
-        nextCursor = nextCursor.sibling;
-        index += 1;
-    }
-    return undefined;
-}
 function commitHostSingleRemoval(fiber, parent) {
     const removed = getSingleRemovedFiber(fiber.alternate?.child, fiber.child);
     if (removed === undefined) {
@@ -1237,6 +1223,17 @@ function collectCommittedHostNodes(fiber) {
     }
     return nodes;
 }
+function getSkippedChild(current) {
+    const child = current?.child;
+    const alternateChild = current?.alternate?.child;
+    if (child !== undefined &&
+        alternateChild !== undefined &&
+        collectCommittedHostNodes(child).length === 0 &&
+        collectCommittedHostNodes(alternateChild).length > 0) {
+        return alternateChild;
+    }
+    return child;
+}
 function finishHostPassthroughFiber(fiber) {
     fiber.memoizedProps = fiber.pendingProps;
     finishCommittedFiber(fiber);
@@ -1265,7 +1262,9 @@ function commitHostFiber(fiber, parent, eventRoot, path, options = {}) {
         if (fiber.hydrateExisting !== true &&
             fiber.flags === NoFlags &&
             fiber.subtreeFlags === NoFlags &&
-            fiber.hostChildListChanged !== true) {
+            fiber.hostChildListChanged !== true &&
+            fiber.childListChanged !== true &&
+            fiber.subtreeChildListChanged !== true) {
             fiber.memoizedProps = fiber.pendingProps;
             return [element];
         }
@@ -1302,6 +1301,7 @@ function commitHostFiber(fiber, parent, eventRoot, path, options = {}) {
         }
         else if (fiber.hostChildListChanged ||
             fiber.childListChanged ||
+            fiber.subtreeChildListChanged ||
             fiber.hydrateExisting === true ||
             (fiber.subtreeFlags & Placement) !== NoFlags) {
             const childNodes = commitHostChildren(fiber.child, element, eventRoot, `${path}.c`, options);