From db59a3ec1d31bf2b5f87417bfaa3d2ee02966175 Mon Sep 17 00:00:00 2001 From: sebmarkbage Date: Mon, 12 Feb 2024 20:01:39 +0000 Subject: [PATCH] [Fiber] Transfer `_debugInfo` from Arrays, Lazy, Thenables and Elements to the inner Fibers. (#28286) That way we can use it for debug information like component stacks and DevTools. I used an extra stack argument in Child Fiber to track this as it's flowing down since it's not just elements where we have this info readily available but parent arrays and lazy can merge this into the Fiber too. It's not great that this is a dev-only argument and I could track it globally but seems more likely to make mistakes. It is possible for the same debug info to appear for multiple child fibers like when it's attached to a fragment or a lazy that resolves to a fragment at the root. The object identity could be used in these scenarios to infer if that's really one server component that's a parent of all children or if each child has a server component with the same name. This is effectively a public API because you can use it to stash information on Promises from a third-party service - not just Server Components. I started outline the types for this for some things I was planning to add but it's not final. I was also planning on storing it from `use(thenable)` for when you suspend on a Promise. However, I realized that there's no Hook instance for those to stash it on. So it might need a separate data structure to stash the previous pass over of `use()` that resets each render. No tests yet since I didn't want to test internals but it'll be covered once we have debugging features like component stacks. DiffTrain build for commit https://github.com/facebook/react/commit/3f93ca1c8dec1fd85df4dbb748a2df9438fc699f. --- .../cjs/ReactTestRenderer-dev.js | 294 ++++++++++++++--- .../cjs/ReactTestRenderer-prod.js | 44 ++- .../cjs/ReactTestRenderer-profiling.js | 44 ++- .../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 | 295 +++++++++++++++--- .../implementations/ReactFabric-prod.fb.js | 44 ++- .../ReactFabric-profiling.fb.js | 30 +- .../ReactNativeRenderer-dev.fb.js | 295 +++++++++++++++--- .../ReactNativeRenderer-prod.fb.js | 44 ++- .../ReactNativeRenderer-profiling.fb.js | 30 +- 13 files changed, 841 insertions(+), 287 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 7ba550a6ef..1b363d3b06 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<9e5c6574214265b8a7f68fb3d0ee99e5>> + * @generated SignedSource<<4781c0c583d1e61ede17a8c473948719>> */ "use strict"; @@ -5112,6 +5112,20 @@ if (__DEV__) { var thenableState$1 = null; var thenableIndexCounter$1 = 0; + + function mergeDebugInfo(outer, inner) { + if (inner == null) { + return outer; + } else if (outer === null) { + return inner; + } else { + // If we have two debugInfo, we need to create a new one. This makes the array no longer + // live so we'll miss any future updates if we received more so ideally we should always + // do this after both have fully resolved/unsuspended. + return outer.concat(inner); + } + } + var didWarnAboutMaps; var didWarnAboutGenerators; var didWarnAboutStringRefs; @@ -5445,7 +5459,13 @@ if (__DEV__) { return newFiber; } - function updateTextNode(returnFiber, current, textContent, lanes) { + function updateTextNode( + returnFiber, + current, + textContent, + lanes, + debugInfo + ) { if (current === null || current.tag !== HostText) { // Insert var created = createFiberFromText( @@ -5454,16 +5474,26 @@ if (__DEV__) { lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, textContent); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateElement(returnFiber, current, element, lanes) { + function updateElement(returnFiber, current, element, lanes, debugInfo) { var elementType = element.type; if (elementType === REACT_FRAGMENT_TYPE) { @@ -5472,7 +5502,8 @@ if (__DEV__) { current, element.props.children, lanes, - element.key + element.key, + debugInfo ); } @@ -5495,6 +5526,7 @@ if (__DEV__) { { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -5504,10 +5536,15 @@ if (__DEV__) { var created = createFiberFromElement(element, returnFiber.mode, lanes); created.ref = coerceRef(returnFiber, current, element); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } - function updatePortal(returnFiber, current, portal, lanes) { + function updatePortal(returnFiber, current, portal, lanes, debugInfo) { if ( current === null || current.tag !== HostPortal || @@ -5517,16 +5554,33 @@ if (__DEV__) { // Insert var created = createFiberFromPortal(portal, returnFiber.mode, lanes); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, portal.children || []); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateFragment(returnFiber, current, fragment, lanes, key) { + function updateFragment( + returnFiber, + current, + fragment, + lanes, + key, + debugInfo + ) { if (current === null || current.tag !== Fragment) { // Insert var created = createFiberFromFragment( @@ -5536,16 +5590,26 @@ if (__DEV__) { key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, fragment); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function createChild(returnFiber, newChild, lanes) { + function createChild(returnFiber, newChild, lanes, debugInfo) { if ( (typeof newChild === "string" && newChild !== "") || typeof newChild === "number" @@ -5559,6 +5623,11 @@ if (__DEV__) { lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } @@ -5573,6 +5642,14 @@ if (__DEV__) { _created.ref = coerceRef(returnFiber, null, newChild); _created.return = returnFiber; + + { + _created._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created; } @@ -5584,13 +5661,23 @@ if (__DEV__) { ); _created2.return = returnFiber; + + { + _created2._debugInfo = debugInfo; + } + return _created2; } case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return createChild(returnFiber, init(payload), lanes); + return createChild( + returnFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) // call merge after init + ); } } @@ -5603,6 +5690,14 @@ if (__DEV__) { ); _created3.return = returnFiber; + + { + _created3._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created3; } // Usable node types // @@ -5610,7 +5705,12 @@ if (__DEV__) { if (typeof newChild.then === "function") { var thenable = newChild; - return createChild(returnFiber, unwrapThenable(thenable), lanes); + return createChild( + returnFiber, + unwrapThenable(thenable), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } if (newChild.$$typeof === REACT_CONTEXT_TYPE) { @@ -5618,7 +5718,8 @@ if (__DEV__) { return createChild( returnFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -5634,7 +5735,7 @@ if (__DEV__) { return null; } - function updateSlot(returnFiber, oldFiber, newChild, lanes) { + function updateSlot(returnFiber, oldFiber, newChild, lanes, debugInfo) { // Update the fiber if the keys match, otherwise return null. var key = oldFiber !== null ? oldFiber.key : null; @@ -5649,14 +5750,26 @@ if (__DEV__) { return null; } - return updateTextNode(returnFiber, oldFiber, "" + newChild, lanes); + return updateTextNode( + returnFiber, + oldFiber, + "" + newChild, + lanes, + debugInfo + ); } if (typeof newChild === "object" && newChild !== null) { switch (newChild.$$typeof) { case REACT_ELEMENT_TYPE: { if (newChild.key === key) { - return updateElement(returnFiber, oldFiber, newChild, lanes); + return updateElement( + returnFiber, + oldFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } else { return null; } @@ -5664,7 +5777,13 @@ if (__DEV__) { case REACT_PORTAL_TYPE: { if (newChild.key === key) { - return updatePortal(returnFiber, oldFiber, newChild, lanes); + return updatePortal( + returnFiber, + oldFiber, + newChild, + lanes, + debugInfo + ); } else { return null; } @@ -5673,7 +5792,13 @@ if (__DEV__) { case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return updateSlot(returnFiber, oldFiber, init(payload), lanes); + return updateSlot( + returnFiber, + oldFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } } @@ -5682,7 +5807,14 @@ if (__DEV__) { return null; } - return updateFragment(returnFiber, oldFiber, newChild, lanes, null); + return updateFragment( + returnFiber, + oldFiber, + newChild, + lanes, + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } // Usable node types // // Unwrap the inner value and recursively call this function again. @@ -5693,7 +5825,8 @@ if (__DEV__) { returnFiber, oldFiber, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -5703,7 +5836,8 @@ if (__DEV__) { returnFiber, oldFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -5724,7 +5858,8 @@ if (__DEV__) { returnFiber, newIdx, newChild, - lanes + lanes, + debugInfo ) { if ( (typeof newChild === "string" && newChild !== "") || @@ -5737,7 +5872,8 @@ if (__DEV__) { returnFiber, matchedFiber, "" + newChild, - lanes + lanes, + debugInfo ); } @@ -5749,7 +5885,13 @@ if (__DEV__) { newChild.key === null ? newIdx : newChild.key ) || null; - return updateElement(returnFiber, _matchedFiber, newChild, lanes); + return updateElement( + returnFiber, + _matchedFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } case REACT_PORTAL_TYPE: { @@ -5758,7 +5900,13 @@ if (__DEV__) { newChild.key === null ? newIdx : newChild.key ) || null; - return updatePortal(returnFiber, _matchedFiber2, newChild, lanes); + return updatePortal( + returnFiber, + _matchedFiber2, + newChild, + lanes, + debugInfo + ); } case REACT_LAZY_TYPE: @@ -5769,7 +5917,8 @@ if (__DEV__) { returnFiber, newIdx, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -5781,7 +5930,8 @@ if (__DEV__) { _matchedFiber3, newChild, lanes, - null + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usable node types // @@ -5794,7 +5944,8 @@ if (__DEV__) { returnFiber, newIdx, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -5805,7 +5956,8 @@ if (__DEV__) { returnFiber, newIdx, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -5877,7 +6029,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChildren, - lanes + lanes, + debugInfo ) { // This algorithm can't optimize by searching from both ends since we // don't have backpointers on fibers. I'm trying to see how far we can get @@ -5923,7 +6076,8 @@ if (__DEV__) { returnFiber, oldFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (newFiber === null) { @@ -5977,7 +6131,8 @@ if (__DEV__) { var _newFiber = createChild( returnFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber === null) { @@ -6007,7 +6162,8 @@ if (__DEV__) { returnFiber, newIdx, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber2 !== null) { @@ -6050,7 +6206,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChildrenIterable, - lanes + lanes, + debugInfo ) { // This is the same implementation as reconcileChildrenArray(), // but using the iterator instead. @@ -6135,7 +6292,13 @@ if (__DEV__) { nextOldFiber = oldFiber.sibling; } - var newFiber = updateSlot(returnFiber, oldFiber, step.value, lanes); + var newFiber = updateSlot( + returnFiber, + oldFiber, + step.value, + lanes, + debugInfo + ); if (newFiber === null) { // TODO: This breaks on empty slots like null children. That's @@ -6185,7 +6348,12 @@ if (__DEV__) { // If we don't have any more existing children we can choose a fast path // since the rest will all be insertions. for (; !step.done; newIdx++, step = newChildren.next()) { - var _newFiber3 = createChild(returnFiber, step.value, lanes); + var _newFiber3 = createChild( + returnFiber, + step.value, + lanes, + debugInfo + ); if (_newFiber3 === null) { continue; @@ -6214,7 +6382,8 @@ if (__DEV__) { returnFiber, newIdx, step.value, - lanes + lanes, + debugInfo ); if (_newFiber4 !== null) { @@ -6281,7 +6450,8 @@ if (__DEV__) { returnFiber, currentFirstChild, element, - lanes + lanes, + debugInfo ) { var key = element.key; var child = currentFirstChild; @@ -6300,6 +6470,7 @@ if (__DEV__) { { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -6325,6 +6496,7 @@ if (__DEV__) { { _existing._debugOwner = element._owner; + _existing._debugInfo = debugInfo; } return _existing; @@ -6348,6 +6520,11 @@ if (__DEV__) { element.key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { var _created4 = createFiberFromElement( @@ -6358,6 +6535,11 @@ if (__DEV__) { _created4.ref = coerceRef(returnFiber, currentFirstChild, element); _created4.return = returnFiber; + + { + _created4._debugInfo = debugInfo; + } + return _created4; } } @@ -6366,7 +6548,8 @@ if (__DEV__) { returnFiber, currentFirstChild, portal, - lanes + lanes, + debugInfo ) { var key = portal.key; var child = currentFirstChild; @@ -6406,7 +6589,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChild, - lanes + lanes, + debugInfo ) { // This function is not recursive. // If the top level item is an array, we treat it as a set of children, @@ -6434,7 +6618,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ) ); @@ -6450,13 +6635,13 @@ if (__DEV__) { case REACT_LAZY_TYPE: var payload = newChild._payload; - var init = newChild._init; // TODO: This function is supposed to be non-recursive. - - return reconcileChildFibers( + var init = newChild._init; + return reconcileChildFibersImpl( returnFiber, currentFirstChild, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -6465,7 +6650,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -6474,7 +6660,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usables are a valid React node type. When React encounters a Usable in // a child position, it unwraps it using the same algorithm as `use`. For @@ -6499,7 +6686,8 @@ if (__DEV__) { returnFiber, currentFirstChild, unwrapThenable(thenable), - lanes + lanes, + mergeDebugInfo(debugInfo, thenable._debugInfo) ); } @@ -6509,7 +6697,8 @@ if (__DEV__) { returnFiber, currentFirstChild, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -6552,7 +6741,8 @@ if (__DEV__) { returnFiber, currentFirstChild, newChild, - lanes + lanes, + null // debugInfo ); thenableState$1 = null; // Don't bother to reset `thenableIndexCounter` to 0 because it always gets // set at the beginning. @@ -15381,7 +15571,11 @@ if (__DEV__) { newWorkInProgress.index = oldWorkInProgress.index; newWorkInProgress.sibling = oldWorkInProgress.sibling; newWorkInProgress.return = oldWorkInProgress.return; - newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it. + newWorkInProgress.ref = oldWorkInProgress.ref; + + { + newWorkInProgress._debugInfo = oldWorkInProgress._debugInfo; + } // Replace the child/sibling pointers above it. if (oldWorkInProgress === returnFiber.child) { returnFiber.child = newWorkInProgress; @@ -25072,6 +25266,7 @@ if (__DEV__) { { // This isn't directly used but is handy for debugging internals: + this._debugInfo = null; this._debugOwner = null; this._debugNeedsRemount = false; this._debugHookTypes = null; @@ -25210,6 +25405,7 @@ if (__DEV__) { } { + workInProgress._debugInfo = current._debugInfo; workInProgress._debugNeedsRemount = current._debugNeedsRemount; switch (workInProgress.tag) { @@ -25721,7 +25917,7 @@ if (__DEV__) { return root; } - var ReactVersion = "18.3.0-canary-9e7944f67-20240212"; + var ReactVersion = "18.3.0-canary-3f93ca1c8-20240212"; // 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 2868e20095..4dcda2c21c 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<6223b3402ebe91d202065e784f2d9af4>> + * @generated SignedSource<> */ "use strict"; @@ -2108,7 +2108,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -2165,12 +2165,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -2180,8 +2175,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -9168,19 +9162,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1023 = { +var devToolsConfig$jscomp$inline_1025 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-canary-9e7944f67-20240212", + version: "18.3.0-canary-3f93ca1c8-20240212", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1204 = { - bundleType: devToolsConfig$jscomp$inline_1023.bundleType, - version: devToolsConfig$jscomp$inline_1023.version, - rendererPackageName: devToolsConfig$jscomp$inline_1023.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1023.rendererConfig, +var internals$jscomp$inline_1206 = { + bundleType: devToolsConfig$jscomp$inline_1025.bundleType, + version: devToolsConfig$jscomp$inline_1025.version, + rendererPackageName: devToolsConfig$jscomp$inline_1025.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1025.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9197,26 +9191,26 @@ var internals$jscomp$inline_1204 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1023.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1025.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-9e7944f67-20240212" + reconcilerVersion: "18.3.0-canary-3f93ca1c8-20240212" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1205 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1207 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1205.isDisabled && - hook$jscomp$inline_1205.supportsFiber + !hook$jscomp$inline_1207.isDisabled && + hook$jscomp$inline_1207.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1205.inject( - internals$jscomp$inline_1204 + (rendererID = hook$jscomp$inline_1207.inject( + internals$jscomp$inline_1206 )), - (injectedHook = hook$jscomp$inline_1205); + (injectedHook = hook$jscomp$inline_1207); } 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 33116db95f..a31e6acaf3 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<9a90acaf1cc6a5a23ed59dfb8d38c84f>> + * @generated SignedSource<<69981d07258d151fac632e0cccfb55ee>> */ "use strict"; @@ -2128,7 +2128,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -2185,12 +2185,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -2200,8 +2195,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -9596,19 +9590,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1065 = { +var devToolsConfig$jscomp$inline_1067 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-canary-9e7944f67-20240212", + version: "18.3.0-canary-3f93ca1c8-20240212", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1245 = { - bundleType: devToolsConfig$jscomp$inline_1065.bundleType, - version: devToolsConfig$jscomp$inline_1065.version, - rendererPackageName: devToolsConfig$jscomp$inline_1065.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1065.rendererConfig, +var internals$jscomp$inline_1247 = { + bundleType: devToolsConfig$jscomp$inline_1067.bundleType, + version: devToolsConfig$jscomp$inline_1067.version, + rendererPackageName: devToolsConfig$jscomp$inline_1067.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1067.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9625,26 +9619,26 @@ var internals$jscomp$inline_1245 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1065.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1067.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-9e7944f67-20240212" + reconcilerVersion: "18.3.0-canary-3f93ca1c8-20240212" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1246 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1248 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1246.isDisabled && - hook$jscomp$inline_1246.supportsFiber + !hook$jscomp$inline_1248.isDisabled && + hook$jscomp$inline_1248.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1246.inject( - internals$jscomp$inline_1245 + (rendererID = hook$jscomp$inline_1248.inject( + internals$jscomp$inline_1247 )), - (injectedHook = hook$jscomp$inline_1246); + (injectedHook = hook$jscomp$inline_1248); } 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 9db98941f2..166a9bc6aa 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 @@ -24,7 +24,7 @@ if (__DEV__) { ) { __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error()); } - var ReactVersion = "18.3.0-canary-9e7944f67-20240212"; + var ReactVersion = "18.3.0-canary-3f93ca1c8-20240212"; // 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 080820b6c2..3258ca94ed 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 @@ -590,4 +590,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactCurrentDispatcher.current.useTransition(); }; -exports.version = "18.3.0-canary-9e7944f67-20240212"; +exports.version = "18.3.0-canary-3f93ca1c8-20240212"; 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 1293aee9be..d6091544d3 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 @@ -586,7 +586,7 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactCurrentDispatcher.current.useTransition(); }; -exports.version = "18.3.0-canary-9e7944f67-20240212"; +exports.version = "18.3.0-canary-3f93ca1c8-20240212"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && 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 03031416de..57bd4daaad 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 @@ -9e7944f67c72b9a69a8db092ba6bd99fe9c731e2 +3f93ca1c8dec1fd85df4dbb748a2df9438fc699f 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 698992b87a..037c28828a 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<0a7a4cb297cbefaedb16aca477b696a7>> + * @generated SignedSource<> */ "use strict"; @@ -8751,6 +8751,20 @@ to return true:wantsResponderID| | var thenableState$1 = null; var thenableIndexCounter$1 = 0; + + function mergeDebugInfo(outer, inner) { + if (inner == null) { + return outer; + } else if (outer === null) { + return inner; + } else { + // If we have two debugInfo, we need to create a new one. This makes the array no longer + // live so we'll miss any future updates if we received more so ideally we should always + // do this after both have fully resolved/unsuspended. + return outer.concat(inner); + } + } + var didWarnAboutMaps; var didWarnAboutGenerators; var didWarnAboutStringRefs; @@ -9084,7 +9098,13 @@ to return true:wantsResponderID| | return newFiber; } - function updateTextNode(returnFiber, current, textContent, lanes) { + function updateTextNode( + returnFiber, + current, + textContent, + lanes, + debugInfo + ) { if (current === null || current.tag !== HostText) { // Insert var created = createFiberFromText( @@ -9093,16 +9113,26 @@ to return true:wantsResponderID| | lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, textContent); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateElement(returnFiber, current, element, lanes) { + function updateElement(returnFiber, current, element, lanes, debugInfo) { var elementType = element.type; if (elementType === REACT_FRAGMENT_TYPE) { @@ -9111,7 +9141,8 @@ to return true:wantsResponderID| | current, element.props.children, lanes, - element.key + element.key, + debugInfo ); } @@ -9134,6 +9165,7 @@ to return true:wantsResponderID| | { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -9143,10 +9175,15 @@ to return true:wantsResponderID| | var created = createFiberFromElement(element, returnFiber.mode, lanes); created.ref = coerceRef(returnFiber, current, element); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } - function updatePortal(returnFiber, current, portal, lanes) { + function updatePortal(returnFiber, current, portal, lanes, debugInfo) { if ( current === null || current.tag !== HostPortal || @@ -9156,16 +9193,33 @@ to return true:wantsResponderID| | // Insert var created = createFiberFromPortal(portal, returnFiber.mode, lanes); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, portal.children || []); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateFragment(returnFiber, current, fragment, lanes, key) { + function updateFragment( + returnFiber, + current, + fragment, + lanes, + key, + debugInfo + ) { if (current === null || current.tag !== Fragment) { // Insert var created = createFiberFromFragment( @@ -9175,16 +9229,26 @@ to return true:wantsResponderID| | key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, fragment); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function createChild(returnFiber, newChild, lanes) { + function createChild(returnFiber, newChild, lanes, debugInfo) { if ( (typeof newChild === "string" && newChild !== "") || typeof newChild === "number" @@ -9198,6 +9262,11 @@ to return true:wantsResponderID| | lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } @@ -9212,6 +9281,14 @@ to return true:wantsResponderID| | _created.ref = coerceRef(returnFiber, null, newChild); _created.return = returnFiber; + + { + _created._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created; } @@ -9223,13 +9300,23 @@ to return true:wantsResponderID| | ); _created2.return = returnFiber; + + { + _created2._debugInfo = debugInfo; + } + return _created2; } case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return createChild(returnFiber, init(payload), lanes); + return createChild( + returnFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) // call merge after init + ); } } @@ -9242,6 +9329,14 @@ to return true:wantsResponderID| | ); _created3.return = returnFiber; + + { + _created3._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created3; } // Usable node types // @@ -9249,7 +9344,12 @@ to return true:wantsResponderID| | if (typeof newChild.then === "function") { var thenable = newChild; - return createChild(returnFiber, unwrapThenable(thenable), lanes); + return createChild( + returnFiber, + unwrapThenable(thenable), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } if (newChild.$$typeof === REACT_CONTEXT_TYPE) { @@ -9257,7 +9357,8 @@ to return true:wantsResponderID| | return createChild( returnFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9273,7 +9374,7 @@ to return true:wantsResponderID| | return null; } - function updateSlot(returnFiber, oldFiber, newChild, lanes) { + function updateSlot(returnFiber, oldFiber, newChild, lanes, debugInfo) { // Update the fiber if the keys match, otherwise return null. var key = oldFiber !== null ? oldFiber.key : null; @@ -9288,14 +9389,26 @@ to return true:wantsResponderID| | return null; } - return updateTextNode(returnFiber, oldFiber, "" + newChild, lanes); + return updateTextNode( + returnFiber, + oldFiber, + "" + newChild, + lanes, + debugInfo + ); } if (typeof newChild === "object" && newChild !== null) { switch (newChild.$$typeof) { case REACT_ELEMENT_TYPE: { if (newChild.key === key) { - return updateElement(returnFiber, oldFiber, newChild, lanes); + return updateElement( + returnFiber, + oldFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } else { return null; } @@ -9303,7 +9416,13 @@ to return true:wantsResponderID| | case REACT_PORTAL_TYPE: { if (newChild.key === key) { - return updatePortal(returnFiber, oldFiber, newChild, lanes); + return updatePortal( + returnFiber, + oldFiber, + newChild, + lanes, + debugInfo + ); } else { return null; } @@ -9312,7 +9431,13 @@ to return true:wantsResponderID| | case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return updateSlot(returnFiber, oldFiber, init(payload), lanes); + return updateSlot( + returnFiber, + oldFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } } @@ -9321,7 +9446,14 @@ to return true:wantsResponderID| | return null; } - return updateFragment(returnFiber, oldFiber, newChild, lanes, null); + return updateFragment( + returnFiber, + oldFiber, + newChild, + lanes, + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } // Usable node types // // Unwrap the inner value and recursively call this function again. @@ -9332,7 +9464,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -9342,7 +9475,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9363,7 +9497,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, newChild, - lanes + lanes, + debugInfo ) { if ( (typeof newChild === "string" && newChild !== "") || @@ -9376,7 +9511,8 @@ to return true:wantsResponderID| | returnFiber, matchedFiber, "" + newChild, - lanes + lanes, + debugInfo ); } @@ -9388,7 +9524,13 @@ to return true:wantsResponderID| | newChild.key === null ? newIdx : newChild.key ) || null; - return updateElement(returnFiber, _matchedFiber, newChild, lanes); + return updateElement( + returnFiber, + _matchedFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } case REACT_PORTAL_TYPE: { @@ -9397,7 +9539,13 @@ to return true:wantsResponderID| | newChild.key === null ? newIdx : newChild.key ) || null; - return updatePortal(returnFiber, _matchedFiber2, newChild, lanes); + return updatePortal( + returnFiber, + _matchedFiber2, + newChild, + lanes, + debugInfo + ); } case REACT_LAZY_TYPE: @@ -9408,7 +9556,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -9420,7 +9569,8 @@ to return true:wantsResponderID| | _matchedFiber3, newChild, lanes, - null + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usable node types // @@ -9433,7 +9583,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -9444,7 +9595,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9516,7 +9668,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChildren, - lanes + lanes, + debugInfo ) { // This algorithm can't optimize by searching from both ends since we // don't have backpointers on fibers. I'm trying to see how far we can get @@ -9562,7 +9715,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (newFiber === null) { @@ -9616,7 +9770,8 @@ to return true:wantsResponderID| | var _newFiber = createChild( returnFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber === null) { @@ -9646,7 +9801,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber2 !== null) { @@ -9689,7 +9845,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChildrenIterable, - lanes + lanes, + debugInfo ) { // This is the same implementation as reconcileChildrenArray(), // but using the iterator instead. @@ -9774,7 +9931,13 @@ to return true:wantsResponderID| | nextOldFiber = oldFiber.sibling; } - var newFiber = updateSlot(returnFiber, oldFiber, step.value, lanes); + var newFiber = updateSlot( + returnFiber, + oldFiber, + step.value, + lanes, + debugInfo + ); if (newFiber === null) { // TODO: This breaks on empty slots like null children. That's @@ -9824,7 +9987,12 @@ to return true:wantsResponderID| | // If we don't have any more existing children we can choose a fast path // since the rest will all be insertions. for (; !step.done; newIdx++, step = newChildren.next()) { - var _newFiber3 = createChild(returnFiber, step.value, lanes); + var _newFiber3 = createChild( + returnFiber, + step.value, + lanes, + debugInfo + ); if (_newFiber3 === null) { continue; @@ -9853,7 +10021,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, step.value, - lanes + lanes, + debugInfo ); if (_newFiber4 !== null) { @@ -9920,7 +10089,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, element, - lanes + lanes, + debugInfo ) { var key = element.key; var child = currentFirstChild; @@ -9939,6 +10109,7 @@ to return true:wantsResponderID| | { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -9964,6 +10135,7 @@ to return true:wantsResponderID| | { _existing._debugOwner = element._owner; + _existing._debugInfo = debugInfo; } return _existing; @@ -9987,6 +10159,11 @@ to return true:wantsResponderID| | element.key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { var _created4 = createFiberFromElement( @@ -9997,6 +10174,11 @@ to return true:wantsResponderID| | _created4.ref = coerceRef(returnFiber, currentFirstChild, element); _created4.return = returnFiber; + + { + _created4._debugInfo = debugInfo; + } + return _created4; } } @@ -10005,7 +10187,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, portal, - lanes + lanes, + debugInfo ) { var key = portal.key; var child = currentFirstChild; @@ -10045,7 +10228,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + debugInfo ) { // This function is not recursive. // If the top level item is an array, we treat it as a set of children, @@ -10073,7 +10257,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ) ); @@ -10089,13 +10274,13 @@ to return true:wantsResponderID| | case REACT_LAZY_TYPE: var payload = newChild._payload; - var init = newChild._init; // TODO: This function is supposed to be non-recursive. - - return reconcileChildFibers( + var init = newChild._init; + return reconcileChildFibersImpl( returnFiber, currentFirstChild, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -10104,7 +10289,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -10113,7 +10299,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usables are a valid React node type. When React encounters a Usable in // a child position, it unwraps it using the same algorithm as `use`. For @@ -10138,7 +10325,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, unwrapThenable(thenable), - lanes + lanes, + mergeDebugInfo(debugInfo, thenable._debugInfo) ); } @@ -10148,7 +10336,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -10191,7 +10380,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + null // debugInfo ); thenableState$1 = null; // Don't bother to reset `thenableIndexCounter` to 0 because it always gets // set at the beginning. @@ -18236,7 +18426,11 @@ to return true:wantsResponderID| | newWorkInProgress.index = oldWorkInProgress.index; newWorkInProgress.sibling = oldWorkInProgress.sibling; newWorkInProgress.return = oldWorkInProgress.return; - newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it. + newWorkInProgress.ref = oldWorkInProgress.ref; + + { + newWorkInProgress._debugInfo = oldWorkInProgress._debugInfo; + } // Replace the child/sibling pointers above it. if (oldWorkInProgress === returnFiber.child) { returnFiber.child = newWorkInProgress; @@ -27088,6 +27282,7 @@ to return true:wantsResponderID| | { // This isn't directly used but is handy for debugging internals: + this._debugInfo = null; this._debugOwner = null; this._debugNeedsRemount = false; this._debugHookTypes = null; @@ -27226,6 +27421,7 @@ to return true:wantsResponderID| | } { + workInProgress._debugInfo = current._debugInfo; workInProgress._debugNeedsRemount = current._debugNeedsRemount; switch (workInProgress.tag) { @@ -27644,6 +27840,7 @@ to return true:wantsResponderID| | target.treeBaseDuration = source.treeBaseDuration; } + target._debugInfo = source._debugInfo; target._debugOwner = source._debugOwner; target._debugNeedsRemount = source._debugNeedsRemount; target._debugHookTypes = source._debugHookTypes; @@ -27759,7 +27956,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "18.3.0-canary-1c3755aa"; + var ReactVersion = "18.3.0-canary-65da79ad"; 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 027b0c05bc..2cc5f6343d 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<> */ "use strict"; @@ -3403,7 +3403,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -3460,12 +3460,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -3475,8 +3470,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -9530,10 +9524,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1070 = { + devToolsConfig$jscomp$inline_1072 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-canary-0b7d95b8", + version: "18.3.0-canary-c7241fda", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -9549,11 +9543,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1295 = { - bundleType: devToolsConfig$jscomp$inline_1070.bundleType, - version: devToolsConfig$jscomp$inline_1070.version, - rendererPackageName: devToolsConfig$jscomp$inline_1070.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1070.rendererConfig, +var internals$jscomp$inline_1297 = { + bundleType: devToolsConfig$jscomp$inline_1072.bundleType, + version: devToolsConfig$jscomp$inline_1072.version, + rendererPackageName: devToolsConfig$jscomp$inline_1072.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1072.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9569,26 +9563,26 @@ var internals$jscomp$inline_1295 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1070.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1072.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-0b7d95b8" + reconcilerVersion: "18.3.0-canary-c7241fda" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1296 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1298 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1296.isDisabled && - hook$jscomp$inline_1296.supportsFiber + !hook$jscomp$inline_1298.isDisabled && + hook$jscomp$inline_1298.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1296.inject( - internals$jscomp$inline_1295 + (rendererID = hook$jscomp$inline_1298.inject( + internals$jscomp$inline_1297 )), - (injectedHook = hook$jscomp$inline_1296); + (injectedHook = hook$jscomp$inline_1298); } 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 cb0ca5dfa4..406f1d4564 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<800d1da7837f2a323a32fd5aeda3ac6a>> + * @generated SignedSource<<972c41b6ca175f84cc8906498a286dd1>> */ "use strict"; @@ -3528,7 +3528,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -3585,12 +3585,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -3600,8 +3595,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -10229,10 +10223,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1148 = { + devToolsConfig$jscomp$inline_1150 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-canary-238d0e7e", + version: "18.3.0-canary-e0d6c8a2", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10262,10 +10256,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1148.bundleType, - version: devToolsConfig$jscomp$inline_1148.version, - rendererPackageName: devToolsConfig$jscomp$inline_1148.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1148.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1150.bundleType, + version: devToolsConfig$jscomp$inline_1150.version, + rendererPackageName: devToolsConfig$jscomp$inline_1150.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1150.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10281,14 +10275,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1148.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1150.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-238d0e7e" + reconcilerVersion: "18.3.0-canary-e0d6c8a2" }); 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 d181a57b66..3e84e11cd2 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<2c1c4e4b5396fa0baf10b58ee57031f6>> + * @generated SignedSource<<54baf364f72bceb97b2ccb7e81bcf964>> */ "use strict"; @@ -9023,6 +9023,20 @@ to return true:wantsResponderID| | var thenableState$1 = null; var thenableIndexCounter$1 = 0; + + function mergeDebugInfo(outer, inner) { + if (inner == null) { + return outer; + } else if (outer === null) { + return inner; + } else { + // If we have two debugInfo, we need to create a new one. This makes the array no longer + // live so we'll miss any future updates if we received more so ideally we should always + // do this after both have fully resolved/unsuspended. + return outer.concat(inner); + } + } + var didWarnAboutMaps; var didWarnAboutGenerators; var didWarnAboutStringRefs; @@ -9356,7 +9370,13 @@ to return true:wantsResponderID| | return newFiber; } - function updateTextNode(returnFiber, current, textContent, lanes) { + function updateTextNode( + returnFiber, + current, + textContent, + lanes, + debugInfo + ) { if (current === null || current.tag !== HostText) { // Insert var created = createFiberFromText( @@ -9365,16 +9385,26 @@ to return true:wantsResponderID| | lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, textContent); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateElement(returnFiber, current, element, lanes) { + function updateElement(returnFiber, current, element, lanes, debugInfo) { var elementType = element.type; if (elementType === REACT_FRAGMENT_TYPE) { @@ -9383,7 +9413,8 @@ to return true:wantsResponderID| | current, element.props.children, lanes, - element.key + element.key, + debugInfo ); } @@ -9406,6 +9437,7 @@ to return true:wantsResponderID| | { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -9415,10 +9447,15 @@ to return true:wantsResponderID| | var created = createFiberFromElement(element, returnFiber.mode, lanes); created.ref = coerceRef(returnFiber, current, element); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } - function updatePortal(returnFiber, current, portal, lanes) { + function updatePortal(returnFiber, current, portal, lanes, debugInfo) { if ( current === null || current.tag !== HostPortal || @@ -9428,16 +9465,33 @@ to return true:wantsResponderID| | // Insert var created = createFiberFromPortal(portal, returnFiber.mode, lanes); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, portal.children || []); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function updateFragment(returnFiber, current, fragment, lanes, key) { + function updateFragment( + returnFiber, + current, + fragment, + lanes, + key, + debugInfo + ) { if (current === null || current.tag !== Fragment) { // Insert var created = createFiberFromFragment( @@ -9447,16 +9501,26 @@ to return true:wantsResponderID| | key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { // Update var existing = useFiber(current, fragment); existing.return = returnFiber; + + { + existing._debugInfo = debugInfo; + } + return existing; } } - function createChild(returnFiber, newChild, lanes) { + function createChild(returnFiber, newChild, lanes, debugInfo) { if ( (typeof newChild === "string" && newChild !== "") || typeof newChild === "number" @@ -9470,6 +9534,11 @@ to return true:wantsResponderID| | lanes ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } @@ -9484,6 +9553,14 @@ to return true:wantsResponderID| | _created.ref = coerceRef(returnFiber, null, newChild); _created.return = returnFiber; + + { + _created._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created; } @@ -9495,13 +9572,23 @@ to return true:wantsResponderID| | ); _created2.return = returnFiber; + + { + _created2._debugInfo = debugInfo; + } + return _created2; } case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return createChild(returnFiber, init(payload), lanes); + return createChild( + returnFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) // call merge after init + ); } } @@ -9514,6 +9601,14 @@ to return true:wantsResponderID| | ); _created3.return = returnFiber; + + { + _created3._debugInfo = mergeDebugInfo( + debugInfo, + newChild._debugInfo + ); + } + return _created3; } // Usable node types // @@ -9521,7 +9616,12 @@ to return true:wantsResponderID| | if (typeof newChild.then === "function") { var thenable = newChild; - return createChild(returnFiber, unwrapThenable(thenable), lanes); + return createChild( + returnFiber, + unwrapThenable(thenable), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } if (newChild.$$typeof === REACT_CONTEXT_TYPE) { @@ -9529,7 +9629,8 @@ to return true:wantsResponderID| | return createChild( returnFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9545,7 +9646,7 @@ to return true:wantsResponderID| | return null; } - function updateSlot(returnFiber, oldFiber, newChild, lanes) { + function updateSlot(returnFiber, oldFiber, newChild, lanes, debugInfo) { // Update the fiber if the keys match, otherwise return null. var key = oldFiber !== null ? oldFiber.key : null; @@ -9560,14 +9661,26 @@ to return true:wantsResponderID| | return null; } - return updateTextNode(returnFiber, oldFiber, "" + newChild, lanes); + return updateTextNode( + returnFiber, + oldFiber, + "" + newChild, + lanes, + debugInfo + ); } if (typeof newChild === "object" && newChild !== null) { switch (newChild.$$typeof) { case REACT_ELEMENT_TYPE: { if (newChild.key === key) { - return updateElement(returnFiber, oldFiber, newChild, lanes); + return updateElement( + returnFiber, + oldFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } else { return null; } @@ -9575,7 +9688,13 @@ to return true:wantsResponderID| | case REACT_PORTAL_TYPE: { if (newChild.key === key) { - return updatePortal(returnFiber, oldFiber, newChild, lanes); + return updatePortal( + returnFiber, + oldFiber, + newChild, + lanes, + debugInfo + ); } else { return null; } @@ -9584,7 +9703,13 @@ to return true:wantsResponderID| | case REACT_LAZY_TYPE: { var payload = newChild._payload; var init = newChild._init; - return updateSlot(returnFiber, oldFiber, init(payload), lanes); + return updateSlot( + returnFiber, + oldFiber, + init(payload), + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } } @@ -9593,7 +9718,14 @@ to return true:wantsResponderID| | return null; } - return updateFragment(returnFiber, oldFiber, newChild, lanes, null); + return updateFragment( + returnFiber, + oldFiber, + newChild, + lanes, + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } // Usable node types // // Unwrap the inner value and recursively call this function again. @@ -9604,7 +9736,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -9614,7 +9747,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9635,7 +9769,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, newChild, - lanes + lanes, + debugInfo ) { if ( (typeof newChild === "string" && newChild !== "") || @@ -9648,7 +9783,8 @@ to return true:wantsResponderID| | returnFiber, matchedFiber, "" + newChild, - lanes + lanes, + debugInfo ); } @@ -9660,7 +9796,13 @@ to return true:wantsResponderID| | newChild.key === null ? newIdx : newChild.key ) || null; - return updateElement(returnFiber, _matchedFiber, newChild, lanes); + return updateElement( + returnFiber, + _matchedFiber, + newChild, + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) + ); } case REACT_PORTAL_TYPE: { @@ -9669,7 +9811,13 @@ to return true:wantsResponderID| | newChild.key === null ? newIdx : newChild.key ) || null; - return updatePortal(returnFiber, _matchedFiber2, newChild, lanes); + return updatePortal( + returnFiber, + _matchedFiber2, + newChild, + lanes, + debugInfo + ); } case REACT_LAZY_TYPE: @@ -9680,7 +9828,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -9692,7 +9841,8 @@ to return true:wantsResponderID| | _matchedFiber3, newChild, lanes, - null + null, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usable node types // @@ -9705,7 +9855,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, unwrapThenable(thenable), - lanes + lanes, + debugInfo ); } @@ -9716,7 +9867,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -9788,7 +9940,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChildren, - lanes + lanes, + debugInfo ) { // This algorithm can't optimize by searching from both ends since we // don't have backpointers on fibers. I'm trying to see how far we can get @@ -9834,7 +9987,8 @@ to return true:wantsResponderID| | returnFiber, oldFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (newFiber === null) { @@ -9888,7 +10042,8 @@ to return true:wantsResponderID| | var _newFiber = createChild( returnFiber, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber === null) { @@ -9918,7 +10073,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, newChildren[newIdx], - lanes + lanes, + debugInfo ); if (_newFiber2 !== null) { @@ -9961,7 +10117,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChildrenIterable, - lanes + lanes, + debugInfo ) { // This is the same implementation as reconcileChildrenArray(), // but using the iterator instead. @@ -10046,7 +10203,13 @@ to return true:wantsResponderID| | nextOldFiber = oldFiber.sibling; } - var newFiber = updateSlot(returnFiber, oldFiber, step.value, lanes); + var newFiber = updateSlot( + returnFiber, + oldFiber, + step.value, + lanes, + debugInfo + ); if (newFiber === null) { // TODO: This breaks on empty slots like null children. That's @@ -10096,7 +10259,12 @@ to return true:wantsResponderID| | // If we don't have any more existing children we can choose a fast path // since the rest will all be insertions. for (; !step.done; newIdx++, step = newChildren.next()) { - var _newFiber3 = createChild(returnFiber, step.value, lanes); + var _newFiber3 = createChild( + returnFiber, + step.value, + lanes, + debugInfo + ); if (_newFiber3 === null) { continue; @@ -10125,7 +10293,8 @@ to return true:wantsResponderID| | returnFiber, newIdx, step.value, - lanes + lanes, + debugInfo ); if (_newFiber4 !== null) { @@ -10192,7 +10361,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, element, - lanes + lanes, + debugInfo ) { var key = element.key; var child = currentFirstChild; @@ -10211,6 +10381,7 @@ to return true:wantsResponderID| | { existing._debugOwner = element._owner; + existing._debugInfo = debugInfo; } return existing; @@ -10236,6 +10407,7 @@ to return true:wantsResponderID| | { _existing._debugOwner = element._owner; + _existing._debugInfo = debugInfo; } return _existing; @@ -10259,6 +10431,11 @@ to return true:wantsResponderID| | element.key ); created.return = returnFiber; + + { + created._debugInfo = debugInfo; + } + return created; } else { var _created4 = createFiberFromElement( @@ -10269,6 +10446,11 @@ to return true:wantsResponderID| | _created4.ref = coerceRef(returnFiber, currentFirstChild, element); _created4.return = returnFiber; + + { + _created4._debugInfo = debugInfo; + } + return _created4; } } @@ -10277,7 +10459,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, portal, - lanes + lanes, + debugInfo ) { var key = portal.key; var child = currentFirstChild; @@ -10317,7 +10500,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + debugInfo ) { // This function is not recursive. // If the top level item is an array, we treat it as a set of children, @@ -10345,7 +10529,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ) ); @@ -10361,13 +10546,13 @@ to return true:wantsResponderID| | case REACT_LAZY_TYPE: var payload = newChild._payload; - var init = newChild._init; // TODO: This function is supposed to be non-recursive. - - return reconcileChildFibers( + var init = newChild._init; + return reconcileChildFibersImpl( returnFiber, currentFirstChild, init(payload), - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -10376,7 +10561,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } @@ -10385,7 +10571,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + mergeDebugInfo(debugInfo, newChild._debugInfo) ); } // Usables are a valid React node type. When React encounters a Usable in // a child position, it unwraps it using the same algorithm as `use`. For @@ -10410,7 +10597,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, unwrapThenable(thenable), - lanes + lanes, + mergeDebugInfo(debugInfo, thenable._debugInfo) ); } @@ -10420,7 +10608,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, readContextDuringReconcilation(returnFiber, context, lanes), - lanes + lanes, + debugInfo ); } @@ -10463,7 +10652,8 @@ to return true:wantsResponderID| | returnFiber, currentFirstChild, newChild, - lanes + lanes, + null // debugInfo ); thenableState$1 = null; // Don't bother to reset `thenableIndexCounter` to 0 because it always gets // set at the beginning. @@ -18508,7 +18698,11 @@ to return true:wantsResponderID| | newWorkInProgress.index = oldWorkInProgress.index; newWorkInProgress.sibling = oldWorkInProgress.sibling; newWorkInProgress.return = oldWorkInProgress.return; - newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it. + newWorkInProgress.ref = oldWorkInProgress.ref; + + { + newWorkInProgress._debugInfo = oldWorkInProgress._debugInfo; + } // Replace the child/sibling pointers above it. if (oldWorkInProgress === returnFiber.child) { returnFiber.child = newWorkInProgress; @@ -27529,6 +27723,7 @@ to return true:wantsResponderID| | { // This isn't directly used but is handy for debugging internals: + this._debugInfo = null; this._debugOwner = null; this._debugNeedsRemount = false; this._debugHookTypes = null; @@ -27667,6 +27862,7 @@ to return true:wantsResponderID| | } { + workInProgress._debugInfo = current._debugInfo; workInProgress._debugNeedsRemount = current._debugNeedsRemount; switch (workInProgress.tag) { @@ -28085,6 +28281,7 @@ to return true:wantsResponderID| | target.treeBaseDuration = source.treeBaseDuration; } + target._debugInfo = source._debugInfo; target._debugOwner = source._debugOwner; target._debugNeedsRemount = source._debugNeedsRemount; target._debugHookTypes = source._debugHookTypes; @@ -28200,7 +28397,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "18.3.0-canary-54ae0c74"; + var ReactVersion = "18.3.0-canary-43d35b5b"; 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 8486110b44..9414b4b861 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<317e792f1cd9362e1233f87a5e42e7b9>> + * @generated SignedSource<> */ "use strict"; @@ -3468,7 +3468,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -3525,12 +3525,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -3540,8 +3535,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -9751,10 +9745,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1139 = { + devToolsConfig$jscomp$inline_1141 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-canary-00814a23", + version: "18.3.0-canary-79b023d7", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -9770,11 +9764,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1378 = { - bundleType: devToolsConfig$jscomp$inline_1139.bundleType, - version: devToolsConfig$jscomp$inline_1139.version, - rendererPackageName: devToolsConfig$jscomp$inline_1139.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1139.rendererConfig, +var internals$jscomp$inline_1380 = { + bundleType: devToolsConfig$jscomp$inline_1141.bundleType, + version: devToolsConfig$jscomp$inline_1141.version, + rendererPackageName: devToolsConfig$jscomp$inline_1141.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1141.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9790,26 +9784,26 @@ var internals$jscomp$inline_1378 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1139.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1141.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-00814a23" + reconcilerVersion: "18.3.0-canary-79b023d7" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1379 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1381 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1379.isDisabled && - hook$jscomp$inline_1379.supportsFiber + !hook$jscomp$inline_1381.isDisabled && + hook$jscomp$inline_1381.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1379.inject( - internals$jscomp$inline_1378 + (rendererID = hook$jscomp$inline_1381.inject( + internals$jscomp$inline_1380 )), - (injectedHook = hook$jscomp$inline_1379); + (injectedHook = hook$jscomp$inline_1381); } 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 19ea5ae238..34db5dd868 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 @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<79f8b34e6781e6dfbd8b98e53067b470>> + * @generated SignedSource<> */ "use strict"; @@ -3592,7 +3592,7 @@ function createChildReconciler(shouldTrackSideEffects) { case REACT_LAZY_TYPE: return ( (child = newChild._init), - reconcileChildFibers( + reconcileChildFibersImpl( returnFiber, currentFirstChild, child(newChild._payload), @@ -3649,12 +3649,7 @@ function createChildReconciler(shouldTrackSideEffects) { placeSingleChild(returnFiber)) : deleteRemainingChildren(returnFiber, currentFirstChild); } - function reconcileChildFibers( - returnFiber, - currentFirstChild, - newChild, - lanes - ) { + return function (returnFiber, currentFirstChild, newChild, lanes) { thenableIndexCounter$1 = 0; returnFiber = reconcileChildFibersImpl( returnFiber, @@ -3664,8 +3659,7 @@ function createChildReconciler(shouldTrackSideEffects) { ); thenableState$1 = null; return returnFiber; - } - return reconcileChildFibers; + }; } var reconcileChildFibers = createChildReconciler(!0), mountChildFibers = createChildReconciler(!1), @@ -10449,10 +10443,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1217 = { + devToolsConfig$jscomp$inline_1219 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-canary-7f0ee2d4", + version: "18.3.0-canary-11c4150f", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10482,10 +10476,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1217.bundleType, - version: devToolsConfig$jscomp$inline_1217.version, - rendererPackageName: devToolsConfig$jscomp$inline_1217.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1217.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1219.bundleType, + version: devToolsConfig$jscomp$inline_1219.version, + rendererPackageName: devToolsConfig$jscomp$inline_1219.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1219.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10501,14 +10495,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1217.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1219.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-7f0ee2d4" + reconcilerVersion: "18.3.0-canary-11c4150f" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {