Skip to content

Commit

Permalink
React Native sync for revisions 0eea577...c96b78e
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@sammy-SC @facebook-github-bot
sammy-SC authored and facebook-github-bot committed Jun 11, 2021
1 parent b496a53 commit e31e2cc
Show file tree
Hide file tree
Showing 15 changed files with 174 additions and 72 deletions.
2 changes: 1 addition & 1 deletion Libraries/Renderer/REVISION
View file
@@ -1 +1 @@
0eea5772486318c5b2922c8b36680cf4744615d6
c96b78e0e7cd9e6ef7c0464748a50cf8510dde81
25 changes: 22 additions & 3 deletions Libraries/Renderer/implementations/ReactFabric-dev.fb.js
View file
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<0962b5cf17d6b982900b0deedd83fda0>>
* @generated SignedSource<<ff752c8b3ab2ddddfde3c3348f99afa3>>
*/

'use strict';
Expand Down Expand Up @@ -4833,7 +4833,11 @@ var _nativeFabricUIManage = nativeFabricUIManager,
registerEventHandler = _nativeFabricUIManage.registerEventHandler,
fabricMeasure = _nativeFabricUIManage.measure,
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
fabricGetCurrentEventPriority =
_nativeFabricUIManage.unstable_getCurrentEventPriority;
var getViewConfigForType =
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
// % 10 === 1 means it is a rootTag.
Expand Down Expand Up @@ -5053,6 +5057,21 @@ function shouldSetTextContent(type, props) {
return false;
}
function getCurrentEventPriority() {
var currentEventPriority = fabricGetCurrentEventPriority
? fabricGetCurrentEventPriority()
: null;

if (currentEventPriority != null) {
switch (currentEventPriority) {
case FabricDiscretePriority:
return DiscreteEventPriority;

case FabricDefaultPriority:
default:
return DefaultEventPriority;
}
}

return DefaultEventPriority;
} // The Fabric renderer is secondary to the existing React Native renderer.
var scheduleTimeout = setTimeout;
Expand Down Expand Up @@ -5853,7 +5872,7 @@ var Passive$1 =
/* */
4;

var ReactVersion = "17.0.3-0eea57724";
var ReactVersion = "18.0.0-c96b78e0e";

var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
var NoTransition = 0;
Expand Down
25 changes: 22 additions & 3 deletions Libraries/Renderer/implementations/ReactFabric-dev.js
View file
Expand Up @@ -8,7 +8,7 @@
* @nolint
* @providesModule ReactFabric-dev
* @preventMunge
* @generated SignedSource<<74d609f93cda46b8478a82d095ab769c>>
* @generated SignedSource<<802b2fe3c3332e7eea4d369034929b93>>
*/

'use strict';
Expand Down Expand Up @@ -4812,7 +4812,11 @@ var _nativeFabricUIManage = nativeFabricUIManager,
registerEventHandler = _nativeFabricUIManage.registerEventHandler,
fabricMeasure = _nativeFabricUIManage.measure,
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
fabricGetCurrentEventPriority =
_nativeFabricUIManage.unstable_getCurrentEventPriority;
var getViewConfigForType =
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
// % 10 === 1 means it is a rootTag.
Expand Down Expand Up @@ -5032,6 +5036,21 @@ function shouldSetTextContent(type, props) {
return false;
}
function getCurrentEventPriority() {
var currentEventPriority = fabricGetCurrentEventPriority
? fabricGetCurrentEventPriority()
: null;

if (currentEventPriority != null) {
switch (currentEventPriority) {
case FabricDiscretePriority:
return DiscreteEventPriority;

case FabricDefaultPriority:
default:
return DefaultEventPriority;
}
}

return DefaultEventPriority;
} // The Fabric renderer is secondary to the existing React Native renderer.
var scheduleTimeout = setTimeout;
Expand Down Expand Up @@ -5735,7 +5754,7 @@ var Passive$1 =
/* */
4;

