Don't read currentTransition back from internals (#30991)

This code is weird. It reads back the transition that it just set from
the shared internals. It's almost like it expects it to be a getter or
something.

This avoids that and makes it consistent with what ReactFiberHooks
already does.

DiffTrain build for commit https://github.com/facebook/react/commit/15da9174518f18f82869767ebe2a21be2fc8bd90.
This commit is contained in:
sebmarkbage
2024-09-17 12:32:15 -07:00
parent f8e3da903b
commit 304fbaee2b
14 changed files with 54 additions and 55 deletions
+1 -1
View File
@@ -1 +1 @@
19.0.0-native-fb-4549be0f-20240917
19.0.0-native-fb-15da9174-20240917
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<8c138f3a4944e40484202ab8167bccac>>
* @generated SignedSource<<d8178e840d5ab137bbd9d89bca983269>>
*/
"use strict";
@@ -15072,11 +15072,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-test-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -15221,5 +15221,5 @@ __DEV__ &&
flushSyncWorkAcrossRoots_impl(0, !0));
}
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
})();
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<2c619eee60969f289c20e79a1655586f>>
* @generated SignedSource<<f3c6bd6adc979c22fbe8bb409a9cf286>>
*/
"use strict";
@@ -9474,14 +9474,14 @@ function wrapFiber(fiber) {
}
var internals$jscomp$inline_1293 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-test-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function (mockNode) {
mockNode = nodeToInstanceMap.get(mockNode);
return void 0 !== mockNode ? mockNode.internalInstanceHandle : null;
},
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1294 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -9617,4 +9617,4 @@ exports.unstable_batchedUpdates = function (fn, a) {
flushSyncWorkAcrossRoots_impl(0, !0));
}
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<92806f29aa29970048491f7bd45d5609>>
* @generated SignedSource<<25ecb89be280a562e5f2233d110ea46c>>
*/
"use strict";
@@ -10040,14 +10040,14 @@ function wrapFiber(fiber) {
}
var internals$jscomp$inline_1151 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-test-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function (mockNode) {
mockNode = nodeToInstanceMap.get(mockNode);
return void 0 !== mockNode ? mockNode.internalInstanceHandle : null;
},
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917",
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917",
getLaneLabelMap: function () {
for (
var map = new Map(), lane = 1, index$141 = 0;
@@ -10198,4 +10198,4 @@ exports.unstable_batchedUpdates = function (fn, a) {
flushSyncWorkAcrossRoots_impl(0, !0));
}
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<298735d4c96c058787833ff7f63746e0>>
* @generated SignedSource<<47bc21816711252981ee9a683ba241a6>>
*/
"use strict";
@@ -1588,15 +1588,14 @@ __DEV__ &&
};
exports.startTransition = function (scope) {
var prevTransition = ReactSharedInternals.T,
transition = {};
ReactSharedInternals.T = transition;
var currentTransition = ReactSharedInternals.T;
ReactSharedInternals.T._updatedFibers = new Set();
currentTransition = {};
ReactSharedInternals.T = currentTransition;
currentTransition._updatedFibers = new Set();
try {
var returnValue = scope(),
onStartTransitionFinish = ReactSharedInternals.S;
null !== onStartTransitionFinish &&
onStartTransitionFinish(transition, returnValue);
onStartTransitionFinish(currentTransition, returnValue);
"object" === typeof returnValue &&
null !== returnValue &&
"function" === typeof returnValue.then &&
@@ -1705,7 +1704,7 @@ __DEV__ &&
exports.useTransition = function () {
return resolveDispatcher().useTransition();
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<10c2be26bb1c1dc9dcd31b78201da7ac>>
* @generated SignedSource<<86b494a77358a6036bae5aefefc6ab94>>
*/
"use strict";
@@ -486,13 +486,13 @@ exports.memo = function (type, compare) {
};
exports.startTransition = function (scope) {
var prevTransition = ReactSharedInternals.T,
transition = {};
ReactSharedInternals.T = transition;
currentTransition = {};
ReactSharedInternals.T = currentTransition;
try {
var returnValue = scope(),
onStartTransitionFinish = ReactSharedInternals.S;
null !== onStartTransitionFinish &&
onStartTransitionFinish(transition, returnValue);
onStartTransitionFinish(currentTransition, returnValue);
"object" === typeof returnValue &&
null !== returnValue &&
"function" === typeof returnValue.then &&
@@ -580,4 +580,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<045200368731519ae71251c33ab117f5>>
* @generated SignedSource<<052c42da954e6821559b1835c4aa50c6>>
*/
"use strict";
@@ -490,13 +490,13 @@ exports.memo = function (type, compare) {
};
exports.startTransition = function (scope) {
var prevTransition = ReactSharedInternals.T,
transition = {};
ReactSharedInternals.T = transition;
currentTransition = {};
ReactSharedInternals.T = currentTransition;
try {
var returnValue = scope(),
onStartTransitionFinish = ReactSharedInternals.S;
null !== onStartTransitionFinish &&
onStartTransitionFinish(transition, returnValue);
onStartTransitionFinish(currentTransition, returnValue);
"object" === typeof returnValue &&
null !== returnValue &&
"function" === typeof returnValue.then &&
@@ -584,7 +584,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-native-fb-4549be0f-20240917";
exports.version = "19.0.0-native-fb-15da9174-20240917";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
@@ -1 +1 @@
4549be0f846e7df5a4eaabf06369d93bd120271e
15da9174518f18f82869767ebe2a21be2fc8bd90
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<0bc2d72e42eaf72bd796171e8e8c2c6b>>
* @generated SignedSource<<35c4627891d8e1920e67d16b88435c98>>
*/
"use strict";
@@ -17078,11 +17078,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals.rendererConfig = extraDevToolsConfig);
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<d7594b16bce3f72dab4e840c4ea018d7>>
* @generated SignedSource<<968598b31e2104f316d96e85b01592d1>>
*/
"use strict";
@@ -11034,11 +11034,11 @@ batchedUpdatesImpl = function (fn, a) {
var roots = new Map(),
internals$jscomp$inline_1163 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals$jscomp$inline_1163.rendererConfig = extraDevToolsConfig);
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<efa7aec722940979db60a35015130675>>
* @generated SignedSource<<93d297930a8f66f4e44d7259905ff570>>
*/
"use strict";
@@ -11693,11 +11693,11 @@ batchedUpdatesImpl = function (fn, a) {
var roots = new Map(),
internals$jscomp$inline_1252 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals$jscomp$inline_1252.rendererConfig = extraDevToolsConfig);
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<3a1f7f39ca4ef2b8abd6407f9f7fc5d6>>
* @generated SignedSource<<bda4d9000386a7efbd6334bebd5d0461>>
*/
"use strict";
@@ -17300,11 +17300,11 @@ __DEV__ &&
shouldSuspendImpl = newShouldSuspendImpl;
};
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-native-fb-4549be0f-20240917" !== isomorphicReactPackageVersion)
if ("19.0.0-native-fb-15da9174-20240917" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-native-renderer: 19.0.0-native-fb-4549be0f-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-native-renderer: 19.0.0-native-fb-15da9174-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
);
if (
"function" !==
@@ -17330,11 +17330,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromTag,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals.rendererConfig = extraDevToolsConfig);
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<10d1fc48d3c04ee4192397b0a7260a58>>
* @generated SignedSource<<090e98b01db506348fe71a4048fce9f8>>
*/
"use strict";
@@ -11164,11 +11164,11 @@ function updateContainer(element, container, parentComponent, callback) {
return lane;
}
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-native-fb-4549be0f-20240917" !== isomorphicReactPackageVersion)
if ("19.0.0-native-fb-15da9174-20240917" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-native-renderer: 19.0.0-native-fb-4549be0f-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-native-renderer: 19.0.0-native-fb-15da9174-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
);
if (
"function" !==
@@ -11217,11 +11217,11 @@ batchedUpdatesImpl = function (fn, a) {
var roots = new Map(),
internals$jscomp$inline_1229 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromTag,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals$jscomp$inline_1229.rendererConfig = extraDevToolsConfig);
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<8d30849aa89a67ab148103270188b6f9>>
* @generated SignedSource<<75c913ffda839253f2e646a7707afd7c>>
*/
"use strict";
@@ -11822,11 +11822,11 @@ function updateContainer(element, container, parentComponent, callback) {
return lane;
}
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-native-fb-4549be0f-20240917" !== isomorphicReactPackageVersion)
if ("19.0.0-native-fb-15da9174-20240917" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-native-renderer: 19.0.0-native-fb-4549be0f-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-native-renderer: 19.0.0-native-fb-15da9174-20240917\nLearn more: https://react.dev/warnings/version-mismatch")
);
if (
"function" !==
@@ -11875,11 +11875,11 @@ batchedUpdatesImpl = function (fn, a) {
var roots = new Map(),
internals$jscomp$inline_1318 = {
bundleType: 0,
version: "19.0.0-native-fb-4549be0f-20240917",
version: "19.0.0-native-fb-15da9174-20240917",
rendererPackageName: "react-native-renderer",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromTag,
reconcilerVersion: "19.0.0-native-fb-4549be0f-20240917"
reconcilerVersion: "19.0.0-native-fb-15da9174-20240917"
};
null !== extraDevToolsConfig &&
(internals$jscomp$inline_1318.rendererConfig = extraDevToolsConfig);