Upgrade bippy to 0.7.1

package.json

@@ -46,6 +46,9 @@
       "sharp",
       "spawn-sync",
       "unrs-resolver"
-    ]
+    ],
+    "patchedDependencies": {
+      "bippy@0.7.0": "patches/bippy@0.7.0.patch"
+    }
   }
 }

packages/react-grab/package.json

@@ -109,7 +109,7 @@
   },
   "dependencies": {
     "@react-grab/cli": "workspace:*",
-    "bippy": "^0.6.1"
+    "bippy": "^0.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",

packages/react-grab/src/core/context.ts

@@ -4,6 +4,7 @@ import {
   getDisplayName,
   getLatestFiber,
   isCompositeFiber,
+  isFiber,
   traverseFiber,
   type Fiber,
 } from "bippy";
@@ -259,11 +260,11 @@ export interface ResolvedSource extends SourceLocation {
 const pickNearestSourceFrame = (frames: StackFrame[]): StackFrame | null => frames[0] ?? null;
 
 const getSourceComponentName = (
-  fiber: Fiber | undefined,
+  debugOwner: Fiber["_debugOwner"],
   isNextProject: boolean,
 ): string | null => {
-  if (!fiber || !isCompositeFiber(fiber)) return null;
-  return toSourceComponentName(getDisplayName(fiber.type), isNextProject);
+  if (!isFiber(debugOwner) || !isCompositeFiber(debugOwner)) return null;
+  return toSourceComponentName(getDisplayName(debugOwner.type), isNextProject);
 };
 
 // getSource reads React's own dev-only debug data, so it works without bippy

packages/react-grab/src/core/element-anchors.ts

@@ -1,10 +1,4 @@
-import {
-  getFiberFromHostInstance,
-  getLatestFiber,
-  getNearestHostFibers,
-  isHostFiber,
-  type Fiber,
-} from "bippy";
+import { getFiberFromHostInstance, getLatestFiber, isHostFiber, type Fiber } from "bippy";
 import { indexInParent } from "../utils/index-in-parent.js";
 import { isShadowRoot } from "../utils/is-shadow-root.js";
 import { isElementNode } from "../utils/is-element-node.js";
@@ -55,15 +49,37 @@ const resolveLiveAnchor = (anchor: ElementAnchor): Element | null => {
     return candidate && candidate.tagName === anchorTagName ? candidate : null;
   }
 
-  for (const hostFiber of getNearestHostFibers(latestParentFiber)) {
-    const node = hostFiber.stateNode;
-    // The tag match keeps recovery from latching onto an unrelated host when the
-    // original element type is gone. Same-tag siblings under a shared composite
-    // ancestor can't be told apart and resolve to the first match, which still
-    // leaves the selection on a valid node instead of dropping it.
-    if (isElementNode(node) && node.isConnected && node.tagName === anchorTagName) {
-      return node;
+  return findNearestHostElementWithTag(latestParentFiber, anchorTagName);
+};
+
+// Walks the nearest host fibers below `parentFiber` (stopping at each host
+// boundary, like bippy's removed getNearestHostFibers) for a connected element
+// with the anchor's tag. The tag match keeps recovery from latching onto an
+// unrelated host when the original element type is gone. Same-tag siblings
+// under a shared composite ancestor can't be told apart and resolve to the
+// first match, which still leaves the selection on a valid node instead of
+// dropping it.
+const findNearestHostElementWithTag = (
+  parentFiber: Fiber,
+  anchorTagName: string,
+): Element | null => {
+  let fiber: Fiber | null = parentFiber.child;
+  while (fiber) {
+    if (isHostFiber(fiber)) {
+      const node = fiber.stateNode;
+      if (isElementNode(node) && node.isConnected && node.tagName === anchorTagName) {
+        return node;
+      }
+    } else if (fiber.child) {
+      fiber = fiber.child;
+      continue;
+    }
+    while (fiber !== parentFiber && !fiber.sibling) {
+      fiber = fiber.return;
+      if (!fiber) return null;
     }
+    if (fiber === parentFiber) return null;
+    fiber = fiber.sibling;
   }
   return null;
 };

packages/react-grab/src/utils/freeze-updates.ts

@@ -19,7 +19,7 @@ import { RecoverableError } from "../errors.js";
 import { reportRecoverableError } from "./report-recoverable-error.js";
 import { IS_DEMO } from "./runtime-mode.js";
 
-interface FiberRootLike extends FiberRoot {
+interface FiberRootLike extends Omit<FiberRoot, "current"> {
   current: Fiber | null;
 }