Skip to content

Commit eb90a8d

Browse files
authored
Sync OSS Fabric renderers for null-target native events (#59546)
Summary: Regenerate the development, production, and profiling Fabric renderer bundles from React revision `dc9aed364252a34966f4f2c4a98272317fdddb60`. Native events whose view has unmounted now reach the responder system even when their event target is null. This renderer-only update retains React version `19.3.0` and leaves package metadata and dependency versions unchanged. Changelog: [General][Fixed] - Fix lost taps after a touched view unmounts when EventTarget event dispatching is enabled Reviewed By: javache Differential Revision: D127828293 Pull Request resolved: #59546
1 parent 01d5527 commit eb90a8d

3 files changed

Lines changed: 140 additions & 138 deletions

File tree

‎packages/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<12e935271cee5bbb34114c56f570f060>>
10+
* @generated SignedSource<<b2da61aa9e350b425820dfd464cce486>>
1111
*
1212
* This file was sync'd from the facebook/react repository.
1313
*/
@@ -1307,12 +1307,11 @@ __DEV__ &&
13071307
(_enableNativeEventTargetEventDispatching =
13081308
"function" === typeof event && event()));
13091309
if (_enableNativeEventTargetEventDispatching)
1310-
null != eventTarget &&
1311-
reactPrivateInterface.dispatchNativeEvent(
1312-
eventTarget,
1313-
topLevelType,
1314-
nativeEvent
1315-
);
1310+
reactPrivateInterface.dispatchNativeEvent(
1311+
eventTarget,
1312+
topLevelType,
1313+
nativeEvent
1314+
);
13161315
else {
13171316
event = eventTarget;
13181317
for (
@@ -4094,7 +4093,7 @@ __DEV__ &&
40944093
)),
40954094
thenable.then(noop, noop),
40964095
(thenable = index));
4097-
if (void 0 === thenable._debugInfo) {
4096+
if (void 0 === thenable._debugInfo && Object.isExtensible(thenable)) {
40984097
thenableState = performance.now();
40994098
trackedThenables = thenable.displayName;
41004099
var ioInfo = {
@@ -11766,17 +11765,16 @@ __DEV__ &&
1176611765
current = finishedWork.alternate,
1176711766
flags = finishedWork.flags;
1176811767
switch (finishedWork.tag) {
11769-
case 0:
11770-
case 11:
11771-
case 15:
11772-
break;
1177311768
case 1:
1177411769
0 !== (flags & 1024) &&
1177511770
null !== current &&
1177611771
commitClassSnapshot(finishedWork, current);
1177711772
break;
1177811773
case 3:
1177911774
break;
11775+
case 0:
11776+
case 11:
11777+
case 15:
1178011778
case 5:
1178111779
case 26:
1178211780
case 27:
@@ -12363,8 +12361,8 @@ __DEV__ &&
1236312361
null !== current)
1236412362
)
1236512363
for (var ii = 0; ii < current.length; ii++) {
12366-
var _eventPayloads$ii2 = current[ii];
12367-
_eventPayloads$ii2.ref.impl = _eventPayloads$ii2.nextImpl;
12364+
var _eventPayloads$ii = current[ii];
12365+
_eventPayloads$ii.ref.impl = _eventPayloads$ii.nextImpl;
1236812366
}
1236912367
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
1237012368
commitReconciliationEffects(finishedWork);
@@ -12484,18 +12482,18 @@ __DEV__ &&
1248412482
break;
1248512483
case 22:
1248612484
ii = null !== finishedWork.memoizedState;
12487-
_eventPayloads$ii2 =
12485+
_eventPayloads$ii =
1248812486
null !== current && null !== current.memoizedState;
1248912487
if (finishedWork.mode & 1) {
1249012488
var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden,
1249112489
prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden;
1249212490
offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || ii;
1249312491
offscreenSubtreeWasHidden =
12494-
prevOffscreenSubtreeWasHidden || _eventPayloads$ii2;
12492+
prevOffscreenSubtreeWasHidden || _eventPayloads$ii;
1249512493
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
1249612494
offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden;
1249712495
offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden;
12498-
_eventPayloads$ii2 &&
12496+
_eventPayloads$ii &&
1249912497
!ii &&
1250012498
!prevOffscreenSubtreeIsHidden &&
1250112499
!prevOffscreenSubtreeWasHidden &&
@@ -12517,11 +12515,11 @@ __DEV__ &&
1251712515
: root._visibility | OffscreenVisible),
1251812516
!ii ||
1251912517
null === current ||
12520-
_eventPayloads$ii2 ||
12518+
_eventPayloads$ii ||
1252112519
offscreenSubtreeIsHidden ||
1252212520
offscreenSubtreeWasHidden ||
1252312521
0 === (finishedWork.mode & 1) ||
12524-
((root = _eventPayloads$ii2 || offscreenSubtreeWasHidden),
12522+
((root = _eventPayloads$ii || offscreenSubtreeWasHidden),
1252512523
(lanes = offscreenSubtreeIsHidden),
1252612524
(current = offscreenSubtreeWasHidden),
1252712525
(offscreenSubtreeIsHidden = ii || offscreenSubtreeIsHidden),
@@ -12563,18 +12561,18 @@ __DEV__ &&
1256312561
safelyDetachRef(current, current.return));
1256412562
flags = pushMutationContext();
1256512563
ii = inUpdateViewTransition;
12566-
_eventPayloads$ii2 = (lanes & 335544064) === lanes;
12564+
_eventPayloads$ii = (lanes & 335544064) === lanes;
1256712565
prevOffscreenSubtreeIsHidden = finishedWork.memoizedProps;
1256812566
inUpdateViewTransition =
12569-
_eventPayloads$ii2 &&
12567+
_eventPayloads$ii &&
1257012568
"none" !==
1257112569
getViewTransitionClassName(
1257212570
prevOffscreenSubtreeIsHidden.default,
1257312571
prevOffscreenSubtreeIsHidden.update
1257412572
);
1257512573
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
1257612574
commitReconciliationEffects(finishedWork);
12577-
_eventPayloads$ii2 &&
12575+
_eventPayloads$ii &&
1257812576
null !== current &&
1257912577
viewTransitionMutationContext &&
1258012578
(finishedWork.flags |= 4);
@@ -14231,10 +14229,12 @@ __DEV__ &&
1423114229
exitStatus = workInProgressRootConcurrentErrors;
1423214230
var wasRootDehydrated = supportsHydration;
1423314231
startTime = renderRootSync(yieldedFiber, startTime, !1);
14234-
if (
14235-
startTime !== RootErrored &&
14236-
startTime !== RootSuspendedAtTheShell
14237-
) {
14232+
if (startTime === RootSuspendedAtTheShell)
14233+
yieldedFiber.errorRecoveryDisabledLanes =
14234+
yieldedFiber.errorRecoveryDisabledLanes |
14235+
lanesThatJustErrored |
14236+
workInProgressDeferredLane;
14237+
else if (startTime !== RootErrored) {
1423814238
if (
1423914239
workInProgressRootDidAttachPingListener &&
1424014240
!wasRootDehydrated

‎packages/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<3c59d85aa170213f7f757b2501b0b2f6>>
10+
* @generated SignedSource<<f1159e174e2c4ae02640d6a11e18b4b1>>
1111
*
1212
* This file was sync'd from the facebook/react repository.
1313
*/
@@ -1209,7 +1209,7 @@ eventPluginOrder = Array.prototype.slice.call([
12091209
"ReactNativeBridgeEventPlugin"
12101210
]);
12111211
recomputePluginOrdering();
1212-
var injectedNamesToPlugins$jscomp$inline_294 = {
1212+
var injectedNamesToPlugins$jscomp$inline_295 = {
12131213
ResponderEventPlugin: ResponderEventPlugin,
12141214
ReactNativeBridgeEventPlugin: {
12151215
eventTypes: {},
@@ -1255,32 +1255,32 @@ var injectedNamesToPlugins$jscomp$inline_294 = {
12551255
}
12561256
}
12571257
},
1258-
isOrderingDirty$jscomp$inline_295 = !1,
1259-
pluginName$jscomp$inline_296;
1260-
for (pluginName$jscomp$inline_296 in injectedNamesToPlugins$jscomp$inline_294)
1258+
isOrderingDirty$jscomp$inline_296 = !1,
1259+
pluginName$jscomp$inline_297;
1260+
for (pluginName$jscomp$inline_297 in injectedNamesToPlugins$jscomp$inline_295)
12611261
if (
1262-
injectedNamesToPlugins$jscomp$inline_294.hasOwnProperty(
1263-
pluginName$jscomp$inline_296
1262+
injectedNamesToPlugins$jscomp$inline_295.hasOwnProperty(
1263+
pluginName$jscomp$inline_297
12641264
)
12651265
) {
1266-
var pluginModule$jscomp$inline_297 =
1267-
injectedNamesToPlugins$jscomp$inline_294[pluginName$jscomp$inline_296];
1266+
var pluginModule$jscomp$inline_298 =
1267+
injectedNamesToPlugins$jscomp$inline_295[pluginName$jscomp$inline_297];
12681268
if (
1269-
!namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_296) ||
1270-
namesToPlugins[pluginName$jscomp$inline_296] !==
1271-
pluginModule$jscomp$inline_297
1269+
!namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_297) ||
1270+
namesToPlugins[pluginName$jscomp$inline_297] !==
1271+
pluginModule$jscomp$inline_298
12721272
) {
1273-
if (namesToPlugins[pluginName$jscomp$inline_296])
1273+
if (namesToPlugins[pluginName$jscomp$inline_297])
12741274
throw Error(
12751275
"EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
1276-
(pluginName$jscomp$inline_296 + "`.")
1276+
(pluginName$jscomp$inline_297 + "`.")
12771277
);
1278-
namesToPlugins[pluginName$jscomp$inline_296] =
1279-
pluginModule$jscomp$inline_297;
1280-
isOrderingDirty$jscomp$inline_295 = !0;
1278+
namesToPlugins[pluginName$jscomp$inline_297] =
1279+
pluginModule$jscomp$inline_298;
1280+
isOrderingDirty$jscomp$inline_296 = !0;
12811281
}
12821282
}
1283-
isOrderingDirty$jscomp$inline_295 && recomputePluginOrdering();
1283+
isOrderingDirty$jscomp$inline_296 && recomputePluginOrdering();
12841284
function batchedUpdatesImpl(fn, bookkeeping) {
12851285
return fn(bookkeeping);
12861286
}
@@ -1338,12 +1338,11 @@ function dispatchEvent(target, topLevelType, nativeEventParam) {
13381338
(_enableNativeEventTargetEventDispatching =
13391339
"function" === typeof event && event()));
13401340
if (_enableNativeEventTargetEventDispatching)
1341-
null != eventTarget &&
1342-
reactPrivateInterface.dispatchNativeEvent(
1343-
eventTarget,
1344-
topLevelType,
1345-
nativeEvent
1346-
);
1341+
reactPrivateInterface.dispatchNativeEvent(
1342+
eventTarget,
1343+
topLevelType,
1344+
nativeEvent
1345+
);
13471346
else {
13481347
event = eventTarget;
13491348
for (
@@ -8391,10 +8390,6 @@ function commitBeforeMutationEffects_complete(
83918390
current = fiber.alternate,
83928391
flags = fiber.flags;
83938392
switch (fiber.tag) {
8394-
case 0:
8395-
case 11:
8396-
case 15:
8397-
break;
83988393
case 1:
83998394
if (0 !== (flags & 1024) && null !== current) {
84008395
isViewTransitionEligible = void 0;
@@ -8419,6 +8414,9 @@ function commitBeforeMutationEffects_complete(
84198414
break;
84208415
case 3:
84218416
break;
8417+
case 0:
8418+
case 11:
8419+
case 15:
84228420
case 5:
84238421
case 26:
84248422
case 27:
@@ -8797,8 +8795,8 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
87978795
null !== current)
87988796
)
87998797
for (var ii = 0; ii < current.length; ii++) {
8800-
var _eventPayloads$ii2 = current[ii];
8801-
_eventPayloads$ii2.ref.impl = _eventPayloads$ii2.nextImpl;
8798+
var _eventPayloads$ii = current[ii];
8799+
_eventPayloads$ii.ref.impl = _eventPayloads$ii.nextImpl;
88028800
}
88038801
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
88048802
commitReconciliationEffects(finishedWork);
@@ -8897,13 +8895,13 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
88978895
break;
88988896
case 22:
88998897
ii = null !== finishedWork.memoizedState;
8900-
_eventPayloads$ii2 = null !== current && null !== current.memoizedState;
8898+
_eventPayloads$ii = null !== current && null !== current.memoizedState;
89018899
if (finishedWork.mode & 1) {
89028900
var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden,
89038901
prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden;
89048902
offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || ii;
89058903
offscreenSubtreeWasHidden =
8906-
prevOffscreenSubtreeWasHidden || _eventPayloads$ii2;
8904+
prevOffscreenSubtreeWasHidden || _eventPayloads$ii;
89078905
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
89088906
offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden;
89098907
offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden;
@@ -8914,11 +8912,11 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
89148912
(root._visibility = ii ? root._visibility & -2 : root._visibility | 1),
89158913
!ii ||
89168914
null === current ||
8917-
_eventPayloads$ii2 ||
8915+
_eventPayloads$ii ||
89188916
offscreenSubtreeIsHidden ||
89198917
offscreenSubtreeWasHidden ||
89208918
0 === (finishedWork.mode & 1) ||
8921-
((root = _eventPayloads$ii2 || offscreenSubtreeWasHidden),
8919+
((root = _eventPayloads$ii || offscreenSubtreeWasHidden),
89228920
(lanes = offscreenSubtreeIsHidden),
89238921
(current = offscreenSubtreeWasHidden),
89248922
(offscreenSubtreeIsHidden = ii || offscreenSubtreeIsHidden),
@@ -8950,12 +8948,12 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
89508948
safelyDetachRef(current, current.return));
89518949
flags = pushMutationContext();
89528950
ii = (lanes & 335544064) === lanes;
8953-
_eventPayloads$ii2 = finishedWork.memoizedProps;
8951+
_eventPayloads$ii = finishedWork.memoizedProps;
89548952
ii &&
89558953
"none" !==
89568954
getViewTransitionClassName(
8957-
_eventPayloads$ii2.default,
8958-
_eventPayloads$ii2.update
8955+
_eventPayloads$ii.default,
8956+
_eventPayloads$ii.update
89598957
);
89608958
recursivelyTraverseMutationEffects(root, finishedWork, lanes);
89618959
commitReconciliationEffects(finishedWork);
@@ -9974,10 +9972,12 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) {
99749972
JSCompiler_inline_result,
99759973
!1
99769974
);
9977-
if (
9978-
2 !== JSCompiler_inline_result &&
9979-
6 !== JSCompiler_inline_result
9980-
) {
9975+
if (6 === JSCompiler_inline_result)
9976+
root.errorRecoveryDisabledLanes =
9977+
root.errorRecoveryDisabledLanes |
9978+
renderWasConcurrent |
9979+
workInProgressDeferredLane;
9980+
else if (2 !== JSCompiler_inline_result) {
99819981
if (workInProgressRootDidAttachPingListener) {
99829982
root.errorRecoveryDisabledLanes |= renderWasConcurrent;
99839983
workInProgressRootInterleavedUpdatedLanes |=
@@ -11742,26 +11742,26 @@ batchedUpdatesImpl = function (fn, a) {
1174211742
}
1174311743
};
1174411744
var roots = new Map(),
11745-
internals$jscomp$inline_1347 = {
11745+
internals$jscomp$inline_1351 = {
1174611746
bundleType: 0,
1174711747
version: "19.3.0",
1174811748
rendererPackageName: "react-native-renderer",
1174911749
currentDispatcherRef: ReactSharedInternals,
1175011750
reconcilerVersion: "19.3.0"
1175111751
};
1175211752
null !== extraDevToolsConfig &&
11753-
(internals$jscomp$inline_1347.rendererConfig = extraDevToolsConfig);
11753+
(internals$jscomp$inline_1351.rendererConfig = extraDevToolsConfig);
1175411754
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
11755-
var hook$jscomp$inline_1663 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
11755+
var hook$jscomp$inline_1672 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1175611756
if (
11757-
!hook$jscomp$inline_1663.isDisabled &&
11758-
hook$jscomp$inline_1663.supportsFiber
11757+
!hook$jscomp$inline_1672.isDisabled &&
11758+
hook$jscomp$inline_1672.supportsFiber
1175911759
)
1176011760
try {
11761-
(rendererID = hook$jscomp$inline_1663.inject(
11762-
internals$jscomp$inline_1347
11761+
(rendererID = hook$jscomp$inline_1672.inject(
11762+
internals$jscomp$inline_1351
1176311763
)),
11764-
(injectedHook = hook$jscomp$inline_1663);
11764+
(injectedHook = hook$jscomp$inline_1672);
1176511765
} catch (err) {}
1176611766
}
1176711767
exports.createPortal = function (children, containerTag) {

0 commit comments

Comments
 (0)