[Transition Tracing] Fix Cache and Transitions Pop Order (#24719)

lunaruan · web-flow · commit 54f17e490f8b · 2022-06-14T11:48:01.000-07:00
We push the Cache before the transition so we should pop the transition before the cache. This PR fixes this issue.
diff --git a/packages/react-reconciler/src/ReactFiberTransition.new.js b/packages/react-reconciler/src/ReactFiberTransition.new.js
@@ -139,13 +139,13 @@ export function pushTransition(
 
 export function popTransition(workInProgress: Fiber, current: Fiber | null) {
   if (current !== null) {
-    if (enableCache) {
-      pop(resumedCache, workInProgress);
-    }
-
     if (enableTransitionTracing) {
       pop(transitionStack, workInProgress);
     }
+
+    if (enableCache) {
+      pop(resumedCache, workInProgress);
+    }
   }
 }
 
diff --git a/packages/react-reconciler/src/ReactFiberTransition.old.js b/packages/react-reconciler/src/ReactFiberTransition.old.js
@@ -139,13 +139,13 @@ export function pushTransition(
 
 export function popTransition(workInProgress: Fiber, current: Fiber | null) {
   if (current !== null) {
-    if (enableCache) {
-      pop(resumedCache, workInProgress);
-    }
-
     if (enableTransitionTracing) {
       pop(transitionStack, workInProgress);
     }
+
+    if (enableCache) {
+      pop(resumedCache, workInProgress);
+    }
   }
 }
 
