Skip to content

Commit 69ade59

Browse files
sebmarkbagefacebook-github-bot
authored andcommitted
React Native sync for revisions 4e5d7fa...454c221
Summary: Base sync before adding Flight files. This sync includes the following changes: - **[454c2211c](facebook/react@454c2211c )**: Refactor SchedulerHostConfigs ([#20025](facebook/react#20025)) //<Ricky>// - **[56e9feead](facebook/react@56e9feead )**: Remove Blocks ([#20138](facebook/react#20138)) //<Sebastian Markbåge>// - **[3fbd47b86](facebook/react@3fbd47b86 )**: Serialize pending server components by reference (lazy component) ([#20137](facebook/react#20137)) //<Sebastian Markbåge>// - **[930ce7c15](facebook/react@930ce7c15 )**: Allow values to be encoded by "reference" to a value rather than the value itself ([#20136](facebook/react#20136)) //<Sebastian Markbåge>// - **[39eb6d176](facebook/react@39eb6d176 )**: Rename ([#20134](facebook/react#20134)) //<Sebastian Markbåge>// - **[ffd842335](facebook/react@ffd842335 )**: [Flight] Add support for Module References in transport protocol ([#20121](facebook/react#20121)) //<Sebastian Markbåge>// - **[343d7a4a7](facebook/react@343d7a4a7 )**: Fast Refresh: Don't block DevTools commit hook ([#20129](facebook/react#20129)) //<Brian Vaughn>// - **[779a472b0](facebook/react@779a472b0 )**: Prevent inlining into recursive commit functions ([#20105](facebook/react#20105)) //<Andrew Clark>// - **[25b18d31c](facebook/react@25b18d31c )**: Traverse commit phase effects iteratively ([#20094](facebook/react#20094)) //<Andrew Clark>// Changelog: [General][Changed] - React Native sync for revisions 4e5d7fa...454c221 Reviewed By: rickhanlonii Differential Revision: D24698701 fbshipit-source-id: dfaf692b1051150355dece1657764a484b7ae603
1 parent d021000 commit 69ade59

13 files changed

+165
-425
lines changed

Libraries/Renderer/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4e5d7faf54b38ebfc7a2dcadbd09a25d6f330ac0
1+
454c2211c09bfa2fd5475c25665f3bbeb6882841

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

Lines changed: 16 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,9 +1239,8 @@ var DehydratedFragment = 18;
12391239
var SuspenseListComponent = 19;
12401240
var FundamentalComponent = 20;
12411241
var ScopeComponent = 21;
1242-
var Block = 22;
1243-
var OffscreenComponent = 23;
1244-
var LegacyHiddenComponent = 24;
1242+
var OffscreenComponent = 22;
1243+
var LegacyHiddenComponent = 23;
12451244

12461245
/**
12471246
* Instance of element that should respond to touch/move types of interactions,
@@ -2548,8 +2547,6 @@ var REACT_SUSPENSE_TYPE = 0xead1;
25482547
var REACT_SUSPENSE_LIST_TYPE = 0xead8;
25492548
var REACT_MEMO_TYPE = 0xead3;
25502549
var REACT_LAZY_TYPE = 0xead4;
2551-
var REACT_BLOCK_TYPE = 0xead9;
2552-
var REACT_SERVER_BLOCK_TYPE = 0xeada;
25532550
var REACT_FUNDAMENTAL_TYPE = 0xead5;
25542551
var REACT_SCOPE_TYPE = 0xead7;
25552552
var REACT_OPAQUE_ID_TYPE = 0xeae0;
@@ -2571,8 +2568,6 @@ if (typeof Symbol === "function" && Symbol.for) {
25712568
REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
25722569
REACT_MEMO_TYPE = symbolFor("react.memo");
25732570
REACT_LAZY_TYPE = symbolFor("react.lazy");
2574-
REACT_BLOCK_TYPE = symbolFor("react.block");
2575-
REACT_SERVER_BLOCK_TYPE = symbolFor("react.server.block");
25762571
REACT_FUNDAMENTAL_TYPE = symbolFor("react.fundamental");
25772572
REACT_SCOPE_TYPE = symbolFor("react.scope");
25782573
REACT_OPAQUE_ID_TYPE = symbolFor("react.opaque.id");
@@ -2670,9 +2665,6 @@ function getComponentName(type) {
26702665
case REACT_MEMO_TYPE:
26712666
return getComponentName(type.type);
26722667

2673-
case REACT_BLOCK_TYPE:
2674-
return getComponentName(type._render);
2675-
26762668
case REACT_LAZY_TYPE: {
26772669
var lazyComponent = type;
26782670
var payload = lazyComponent._payload;
@@ -4227,9 +4219,6 @@ function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
42274219
// Memo may contain any component type so we recursively resolve it.
42284220
return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
42294221

4230-
case REACT_BLOCK_TYPE:
4231-
return describeFunctionComponentFrame(type._render, source, ownerFn);
4232-
42334222
case REACT_LAZY_TYPE: {
42344223
var lazyComponent = type;
42354224
var payload = lazyComponent._payload;
@@ -5714,7 +5703,7 @@ function flushSyncCallbackQueueImpl() {
57145703
}
57155704

57165705
// TODO: this is special because it gets imported during build.
5717-
var ReactVersion = "17.0.1-4e5d7faf5";
5706+
var ReactVersion = "17.0.1-454c2211c";
57185707

57195708
var NoMode = 0;
57205709
var StrictMode = 1; // TODO: Remove BlockingMode and ConcurrentMode by reading from the root
@@ -5808,9 +5797,6 @@ function describeFiber(fiber) {
58085797
case ForwardRef:
58095798
return describeFunctionComponentFrame(fiber.type.render, source, owner);
58105799

5811-
case Block:
5812-
return describeFunctionComponentFrame(fiber.type._render, source, owner);
5813-
58145800
case ClassComponent:
58155801
return describeClassComponentFrame(fiber.type, source, owner);
58165802

@@ -8303,7 +8289,7 @@ function warnOnFunctionType(returnFiber) {
83038289
"Or maybe you meant to call this function rather than return it."
83048290
);
83058291
}
8306-
} // We avoid inlining this to avoid potential deopts from using try/catch.
8292+
} // This wrapper function exists because I expect to clone the code in each path
83078293
// to be able to optimize each path individually by branching early. This needs
83088294
// a compiler or we can do it manually. Helpers that don't need this branching
83098295
// live outside of this function.
@@ -9161,29 +9147,24 @@ function ChildReconciler(shouldTrackSideEffects) {
91619147
break;
91629148
}
91639149

9164-
case Block:
9165-
9166-
// We intentionally fallthrough here if enableBlocksAPI is not on.
9167-
// eslint-disable-next-lined no-fallthrough
9168-
91699150
default: {
91709151
if (
91719152
child.elementType === element.type || // Keep this check inline so it only runs on the false path:
91729153
isCompatibleFamilyForHotReloading(child, element)
91739154
) {
91749155
deleteRemainingChildren(returnFiber, child.sibling);
91759156

9176-
var _existing3 = useFiber(child, element.props);
9157+
var _existing = useFiber(child, element.props);
91779158

9178-
_existing3.ref = coerceRef(returnFiber, child, element);
9179-
_existing3.return = returnFiber;
9159+
_existing.ref = coerceRef(returnFiber, child, element);
9160+
_existing.return = returnFiber;
91809161

91819162
{
9182-
_existing3._debugSource = element._source;
9183-
_existing3._debugOwner = element._owner;
9163+
_existing._debugSource = element._source;
9164+
_existing._debugOwner = element._owner;
91849165
}
91859166

9186-
return _existing3;
9167+
return _existing;
91879168
}
91889169

91899170
break;
@@ -9364,7 +9345,6 @@ function ChildReconciler(shouldTrackSideEffects) {
93649345
// functions and classes
93659346
// eslint-disable-next-lined no-fallthrough
93669347

9367-
case Block:
93689348
case FunctionComponent:
93699349
case ForwardRef:
93709350
case SimpleMemoComponent: {
@@ -14764,10 +14744,6 @@ function beginWork(current, workInProgress, renderLanes) {
1476414744
break;
1476514745
}
1476614746

14767-
case Block: {
14768-
break;
14769-
}
14770-
1477114747
case OffscreenComponent: {
1477214748
return updateOffscreenComponent(current, workInProgress, renderLanes);
1477314749
}
@@ -15661,9 +15637,6 @@ function completeWork(current, workInProgress, renderLanes) {
1566115637
break;
1566215638
}
1566315639

15664-
case Block:
15665-
break;
15666-
1566715640
case OffscreenComponent:
1566815641
case LegacyHiddenComponent: {
1566915642
popRenderLanes(workInProgress);
@@ -16341,8 +16314,7 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
1634116314
switch (finishedWork.tag) {
1634216315
case FunctionComponent:
1634316316
case ForwardRef:
16344-
case SimpleMemoComponent:
16345-
case Block: {
16317+
case SimpleMemoComponent: {
1634616318
return;
1634716319
}
1634816320

@@ -16538,8 +16510,7 @@ function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
1653816510
switch (finishedWork.tag) {
1653916511
case FunctionComponent:
1654016512
case ForwardRef:
16541-
case SimpleMemoComponent:
16542-
case Block: {
16513+
case SimpleMemoComponent: {
1654316514
// At this point layout effects have already been destroyed (during mutation phase).
1654416515
// This is done to prevent sibling component effects from interfering with each other,
1654516516
// e.g. a destroy function in one component should never override a ref set
@@ -16837,8 +16808,7 @@ function commitUnmount(finishedRoot, current, renderPriorityLevel) {
1683716808
case FunctionComponent:
1683816809
case ForwardRef:
1683916810
case MemoComponent:
16840-
case SimpleMemoComponent:
16841-
case Block: {
16811+
case SimpleMemoComponent: {
1684216812
var updateQueue = current.updateQueue;
1684316813

1684416814
if (updateQueue !== null) {
@@ -17032,8 +17002,7 @@ function commitWork(current, finishedWork) {
1703217002
case FunctionComponent:
1703317003
case ForwardRef:
1703417004
case MemoComponent:
17035-
case SimpleMemoComponent:
17036-
case Block: {
17005+
case SimpleMemoComponent: {
1703717006
// Layout effects are destroyed during the mutation phase so that all
1703817007
// destroy functions for all fibers are called before any create functions.
1703917008
// This prevents sibling component effects from interfering with each other,
@@ -19355,8 +19324,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
1935519324
tag !== FunctionComponent &&
1935619325
tag !== ForwardRef &&
1935719326
tag !== MemoComponent &&
19358-
tag !== SimpleMemoComponent &&
19359-
tag !== Block
19327+
tag !== SimpleMemoComponent
1936019328
) {
1936119329
// Only warn for user-defined components, not internal ones like Suspense.
1936219330
return;
@@ -19408,8 +19376,7 @@ function warnAboutUpdateOnUnmountedFiberInDEV(fiber) {
1940819376
tag !== FunctionComponent &&
1940919377
tag !== ForwardRef &&
1941019378
tag !== MemoComponent &&
19411-
tag !== SimpleMemoComponent &&
19412-
tag !== Block
19379+
tag !== SimpleMemoComponent
1941319380
) {
1941419381
// Only warn for user-defined components, not internal ones like Suspense.
1941519382
return;
@@ -20609,10 +20576,6 @@ function createFiberFromTypeAndProps(
2060920576
fiberTag = LazyComponent;
2061020577
resolvedType = null;
2061120578
break getTag;
20612-
20613-
case REACT_BLOCK_TYPE:
20614-
fiberTag = Block;
20615-
break getTag;
2061620579
}
2061720580
}
2061820581

0 commit comments

Comments
 (0)