Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Update while suspended fails to interrupt (#26739)

Browse Source 
This fixes a bug with `use` where if you update a component that's
currently suspended, React will sometimes mistake it for a render phase
update.

This happens because we don't reset `currentlyRenderingFiber` until the
suspended is unwound. And with `use`, that can happen asynchronously,
most commonly when the work loop is suspended during a transition.

The fix is to make sure `currentlyRenderingFiber` is only set when we're
in the middle of rendering, which used to be true until `use` was
introduced.

More specifically this means clearing `currentlyRenderingFiber` when
something throws and setting it again when we resume work.

In many cases, this bug will fail "gracefully" because the update is
still added to the queue; it's not dropped completely. It's also
somewhat rare because it has to be the exact same component that's
currently suspended. But it's still a bug. I wrote a regression test
that shows a sync update failing to interrupt a suspended component.

DiffTrain build for commit https://github.com/facebook/react/commit/18282f881dae106ebf6240aa52c8c02fe7c8d6f2.
This commit is contained in:
acdlite
2023-04-28 19:40:05 +00:00
parent fcc18f83c8
commit bdec677cb1
13 changed files with 214 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js
Vendored
+12 -10
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<147e07431dc4defee6d2e9faf584292a>>
* @generated SignedSource<<a56cd14b45443ff19095298bed47faaf>>
*/
'use strict';
@@ -6927,6 +6927,7 @@ function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
//
// Keep rendering in a loop for as long as render phase updates continue to
// be scheduled. Use a counter to prevent infinite loops.
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
var children;
@@ -6994,11 +6995,12 @@ function resetHooksAfterThrow() {
//
// It should only reset things like the current dispatcher, to prevent hooks
// from being called outside of a component.
// We can assume the previous dispatcher is always this one, since we set it
currentlyRenderingFiber$1 = null; // We can assume the previous dispatcher is always this one, since we set it
// at the beginning of the render phase and there's no re-entrance.
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
// There were render phase updates. These are only valid for this render
// phase, which we are now aborting. Remove the updates from the queues so
@@ -7008,7 +7010,7 @@ function resetHooksOnUnwind() {
// Only reset the updates from the queue if it has a clone. If it does
// not have a clone, that means it wasn't processed, and the updates were
// scheduled before we entered the render phase.
var hook = currentlyRenderingFiber$1.memoizedState;
var hook = workInProgress.memoizedState;
while (hook !== null) {
var queue = hook.queue;
@@ -20773,7 +20775,7 @@ function resetWorkInProgressStack() {
} else {
// Work-in-progress is in suspended state. Reset the work loop and unwind
// both the suspended fiber and all its parents.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(workInProgress);
interruptedWork = workInProgress;
}
@@ -20830,10 +20832,10 @@ function prepareFreshStack(root, lanes) {
return rootWorkInProgress;
}
function resetSuspendedWorkLoopOnUnwind() {
function resetSuspendedWorkLoopOnUnwind(fiber) {
// Reset module-level state that was set during the render phase.
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(fiber);
resetChildReconcilerOnUnwind();
}
@@ -21488,7 +21490,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
// is to reuse uncached promises, but we happen to know that the only
// promises that a host component might suspend on are definitely cached
// because they are controlled by us. So don't bother.
resetHooksOnUnwind(); // Fallthrough to the next branch.
resetHooksOnUnwind(unitOfWork); // Fallthrough to the next branch.
}
default: {
@@ -21534,7 +21536,7 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
//
// Return to the normal work loop. This will unwind the stack, and potentially
// result in showing a fallback.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(unitOfWork);
var returnFiber = unitOfWork.return;
if (returnFiber === null || workInProgressRoot === null) {
@@ -23892,7 +23894,7 @@ function createFiberRoot(
return root;
}
var ReactVersion = "18.3.0-next-540bab085-20230426";
var ReactVersion = "18.3.0-next-18282f881-20230428";
// Might add PROFILE later.
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js
Vendored
+31 -24
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<1d48b6135e400c479a77aa3a6d0aa557>>
* @generated SignedSource<<36182b4efb97f53e0d4f613caa8813e2>>
*/
"use strict";
@@ -2224,6 +2224,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -2246,12 +2247,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -6681,8 +6686,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -6720,6 +6726,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -6974,7 +6981,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -6989,7 +6996,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -8596,19 +8603,19 @@ function wrapFiber(fiber) {
fiberToWrapper.set(fiber, wrapper));
return wrapper;
}
var devToolsConfig$jscomp$inline_1022 = {
var devToolsConfig$jscomp$inline_1024 = {
findFiberByHostInstance: function () {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1207 = {
bundleType: devToolsConfig$jscomp$inline_1022.bundleType,
version: devToolsConfig$jscomp$inline_1022.version,
rendererPackageName: devToolsConfig$jscomp$inline_1022.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1022.rendererConfig,
var internals$jscomp$inline_1209 = {
bundleType: devToolsConfig$jscomp$inline_1024.bundleType,
version: devToolsConfig$jscomp$inline_1024.version,
rendererPackageName: devToolsConfig$jscomp$inline_1024.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1024.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -8625,26 +8632,26 @@ var internals$jscomp$inline_1207 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1022.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1024.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1208 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1210 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1208.isDisabled &&
hook$jscomp$inline_1208.supportsFiber
!hook$jscomp$inline_1210.isDisabled &&
hook$jscomp$inline_1210.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1208.inject(
internals$jscomp$inline_1207
(rendererID = hook$jscomp$inline_1210.inject(
internals$jscomp$inline_1209
)),
(injectedHook = hook$jscomp$inline_1208);
(injectedHook = hook$jscomp$inline_1210);
} catch (err) {}
}
exports._Scheduler = Scheduler;
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js
Vendored
+31 -24
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<1f1b211c71736978a204aa9af530fa47>>
* @generated SignedSource<<54c4cf0ba74fa6cfb2cf017a817e526a>>
*/
"use strict";
@@ -2244,6 +2244,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -2266,12 +2267,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -7021,8 +7026,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -7060,6 +7066,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -7325,7 +7332,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -7341,7 +7348,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -9022,19 +9029,19 @@ function wrapFiber(fiber) {
fiberToWrapper.set(fiber, wrapper));
return wrapper;
}
var devToolsConfig$jscomp$inline_1064 = {
var devToolsConfig$jscomp$inline_1066 = {
findFiberByHostInstance: function () {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1248 = {
bundleType: devToolsConfig$jscomp$inline_1064.bundleType,
version: devToolsConfig$jscomp$inline_1064.version,
rendererPackageName: devToolsConfig$jscomp$inline_1064.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1064.rendererConfig,
var internals$jscomp$inline_1250 = {
bundleType: devToolsConfig$jscomp$inline_1066.bundleType,
version: devToolsConfig$jscomp$inline_1066.version,
rendererPackageName: devToolsConfig$jscomp$inline_1066.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1066.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -9051,26 +9058,26 @@ var internals$jscomp$inline_1248 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1064.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1066.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1249 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1251 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1249.isDisabled &&
hook$jscomp$inline_1249.supportsFiber
!hook$jscomp$inline_1251.isDisabled &&
hook$jscomp$inline_1251.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1249.inject(
internals$jscomp$inline_1248
(rendererID = hook$jscomp$inline_1251.inject(
internals$jscomp$inline_1250
)),
(injectedHook = hook$jscomp$inline_1249);
(injectedHook = hook$jscomp$inline_1251);
} catch (err) {}
}
exports._Scheduler = Scheduler;
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ if (
}
"use strict";
var ReactVersion = "18.3.0-next-540bab085-20230426";
var ReactVersion = "18.3.0-next-18282f881-20230428";
// ATTENTION
// When adding new symbols to this file,
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js
Vendored
+1 -1
View File
@@ -639,4 +639,4 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-next-540bab085-20230426";
exports.version = "18.3.0-next-18282f881-20230428";
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js
Vendored
+1 -1
View File
@@ -642,7 +642,7 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-next-540bab085-20230426";
exports.version = "18.3.0-next-18282f881-20230428";
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
+1 -1
View File
@@ -1 +1 @@
540bab085d571789f4562565eebfd0db9f36345c
18282f881dae106ebf6240aa52c8c02fe7c8d6f2
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
+13 -11
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<c56d233e78e730ff1d26a9cbc8974a45>>
* @generated SignedSource<<18e30748410410333f18797738ddce9f>>
*/
'use strict';
@@ -10710,6 +10710,7 @@ function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
//
// Keep rendering in a loop for as long as render phase updates continue to
// be scheduled. Use a counter to prevent infinite loops.
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
var children;
@@ -10777,11 +10778,12 @@ function resetHooksAfterThrow() {
//
// It should only reset things like the current dispatcher, to prevent hooks
// from being called outside of a component.
// We can assume the previous dispatcher is always this one, since we set it
currentlyRenderingFiber$1 = null; // We can assume the previous dispatcher is always this one, since we set it
// at the beginning of the render phase and there's no re-entrance.
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
// There were render phase updates. These are only valid for this render
// phase, which we are now aborting. Remove the updates from the queues so
@@ -10791,7 +10793,7 @@ function resetHooksOnUnwind() {
// Only reset the updates from the queue if it has a clone. If it does
// not have a clone, that means it wasn't processed, and the updates were
// scheduled before we entered the render phase.
var hook = currentlyRenderingFiber$1.memoizedState;
var hook = workInProgress.memoizedState;
while (hook !== null) {
var queue = hook.queue;
@@ -23881,7 +23883,7 @@ function resetWorkInProgressStack() {
} else {
// Work-in-progress is in suspended state. Reset the work loop and unwind
// both the suspended fiber and all its parents.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(workInProgress);
interruptedWork = workInProgress;
}
@@ -23938,10 +23940,10 @@ function prepareFreshStack(root, lanes) {
return rootWorkInProgress;
}
function resetSuspendedWorkLoopOnUnwind() {
function resetSuspendedWorkLoopOnUnwind(fiber) {
// Reset module-level state that was set during the render phase.
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(fiber);
resetChildReconcilerOnUnwind();
}
@@ -24660,7 +24662,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
// is to reuse uncached promises, but we happen to know that the only
// promises that a host component might suspend on are definitely cached
// because they are controlled by us. So don't bother.
resetHooksOnUnwind(); // Fallthrough to the next branch.
resetHooksOnUnwind(unitOfWork); // Fallthrough to the next branch.
}
default: {
@@ -24706,7 +24708,7 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
//
// Return to the normal work loop. This will unwind the stack, and potentially
// result in showing a fallback.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(unitOfWork);
var returnFiber = unitOfWork.return;
if (returnFiber === null || workInProgressRoot === null) {
@@ -25766,7 +25768,7 @@ var beginWork;
// same fiber again.
// Unwind the failed stack frame
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(unitOfWork);
unwindInterruptedWork(current, unitOfWork); // Restore the original properties of the fiber.
assignFiberPropertiesInDEV(unitOfWork, originalWorkInProgressCopy);
@@ -27202,7 +27204,7 @@ function createFiberRoot(
return root;
}
var ReactVersion = "18.3.0-next-540bab085-20230426";
var ReactVersion = "18.3.0-next-18282f881-20230428";
function createPortal$1(
children,
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
+31 -24
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<eea5199d8ea5e7e01ee9bf40f6eb4713>>
* @generated SignedSource<<7a29c1691f1fff3fcabd828853dc510f>>
*/
"use strict";
@@ -3594,6 +3594,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -3616,12 +3617,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -7780,8 +7785,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -7819,6 +7825,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -8064,7 +8071,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -8079,7 +8086,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -9469,10 +9476,10 @@ batchedUpdatesImpl = function (fn, a) {
}
};
var roots = new Map(),
devToolsConfig$jscomp$inline_1046 = {
devToolsConfig$jscomp$inline_1048 = {
findFiberByHostInstance: getInstanceFromNode,
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function () {
@@ -9487,11 +9494,11 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1277 = {
bundleType: devToolsConfig$jscomp$inline_1046.bundleType,
version: devToolsConfig$jscomp$inline_1046.version,
rendererPackageName: devToolsConfig$jscomp$inline_1046.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1046.rendererConfig,
var internals$jscomp$inline_1279 = {
bundleType: devToolsConfig$jscomp$inline_1048.bundleType,
version: devToolsConfig$jscomp$inline_1048.version,
rendererPackageName: devToolsConfig$jscomp$inline_1048.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1048.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -9507,26 +9514,26 @@ var internals$jscomp$inline_1277 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1046.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1048.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1278 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1280 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1278.isDisabled &&
hook$jscomp$inline_1278.supportsFiber
!hook$jscomp$inline_1280.isDisabled &&
hook$jscomp$inline_1280.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1278.inject(
internals$jscomp$inline_1277
(rendererID = hook$jscomp$inline_1280.inject(
internals$jscomp$inline_1279
)),
(injectedHook = hook$jscomp$inline_1278);
(injectedHook = hook$jscomp$inline_1280);
} catch (err) {}
}
exports.createPortal = function (children, containerTag) {
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
+24 -17
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<7634b64643555a5e869a82fd5e1dc828>>
* @generated SignedSource<<4d7bf75ac0b4bdba172d8252b2ae83c7>>
*/
@@ -3724,6 +3724,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -3746,12 +3747,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -8311,8 +8316,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -8350,6 +8356,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -8661,7 +8668,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -8677,7 +8684,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -10178,10 +10185,10 @@ batchedUpdatesImpl = function (fn, a) {
}
};
var roots = new Map(),
devToolsConfig$jscomp$inline_1124 = {
devToolsConfig$jscomp$inline_1126 = {
findFiberByHostInstance: getInstanceFromNode,
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function () {
@@ -10210,10 +10217,10 @@ var roots = new Map(),
} catch (err) {}
return hook.checkDCE ? !0 : !1;
})({
bundleType: devToolsConfig$jscomp$inline_1124.bundleType,
version: devToolsConfig$jscomp$inline_1124.version,
rendererPackageName: devToolsConfig$jscomp$inline_1124.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1124.rendererConfig,
bundleType: devToolsConfig$jscomp$inline_1126.bundleType,
version: devToolsConfig$jscomp$inline_1126.version,
rendererPackageName: devToolsConfig$jscomp$inline_1126.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1126.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -10229,14 +10236,14 @@ var roots = new Map(),
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1124.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1126.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
});
exports.createPortal = function (children, containerTag) {
return createPortal$1(
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
+13 -11
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<22b18563a8650deb3b64f41ff6b2aec7>>
* @generated SignedSource<<57dda990c7572e68982e1c5dcca1693a>>
*/
'use strict';
@@ -11026,6 +11026,7 @@ function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
//
// Keep rendering in a loop for as long as render phase updates continue to
// be scheduled. Use a counter to prevent infinite loops.
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
var children;
@@ -11093,11 +11094,12 @@ function resetHooksAfterThrow() {
//
// It should only reset things like the current dispatcher, to prevent hooks
// from being called outside of a component.
// We can assume the previous dispatcher is always this one, since we set it
currentlyRenderingFiber$1 = null; // We can assume the previous dispatcher is always this one, since we set it
// at the beginning of the render phase and there's no re-entrance.
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
// There were render phase updates. These are only valid for this render
// phase, which we are now aborting. Remove the updates from the queues so
@@ -11107,7 +11109,7 @@ function resetHooksOnUnwind() {
// Only reset the updates from the queue if it has a clone. If it does
// not have a clone, that means it wasn't processed, and the updates were
// scheduled before we entered the render phase.
var hook = currentlyRenderingFiber$1.memoizedState;
var hook = workInProgress.memoizedState;
while (hook !== null) {
var queue = hook.queue;
@@ -24394,7 +24396,7 @@ function resetWorkInProgressStack() {
} else {
// Work-in-progress is in suspended state. Reset the work loop and unwind
// both the suspended fiber and all its parents.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(workInProgress);
interruptedWork = workInProgress;
}
@@ -24451,10 +24453,10 @@ function prepareFreshStack(root, lanes) {
return rootWorkInProgress;
}
function resetSuspendedWorkLoopOnUnwind() {
function resetSuspendedWorkLoopOnUnwind(fiber) {
// Reset module-level state that was set during the render phase.
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(fiber);
resetChildReconcilerOnUnwind();
}
@@ -25173,7 +25175,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
// is to reuse uncached promises, but we happen to know that the only
// promises that a host component might suspend on are definitely cached
// because they are controlled by us. So don't bother.
resetHooksOnUnwind(); // Fallthrough to the next branch.
resetHooksOnUnwind(unitOfWork); // Fallthrough to the next branch.
}
default: {
@@ -25219,7 +25221,7 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
//
// Return to the normal work loop. This will unwind the stack, and potentially
// result in showing a fallback.
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(unitOfWork);
var returnFiber = unitOfWork.return;
if (returnFiber === null || workInProgressRoot === null) {
@@ -26279,7 +26281,7 @@ var beginWork;
// same fiber again.
// Unwind the failed stack frame
resetSuspendedWorkLoopOnUnwind();
resetSuspendedWorkLoopOnUnwind(unitOfWork);
unwindInterruptedWork(current, unitOfWork); // Restore the original properties of the fiber.
assignFiberPropertiesInDEV(unitOfWork, originalWorkInProgressCopy);
@@ -27715,7 +27717,7 @@ function createFiberRoot(
return root;
}
var ReactVersion = "18.3.0-next-540bab085-20230426";
var ReactVersion = "18.3.0-next-18282f881-20230428";
function createPortal$1(
children,
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
+31 -24
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<af3a4dae6a45a4183ba8d894550b2310>>
* @generated SignedSource<<01e7b5c787b69207a4de64324a71419c>>
*/
"use strict";
@@ -3684,6 +3684,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -3706,12 +3707,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -8032,8 +8037,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -8071,6 +8077,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -8316,7 +8323,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -8331,7 +8338,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -9728,10 +9735,10 @@ batchedUpdatesImpl = function (fn, a) {
}
};
var roots = new Map(),
devToolsConfig$jscomp$inline_1101 = {
devToolsConfig$jscomp$inline_1103 = {
findFiberByHostInstance: getInstanceFromTag,
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function () {
@@ -9746,11 +9753,11 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1346 = {
bundleType: devToolsConfig$jscomp$inline_1101.bundleType,
version: devToolsConfig$jscomp$inline_1101.version,
rendererPackageName: devToolsConfig$jscomp$inline_1101.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1101.rendererConfig,
var internals$jscomp$inline_1348 = {
bundleType: devToolsConfig$jscomp$inline_1103.bundleType,
version: devToolsConfig$jscomp$inline_1103.version,
rendererPackageName: devToolsConfig$jscomp$inline_1103.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1103.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -9766,26 +9773,26 @@ var internals$jscomp$inline_1346 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1101.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1103.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1347 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1349 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1347.isDisabled &&
hook$jscomp$inline_1347.supportsFiber
!hook$jscomp$inline_1349.isDisabled &&
hook$jscomp$inline_1349.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1347.inject(
internals$jscomp$inline_1346
(rendererID = hook$jscomp$inline_1349.inject(
internals$jscomp$inline_1348
)),
(injectedHook = hook$jscomp$inline_1347);
(injectedHook = hook$jscomp$inline_1349);
} catch (err) {}
}
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
+24 -17
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<96114abf645049ee264d3195be710b11>>
* @generated SignedSource<<3fc819c2e3782cf6fa92dd2e4f1c20b7>>
*/
@@ -3814,6 +3814,7 @@ function finishRenderingHooks() {
);
}
function renderWithHooksAgain(workInProgress, Component, props, secondArg) {
currentlyRenderingFiber$1 = workInProgress;
var numberOfReRenders = 0;
do {
didScheduleRenderPhaseUpdateDuringThisPass && (thenableState = null);
@@ -3836,12 +3837,16 @@ function bailoutHooks(current, workInProgress, lanes) {
workInProgress.flags &= -2053;
current.lanes &= ~lanes;
}
function resetHooksOnUnwind() {
function resetHooksOnUnwind(workInProgress) {
if (didScheduleRenderPhaseUpdate) {
for (var hook = currentlyRenderingFiber$1.memoizedState; null !== hook; ) {
var queue = hook.queue;
for (
workInProgress = workInProgress.memoizedState;
null !== workInProgress;
) {
var queue = workInProgress.queue;
null !== queue && (queue.pending = null);
hook = hook.next;
workInProgress = workInProgress.next;
}
didScheduleRenderPhaseUpdate = !1;
}
@@ -8563,8 +8568,9 @@ function resetWorkInProgressStack() {
if (0 === workInProgressSuspendedReason)
var interruptedWork = workInProgress.return;
else
resetContextDependencies(),
resetHooksOnUnwind(),
(interruptedWork = workInProgress),
resetContextDependencies(),
resetHooksOnUnwind(interruptedWork),
(thenableState$1 = null),
(thenableIndexCounter$1 = 0),
(interruptedWork = workInProgress);
@@ -8602,6 +8608,7 @@ function prepareFreshStack(root, lanes) {
return root;
}
function handleThrow(root, thrownValue) {
currentlyRenderingFiber$1 = null;
ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
ReactCurrentOwner.current = null;
thrownValue === SuspenseException
@@ -8913,7 +8920,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
);
break;
case 5:
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
default:
unwindInterruptedWork(current, unitOfWork),
(unitOfWork = workInProgress =
@@ -8929,7 +8936,7 @@ function replaySuspendedUnitOfWork(unitOfWork) {
}
function throwAndUnwindWorkLoop(unitOfWork, thrownValue) {
resetContextDependencies();
resetHooksOnUnwind();
resetHooksOnUnwind(unitOfWork);
thenableState$1 = null;
thenableIndexCounter$1 = 0;
var returnFiber = unitOfWork.return;
@@ -10437,10 +10444,10 @@ batchedUpdatesImpl = function (fn, a) {
}
};
var roots = new Map(),
devToolsConfig$jscomp$inline_1179 = {
devToolsConfig$jscomp$inline_1181 = {
findFiberByHostInstance: getInstanceFromTag,
bundleType: 0,
version: "18.3.0-next-540bab085-20230426",
version: "18.3.0-next-18282f881-20230428",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function () {
@@ -10469,10 +10476,10 @@ var roots = new Map(),
} catch (err) {}
return hook.checkDCE ? !0 : !1;
})({
bundleType: devToolsConfig$jscomp$inline_1179.bundleType,
version: devToolsConfig$jscomp$inline_1179.version,
rendererPackageName: devToolsConfig$jscomp$inline_1179.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1179.rendererConfig,
bundleType: devToolsConfig$jscomp$inline_1181.bundleType,
version: devToolsConfig$jscomp$inline_1181.version,
rendererPackageName: devToolsConfig$jscomp$inline_1181.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1181.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
@@ -10488,14 +10495,14 @@ var roots = new Map(),
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1179.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1181.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-540bab085-20230426"
reconcilerVersion: "18.3.0-next-18282f881-20230428"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
computeComponentStackForErrorReporting: function (reactTag) {