Patch devtools before running useMemo function in strict mode

This fixes a regression #25583 where we stopped patching before calling useMemo function.
facebook · Feb 5, 2024 · 961ed5b · 961ed5b
1 parent 4217d32
commit 961ed5b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberHooks.js b/packages/react-reconciler/src/ReactFiberHooks.js
@@ -2635,10 +2635,12 @@ function mountMemo<T>(
 ): T {
   const hook = mountWorkInProgressHook();
   const nextDeps = deps === undefined ? null : deps;
+  const nextValue = nextCreate();
   if (shouldDoubleInvokeUserFnsInHooksDEV) {
+    setIsStrictModeForDevtools(true);
     nextCreate();
+    setIsStrictModeForDevtools(false);
   }
-  const nextValue = nextCreate();
   hook.memoizedState = [nextValue, nextDeps];
   return nextValue;
 }
@@ -2657,10 +2659,12 @@ function updateMemo<T>(
       return prevState[0];
     }
   }
+  const nextValue = nextCreate();
   if (shouldDoubleInvokeUserFnsInHooksDEV) {
+    setIsStrictModeForDevtools(true);
     nextCreate();
+    setIsStrictModeForDevtools(false);
   }
-  const nextValue = nextCreate();
   hook.memoizedState = [nextValue, nextDeps];
   return nextValue;
 }