From 5fbd7c91c1a19be0f9ad488f812a36541149f3f8 Mon Sep 17 00:00:00 2001
From: Biki das <bikid475@gmail.com>
Date: Mon, 4 May 2026 23:46:13 +0530
Subject: [PATCH] Fixed incorrect highlights components when filtered parent
 re-mounts them

---
 .../backend/fiber/shared/DevToolsFiberChangeDetection.js   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/react-devtools-shared/src/backend/fiber/shared/DevToolsFiberChangeDetection.js b/packages/react-devtools-shared/src/backend/fiber/shared/DevToolsFiberChangeDetection.js
index 0feef5803e92..819dd3a62e4c 100644
--- a/packages/react-devtools-shared/src/backend/fiber/shared/DevToolsFiberChangeDetection.js
+++ b/packages/react-devtools-shared/src/backend/fiber/shared/DevToolsFiberChangeDetection.js
@@ -135,7 +135,12 @@ export function didFiberRender(
       // releasing DevTools in lockstep with React, we should import a
       // function from the reconciler instead.
       const PerformedWork = 0b000000000000000000000000001;
-      return (getFiberFlags(nextFiber) & PerformedWork) === PerformedWork;
+      const hasPerformedWork =
+        (getFiberFlags(nextFiber) & PerformedWork) === PerformedWork;
+      if (nextFiber.alternate === null) {
+        return false;
+      }
+      return hasPerformedWork;
     // Note: ContextConsumer only gets PerformedWork effect in 16.3.3+
     // so it won't get highlighted with React 16.3.0 to 16.3.2.
     default: