Skip to content

Commit ec7f46b

Browse files
committed
Add the suffix to cancelled view transition names (facebook#35485)
When a View Transition might not need to update we add it to a queue. If the parent are able to be reverted, we then cancel the already started view transitions. We do this by adding an animation that hides the "old" state and remove the view transition name from the old state. There was a bug where if you have more than one child in a `<ViewTransition>` we didn't add the right suffix to the name we added in the queue so it wasn't adding an animation that hides the old state. The effect was that it playing an exit animation instead of being cancelled. DiffTrain build for [4a3d993](facebook@4a3d993)
1 parent 977f18f commit ec7f46b

File tree

21 files changed

+384
-336
lines changed

21 files changed

+384
-336
lines changed

compiled-rn/VERSION_NATIVE_FB

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.3.0-native-fb-583e2003-20260113
1+
19.3.0-native-fb-4a3d993e-20260114

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-dev.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<97be142549461ace682d9bfec6b1781e>>
10+
* @generated SignedSource<<8fdc988232171808b42c4d5042262db1>>
1111
*/
1212

1313
"use strict";
@@ -410,5 +410,5 @@ __DEV__ &&
410410
exports.useFormStatus = function () {
411411
return resolveDispatcher().useHostTransitionStatus();
412412
};
413-
exports.version = "19.3.0-native-fb-583e2003-20260113";
413+
exports.version = "19.3.0-native-fb-4a3d993e-20260114";
414414
})();

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-prod.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<825b8291149be1e03ab990dec8a6245d>>
10+
* @generated SignedSource<<e75344f749ee920665ba7d77c0a30c7a>>
1111
*/
1212

