From 6fb4d0dc75243ff8066a280a75c969c5db704e91 Mon Sep 17 00:00:00 2001 From: sammy-SC Date: Fri, 23 Feb 2024 15:35:55 +0000 Subject: [PATCH] [RN] Move unifiedSyncLane back to dynamic (#28430) This surfaced a bug because it wasn't on everywhere, moving back to dynamic while we investigate the bug DiffTrain build for commit https://github.com/facebook/react/commit/98b8359f656ef714cc44828d7bfd2409ca16b9b3. --- .../cjs/ReactTestRenderer-dev.js | 2 +- .../cjs/ReactTestRenderer-prod.js | 4 ++-- .../cjs/ReactTestRenderer-profiling.js | 4 ++-- .../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 | 15 +++++++------ .../implementations/ReactFabric-prod.fb.js | 21 ++++++++++++------- .../ReactFabric-profiling.fb.js | 19 ++++++++++------- .../ReactNativeRenderer-dev.fb.js | 16 +++++++------- .../ReactNativeRenderer-prod.fb.js | 21 ++++++++++++------- .../ReactNativeRenderer-profiling.fb.js | 19 ++++++++++------- 13 files changed, 77 insertions(+), 52 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 13803f35ede9f..ddddd69e4e6cf 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 @@ -25707,7 +25707,7 @@ if (__DEV__) { return root; } - var ReactVersion = "18.3.0-canary-aaa4acb12-20240222"; + var ReactVersion = "18.3.0-canary-98b8359f6-20240223"; // 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 fa75ec8c7d60e..efb67c0416931 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 @@ -9171,7 +9171,7 @@ var devToolsConfig$jscomp$inline_1014 = { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-canary-aaa4acb12-20240222", + version: "18.3.0-canary-98b8359f6-20240223", rendererPackageName: "react-test-renderer" }; var internals$jscomp$inline_1195 = { @@ -9202,7 +9202,7 @@ var internals$jscomp$inline_1195 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-aaa4acb12-20240222" + reconcilerVersion: "18.3.0-canary-98b8359f6-20240223" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1196 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js index 02c2709d4b7e9..b86aa5f54ffa0 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 @@ -9599,7 +9599,7 @@ var devToolsConfig$jscomp$inline_1056 = { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-canary-aaa4acb12-20240222", + version: "18.3.0-canary-98b8359f6-20240223", rendererPackageName: "react-test-renderer" }; var internals$jscomp$inline_1236 = { @@ -9630,7 +9630,7 @@ var internals$jscomp$inline_1236 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-aaa4acb12-20240222" + reconcilerVersion: "18.3.0-canary-98b8359f6-20240223" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1237 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js index 81b87a4436e52..e0f240e86bd47 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 @@ -26,7 +26,7 @@ if (__DEV__) { } var dynamicFlags = require("ReactNativeInternalFeatureFlags"); - var ReactVersion = "18.3.0-canary-aaa4acb12-20240222"; + var ReactVersion = "18.3.0-canary-98b8359f6-20240223"; // 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 f00d2222eea04..bf6843f08b17b 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 @@ -600,4 +600,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactCurrentDispatcher.current.useTransition(); }; -exports.version = "18.3.0-canary-aaa4acb12-20240222"; +exports.version = "18.3.0-canary-98b8359f6-20240223"; 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 58d7b7b339dc5..7eb55f2a79030 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 @@ -596,7 +596,7 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactCurrentDispatcher.current.useTransition(); }; -exports.version = "18.3.0-canary-aaa4acb12-20240222"; +exports.version = "18.3.0-canary-98b8359f6-20240223"; "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 ea3f6d094df51..9ea9d247c916e 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 @@ -aaa4acb1280fcda398defb805db47a8623df6c0f +98b8359f656ef714cc44828d7bfd2409ca16b9b3 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 653207a9d0522..e1b0180f3afaa 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<> + * @generated SignedSource<<4c526192e135ce4617cc964ef360f7e3>> */ "use strict"; @@ -3241,7 +3241,8 @@ to return true:wantsResponderID| | passChildrenWhenCloningPersistedNodes = dynamicFlags.passChildrenWhenCloningPersistedNodes, useMicrotasksForSchedulingInFabric = - dynamicFlags.useMicrotasksForSchedulingInFabric; // The rest of the flags are static for better dead code elimination. + dynamicFlags.useMicrotasksForSchedulingInFabric, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane; // The rest of the flags are static for better dead code elimination. var enableSchedulingProfiler = true; var enableProfilerTimer = true; var enableProfilerCommitHooks = true; @@ -4005,7 +4006,9 @@ to return true:wantsResponderID| | var DefaultLane = /* */ 32; - var SyncUpdateLanes = SyncLane | InputContinuousLane | DefaultLane; + var SyncUpdateLanes = enableUnifiedSyncLane + ? SyncLane | InputContinuousLane | DefaultLane + : SyncLane; var TransitionHydrationLane = /* */ 64; @@ -4161,7 +4164,7 @@ to return true:wantsResponderID| | var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { - { + if (enableUnifiedSyncLane) { var pendingSyncLanes = lanes & SyncUpdateLanes; if (pendingSyncLanes !== 0) { @@ -4761,7 +4764,7 @@ to return true:wantsResponderID| | var renderLane = getHighestPriorityLane(renderLanes); var lane; - if ((renderLane & SyncUpdateLanes) !== NoLane) { + if (enableUnifiedSyncLane && (renderLane & SyncUpdateLanes) !== NoLane) { lane = SyncHydrationLane; } else { switch (renderLane) { @@ -28015,7 +28018,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "18.3.0-canary-2e1e0d6f"; + var ReactVersion = "18.3.0-canary-0435735f"; 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 4e32601984b96..b1934cf6f14cd 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<<2a3d0aa946faed7a858417c14fa324c6>> + * @generated SignedSource<<743b9976cf9cb1022780b5808cc05a13>> */ "use strict"; @@ -1323,6 +1323,7 @@ var alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries, dynamicFlags.passChildrenWhenCloningPersistedNodes, useMicrotasksForSchedulingInFabric = dynamicFlags.useMicrotasksForSchedulingInFabric, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane, scheduleCallback$2 = Scheduler.unstable_scheduleCallback, cancelCallback$1 = Scheduler.unstable_cancelCallback, shouldYield = Scheduler.unstable_shouldYield, @@ -1354,11 +1355,14 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, +var SyncUpdateLanes = enableUnifiedSyncLane ? 42 : 2, + nextTransitionLane = 128, nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { - var pendingSyncLanes = lanes & 42; - if (0 !== pendingSyncLanes) return pendingSyncLanes; + if (enableUnifiedSyncLane) { + var pendingSyncLanes = lanes & SyncUpdateLanes; + if (0 !== pendingSyncLanes) return pendingSyncLanes; + } switch (lanes & -lanes) { case 1: return 1; @@ -5754,7 +5758,8 @@ function updateDehydratedSuspenseComponent( didPrimaryChildrenDefer = workInProgressRoot; if (null !== didPrimaryChildrenDefer) { nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; else switch (nextProps) { case 2: @@ -8598,7 +8603,7 @@ function commitRootImpl( 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (transitions & 4194218) && 0 !== (remainingLanes & 42) + 0 !== (transitions & 4194218) && 0 !== (remainingLanes & SyncUpdateLanes) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -9687,7 +9692,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1069 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-canary-b37c113f", + version: "18.3.0-canary-06019910", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -9730,7 +9735,7 @@ var internals$jscomp$inline_1294 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-b37c113f" + reconcilerVersion: "18.3.0-canary-06019910" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1295 = __REACT_DEVTOOLS_GLOBAL_HOOK__; 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 a1a9b21c6ac05..e9b44ecb6057f 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<<228fd7bab3210ea9b41049c42925b98a>> + * @generated SignedSource<> */ "use strict"; @@ -1327,6 +1327,7 @@ var alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries, dynamicFlags.passChildrenWhenCloningPersistedNodes, useMicrotasksForSchedulingInFabric = dynamicFlags.useMicrotasksForSchedulingInFabric, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane, scheduleCallback$2 = Scheduler.unstable_scheduleCallback, cancelCallback$1 = Scheduler.unstable_cancelCallback, shouldYield = Scheduler.unstable_shouldYield, @@ -1430,6 +1431,7 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } +var SyncUpdateLanes = enableUnifiedSyncLane ? 42 : 2; function getLabelForLane(lane) { if (lane & 1) return "SyncHydrationLane"; if (lane & 2) return "Sync"; @@ -1449,8 +1451,10 @@ function getLabelForLane(lane) { var nextTransitionLane = 128, nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { - var pendingSyncLanes = lanes & 42; - if (0 !== pendingSyncLanes) return pendingSyncLanes; + if (enableUnifiedSyncLane) { + var pendingSyncLanes = lanes & SyncUpdateLanes; + if (0 !== pendingSyncLanes) return pendingSyncLanes; + } switch (lanes & -lanes) { case 1: return 1; @@ -5972,7 +5976,8 @@ function updateDehydratedSuspenseComponent( didPrimaryChildrenDefer = workInProgressRoot; if (null !== didPrimaryChildrenDefer) { nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; else switch (nextProps) { case 2: @@ -9206,7 +9211,7 @@ function commitRootImpl( 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (transitions & 4194218) && 0 !== (remainingLanes & 42) + 0 !== (transitions & 4194218) && 0 !== (remainingLanes & SyncUpdateLanes) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -10385,7 +10390,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1147 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-canary-b2e48ba9", + version: "18.3.0-canary-9dda16fd", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10441,7 +10446,7 @@ var roots = new Map(), scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-b2e48ba9" + reconcilerVersion: "18.3.0-canary-9dda16fd" }); 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 dd4d6a32c0e3f..c1ec7b1a7fb51 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<<83d99d0c79ddb75f425e727a1ae48bd3>> + * @generated SignedSource<<2b24b949db80030833f17449b6904d8c>> */ "use strict"; @@ -2948,8 +2948,8 @@ to return true:wantsResponderID| | dynamicFlags.enableComponentStackLocations, enableDeferRootSchedulingToMicrotask = dynamicFlags.enableDeferRootSchedulingToMicrotask, - enableUseRefAccessWarning = dynamicFlags.enableUseRefAccessWarning; - // The rest of the flags are static for better dead code elimination. + enableUseRefAccessWarning = dynamicFlags.enableUseRefAccessWarning, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane; // The rest of the flags are static for better dead code elimination. var enableSchedulingProfiler = true; var enableProfilerTimer = true; var enableProfilerCommitHooks = true; @@ -4896,7 +4896,9 @@ to return true:wantsResponderID| | var DefaultLane = /* */ 32; - var SyncUpdateLanes = SyncLane | InputContinuousLane | DefaultLane; + var SyncUpdateLanes = enableUnifiedSyncLane + ? SyncLane | InputContinuousLane | DefaultLane + : SyncLane; var TransitionHydrationLane = /* */ 64; @@ -5052,7 +5054,7 @@ to return true:wantsResponderID| | var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { - { + if (enableUnifiedSyncLane) { var pendingSyncLanes = lanes & SyncUpdateLanes; if (pendingSyncLanes !== 0) { @@ -5652,7 +5654,7 @@ to return true:wantsResponderID| | var renderLane = getHighestPriorityLane(renderLanes); var lane; - if ((renderLane & SyncUpdateLanes) !== NoLane) { + if (enableUnifiedSyncLane && (renderLane & SyncUpdateLanes) !== NoLane) { lane = SyncHydrationLane; } else { switch (renderLane) { @@ -28456,7 +28458,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "18.3.0-canary-589e7bda"; + var ReactVersion = "18.3.0-canary-a4796866"; 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 6bf9bcc676d1a..8881d5addb921 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<<786bf0054cebdca0cc5ce47ddff76e92>> + * @generated SignedSource<> */ "use strict"; @@ -1164,6 +1164,7 @@ var ReactSharedInternals = enableDeferRootSchedulingToMicrotask = dynamicFlags.enableDeferRootSchedulingToMicrotask, enableUseRefAccessWarning = dynamicFlags.enableUseRefAccessWarning, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane, REACT_ELEMENT_TYPE = Symbol.for("react.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), @@ -1726,11 +1727,14 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, +var SyncUpdateLanes = enableUnifiedSyncLane ? 42 : 2, + nextTransitionLane = 128, nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { - var pendingSyncLanes = lanes & 42; - if (0 !== pendingSyncLanes) return pendingSyncLanes; + if (enableUnifiedSyncLane) { + var pendingSyncLanes = lanes & SyncUpdateLanes; + if (0 !== pendingSyncLanes) return pendingSyncLanes; + } switch (lanes & -lanes) { case 1: return 1; @@ -5819,7 +5823,8 @@ function updateDehydratedSuspenseComponent( didPrimaryChildrenDefer = workInProgressRoot; if (null !== didPrimaryChildrenDefer) { nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; else switch (nextProps) { case 2: @@ -8809,7 +8814,7 @@ function commitRootImpl( 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (transitions & 4194218) && 0 !== (remainingLanes & 42) + 0 !== (transitions & 4194218) && 0 !== (remainingLanes & SyncUpdateLanes) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -9905,7 +9910,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1138 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-canary-32080511", + version: "18.3.0-canary-82f6e470", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -9948,7 +9953,7 @@ var internals$jscomp$inline_1377 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-32080511" + reconcilerVersion: "18.3.0-canary-82f6e470" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1378 = __REACT_DEVTOOLS_GLOBAL_HOOK__; 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 368d04b62c385..a5f8f57375ad3 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<> + * @generated SignedSource<<38dfc1d1ad422291a111bb9d8399dcea>> */ "use strict"; @@ -1168,6 +1168,7 @@ var ReactSharedInternals = enableDeferRootSchedulingToMicrotask = dynamicFlags.enableDeferRootSchedulingToMicrotask, enableUseRefAccessWarning = dynamicFlags.enableUseRefAccessWarning, + enableUnifiedSyncLane = dynamicFlags.enableUnifiedSyncLane, REACT_ELEMENT_TYPE = Symbol.for("react.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), @@ -1802,6 +1803,7 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } +var SyncUpdateLanes = enableUnifiedSyncLane ? 42 : 2; function getLabelForLane(lane) { if (lane & 1) return "SyncHydrationLane"; if (lane & 2) return "Sync"; @@ -1821,8 +1823,10 @@ function getLabelForLane(lane) { var nextTransitionLane = 128, nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { - var pendingSyncLanes = lanes & 42; - if (0 !== pendingSyncLanes) return pendingSyncLanes; + if (enableUnifiedSyncLane) { + var pendingSyncLanes = lanes & SyncUpdateLanes; + if (0 !== pendingSyncLanes) return pendingSyncLanes; + } switch (lanes & -lanes) { case 1: return 1; @@ -6036,7 +6040,8 @@ function updateDehydratedSuspenseComponent( didPrimaryChildrenDefer = workInProgressRoot; if (null !== didPrimaryChildrenDefer) { nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; else switch (nextProps) { case 2: @@ -9417,7 +9422,7 @@ function commitRootImpl( 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (transitions & 4194218) && 0 !== (remainingLanes & 42) + 0 !== (transitions & 4194218) && 0 !== (remainingLanes & SyncUpdateLanes) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -10603,7 +10608,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1216 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-canary-d8af9fbc", + version: "18.3.0-canary-82057a3e", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10659,7 +10664,7 @@ var roots = new Map(), scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-canary-d8af9fbc" + reconcilerVersion: "18.3.0-canary-82057a3e" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {