Skip to content

Commit e31e2cc

Browse files
sammy-SCfacebook-github-bot
sammy-SC
authored and
facebook-github-bot
committed
React Native sync for revisions 0eea577...c96b78e
Summary: This sync includes the following changes: - **[c96b78e0e](facebook/react@c96b78e0e )**: Add concurrentRoot property to ReactNativeTypes ([#21648](facebook/react#21648)) //<Samuel Susla>// - **[1a3f1afbd](facebook/react@1a3f1afbd )**: [React Native] Fabric get current event priority ([#21553](facebook/react#21553)) //<Samuel Susla>// - **[48a11a3ef](facebook/react@48a11a3ef )**: Update next React version ([#21647](facebook/react#21647)) //<Andrew Clark>// - **[5aa0c5671](facebook/react@5aa0c5671 )**: Fix Issue with Undefined Lazy Imports By Refactoring Lazy Initialization Order ([#21642](facebook/react#21642)) //<Sebastian Markbåge>// Changelog: [General][Changed] - React Native sync for revisions 0eea577...c96b78e jest_e2e[run_all_tests] Reviewed By: bvaughn Differential Revision: D29029542 fbshipit-source-id: 9f2e19b4714b5697b5b846f2db8eb28c25420932
1 parent b496a53 commit e31e2cc

15 files changed

+174
-72
lines changed

‎Libraries/Renderer/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0eea5772486318c5b2922c8b36680cf4744615d6
1+
c96b78e0e7cd9e6ef7c0464748a50cf8510dde81

‎Libraries/Renderer/implementations/ReactFabric-dev.fb.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<0962b5cf17d6b982900b0deedd83fda0>>
10+
* @generated SignedSource<<ff752c8b3ab2ddddfde3c3348f99afa3>>
1111
*/
1212

1313
'use strict';
@@ -4833,7 +4833,11 @@ var _nativeFabricUIManage = nativeFabricUIManager,
48334833
registerEventHandler = _nativeFabricUIManage.registerEventHandler,
48344834
fabricMeasure = _nativeFabricUIManage.measure,
48354835
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
4836-
fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
4836+
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
4837+
FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
4838+
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
4839+
fabricGetCurrentEventPriority =
4840+
_nativeFabricUIManage.unstable_getCurrentEventPriority;
48374841
var getViewConfigForType =
48384842
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
48394843
// % 10 === 1 means it is a rootTag.
@@ -5053,6 +5057,21 @@ function shouldSetTextContent(type, props) {
50535057
return false;
50545058
}
50555059
function getCurrentEventPriority() {
5060+
var currentEventPriority = fabricGetCurrentEventPriority
5061+
? fabricGetCurrentEventPriority()
5062+
: null;
5063+
5064+
if (currentEventPriority != null) {
5065+
switch (currentEventPriority) {
5066+
case FabricDiscretePriority:
5067+
return DiscreteEventPriority;
5068+
5069+
case FabricDefaultPriority:
5070+
default:
5071+
return DefaultEventPriority;
5072+
}
5073+
}
5074+
50565075
return DefaultEventPriority;
50575076
} // The Fabric renderer is secondary to the existing React Native renderer.
50585077
var scheduleTimeout = setTimeout;
@@ -5853,7 +5872,7 @@ var Passive$1 =
58535872
/* */
58545873
4;
58555874

5856-
var ReactVersion = "17.0.3-0eea57724";
5875+
var ReactVersion = "18.0.0-c96b78e0e";
58575876

58585877
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
58595878
var NoTransition = 0;

‎Libraries/Renderer/implementations/ReactFabric-dev.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactFabric-dev
1010
* @preventMunge
11-
* @generated SignedSource<<74d609f93cda46b8478a82d095ab769c>>
11+
* @generated SignedSource<<802b2fe3c3332e7eea4d369034929b93>>
1212
*/
1313

1414
'use strict';
@@ -4812,7 +4812,11 @@ var _nativeFabricUIManage = nativeFabricUIManager,
48124812
registerEventHandler = _nativeFabricUIManage.registerEventHandler,
48134813
fabricMeasure = _nativeFabricUIManage.measure,
48144814
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
4815-
fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
4815+
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
4816+
FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
4817+
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
4818+
fabricGetCurrentEventPriority =
4819+
_nativeFabricUIManage.unstable_getCurrentEventPriority;
48164820
var getViewConfigForType =
48174821
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
48184822
// % 10 === 1 means it is a rootTag.
@@ -5032,6 +5036,21 @@ function shouldSetTextContent(type, props) {
50325036
return false;
50335037
}
50345038
function getCurrentEventPriority() {
5039+
var currentEventPriority = fabricGetCurrentEventPriority
5040+
? fabricGetCurrentEventPriority()
5041+
: null;
5042+
5043+
if (currentEventPriority != null) {
5044+
switch (currentEventPriority) {
5045+
case FabricDiscretePriority:
5046+
return DiscreteEventPriority;
5047+
5048+
case FabricDefaultPriority:
5049+
default:
5050+
return DefaultEventPriority;
5051+
}
5052+
}
5053+
50355054
return DefaultEventPriority;
50365055
} // The Fabric renderer is secondary to the existing React Native renderer.
50375056
var scheduleTimeout = setTimeout;
@@ -5735,7 +5754,7 @@ var Passive$1 =
57355754
/* */
57365755
4;
57375756

5738-
var ReactVersion = "17.0.3-0eea57724";
5757+
var ReactVersion = "18.0.0-c96b78e0e";
57395758

57405759
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
57415760
var NoTransition = 0;

‎Libraries/Renderer/implementations/ReactFabric-prod.fb.js

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<683bd75bd1f5651f1e727c13530bd075>>
10+
* @generated SignedSource<<c51ddcb95ee9b875b0f62050aa3d7241>>
1111
*/
1212

1313
"use strict";
@@ -1855,6 +1855,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
18551855
fabricMeasure = _nativeFabricUIManage.measure,
18561856
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
18571857
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
1858+
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
1859+
fabricGetCurrentEventPriority =
1860+
_nativeFabricUIManage.unstable_getCurrentEventPriority,
18581861
getViewConfigForType =
18591862
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
18601863
nextReactTag = 2;
@@ -6015,7 +6018,20 @@ function requestUpdateLane(fiber) {
60156018
currentEventTransitionLane
60166019
);
60176020
fiber = currentUpdatePriority;
6018-
return 0 !== fiber ? fiber : 16;
6021+
if (0 === fiber)
6022+
a: {
6023+
fiber = fabricGetCurrentEventPriority
6024+
? fabricGetCurrentEventPriority()
6025+
: null;
6026+
if (null != fiber)
6027+
switch (fiber) {
6028+
case FabricDiscretePriority:
6029+
fiber = 1;
6030+
break a;
6031+
}
6032+
fiber = 16;
6033+
}
6034+
return fiber;
60196035
}
60206036
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
60216037
if (50 < nestedUpdateCount)
@@ -7779,7 +7795,7 @@ var roots = new Map(),
77797795
devToolsConfig$jscomp$inline_942 = {
77807796
findFiberByHostInstance: getInstanceFromInstance,
77817797
bundleType: 0,
7782-
version: "17.0.3-0eea57724",
7798+
version: "18.0.0-c96b78e0e",
77837799
rendererPackageName: "react-native-renderer",
77847800
rendererConfig: {
77857801
getInspectorDataForViewTag: function() {
@@ -7794,7 +7810,7 @@ var roots = new Map(),
77947810
}.bind(null, findNodeHandle)
77957811
}
77967812
};
7797-
var internals$jscomp$inline_1180 = {
7813+
var internals$jscomp$inline_1183 = {
77987814
bundleType: devToolsConfig$jscomp$inline_942.bundleType,
77997815
version: devToolsConfig$jscomp$inline_942.version,
78007816
rendererPackageName: devToolsConfig$jscomp$inline_942.rendererPackageName,
@@ -7821,19 +7837,19 @@ var internals$jscomp$inline_1180 = {
78217837
scheduleRoot: null,
78227838
setRefreshHandler: null,
78237839
getCurrentFiber: null,
7824-
reconcilerVersion: "17.0.3-0eea57724"
7840+
reconcilerVersion: "18.0.0-c96b78e0e"
78257841
};
78267842
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
7827-
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
7843+
var hook$jscomp$inline_1184 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
78287844
if (
7829-
!hook$jscomp$inline_1181.isDisabled &&
7830-
hook$jscomp$inline_1181.supportsFiber
7845+
!hook$jscomp$inline_1184.isDisabled &&
7846+
hook$jscomp$inline_1184.supportsFiber
78317847
)
78327848
try {
7833-
(rendererID = hook$jscomp$inline_1181.inject(
7834-
internals$jscomp$inline_1180
7849+
(rendererID = hook$jscomp$inline_1184.inject(
7850+
internals$jscomp$inline_1183
78357851
)),
7836-
(injectedHook = hook$jscomp$inline_1181);
7852+
(injectedHook = hook$jscomp$inline_1184);
78377853
} catch (err) {}
78387854
}
78397855
exports.createPortal = function(children, containerTag) {

‎Libraries/Renderer/implementations/ReactFabric-prod.js

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactFabric-prod
1010
* @preventMunge
11-
* @generated SignedSource<<abb0257485f1a54fe8d91eb371f94243>>
11+
* @generated SignedSource<<2b5c5a5f3e3edee888af3971bac202a4>>
1212
*/
1313

1414
"use strict";
@@ -1854,6 +1854,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
18541854
fabricMeasure = _nativeFabricUIManage.measure,
18551855
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
18561856
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
1857+
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
1858+
fabricGetCurrentEventPriority =
1859+
_nativeFabricUIManage.unstable_getCurrentEventPriority,
18571860
getViewConfigForType =
18581861
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
18591862
nextReactTag = 2;
@@ -6014,7 +6017,20 @@ function requestUpdateLane(fiber) {
60146017
currentEventTransitionLane
60156018
);
60166019
fiber = currentUpdatePriority;
6017-
return 0 !== fiber ? fiber : 16;
6020+
if (0 === fiber)
6021+
a: {
6022+
fiber = fabricGetCurrentEventPriority
6023+
? fabricGetCurrentEventPriority()
6024+
: null;
6025+
if (null != fiber)
6026+
switch (fiber) {
6027+
case FabricDiscretePriority:
6028+
fiber = 1;
6029+
break a;
6030+
}
6031+
fiber = 16;
6032+
}
6033+
return fiber;
60186034
}
60196035
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
60206036
if (50 < nestedUpdateCount)
@@ -7774,7 +7790,7 @@ var roots = new Map(),
77747790
devToolsConfig$jscomp$inline_942 = {
77757791
findFiberByHostInstance: getInstanceFromInstance,
77767792
bundleType: 0,
7777-
version: "17.0.3-experimental-0eea57724",
7793+
version: "18.0.0-experimental-c96b78e0e",
77787794
rendererPackageName: "react-native-renderer",
77797795
rendererConfig: {
77807796
getInspectorDataForViewTag: function() {
@@ -7789,7 +7805,7 @@ var roots = new Map(),
77897805
}.bind(null, findNodeHandle)
77907806
}
77917807
};
7792-
var internals$jscomp$inline_1180 = {
7808+
var internals$jscomp$inline_1183 = {
77937809
bundleType: devToolsConfig$jscomp$inline_942.bundleType,
77947810
version: devToolsConfig$jscomp$inline_942.version,
77957811
rendererPackageName: devToolsConfig$jscomp$inline_942.rendererPackageName,
@@ -7816,19 +7832,19 @@ var internals$jscomp$inline_1180 = {
78167832
scheduleRoot: null,
78177833
setRefreshHandler: null,
78187834
getCurrentFiber: null,
7819-
reconcilerVersion: "17.0.3-experimental-0eea57724"
7835+
reconcilerVersion: "18.0.0-experimental-c96b78e0e"
78207836
};
78217837
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
7822-
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
7838+
var hook$jscomp$inline_1184 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
78237839
if (
7824-
!hook$jscomp$inline_1181.isDisabled &&
7825-
hook$jscomp$inline_1181.supportsFiber
7840+
!hook$jscomp$inline_1184.isDisabled &&
7841+
hook$jscomp$inline_1184.supportsFiber
78267842
)
78277843
try {
7828-
(rendererID = hook$jscomp$inline_1181.inject(
7829-
internals$jscomp$inline_1180
7844+
(rendererID = hook$jscomp$inline_1184.inject(
7845+
internals$jscomp$inline_1183
78307846
)),
7831-
(injectedHook = hook$jscomp$inline_1181);
7847+
(injectedHook = hook$jscomp$inline_1184);
78327848
} catch (err) {}
78337849
}
78347850
exports.createPortal = function(children, containerTag) {

‎Libraries/Renderer/implementations/ReactFabric-profiling.fb.js

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<21f28e209cfb07c744f2addfe335ba8b>>
10+
* @generated SignedSource<<cc2d0b98265085526a6a2178a6cdbdf8>>
1111
*/
1212

1313
"use strict";
@@ -1903,6 +1903,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
19031903
fabricMeasure = _nativeFabricUIManage.measure,
19041904
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
19051905
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
1906+
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
1907+
fabricGetCurrentEventPriority =
1908+
_nativeFabricUIManage.unstable_getCurrentEventPriority,
19061909
getViewConfigForType =
19071910
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
19081911
nextReactTag = 2;
@@ -6316,7 +6319,20 @@ function requestUpdateLane(fiber) {
63166319
currentEventTransitionLane
63176320
);
63186321
fiber = currentUpdatePriority;
6319-
return 0 !== fiber ? fiber : 16;
6322+
if (0 === fiber)
6323+
a: {
6324+
fiber = fabricGetCurrentEventPriority
6325+
? fabricGetCurrentEventPriority()
6326+
: null;
6327+
if (null != fiber)
6328+
switch (fiber) {
6329+
case FabricDiscretePriority:
6330+
fiber = 1;
6331+
break a;
6332+
}
6333+
fiber = 16;
6334+
}
6335+
return fiber;
63206336
}
63216337
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
63226338
if (50 < nestedUpdateCount)
@@ -8221,7 +8237,7 @@ var roots = new Map(),
82218237
devToolsConfig$jscomp$inline_972 = {
82228238
findFiberByHostInstance: getInstanceFromInstance,
82238239
bundleType: 0,
8224-
version: "17.0.3-0eea57724",
8240+
version: "18.0.0-c96b78e0e",
82258241
rendererPackageName: "react-native-renderer",
82268242
rendererConfig: {
82278243
getInspectorDataForViewTag: function() {
@@ -8236,7 +8252,7 @@ var roots = new Map(),
82368252
}.bind(null, findNodeHandle)
82378253
}
82388254
};
8239-
var internals$jscomp$inline_1230 = {
8255+
var internals$jscomp$inline_1233 = {
82408256
bundleType: devToolsConfig$jscomp$inline_972.bundleType,
82418257
version: devToolsConfig$jscomp$inline_972.version,
82428258
rendererPackageName: devToolsConfig$jscomp$inline_972.rendererPackageName,
@@ -8263,19 +8279,19 @@ var internals$jscomp$inline_1230 = {
82638279
scheduleRoot: null,
82648280
setRefreshHandler: null,
82658281
getCurrentFiber: null,
8266-
reconcilerVersion: "17.0.3-0eea57724"
8282+
reconcilerVersion: "18.0.0-c96b78e0e"
82678283
};
82688284
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
8269-
var hook$jscomp$inline_1231 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
8285+
var hook$jscomp$inline_1234 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
82708286
if (
8271-
!hook$jscomp$inline_1231.isDisabled &&
8272-
hook$jscomp$inline_1231.supportsFiber
8287+
!hook$jscomp$inline_1234.isDisabled &&
8288+
hook$jscomp$inline_1234.supportsFiber
82738289
)
82748290
try {
8275-
(rendererID = hook$jscomp$inline_1231.inject(
8276-
internals$jscomp$inline_1230
8291+
(rendererID = hook$jscomp$inline_1234.inject(
8292+
internals$jscomp$inline_1233
82778293
)),
8278-
(injectedHook = hook$jscomp$inline_1231);
8294+
(injectedHook = hook$jscomp$inline_1234);
82798295
} catch (err) {}
82808296
}
82818297
exports.createPortal = function(children, containerTag) {

0 commit comments

Comments
 (0)