Skip to content

Commit 1c5d0dc

Browse files
rickhanloniifacebook-github-bot
rickhanlonii
authored and
facebook-github-bot
committed
React Native sync for revisions b8fda6c...ebcec3c
Summary: This sync includes the following changes: - **[316943091](facebook/react@316943091 )**: Make StrictMode double rendering flag static for FB/www ([#21517](facebook/react#21517)) //<Brian Vaughn>// - **[e0f89aa05](facebook/react@e0f89aa05 )**: Clean up Scheduler forks ([#20915](facebook/react#20915)) //<Ricky>// - **[5890e0e69](facebook/react@5890e0e69 )**: Remove data-reactroot from server rendering and hydration heuristic ([#20996](facebook/react#20996)) //<Sebastian Markbåge>// - **[46491dce9](facebook/react@46491dce9 )**: [Bugfix] Prevent already-committed setState callback from firing again during a rebase ([#21498](facebook/react#21498)) //<Andrew Clark>// - **[b770f7500](facebook/react@b770f7500 )**: lint-build: Infer format from artifact filename ([#21489](facebook/react#21489)) //<Andrew Clark>// - **[2bf4805e4](facebook/react@2bf4805e4 )**: Update entry point exports ([#21488](facebook/react#21488)) //<Brian Vaughn>// Changelog: [General][Changed] - React Native sync for revisions b8fda6c...ebcec3c jest_e2e[run_all_tests] Reviewed By: JoshuaGross Differential Revision: D28572047 fbshipit-source-id: eb09c0358edb7fbf241333ea9c08724748906fea
1 parent 341f061 commit 1c5d0dc

13 files changed

+61
-37
lines changed

‎Libraries/Renderer/REVISION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b8fda6cabc7efc53356d87c6516d6a3d7eb1253c
1+
316943091ed36b2807b70b765283c7647dd9ffda

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<8974e8c964125552d627281e52405ecc>>
10+
* @generated SignedSource<<d8654ddab1f90ed55c9d13dacb5fd34d>>
1111
*/
1212

1313
'use strict';
@@ -5812,7 +5812,7 @@ var Passive$1 =
58125812
/* */
58135813
4;
58145814

5815-
var ReactVersion = "17.0.3-b8fda6cab";
5815+
var ReactVersion = "17.0.3-316943091";
58165816

58175817
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
58185818
var NoTransition = 0;
@@ -7079,7 +7079,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
70797079
);
70807080
var callback = update.callback;
70817081

7082-
if (callback !== null) {
7082+
if (
7083+
callback !== null && // If the update was already committed, we should not queue its
7084+
// callback again.
7085+
update.lane !== NoLane
7086+
) {
70837087
workInProgress.flags |= Callback;
70847088
var effects = queue.effects;
70857089

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactFabric-dev
1010
* @preventMunge
11-
* @generated SignedSource<<0b8cd409f26ccc8dbab26e2f700f6c68>>
11+
* @generated SignedSource<<30d93cc0c27c6cc2eeb760079781964b>>
1212
*/
1313

1414
'use strict';
@@ -5697,7 +5697,7 @@ var Passive$1 =
56975697
/* */
56985698
4;
56995699

5700-
var ReactVersion = "17.0.3-b8fda6cab";
5700+
var ReactVersion = "17.0.3-316943091";
57015701

57025702
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
57035703
var NoTransition = 0;
@@ -6944,7 +6944,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
69446944
);
69456945
var callback = update.callback;
69466946

6947-
if (callback !== null) {
6947+
if (
6948+
callback !== null && // If the update was already committed, we should not queue its
6949+
// callback again.
6950+
update.lane !== NoLane
6951+
) {
69486952
workInProgress.flags |= Callback;
69496953
var effects = queue.effects;
69506954

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<2dc7c402c6aee869836656b83828b0a5>>
10+
* @generated SignedSource<<b257e5deefd3596e0660367606c9be96>>
1111
*/
1212

1313
"use strict";
@@ -2376,6 +2376,7 @@ function processUpdateQueue(
23762376
}
23772377
}
23782378
null !== pendingQueue.callback &&
2379+
0 !== pendingQueue.lane &&
23792380
((workInProgress$jscomp$0.flags |= 64),
23802381
(updateLane = queue.effects),
23812382
null === updateLane
@@ -7771,7 +7772,7 @@ var roots = new Map(),
77717772
devToolsConfig$jscomp$inline_942 = {
77727773
findFiberByHostInstance: getInstanceFromInstance,
77737774
bundleType: 0,
7774-
version: "17.0.3-b8fda6cab",
7775+
version: "17.0.3-316943091",
77757776
rendererPackageName: "react-native-renderer",
77767777
rendererConfig: {
77777778
getInspectorDataForViewTag: function() {
@@ -7812,7 +7813,7 @@ var internals$jscomp$inline_1180 = {
78127813
scheduleRoot: null,
78137814
setRefreshHandler: null,
78147815
getCurrentFiber: null,
7815-
reconcilerVersion: "17.0.3-b8fda6cab"
7816+
reconcilerVersion: "17.0.3-316943091"
78167817
};
78177818
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
78187819
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactFabric-prod
1010
* @preventMunge
11-
* @generated SignedSource<<13b77909c1b0f4c0d620f64b4cb52c31>>
11+
* @generated SignedSource<<b982542426fff1359566cd81ee8fb6a1>>
1212
*/
1313

1414
"use strict";
@@ -2375,6 +2375,7 @@ function processUpdateQueue(
23752375
}
23762376
}
23772377
null !== pendingQueue.callback &&
2378+
0 !== pendingQueue.lane &&
23782379
((workInProgress$jscomp$0.flags |= 64),
23792380
(updateLane = queue.effects),
23802381
null === updateLane
@@ -7766,7 +7767,7 @@ var roots = new Map(),
77667767
devToolsConfig$jscomp$inline_942 = {
77677768
findFiberByHostInstance: getInstanceFromInstance,
77687769
bundleType: 0,
7769-
version: "17.0.3-experimental-b8fda6cab",
7770+
version: "17.0.3-experimental-316943091",
77707771
rendererPackageName: "react-native-renderer",
77717772
rendererConfig: {
77727773
getInspectorDataForViewTag: function() {
@@ -7807,7 +7808,7 @@ var internals$jscomp$inline_1180 = {
78077808
scheduleRoot: null,
78087809
setRefreshHandler: null,
78097810
getCurrentFiber: null,
7810-
reconcilerVersion: "17.0.3-experimental-b8fda6cab"
7811+
reconcilerVersion: "17.0.3-experimental-316943091"
78117812
};
78127813
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
78137814
var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<f4478d44b07e8c93ca1b01afcf098968>>
10+
* @generated SignedSource<<53c0b624e2940b070555c7f2253a7464>>
1111
*/
1212

1313
"use strict";
@@ -2394,6 +2394,7 @@ function processUpdateQueue(
23942394
}
23952395
}
23962396
null !== pendingQueue.callback &&
2397+
0 !== pendingQueue.lane &&
23972398
((workInProgress$jscomp$0.flags |= 64),
23982399
(updateLane = queue.effects),
23992400
null === updateLane
@@ -7922,7 +7923,7 @@ var roots = new Map(),
79227923
devToolsConfig$jscomp$inline_966 = {
79237924
findFiberByHostInstance: getInstanceFromInstance,
79247925
bundleType: 0,
7925-
version: "17.0.3-b8fda6cab",
7926+
version: "17.0.3-316943091",
79267927
rendererPackageName: "react-native-renderer",
79277928
rendererConfig: {
79287929
getInspectorDataForViewTag: function() {
@@ -7963,7 +7964,7 @@ var internals$jscomp$inline_1208 = {
79637964
scheduleRoot: null,
79647965
setRefreshHandler: null,
79657966
getCurrentFiber: null,
7966-
reconcilerVersion: "17.0.3-b8fda6cab"
7967+
reconcilerVersion: "17.0.3-316943091"
79677968
};
79687969
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
79697970
var hook$jscomp$inline_1209 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactFabric-profiling
1010
* @preventMunge
11-
* @generated SignedSource<<e02801db70a5777798593a0165dd112f>>
11+
* @generated SignedSource<<539de6e874474ef5e41b0b59b08b0a87>>
1212
*/
1313

1414
"use strict";
@@ -2393,6 +2393,7 @@ function processUpdateQueue(
23932393
}
23942394
}
23952395
null !== pendingQueue.callback &&
2396+
0 !== pendingQueue.lane &&
23962397
((workInProgress$jscomp$0.flags |= 64),
23972398
(updateLane = queue.effects),
23982399
null === updateLane
@@ -7917,7 +7918,7 @@ var roots = new Map(),
79177918
devToolsConfig$jscomp$inline_966 = {
79187919
findFiberByHostInstance: getInstanceFromInstance,
79197920
bundleType: 0,
7920-
version: "17.0.3-experimental-b8fda6cab",
7921+
version: "17.0.3-experimental-316943091",
79217922
rendererPackageName: "react-native-renderer",
79227923
rendererConfig: {
79237924
getInspectorDataForViewTag: function() {
@@ -7958,7 +7959,7 @@ var internals$jscomp$inline_1208 = {
79587959
scheduleRoot: null,
79597960
setRefreshHandler: null,
79607961
getCurrentFiber: null,
7961-
reconcilerVersion: "17.0.3-experimental-b8fda6cab"
7962+
reconcilerVersion: "17.0.3-experimental-316943091"
79627963
};
79637964
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
79647965
var hook$jscomp$inline_1209 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<8033e694383dc0dfd8e2862436d6a7f5>>
10+
* @generated SignedSource<<d730d65da7794cd154ac00cac3550316>>
1111
*/
1212

1313
'use strict';
@@ -6100,7 +6100,7 @@ var Passive$1 =
61006100
/* */
61016101
4;
61026102

6103-
var ReactVersion = "17.0.3-b8fda6cab";
6103+
var ReactVersion = "17.0.3-316943091";
61046104

61056105
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
61066106
var NoTransition = 0;
@@ -7367,7 +7367,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
73677367
);
73687368
var callback = update.callback;
73697369

7370-
if (callback !== null) {
7370+
if (
7371+
callback !== null && // If the update was already committed, we should not queue its
7372+
// callback again.
7373+
update.lane !== NoLane
7374+
) {
73717375
workInProgress.flags |= Callback;
73727376
var effects = queue.effects;
73737377

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactNativeRenderer-dev
1010
* @preventMunge
11-
* @generated SignedSource<<b6540a3b671ae373f1722d7ea8f20722>>
11+
* @generated SignedSource<<533806c353bad3548a1ff8956f9b4926>>
1212
*/
1313

1414
'use strict';
@@ -5985,7 +5985,7 @@ var Passive$1 =
59855985
/* */
59865986
4;
59875987

5988-
var ReactVersion = "17.0.3-experimental-b8fda6cab";
5988+
var ReactVersion = "17.0.3-experimental-316943091";
59895989

59905990
var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
59915991
var NoTransition = 0;
@@ -7232,7 +7232,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
72327232
);
72337233
var callback = update.callback;
72347234

7235-
if (callback !== null) {
7235+
if (
7236+
callback !== null && // If the update was already committed, we should not queue its
7237+
// callback again.
7238+
update.lane !== NoLane
7239+
) {
72367240
workInProgress.flags |= Callback;
72377241
var effects = queue.effects;
72387242

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<59cfc9a453cf45eb8d4cd09410777f21>>
10+
* @generated SignedSource<<53f60697568934e10ab6356420c30183>>
1111
*/
1212

1313
"use strict";
@@ -2399,6 +2399,7 @@ function processUpdateQueue(
23992399
}
24002400
}
24012401
null !== pendingQueue.callback &&
2402+
0 !== pendingQueue.lane &&
24022403
((workInProgress$jscomp$0.flags |= 64),
24032404
(updateLane = queue.effects),
24042405
null === updateLane
@@ -7989,7 +7990,7 @@ var roots = new Map(),
79897990
devToolsConfig$jscomp$inline_986 = {
79907991
findFiberByHostInstance: getInstanceFromTag,
79917992
bundleType: 0,
7992-
version: "17.0.3-b8fda6cab",
7993+
version: "17.0.3-316943091",
79937994
rendererPackageName: "react-native-renderer",
79947995
rendererConfig: {
79957996
getInspectorDataForViewTag: function() {
@@ -8030,7 +8031,7 @@ var internals$jscomp$inline_1243 = {
80308031
scheduleRoot: null,
80318032
setRefreshHandler: null,
80328033
getCurrentFiber: null,
8033-
reconcilerVersion: "17.0.3-b8fda6cab"
8034+
reconcilerVersion: "17.0.3-316943091"
80348035
};
80358036
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
80368037
var hook$jscomp$inline_1244 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @nolint
99
* @providesModule ReactNativeRenderer-prod
1010
* @preventMunge
11-
* @generated SignedSource<<c2bd920e65c75725045e8813eeeac57b>>
11+
* @generated SignedSource<<6d4caf24a3e1740a61fb1e9ec904caff>>
1212
*/
1313

1414
"use strict";
@@ -2398,6 +2398,7 @@ function processUpdateQueue(
23982398
}
23992399
}
24002400
null !== pendingQueue.callback &&
2401+
0 !== pendingQueue.lane &&
24012402
((workInProgress$jscomp$0.flags |= 64),
24022403
(updateLane = queue.effects),
24032404
null === updateLane
@@ -7984,7 +7985,7 @@ var roots = new Map(),
79847985
devToolsConfig$jscomp$inline_986 = {
79857986
findFiberByHostInstance: getInstanceFromTag,
79867987
bundleType: 0,
7987-
version: "17.0.3-experimental-b8fda6cab",
7988+
version: "17.0.3-experimental-316943091",
79887989
rendererPackageName: "react-native-renderer",
79897990
rendererConfig: {
79907991
getInspectorDataForViewTag: function() {
@@ -8025,7 +8026,7 @@ var internals$jscomp$inline_1243 = {
80258026
scheduleRoot: null,
80268027
setRefreshHandler: null,
80278028
getCurrentFiber: null,
8028-
reconcilerVersion: "17.0.3-experimental-b8fda6cab"
8029+
reconcilerVersion: "17.0.3-experimental-316943091"
80298030
};
80308031
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
80318032
var hook$jscomp$inline_1244 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<6cad811dbb0701b65f3ecc4aca877fe5>>
10+
* @generated SignedSource<<e90b0d8815bb6c24c91e1b8148a5b15d>>
1111
*/
1212

1313
"use strict";
@@ -2417,6 +2417,7 @@ function processUpdateQueue(
24172417
}
24182418
}
24192419
null !== pendingQueue.callback &&
2420+
0 !== pendingQueue.lane &&
24202421
((workInProgress$jscomp$0.flags |= 64),
24212422
(updateLane = queue.effects),
24222423
null === updateLane
@@ -8140,7 +8141,7 @@ var roots = new Map(),
81408141
devToolsConfig$jscomp$inline_1010 = {
81418142
findFiberByHostInstance: getInstanceFromTag,
81428143
bundleType: 0,
8143-
version: "17.0.3-b8fda6cab",
8144+
version: "17.0.3-316943091",
81448145
rendererPackageName: "react-native-renderer",
81458146
rendererConfig: {
81468147
getInspectorDataForViewTag: function() {
@@ -8181,7 +8182,7 @@ var internals$jscomp$inline_1271 = {
81818182
scheduleRoot: null,
81828183
setRefreshHandler: null,
81838184
getCurrentFiber: null,
8184-
reconcilerVersion: "17.0.3-b8fda6cab"
8185+
reconcilerVersion: "17.0.3-316943091"
81858186
};
81868187
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
81878188
var hook$jscomp$inline_1272 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

0 commit comments

Comments
 (0)