1313
"use strict";
@@ -209,4 +209,4 @@ exports.useFormState = function (action, initialState, permalink) {
209209
exports.useFormStatus = function () {
210210
return ReactSharedInternals.H.useHostTransitionStatus();
211211
};
212-
exports.version = "19.3.0-native-fb-583e2003-20260113";
212+
exports.version = "19.3.0-native-fb-4a3d993e-20260114";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-profiling.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<825b8291149be1e03ab990dec8a6245d>>
10+
* @generated SignedSource<<e75344f749ee920665ba7d77c0a30c7a>>
1111
*/
1212

1313
"use strict";
@@ -209,4 +209,4 @@ exports.useFormState = function (action, initialState, permalink) {
209209
exports.useFormStatus = function () {
210210
return ReactSharedInternals.H.useHostTransitionStatus();
211211
};
212-
exports.version = "19.3.0-native-fb-583e2003-20260113";
212+
exports.version = "19.3.0-native-fb-4a3d993e-20260114";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.js

Lines changed: 132 additions & 124 deletions
Large diffs are not rendered by default.

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-prod.js

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<05670725bc1e39e7e1d7c0e68b29a5e6>>
10+
* @generated SignedSource<<78a1f4581418a7826f185e59af0eb933>>
1111
*/
1212

1313
/*
@@ -12361,7 +12361,15 @@ function replaySuspendedUnitOfWork(unitOfWork) {
1236112361
);
1236212362
break;
1236312363
case 5:
12364-
resetHooksOnUnwind(next);
12364+
resetHooksOnUnwind(next),
12365+
(Component = next),
12366+
Component === hydrationParentFiber &&
12367+
(isHydrating
12368+
? (popToNextHostParent(Component),
12369+
5 === Component.tag &&
12370+
null != Component.stateNode &&
12371+
(nextHydratableInstance = Component.stateNode))
12372+
: (popToNextHostParent(Component), (isHydrating = !0)));
1236512373
default:
1236612374
unwindInterruptedWork(current, next),
1236712375
(next = workInProgress =
@@ -17693,14 +17701,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1769317701
};
1769417702
var isomorphicReactPackageVersion$jscomp$inline_2054 = React.version;
1769517703
if (
17696-
"19.3.0-native-fb-583e2003-20260113" !==
17704+
"19.3.0-native-fb-4a3d993e-20260114" !==
1769717705
isomorphicReactPackageVersion$jscomp$inline_2054
1769817706
)
1769917707
throw Error(
1770017708
formatProdErrorMessage(
1770117709
527,
1770217710
isomorphicReactPackageVersion$jscomp$inline_2054,
17703-
"19.3.0-native-fb-583e2003-20260113"
17711+
"19.3.0-native-fb-4a3d993e-20260114"
1770417712
)
1770517713
);
1770617714
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17720,24 +17728,24 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1772017728
null === componentOrElement ? null : componentOrElement.stateNode;
1772117729
return componentOrElement;
1772217730
};
17723-
var internals$jscomp$inline_2636 = {
17731+
var internals$jscomp$inline_2638 = {
1772417732
bundleType: 0,
17725-
version: "19.3.0-native-fb-583e2003-20260113",
17733+
version: "19.3.0-native-fb-4a3d993e-20260114",
1772617734
rendererPackageName: "react-dom",
1772717735
currentDispatcherRef: ReactSharedInternals,
17728-
reconcilerVersion: "19.3.0-native-fb-583e2003-20260113"
17736+
reconcilerVersion: "19.3.0-native-fb-4a3d993e-20260114"
1772917737
};
1773017738
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
17731-
var hook$jscomp$inline_2637 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
17739+
var hook$jscomp$inline_2639 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1773217740
if (
17733-
!hook$jscomp$inline_2637.isDisabled &&
17734-
hook$jscomp$inline_2637.supportsFiber
17741+
!hook$jscomp$inline_2639.isDisabled &&
17742+
hook$jscomp$inline_2639.supportsFiber
1773517743
)
1773617744
try {
17737-
(rendererID = hook$jscomp$inline_2637.inject(
17738-
internals$jscomp$inline_2636
17745+
(rendererID = hook$jscomp$inline_2639.inject(
17746+
internals$jscomp$inline_2638
1773917747
)),
17740-
(injectedHook = hook$jscomp$inline_2637);
17748+
(injectedHook = hook$jscomp$inline_2639);
1774117749
} catch (err) {}
1774217750
}
1774317751
exports.createRoot = function (container, options) {
@@ -17832,4 +17840,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1783217840
listenToAllSupportedEvents(container);
1783317841
return new ReactDOMHydrationRoot(initialChildren);
1783417842
};
17835-
exports.version = "19.3.0-native-fb-583e2003-20260113";
17843+
exports.version = "19.3.0-native-fb-4a3d993e-20260114";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-profiling.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<4c224d47cb804628a5c170bedeb9f46a>>
10+
* @generated SignedSource<<b69d53608744fc118ed4bf20a96f5ed4>>
1111
*/
1212

1313
/*
@@ -14193,7 +14193,15 @@ function replaySuspendedUnitOfWork(unitOfWork) {
1419314193
);
1419414194
break;
1419514195
case 5:
14196-
resetHooksOnUnwind(next);
14196+
resetHooksOnUnwind(next),
14197+
(Component = next),
14198+
Component === hydrationParentFiber &&
14199+
(isHydrating
14200+
? (popToNextHostParent(Component),
14201+
5 === Component.tag &&
14202+
null != Component.stateNode &&
14203+
(nextHydratableInstance = Component.stateNode))
14204+
: (popToNextHostParent(Component), (isHydrating = !0)));
1419714205
default:
1419814206
unwindInterruptedWork(current, next),
1419914207
(next = workInProgress =
@@ -19819,14 +19827,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1981919827
};
1982019828
var isomorphicReactPackageVersion$jscomp$inline_2369 = React.version;
1982119829
if (
19822-
"19.3.0-native-fb-583e2003-20260113" !==
19830+
"19.3.0-native-fb-4a3d993e-20260114" !==
1982319831
isomorphicReactPackageVersion$jscomp$inline_2369
1982419832
)
1982519833
throw Error(
1982619834
formatProdErrorMessage(
1982719835
527,
1982819836
isomorphicReactPackageVersion$jscomp$inline_2369,
19829-
"19.3.0-native-fb-583e2003-20260113"
19837+
"19.3.0-native-fb-4a3d993e-20260114"
1983019838
)
1983119839
);
1983219840
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19848,10 +19856,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1984819856
};
1984919857
var internals$jscomp$inline_2376 = {
1985019858
bundleType: 0,
19851-
version: "19.3.0-native-fb-583e2003-20260113",
19859+
version: "19.3.0-native-fb-4a3d993e-20260114",
1985219860
rendererPackageName: "react-dom",
1985319861
currentDispatcherRef: ReactSharedInternals,
19854-
reconcilerVersion: "19.3.0-native-fb-583e2003-20260113",
19862+
reconcilerVersion: "19.3.0-native-fb-4a3d993e-20260114",
1985519863
getLaneLabelMap: function () {
1985619864
for (
1985719865
var map = new Map(), lane = 1, index$336 = 0;
@@ -19869,16 +19877,16 @@ var internals$jscomp$inline_2376 = {
1986919877
}
1987019878
};
1987119879
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
19872-
var hook$jscomp$inline_2961 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
19880+
var hook$jscomp$inline_2963 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1987319881
if (
19874-
!hook$jscomp$inline_2961.isDisabled &&
19875-
hook$jscomp$inline_2961.supportsFiber
19882+
!hook$jscomp$inline_2963.isDisabled &&
19883+
hook$jscomp$inline_2963.supportsFiber
1987619884
)
1987719885
try {
19878-
(rendererID = hook$jscomp$inline_2961.inject(
19886+
(rendererID = hook$jscomp$inline_2963.inject(
1987919887
internals$jscomp$inline_2376
1988019888
)),
19881-
(injectedHook = hook$jscomp$inline_2961);
19889+
(injectedHook = hook$jscomp$inline_2963);
1988219890
} catch (err) {}
1988319891
}
1988419892
exports.createRoot = function (container, options) {
@@ -19974,4 +19982,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1997419982
listenToAllSupportedEvents(container);
1997519983
return new ReactDOMHydrationRoot(initialChildren);
1997619984
};
19977-
exports.version = "19.3.0-native-fb-583e2003-20260113";
19985+
exports.version = "19.3.0-native-fb-4a3d993e-20260114";

0 commit comments

Comments
 (0)