@reckona/mreact-compat 0.0.139 → 0.0.141

package/src/fiber-commit.ts

@@ -29,6 +29,9 @@ export function commitFiberRoot(
     });
   }
   commitHostFiberRoot(root, finishedWork, options);
+  if (hasRemovedAlternateChildren(finishedWork)) {
+    detachRemovedAlternateChildren(finishedWork);
+  }
   root.current = finishedWork;
   root.current.stateNode = root;
   markRootFinished(root, finishedWork.lanes);
@@ -44,6 +47,95 @@ export function detachFiberRefs(fiber: Fiber): void {
   }
 }
 
+function detachRemovedAlternateChildren(fiber: Fiber | undefined): void {
+  let cursor: Fiber | undefined = fiber;
+
+  while (cursor !== undefined) {
+    const retained = collectRetainedAlternateChildren(cursor.child);
+    let alternateChild = cursor.alternate?.child;
+
+    while (alternateChild !== undefined) {
+      const nextAlternateChild = alternateChild.sibling;
+
+      if (!retained.has(alternateChild)) {
+        detachFiberSubtree(alternateChild, retained);
+      }
+
+      alternateChild = nextAlternateChild;
+    }
+
+    if (cursor.deletions !== undefined) {
+      for (const deleted of cursor.deletions) {
+        detachFiberSubtree(deleted, retained);
+      }
+      cursor.deletions = undefined;
+    }
+
+    detachRemovedAlternateChildren(cursor.child);
+    cursor = cursor.sibling;
+  }
+}
+
+function hasRemovedAlternateChildren(fiber: Fiber): boolean {
+  return (
+    fiber.childListChanged ||
+    fiber.subtreeChildListChanged ||
+    fiber.deletions !== undefined
+  );
+}
+
+function collectRetainedAlternateChildren(fiber: Fiber | undefined): Set<Fiber> {
+  const retained = new Set<Fiber>();
+  let cursor = fiber;
+
+  while (cursor !== undefined) {
+    retained.add(cursor);
+
+    if (cursor.alternate !== undefined) {
+      retained.add(cursor.alternate);
+    }
+
+    cursor = cursor.sibling;
+  }
+
+  return retained;
+}
+
+function detachFiberSubtree(fiber: Fiber, preserve: ReadonlySet<Fiber>): void {
+  const stack = [fiber];
+  const seen = new Set<Fiber>();
+
+  while (stack.length > 0) {
+    const current = stack.pop();
+
+    if (current === undefined || seen.has(current) || preserve.has(current)) {
+      continue;
+    }
+
+    seen.add(current);
+
+    let child = current.child;
+    while (child !== undefined) {
+      stack.push(child);
+      child = child.sibling;
+    }
+
+    if (current.alternate !== undefined) {
+      stack.push(current.alternate);
+    }
+
+    current.return = undefined;
+    current.child = undefined;
+    current.sibling = undefined;
+    current.alternate = undefined;
+    current.pendingProps = undefined;
+    current.memoizedProps = undefined;
+    current.memoizedState = undefined;
+    current.stateNode = undefined;
+    current.deletions = undefined;
+  }
+}
+
 function cleanupDeletedRefs(previous: Fiber, next: Fiber): void {
   const nextRefs = new Set<unknown>();
 

package/src/host-event-binder.ts

@@ -7,6 +7,8 @@ export {
 } from "./event-listeners.js";
 export {
   ensureDelegatedEventListener,
+  ensureDelegatedEventListenersForProp,
+  forEachEventName,
   getEventPriority,
   setLogicalEventParent,
   toEventNames,

package/src/host-reconciler.ts

@@ -3,6 +3,7 @@ import {
   ERROR_BOUNDARY_TYPE,
   FORWARD_REF_TYPE,
   Fragment,
+  HOST_CHILDREN_ONLY_PROPS_META,
   HOST_OWN_PROPS_META,
   LAZY_TYPE,
   MEMO_TYPE,
@@ -1621,13 +1622,23 @@ function commitHostDirtyFiber(
 
     const props = fiber.pendingProps as Record<string, unknown>;
     const previousProps = fiber.memoizedProps as Record<string, unknown> | undefined;
+    const directTextChild =
+      fiber.child === undefined && fiber.hydrateExisting !== true
+        ? getDirectHostTextChild(props.children)
+        : undefined;
+    const textOnlyChildrenUpdate =
+      directTextChild !== undefined &&
+      hostPropsAreKnownChildrenOnly(fiber.memoizedProps) &&
+      hostPropsAreKnownChildrenOnly(props);
     const propsAreUnchanged =
       fiber.hydrateExisting !== true &&
+      !textOnlyChildrenUpdate &&
       hostPropsEqual(fiber.memoizedProps, props);
     const propsAreChildrenOnly =
-      fiber.hydrateExisting !== true &&
-      hostPropsAreChildrenOnly(fiber.memoizedProps) &&
-      hostPropsAreChildrenOnly(props);
+      textOnlyChildrenUpdate ||
+      (fiber.hydrateExisting !== true &&
+        hostPropsAreChildrenOnly(fiber.memoizedProps) &&
+        hostPropsAreChildrenOnly(props));
     const textOnlyRowUpdate =
       fiber.hydrateExisting !== true &&
       isRowTextOnlyUpdate(fiber.memoizedProps, props);
@@ -1641,11 +1652,6 @@ function commitHostDirtyFiber(
       applyChangedRef(previousProps?.ref, props.ref, element);
     }
 
-    const directTextChild =
-      fiber.child === undefined && fiber.hydrateExisting !== true
-        ? getDirectHostTextChild(props.children)
-        : undefined;
-
     if (directTextChild !== undefined) {
       syncDirectHostTextChild(element, directTextChild);
     } else if (fiber.subtreeFlags !== NoFlags) {
@@ -2007,13 +2013,23 @@ function commitHostFiber(
 
     const props = fiber.pendingProps as Record<string, unknown>;
     const previousProps = fiber.memoizedProps as Record<string, unknown> | undefined;
+    const directTextChild =
+      fiber.child === undefined && fiber.hydrateExisting !== true
+        ? getDirectHostTextChild(props.children)
+        : undefined;
+    const textOnlyChildrenUpdate =
+      directTextChild !== undefined &&
+      hostPropsAreKnownChildrenOnly(fiber.memoizedProps) &&
+      hostPropsAreKnownChildrenOnly(props);
     const propsAreUnchanged =
       fiber.hydrateExisting !== true &&
+      !textOnlyChildrenUpdate &&
       hostPropsEqual(fiber.memoizedProps, props);
     const propsAreChildrenOnly =
-      fiber.hydrateExisting !== true &&
-      hostPropsAreChildrenOnly(fiber.memoizedProps) &&
-      hostPropsAreChildrenOnly(props);
+      textOnlyChildrenUpdate ||
+      (fiber.hydrateExisting !== true &&
+        hostPropsAreChildrenOnly(fiber.memoizedProps) &&
+        hostPropsAreChildrenOnly(props));
     const textOnlyRowUpdate =
       fiber.hydrateExisting !== true &&
       isRowTextOnlyUpdate(fiber.memoizedProps, props);
@@ -2026,11 +2042,6 @@ function commitHostFiber(
       });
       applyChangedRef(previousProps?.ref, props.ref, element);
     }
-    const directTextChild =
-      fiber.child === undefined && fiber.hydrateExisting !== true
-        ? getDirectHostTextChild(props.children)
-        : undefined;
-
     if (directTextChild !== undefined) {
       syncDirectHostTextChild(element, directTextChild);
     } else if (
@@ -2352,6 +2363,16 @@ function hostPropsAreChildrenOnly(props: unknown): boolean {
   return true;
 }
 
+function hostPropsAreKnownChildrenOnly(props: unknown): boolean {
+  return (
+    typeof props === "object" &&
+    props !== null &&
+    (props as { [HOST_CHILDREN_ONLY_PROPS_META]?: true })[
+      HOST_CHILDREN_ONLY_PROPS_META
+    ] === true
+  );
+}
+
 function isRowTextOnlyUpdate(previous: unknown, next: Record<string, unknown>): boolean {
   if (typeof previous !== "object" || previous === null) {
     return false;