Wrap user space calls in runWithFiberInDEV

facebook · Sep 4, 2024 · b614e89 · b614e89
1 parent 5e8b486
commit b614e89
Showing 1 changed file with 42 additions and 7 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberCommitEffects.js b/packages/react-reconciler/src/ReactFiberCommitEffects.js
@@ -75,6 +75,8 @@ import {
   callDestroyInDEV,
 } from './ReactFiberCallUserSpace';
 
+import {runWithFiberInDEV} from './ReactCurrentFiber';
+
 function shouldProfile(current: Fiber): boolean {
   return (
     enableProfilerTimer &&
@@ -128,7 +130,7 @@ export function commitHookEffectListMount(
             if ((flags & HookInsertion) !== NoHookEffect) {
               setIsRunningInsertionEffect(true);
             }
-            destroy = callCreateInDEV(effect);
+            destroy = runWithFiberInDEV(finishedWork, callCreateInDEV, effect);
             if ((flags & HookInsertion) !== NoHookEffect) {
               setIsRunningInsertionEffect(false);
             }
@@ -330,7 +332,12 @@ export function commitClassLayoutLifecycles(
     if (shouldProfile(finishedWork)) {
       startLayoutEffectTimer();
       if (__DEV__) {
-        callComponentDidMountInDEV(finishedWork, instance);
+        runWithFiberInDEV(
+          finishedWork,
+          callComponentDidMountInDEV,
+          finishedWork,
+          instance,
+        );
       } else {
         try {
           instance.componentDidMount();
@@ -341,7 +348,12 @@ export function commitClassLayoutLifecycles(
       recordLayoutEffectDuration(finishedWork);
     } else {
       if (__DEV__) {
-        callComponentDidMountInDEV(finishedWork, instance);
+        runWithFiberInDEV(
+          finishedWork,
+          callComponentDidMountInDEV,
+          finishedWork,
+          instance,
+        );
       } else {
         try {
           instance.componentDidMount();
@@ -439,7 +451,12 @@ export function commitClassDidMount(finishedWork: Fiber) {
   const instance = finishedWork.stateNode;
   if (typeof instance.componentDidMount === 'function') {
     if (__DEV__) {
-      callComponentDidMountInDEV(finishedWork, instance);
+      runWithFiberInDEV(
+        finishedWork,
+        callComponentDidMountInDEV,
+        finishedWork,
+        instance,
+      );
     } else {
       try {
         instance.componentDidMount();
@@ -619,7 +636,13 @@ export function safelyCallComponentWillUnmount(
   if (shouldProfile(current)) {
     startLayoutEffectTimer();
     if (__DEV__) {
-      callComponentWillUnmountInDEV(current, nearestMountedAncestor, instance);
+      runWithFiberInDEV(
+        current,
+        callComponentWillUnmountInDEV,
+        current,
+        nearestMountedAncestor,
+        instance,
+      );
     } else {
       try {
         instance.componentWillUnmount();
@@ -630,7 +653,13 @@ export function safelyCallComponentWillUnmount(
     recordLayoutEffectDuration(current);
   } else {
     if (__DEV__) {
-      callComponentWillUnmountInDEV(current, nearestMountedAncestor, instance);
+      runWithFiberInDEV(
+        current,
+        callComponentWillUnmountInDEV,
+        current,
+        nearestMountedAncestor,
+        instance,
+      );
     } else {
       try {
         instance.componentWillUnmount();
@@ -761,7 +790,13 @@ export function safelyCallDestroy(
   destroy: () => void,
 ) {
   if (__DEV__) {
-    callDestroyInDEV(current, nearestMountedAncestor, destroy);
+    runWithFiberInDEV(
+      current,
+      callDestroyInDEV,
+      current,
+      nearestMountedAncestor,
+      destroy,
+    );
   } else {
     try {
       destroy();