Skip to content

Commit

Permalink
Update isConcurrent RTR option usage (#28546)
Browse files Browse the repository at this point in the history
Reverting some of #27804 which
renamed this option to stable. This PR just replaces internal usage to
make upcoming PRs cleaner.

Keeping isConcurrent unstable for the next major release in order to
enable a broader deprecation of RTR and be consistent with concurrent
rendering everywhere for next major.
(#28498)
- Next major will use concurrent root
- The old behavior (legacy root by default, concurrent root with
unstable option) will be preserved for React Native until new
architecture is fully shipped.
- Flag and legacy root usage can be removed after RN dependency is
unblocked without an additional breaking change

DiffTrain build for commit 3832730.
  • Loading branch information
jackpope committed Mar 18, 2024
1 parent 77beaa1 commit 115f6d6
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<15edad3f290e335d70dc9466dde6cfcc>>
* @generated SignedSource<<a3b83de91596e95a8c9484b94ff6b74c>>
*/

"use strict";
Expand Down Expand Up @@ -25454,7 +25454,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-canary-b09e102ff-20240316";
var ReactVersion = "18.3.0-canary-38327309a-20240318";

// Might add PROFILE later.

Expand Down Expand Up @@ -26358,10 +26358,7 @@ if (__DEV__) {
createNodeMock = options.createNodeMock;
}

if (
options.unstable_isConcurrent === true ||
options.isConcurrent === true
) {
if (options.unstable_isConcurrent === true) {
isConcurrent = true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<c324111a5b9cb8168651dba09e62a33a>>
* @generated SignedSource<<f286949b9793004b5a064c2aeef09640>>
*/

"use strict";
Expand Down Expand Up @@ -9175,7 +9175,7 @@ var devToolsConfig$jscomp$inline_1016 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-canary-b09e102ff-20240316",
version: "18.3.0-canary-38327309a-20240318",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1194 = {
Expand Down Expand Up @@ -9206,7 +9206,7 @@ var internals$jscomp$inline_1194 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-canary-b09e102ff-20240316"
reconcilerVersion: "18.3.0-canary-38327309a-20240318"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1195 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -9228,16 +9228,15 @@ exports.create = function (element, options) {
isConcurrent = !1,
isStrictMode = !1,
concurrentUpdatesByDefault = null;
if ("object" === typeof options && null !== options) {
"function" === typeof options.createNodeMock &&
(createNodeMock = options.createNodeMock);
if (!0 === options.unstable_isConcurrent || !0 === options.isConcurrent)
isConcurrent = !0;
!0 === options.unstable_strictMode && (isStrictMode = !0);
"object" === typeof options &&
null !== options &&
("function" === typeof options.createNodeMock &&
(createNodeMock = options.createNodeMock),
!0 === options.unstable_isConcurrent && (isConcurrent = !0),
!0 === options.unstable_strictMode && (isStrictMode = !0),
void 0 !== options.unstable_concurrentUpdatesByDefault &&
(concurrentUpdatesByDefault =
options.unstable_concurrentUpdatesByDefault);
}
options.unstable_concurrentUpdatesByDefault));
var container = {
children: [],
createNodeMock: createNodeMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<ad44e5907f7d21ae6abb5c30cb23b66a>>
* @generated SignedSource<<e7f6aa2c01048ac2a1b605aae48eb66a>>
*/

"use strict";
Expand Down Expand Up @@ -9603,7 +9603,7 @@ var devToolsConfig$jscomp$inline_1058 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-canary-b09e102ff-20240316",
version: "18.3.0-canary-38327309a-20240318",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1235 = {
Expand Down Expand Up @@ -9634,7 +9634,7 @@ var internals$jscomp$inline_1235 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-canary-b09e102ff-20240316"
reconcilerVersion: "18.3.0-canary-38327309a-20240318"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1236 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -9656,16 +9656,15 @@ exports.create = function (element, options) {
isConcurrent = !1,
isStrictMode = !1,
concurrentUpdatesByDefault = null;
if ("object" === typeof options && null !== options) {
"function" === typeof options.createNodeMock &&
(createNodeMock = options.createNodeMock);
if (!0 === options.unstable_isConcurrent || !0 === options.isConcurrent)
isConcurrent = !0;
!0 === options.unstable_strictMode && (isStrictMode = !0);
"object" === typeof options &&
null !== options &&
("function" === typeof options.createNodeMock &&
(createNodeMock = options.createNodeMock),
!0 === options.unstable_isConcurrent && (isConcurrent = !0),
!0 === options.unstable_strictMode && (isStrictMode = !0),
void 0 !== options.unstable_concurrentUpdatesByDefault &&
(concurrentUpdatesByDefault =
options.unstable_concurrentUpdatesByDefault);
}
options.unstable_concurrentUpdatesByDefault));
var container = {
children: [],
createNodeMock: createNodeMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (__DEV__) {
}
var dynamicFlags = require("ReactNativeInternalFeatureFlags");

var ReactVersion = "18.3.0-canary-b09e102ff-20240316";
var ReactVersion = "18.3.0-canary-38327309a-20240318";

// ATTENTION
// When adding new symbols to this file,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,4 +628,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-canary-b09e102ff-20240316";
exports.version = "18.3.0-canary-38327309a-20240318";
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-canary-b09e102ff-20240316";
exports.version = "18.3.0-canary-38327309a-20240318";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b09e102ff1e2aaaf5eb6585b04609ac7ff54a5c8
38327309a4172a52cf94e8e264990bedafc1df6e

0 comments on commit 115f6d6

Please sign in to comment.