var ReactVersion = "17.0.3-0eea57724";
var ReactVersion = "18.0.0-c96b78e0e";

var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
var NoTransition = 0;
Expand Down
38 changes: 27 additions & 11 deletions Libraries/Renderer/implementations/ReactFabric-prod.fb.js
View file
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<683bd75bd1f5651f1e727c13530bd075>>
* @generated SignedSource<<c51ddcb95ee9b875b0f62050aa3d7241>>
*/

"use strict";
Expand Down Expand Up @@ -1855,6 +1855,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
fabricMeasure = _nativeFabricUIManage.measure,
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
fabricGetCurrentEventPriority =
_nativeFabricUIManage.unstable_getCurrentEventPriority,
getViewConfigForType =
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
nextReactTag = 2;
Expand Down Expand Up @@ -6015,7 +6018,20 @@ function requestUpdateLane(fiber) {
currentEventTransitionLane
);
fiber = currentUpdatePriority;
return 0 !== fiber ? fiber : 16;
if (0 === fiber)
a: {
fiber = fabricGetCurrentEventPriority
? fabricGetCurrentEventPriority()
: null;
if (null != fiber)
switch (fiber) {
case FabricDiscretePriority:
fiber = 1;
break a;
}
fiber = 16;
}
return fiber;
}
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
if (50 < nestedUpdateCount)
Expand Down Expand Up @@ -7779,7 +7795,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_942 = {
findFiberByHostInstance: getInstanceFromInstance,
bundleType: 0,
version: "17.0.3-0eea57724",
version: "18.0.0-c96b78e0e",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function() {
Expand All @@ -7794,7 +7810,7 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1180 = {
var internals$jscomp$inline_1183 = {
bundleType: devToolsConfig$jscomp$inline_942.bundleType,
version: devToolsConfig$jscomp$inline_942.version,
rendererPackageName: devToolsConfig$jscomp$inline_942.rendererPackageName,
Expand All @@ -7821,19 +7837,19 @@ var internals$jscomp$inline_1180 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "17.0.3-0eea57724"
reconcilerVersion: "18.0.0-c96b78e0e"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1184 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1181.isDisabled &&
hook$jscomp$inline_1181.supportsFiber
!hook$jscomp$inline_1184.isDisabled &&
hook$jscomp$inline_1184.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1181.inject(
internals$jscomp$inline_1180
(rendererID = hook$jscomp$inline_1184.inject(
internals$jscomp$inline_1183
)),
(injectedHook = hook$jscomp$inline_1181);
(injectedHook = hook$jscomp$inline_1184);
} catch (err) {}
}
exports.createPortal = function(children, containerTag) {
Expand Down
38 changes: 27 additions & 11 deletions Libraries/Renderer/implementations/ReactFabric-prod.js
View file
Expand Up @@ -8,7 +8,7 @@
* @nolint
* @providesModule ReactFabric-prod
* @preventMunge
* @generated SignedSource<<abb0257485f1a54fe8d91eb371f94243>>
* @generated SignedSource<<2b5c5a5f3e3edee888af3971bac202a4>>
*/

"use strict";
Expand Down Expand Up @@ -1854,6 +1854,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
fabricMeasure = _nativeFabricUIManage.measure,
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
fabricGetCurrentEventPriority =
_nativeFabricUIManage.unstable_getCurrentEventPriority,
getViewConfigForType =
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
nextReactTag = 2;
Expand Down Expand Up @@ -6014,7 +6017,20 @@ function requestUpdateLane(fiber) {
currentEventTransitionLane
);
fiber = currentUpdatePriority;
return 0 !== fiber ? fiber : 16;
if (0 === fiber)
a: {
fiber = fabricGetCurrentEventPriority
? fabricGetCurrentEventPriority()
: null;
if (null != fiber)
switch (fiber) {
case FabricDiscretePriority:
fiber = 1;
break a;
}
fiber = 16;
}
return fiber;
}
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
if (50 < nestedUpdateCount)
Expand Down Expand Up @@ -7774,7 +7790,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_942 = {
findFiberByHostInstance: getInstanceFromInstance,
bundleType: 0,
version: "17.0.3-experimental-0eea57724",
version: "18.0.0-experimental-c96b78e0e",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function() {
Expand All @@ -7789,7 +7805,7 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1180 = {
var internals$jscomp$inline_1183 = {
bundleType: devToolsConfig$jscomp$inline_942.bundleType,
version: devToolsConfig$jscomp$inline_942.version,
rendererPackageName: devToolsConfig$jscomp$inline_942.rendererPackageName,
Expand All @@ -7816,19 +7832,19 @@ var internals$jscomp$inline_1180 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "17.0.3-experimental-0eea57724"
reconcilerVersion: "18.0.0-experimental-c96b78e0e"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1184 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1181.isDisabled &&
hook$jscomp$inline_1181.supportsFiber
!hook$jscomp$inline_1184.isDisabled &&
hook$jscomp$inline_1184.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1181.inject(
internals$jscomp$inline_1180
(rendererID = hook$jscomp$inline_1184.inject(
internals$jscomp$inline_1183
)),
(injectedHook = hook$jscomp$inline_1181);
(injectedHook = hook$jscomp$inline_1184);
} catch (err) {}
}
exports.createPortal = function(children, containerTag) {
Expand Down
38 changes: 27 additions & 11 deletions Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
View file
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<21f28e209cfb07c744f2addfe335ba8b>>
* @generated SignedSource<<cc2d0b98265085526a6a2178a6cdbdf8>>
*/

"use strict";
Expand Down Expand Up @@ -1903,6 +1903,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
fabricMeasure = _nativeFabricUIManage.measure,
fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
fabricGetCurrentEventPriority =
_nativeFabricUIManage.unstable_getCurrentEventPriority,
getViewConfigForType =
ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
nextReactTag = 2;
Expand Down Expand Up @@ -6316,7 +6319,20 @@ function requestUpdateLane(fiber) {
currentEventTransitionLane
);
fiber = currentUpdatePriority;
return 0 !== fiber ? fiber : 16;
if (0 === fiber)
a: {
fiber = fabricGetCurrentEventPriority
? fabricGetCurrentEventPriority()
: null;
if (null != fiber)
switch (fiber) {
case FabricDiscretePriority:
fiber = 1;
break a;
}
fiber = 16;
}
return fiber;
}
function scheduleUpdateOnFiber(fiber, lane, eventTime) {
if (50 < nestedUpdateCount)
Expand Down Expand Up @@ -8221,7 +8237,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_972 = {
findFiberByHostInstance: getInstanceFromInstance,
bundleType: 0,
version: "17.0.3-0eea57724",
version: "18.0.0-c96b78e0e",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForViewTag: function() {
Expand All @@ -8236,7 +8252,7 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1230 = {
var internals$jscomp$inline_1233 = {
bundleType: devToolsConfig$jscomp$inline_972.bundleType,
version: devToolsConfig$jscomp$inline_972.version,
rendererPackageName: devToolsConfig$jscomp$inline_972.rendererPackageName,
Expand All @@ -8263,19 +8279,19 @@ var internals$jscomp$inline_1230 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "17.0.3-0eea57724"
reconcilerVersion: "18.0.0-c96b78e0e"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1231 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1234 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1231.isDisabled &&
hook$jscomp$inline_1231.supportsFiber
!hook$jscomp$inline_1234.isDisabled &&
hook$jscomp$inline_1234.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1231.inject(
internals$jscomp$inline_1230
(rendererID = hook$jscomp$inline_1234.inject(
internals$jscomp$inline_1233
)),
(injectedHook = hook$jscomp$inline_1231);
(injectedHook = hook$jscomp$inline_1234);
} catch (err) {}
}
exports.createPortal = function(children, containerTag) {
Expand Down

0 comments on commit e31e2cc

Please sign in to comment.