Don't modify keyPath until right before recursive renderNode call (#27366)

acdlite · acdlite · commit f73ef32f79fc · 2023-09-13T01:32:20.000Z
Currently, if a component suspends, the keyPath has already been modified to include the identity of the component itself; the path is set before the component body is called (akin to the begin phase in Fiber). An accidental consequence is that when the promise resolves and component is retried, the identity gets appended to the keyPath again, leading to a duplicate node in the path. To address this, we should only modify contexts after any code that may suspend. For maximum safety, this should occur as late as possible: right before the recursive renderNode call, before the children are rendered. I did not add a test yet because there's no feature that currently observes it, but I do have tests in my other WIP PR for useFormState: #27321 DiffTrain build for commit d07921e.
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js
@@ -23994,7 +23994,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-canary-7a3cb8f9c-20230912";
+var ReactVersion = "18.3.0-canary-d07921eed-20230912";
 
 // Might add PROFILE later.
 
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js
@@ -8617,7 +8617,7 @@ var devToolsConfig$jscomp$inline_1027 = {
     throw Error("TestRenderer does not support findFiberByHostInstance()");
   },
   bundleType: 0,
-  version: "18.3.0-canary-7a3cb8f9c-20230912",
+  version: "18.3.0-canary-d07921eed-20230912",
   rendererPackageName: "react-test-renderer"
 };
 var internals$jscomp$inline_1226 = {
@@ -8648,7 +8648,7 @@ var internals$jscomp$inline_1226 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-canary-7a3cb8f9c-20230912"
+  reconcilerVersion: "18.3.0-canary-d07921eed-20230912"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1227 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js
@@ -9043,7 +9043,7 @@ var devToolsConfig$jscomp$inline_1069 = {
     throw Error("TestRenderer does not support findFiberByHostInstance()");
   },
   bundleType: 0,
-  version: "18.3.0-canary-7a3cb8f9c-20230912",
+  version: "18.3.0-canary-d07921eed-20230912",
   rendererPackageName: "react-test-renderer"
 };
 var internals$jscomp$inline_1267 = {
@@ -9074,7 +9074,7 @@ var internals$jscomp$inline_1267 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-canary-7a3cb8f9c-20230912"
+  reconcilerVersion: "18.3.0-canary-d07921eed-20230912"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1268 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js
@@ -27,7 +27,7 @@ if (
 }
           "use strict";
 
-var ReactVersion = "18.3.0-canary-7a3cb8f9c-20230912";
+var ReactVersion = "18.3.0-canary-d07921eed-20230912";
 
 // ATTENTION
 // When adding new symbols to this file,
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js
@@ -616,4 +616,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactCurrentDispatcher.current.useTransition();
 };
-exports.version = "18.3.0-canary-7a3cb8f9c-20230912";
+exports.version = "18.3.0-canary-d07921eed-20230912";
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js
@@ -619,7 +619,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactCurrentDispatcher.current.useTransition();
 };
-exports.version = "18.3.0-canary-7a3cb8f9c-20230912";
+exports.version = "18.3.0-canary-d07921eed-20230912";
 
           /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
 if (
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
@@ -1 +1 @@
-7a3cb8f9cf43591afc74722ece9e3216ccc98128
+d07921eeda62613bfcf52ecdb66322db26393567

Original file line number	Diff line number	Diff line change
`@@ -23994,7 +23994,7 @@ function createFiberRoot(`
`23994`	`23994`	`return root;`
`23995`	`23995`	`}`
`23996`	`23996`
`23997`		`-var ReactVersion = "18.3.0-canary-7a3cb8f9c-20230912";`
	`23997`	`+var ReactVersion = "18.3.0-canary-d07921eed-20230912";`
`23998`	`23998`
`23999`	`23999`	`// Might add PROFILE later.`
`24000`	`24000`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ if (`
`27`	`27`	`}`
`28`	`28`	`"use strict";`
`29`	`29`
`30`		`-var ReactVersion = "18.3.0-canary-7a3cb8f9c-20230912";`
	`30`	`+var ReactVersion = "18.3.0-canary-d07921eed-20230912";`
`31`	`31`
`32`	`32`	`// ATTENTION`
`33`	`33`	`// When adding new symbols to this file,`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-7a3cb8f9cf43591afc74722ece9e3216ccc98128`
	`1`	`+d07921eeda62613bfcf52ecdb66322db26393567`