From 44c0913b5cba7a1563094a54e5d56a906da4a5b8 Mon Sep 17 00:00:00 2001 From: acdlite Date: Sun, 2 Apr 2023 22:53:07 +0000 Subject: [PATCH] Fix suspense replaying forward refs (#26535) Continuation of https://github.com/facebook/react/issues/26420 Fixes https://github.com/facebook/react/issues/26385 and https://github.com/facebook/react/issues/26419 --------- Co-authored-by: eps1lon Co-authored-by: Andrew Clark DiffTrain build for commit https://github.com/facebook/react/commit/7329ea81c154d40800e30104be40f050e8c2af3e. --- .../cjs/ReactTestRenderer-dev.js | 43 ++++++--- .../cjs/ReactTestRenderer-prod.js | 57 +++++++----- .../cjs/ReactTestRenderer-profiling.js | 57 +++++++----- .../RKJSModules/vendor/react/cjs/React-dev.js | 2 +- .../vendor/react/cjs/React-prod.js | 2 +- .../vendor/react/cjs/React-profiling.js | 2 +- .../Libraries/Renderer/REVISION | 2 +- .../implementations/ReactFabric-dev.fb.js | 43 ++++++--- .../implementations/ReactFabric-prod.fb.js | 91 ++++++++++--------- .../ReactFabric-profiling.fb.js | 77 +++++++++------- .../ReactNativeRenderer-dev.fb.js | 43 ++++++--- .../ReactNativeRenderer-prod.fb.js | 91 ++++++++++--------- .../ReactNativeRenderer-profiling.fb.js | 77 +++++++++------- 13 files changed, 340 insertions(+), 247 deletions(-) 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 index c6b4656597794..aab93e23a720b 100644 --- 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 @@ -11354,18 +11354,12 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { // This function is used to replay a component that previously suspended, // after its data resolves. It's a simplified version of // updateFunctionComponent that reuses the hooks from the previous attempt. - var context; - - { - var unmaskedContext = getUnmaskedContext(workInProgress, Component, true); - context = getMaskedContext(workInProgress, unmaskedContext); - } - prepareToReadContext(workInProgress, renderLanes); var nextChildren = replaySuspendedComponentWithHooks( @@ -11373,7 +11367,7 @@ function replayFunctionComponent( workInProgress, Component, nextProps, - context + secondArg ); if (current !== null && !didReceiveUpdate) { @@ -21407,8 +21401,8 @@ function replaySuspendedUnitOfWork(unitOfWork) { } // eslint-disable-next-line no-fallthrough - case FunctionComponent: - case ForwardRef: { + case SimpleMemoComponent: + case FunctionComponent: { // Resolve `defaultProps`. This logic is copied from `beginWork`. // TODO: Consider moving this switch statement into that module. Also, // could maybe use this as an opportunity to say `use` doesn't work with @@ -21419,24 +21413,43 @@ function replaySuspendedUnitOfWork(unitOfWork) { unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context; + + { + var unmaskedContext = getUnmaskedContext(unitOfWork, Component, true); + context = getMaskedContext(unitOfWork, unmaskedContext); + } + next = replayFunctionComponent( current, unitOfWork, resolvedProps, Component, + context, workInProgressRootRenderLanes ); break; } - case SimpleMemoComponent: { - var _Component = unitOfWork.type; - var nextProps = unitOfWork.pendingProps; + case ForwardRef: { + // Resolve `defaultProps`. This logic is copied from `beginWork`. + // TODO: Consider moving this switch statement into that module. Also, + // could maybe use this as an opportunity to say `use` doesn't work with + // `defaultProps` :) + var _Component = unitOfWork.type.render; + var _unresolvedProps = unitOfWork.pendingProps; + + var _resolvedProps = + unitOfWork.elementType === _Component + ? _unresolvedProps + : resolveDefaultProps(_Component, _unresolvedProps); + next = replayFunctionComponent( current, unitOfWork, - nextProps, + _resolvedProps, _Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -23869,7 +23882,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-0ae348018-20230331"; +var ReactVersion = "18.3.0-next-7329ea81c-20230402"; // 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 index 26a7aa1487178..8119f67ed62d3 100644 --- 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 @@ -3249,18 +3249,15 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); if (null !== current && !didReceiveUpdate) @@ -7017,28 +7014,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -8669,19 +8678,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1026 = { +var devToolsConfig$jscomp$inline_1028 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-next-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1218 = { - bundleType: devToolsConfig$jscomp$inline_1026.bundleType, - version: devToolsConfig$jscomp$inline_1026.version, - rendererPackageName: devToolsConfig$jscomp$inline_1026.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1026.rendererConfig, +var internals$jscomp$inline_1220 = { + bundleType: devToolsConfig$jscomp$inline_1028.bundleType, + version: devToolsConfig$jscomp$inline_1028.version, + rendererPackageName: devToolsConfig$jscomp$inline_1028.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1028.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -8698,26 +8707,26 @@ var internals$jscomp$inline_1218 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1026.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1028.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1219 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1221 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1219.isDisabled && - hook$jscomp$inline_1219.supportsFiber + !hook$jscomp$inline_1221.isDisabled && + hook$jscomp$inline_1221.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1219.inject( - internals$jscomp$inline_1218 + (rendererID = hook$jscomp$inline_1221.inject( + internals$jscomp$inline_1220 )), - (injectedHook = hook$jscomp$inline_1219); + (injectedHook = hook$jscomp$inline_1221); } catch (err) {} } exports._Scheduler = Scheduler; 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 index fac37bf2b037c..9a4b2bfb252e0 100644 --- 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 @@ -3329,18 +3329,15 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); if (null !== current && !didReceiveUpdate) @@ -7367,28 +7364,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -9094,19 +9103,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1068 = { +var devToolsConfig$jscomp$inline_1070 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-next-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1259 = { - bundleType: devToolsConfig$jscomp$inline_1068.bundleType, - version: devToolsConfig$jscomp$inline_1068.version, - rendererPackageName: devToolsConfig$jscomp$inline_1068.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1068.rendererConfig, +var internals$jscomp$inline_1261 = { + bundleType: devToolsConfig$jscomp$inline_1070.bundleType, + version: devToolsConfig$jscomp$inline_1070.version, + rendererPackageName: devToolsConfig$jscomp$inline_1070.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1070.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9123,26 +9132,26 @@ var internals$jscomp$inline_1259 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1068.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1070.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1260 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1262 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1260.isDisabled && - hook$jscomp$inline_1260.supportsFiber + !hook$jscomp$inline_1262.isDisabled && + hook$jscomp$inline_1262.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1260.inject( - internals$jscomp$inline_1259 + (rendererID = hook$jscomp$inline_1262.inject( + internals$jscomp$inline_1261 )), - (injectedHook = hook$jscomp$inline_1260); + (injectedHook = hook$jscomp$inline_1262); } catch (err) {} } exports._Scheduler = Scheduler; 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 index 60ae416b0d897..4d85b82892bde 100644 --- 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-next-0ae348018-20230331"; +var ReactVersion = "18.3.0-next-7329ea81c-20230402"; // 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 index 7658e46638076..060c95538ebf3 100644 --- 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 @@ -639,4 +639,4 @@ exports.useSyncExternalStore = function ( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-next-0ae348018-20230331"; +exports.version = "18.3.0-next-7329ea81c-20230402"; 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 index 918c3ef4f4e7a..8f244522fb7c9 100644 --- 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 @@ -642,7 +642,7 @@ exports.useSyncExternalStore = function ( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-next-0ae348018-20230331"; +exports.version = "18.3.0-next-7329ea81c-20230402"; /* 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 index 77f38c9b29c04..90896084774bb 100644 --- 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 @@ -0ae348018d5b3a3f1ccdd92de85d9cc581b2b98d +7329ea81c154d40800e30104be40f050e8c2af3e diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js index 3257898300eff..95d7ced29bb2b 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js @@ -15415,18 +15415,12 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { // This function is used to replay a component that previously suspended, // after its data resolves. It's a simplified version of // updateFunctionComponent that reuses the hooks from the previous attempt. - var context; - - { - var unmaskedContext = getUnmaskedContext(workInProgress, Component, true); - context = getMaskedContext(workInProgress, unmaskedContext); - } - prepareToReadContext(workInProgress, renderLanes); { @@ -15438,7 +15432,7 @@ function replayFunctionComponent( workInProgress, Component, nextProps, - context + secondArg ); { @@ -24545,8 +24539,8 @@ function replaySuspendedUnitOfWork(unitOfWork) { } // eslint-disable-next-line no-fallthrough - case FunctionComponent: - case ForwardRef: { + case SimpleMemoComponent: + case FunctionComponent: { // Resolve `defaultProps`. This logic is copied from `beginWork`. // TODO: Consider moving this switch statement into that module. Also, // could maybe use this as an opportunity to say `use` doesn't work with @@ -24557,24 +24551,43 @@ function replaySuspendedUnitOfWork(unitOfWork) { unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context; + + { + var unmaskedContext = getUnmaskedContext(unitOfWork, Component, true); + context = getMaskedContext(unitOfWork, unmaskedContext); + } + next = replayFunctionComponent( current, unitOfWork, resolvedProps, Component, + context, workInProgressRootRenderLanes ); break; } - case SimpleMemoComponent: { - var _Component = unitOfWork.type; - var nextProps = unitOfWork.pendingProps; + case ForwardRef: { + // Resolve `defaultProps`. This logic is copied from `beginWork`. + // TODO: Consider moving this switch statement into that module. Also, + // could maybe use this as an opportunity to say `use` doesn't work with + // `defaultProps` :) + var _Component = unitOfWork.type.render; + var _unresolvedProps = unitOfWork.pendingProps; + + var _resolvedProps = + unitOfWork.elementType === _Component + ? _unresolvedProps + : resolveDefaultProps(_Component, _unresolvedProps); + next = replayFunctionComponent( current, unitOfWork, - nextProps, + _resolvedProps, _Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -27145,7 +27158,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-0ae348018-20230331"; +var ReactVersion = "18.3.0-next-7329ea81c-20230402"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js index 57c62f0059ae0..980aa754b8131 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js @@ -940,7 +940,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_241 = { +var injectedNamesToPlugins$jscomp$inline_243 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -986,32 +986,32 @@ var injectedNamesToPlugins$jscomp$inline_241 = { } } }, - isOrderingDirty$jscomp$inline_242 = !1, - pluginName$jscomp$inline_243; -for (pluginName$jscomp$inline_243 in injectedNamesToPlugins$jscomp$inline_241) + isOrderingDirty$jscomp$inline_244 = !1, + pluginName$jscomp$inline_245; +for (pluginName$jscomp$inline_245 in injectedNamesToPlugins$jscomp$inline_243) if ( - injectedNamesToPlugins$jscomp$inline_241.hasOwnProperty( - pluginName$jscomp$inline_243 + injectedNamesToPlugins$jscomp$inline_243.hasOwnProperty( + pluginName$jscomp$inline_245 ) ) { - var pluginModule$jscomp$inline_244 = - injectedNamesToPlugins$jscomp$inline_241[pluginName$jscomp$inline_243]; + var pluginModule$jscomp$inline_246 = + injectedNamesToPlugins$jscomp$inline_243[pluginName$jscomp$inline_245]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_243) || - namesToPlugins[pluginName$jscomp$inline_243] !== - pluginModule$jscomp$inline_244 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_245) || + namesToPlugins[pluginName$jscomp$inline_245] !== + pluginModule$jscomp$inline_246 ) { - if (namesToPlugins[pluginName$jscomp$inline_243]) + if (namesToPlugins[pluginName$jscomp$inline_245]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_243 + "`.") + (pluginName$jscomp$inline_245 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_243] = - pluginModule$jscomp$inline_244; - isOrderingDirty$jscomp$inline_242 = !0; + namesToPlugins[pluginName$jscomp$inline_245] = + pluginModule$jscomp$inline_246; + isOrderingDirty$jscomp$inline_244 = !0; } } -isOrderingDirty$jscomp$inline_242 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_244 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -4729,18 +4729,15 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); if (null !== current && !didReceiveUpdate) @@ -8107,28 +8104,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -9542,10 +9551,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-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -9560,11 +9569,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1291 = { - 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_1293 = { + 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, @@ -9580,26 +9589,26 @@ var internals$jscomp$inline_1291 = { 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-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1292 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1294 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1292.isDisabled && - hook$jscomp$inline_1292.supportsFiber + !hook$jscomp$inline_1294.isDisabled && + hook$jscomp$inline_1294.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1292.inject( - internals$jscomp$inline_1291 + (rendererID = hook$jscomp$inline_1294.inject( + internals$jscomp$inline_1293 )), - (injectedHook = hook$jscomp$inline_1292); + (injectedHook = hook$jscomp$inline_1294); } catch (err) {} } exports.createPortal = function (children, containerTag) { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js index f67d8066c2097..8ef5073f60211 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js @@ -951,7 +951,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_257 = { +var injectedNamesToPlugins$jscomp$inline_259 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -997,32 +997,32 @@ var injectedNamesToPlugins$jscomp$inline_257 = { } } }, - isOrderingDirty$jscomp$inline_258 = !1, - pluginName$jscomp$inline_259; -for (pluginName$jscomp$inline_259 in injectedNamesToPlugins$jscomp$inline_257) + isOrderingDirty$jscomp$inline_260 = !1, + pluginName$jscomp$inline_261; +for (pluginName$jscomp$inline_261 in injectedNamesToPlugins$jscomp$inline_259) if ( - injectedNamesToPlugins$jscomp$inline_257.hasOwnProperty( - pluginName$jscomp$inline_259 + injectedNamesToPlugins$jscomp$inline_259.hasOwnProperty( + pluginName$jscomp$inline_261 ) ) { - var pluginModule$jscomp$inline_260 = - injectedNamesToPlugins$jscomp$inline_257[pluginName$jscomp$inline_259]; + var pluginModule$jscomp$inline_262 = + injectedNamesToPlugins$jscomp$inline_259[pluginName$jscomp$inline_261]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_259) || - namesToPlugins[pluginName$jscomp$inline_259] !== - pluginModule$jscomp$inline_260 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_261) || + namesToPlugins[pluginName$jscomp$inline_261] !== + pluginModule$jscomp$inline_262 ) { - if (namesToPlugins[pluginName$jscomp$inline_259]) + if (namesToPlugins[pluginName$jscomp$inline_261]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_259 + "`.") + (pluginName$jscomp$inline_261 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_259] = - pluginModule$jscomp$inline_260; - isOrderingDirty$jscomp$inline_258 = !0; + namesToPlugins[pluginName$jscomp$inline_261] = + pluginModule$jscomp$inline_262; + isOrderingDirty$jscomp$inline_260 = !0; } } -isOrderingDirty$jscomp$inline_258 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_260 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -4930,19 +4930,16 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); markComponentRenderStarted(workInProgress); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); markComponentRenderStopped(); @@ -8703,28 +8700,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -10250,10 +10259,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-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -10282,10 +10291,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, @@ -10301,14 +10310,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-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }); exports.createPortal = function (children, containerTag) { return createPortal$1( diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js index af7cc166b63a4..76dd16e8e21b3 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js @@ -15759,18 +15759,12 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { // This function is used to replay a component that previously suspended, // after its data resolves. It's a simplified version of // updateFunctionComponent that reuses the hooks from the previous attempt. - var context; - - { - var unmaskedContext = getUnmaskedContext(workInProgress, Component, true); - context = getMaskedContext(workInProgress, unmaskedContext); - } - prepareToReadContext(workInProgress, renderLanes); { @@ -15782,7 +15776,7 @@ function replayFunctionComponent( workInProgress, Component, nextProps, - context + secondArg ); { @@ -25085,8 +25079,8 @@ function replaySuspendedUnitOfWork(unitOfWork) { } // eslint-disable-next-line no-fallthrough - case FunctionComponent: - case ForwardRef: { + case SimpleMemoComponent: + case FunctionComponent: { // Resolve `defaultProps`. This logic is copied from `beginWork`. // TODO: Consider moving this switch statement into that module. Also, // could maybe use this as an opportunity to say `use` doesn't work with @@ -25097,24 +25091,43 @@ function replaySuspendedUnitOfWork(unitOfWork) { unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context; + + { + var unmaskedContext = getUnmaskedContext(unitOfWork, Component, true); + context = getMaskedContext(unitOfWork, unmaskedContext); + } + next = replayFunctionComponent( current, unitOfWork, resolvedProps, Component, + context, workInProgressRootRenderLanes ); break; } - case SimpleMemoComponent: { - var _Component = unitOfWork.type; - var nextProps = unitOfWork.pendingProps; + case ForwardRef: { + // Resolve `defaultProps`. This logic is copied from `beginWork`. + // TODO: Consider moving this switch statement into that module. Also, + // could maybe use this as an opportunity to say `use` doesn't work with + // `defaultProps` :) + var _Component = unitOfWork.type.render; + var _unresolvedProps = unitOfWork.pendingProps; + + var _resolvedProps = + unitOfWork.elementType === _Component + ? _unresolvedProps + : resolveDefaultProps(_Component, _unresolvedProps); + next = replayFunctionComponent( current, unitOfWork, - nextProps, + _resolvedProps, _Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -27685,7 +27698,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-0ae348018-20230331"; +var ReactVersion = "18.3.0-next-7329ea81c-20230402"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js index 8e6a1c1be5c59..3247dfdbd4ef5 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js @@ -940,7 +940,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_248 = { +var injectedNamesToPlugins$jscomp$inline_250 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -986,32 +986,32 @@ var injectedNamesToPlugins$jscomp$inline_248 = { } } }, - isOrderingDirty$jscomp$inline_249 = !1, - pluginName$jscomp$inline_250; -for (pluginName$jscomp$inline_250 in injectedNamesToPlugins$jscomp$inline_248) + isOrderingDirty$jscomp$inline_251 = !1, + pluginName$jscomp$inline_252; +for (pluginName$jscomp$inline_252 in injectedNamesToPlugins$jscomp$inline_250) if ( - injectedNamesToPlugins$jscomp$inline_248.hasOwnProperty( - pluginName$jscomp$inline_250 + injectedNamesToPlugins$jscomp$inline_250.hasOwnProperty( + pluginName$jscomp$inline_252 ) ) { - var pluginModule$jscomp$inline_251 = - injectedNamesToPlugins$jscomp$inline_248[pluginName$jscomp$inline_250]; + var pluginModule$jscomp$inline_253 = + injectedNamesToPlugins$jscomp$inline_250[pluginName$jscomp$inline_252]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_250) || - namesToPlugins[pluginName$jscomp$inline_250] !== - pluginModule$jscomp$inline_251 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_252) || + namesToPlugins[pluginName$jscomp$inline_252] !== + pluginModule$jscomp$inline_253 ) { - if (namesToPlugins[pluginName$jscomp$inline_250]) + if (namesToPlugins[pluginName$jscomp$inline_252]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_250 + "`.") + (pluginName$jscomp$inline_252 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_250] = - pluginModule$jscomp$inline_251; - isOrderingDirty$jscomp$inline_249 = !0; + namesToPlugins[pluginName$jscomp$inline_252] = + pluginModule$jscomp$inline_253; + isOrderingDirty$jscomp$inline_251 = !0; } } -isOrderingDirty$jscomp$inline_249 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_251 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -4809,18 +4809,15 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); if (null !== current && !didReceiveUpdate) @@ -8356,28 +8353,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -9798,10 +9807,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1105 = { + devToolsConfig$jscomp$inline_1107 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-next-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -9816,11 +9825,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1357 = { - bundleType: devToolsConfig$jscomp$inline_1105.bundleType, - version: devToolsConfig$jscomp$inline_1105.version, - rendererPackageName: devToolsConfig$jscomp$inline_1105.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1105.rendererConfig, +var internals$jscomp$inline_1359 = { + bundleType: devToolsConfig$jscomp$inline_1107.bundleType, + version: devToolsConfig$jscomp$inline_1107.version, + rendererPackageName: devToolsConfig$jscomp$inline_1107.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1107.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9836,26 +9845,26 @@ var internals$jscomp$inline_1357 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1105.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1107.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1358 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1360 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1358.isDisabled && - hook$jscomp$inline_1358.supportsFiber + !hook$jscomp$inline_1360.isDisabled && + hook$jscomp$inline_1360.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1358.inject( - internals$jscomp$inline_1357 + (rendererID = hook$jscomp$inline_1360.inject( + internals$jscomp$inline_1359 )), - (injectedHook = hook$jscomp$inline_1358); + (injectedHook = hook$jscomp$inline_1360); } catch (err) {} } exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js index e2668266cbd83..2b67aea09080f 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js @@ -951,7 +951,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_264 = { +var injectedNamesToPlugins$jscomp$inline_266 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -997,32 +997,32 @@ var injectedNamesToPlugins$jscomp$inline_264 = { } } }, - isOrderingDirty$jscomp$inline_265 = !1, - pluginName$jscomp$inline_266; -for (pluginName$jscomp$inline_266 in injectedNamesToPlugins$jscomp$inline_264) + isOrderingDirty$jscomp$inline_267 = !1, + pluginName$jscomp$inline_268; +for (pluginName$jscomp$inline_268 in injectedNamesToPlugins$jscomp$inline_266) if ( - injectedNamesToPlugins$jscomp$inline_264.hasOwnProperty( - pluginName$jscomp$inline_266 + injectedNamesToPlugins$jscomp$inline_266.hasOwnProperty( + pluginName$jscomp$inline_268 ) ) { - var pluginModule$jscomp$inline_267 = - injectedNamesToPlugins$jscomp$inline_264[pluginName$jscomp$inline_266]; + var pluginModule$jscomp$inline_269 = + injectedNamesToPlugins$jscomp$inline_266[pluginName$jscomp$inline_268]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_266) || - namesToPlugins[pluginName$jscomp$inline_266] !== - pluginModule$jscomp$inline_267 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_268) || + namesToPlugins[pluginName$jscomp$inline_268] !== + pluginModule$jscomp$inline_269 ) { - if (namesToPlugins[pluginName$jscomp$inline_266]) + if (namesToPlugins[pluginName$jscomp$inline_268]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_266 + "`.") + (pluginName$jscomp$inline_268 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_266] = - pluginModule$jscomp$inline_267; - isOrderingDirty$jscomp$inline_265 = !0; + namesToPlugins[pluginName$jscomp$inline_268] = + pluginModule$jscomp$inline_269; + isOrderingDirty$jscomp$inline_267 = !0; } } -isOrderingDirty$jscomp$inline_265 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_267 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -5010,19 +5010,16 @@ function replayFunctionComponent( workInProgress, nextProps, Component, + secondArg, renderLanes ) { - var context = isContextProvider(Component) - ? previousContext - : contextStackCursor$1.current; - context = getMaskedContext(workInProgress, context); prepareToReadContext(workInProgress, renderLanes); markComponentRenderStarted(workInProgress); nextProps = renderWithHooksAgain( workInProgress, Component, nextProps, - context + secondArg ); finishRenderingHooks(); markComponentRenderStopped(); @@ -8952,28 +8949,40 @@ function replaySuspendedUnitOfWork(unitOfWork) { switch (unitOfWork.tag) { case 2: unitOfWork.tag = 0; + case 15: case 0: - case 11: var Component = unitOfWork.type, unresolvedProps = unitOfWork.pendingProps; unresolvedProps = unitOfWork.elementType === Component ? unresolvedProps : resolveDefaultProps(Component, unresolvedProps); + var context = isContextProvider(Component) + ? previousContext + : contextStackCursor$1.current; + context = getMaskedContext(unitOfWork, context); current = replayFunctionComponent( current, unitOfWork, unresolvedProps, Component, + context, workInProgressRootRenderLanes ); break; - case 15: + case 11: + Component = unitOfWork.type.render; + unresolvedProps = unitOfWork.pendingProps; + unresolvedProps = + unitOfWork.elementType === Component + ? unresolvedProps + : resolveDefaultProps(Component, unresolvedProps); current = replayFunctionComponent( current, unitOfWork, - unitOfWork.pendingProps, - unitOfWork.type, + unresolvedProps, + Component, + unitOfWork.ref, workInProgressRootRenderLanes ); break; @@ -10506,10 +10515,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1183 = { + devToolsConfig$jscomp$inline_1185 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-next-0ae348018-20230331", + version: "18.3.0-next-7329ea81c-20230402", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -10538,10 +10547,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1183.bundleType, - version: devToolsConfig$jscomp$inline_1183.version, - rendererPackageName: devToolsConfig$jscomp$inline_1183.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1183.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1185.bundleType, + version: devToolsConfig$jscomp$inline_1185.version, + rendererPackageName: devToolsConfig$jscomp$inline_1185.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1185.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10557,14 +10566,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1183.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1185.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-0ae348018-20230331" + reconcilerVersion: "18.3.0-next-7329ea81c-20230402" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {