OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2025-12-06 00:20:04 +01:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Fizz] Make ViewTransition enter/exit/share null the same as none (#33331)

Browse Source 
I believe that these mean the same thing. We don't have to emit the
attribute if it's `none` for these cases because if there is no matching
scenario we won't apply the animation in this case.

The only case where we have to emit `none` in the attribute is for
`vt-update` because those can block updates from propagating upwards.
This commit is contained in:
Sebastian Markbåge 2025-05-22 10:21:28 -04:00 committed by GitHub
parent 99781d605b
commit 08064ea671
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js vendored
View File

@ -759,10 +759,9 @@ const SUBTREE_SCOPE = ~(ENTER_SCOPE | EXIT_SCOPE);
type ViewTransitionContext = {
update: 'none' | 'auto' | string,
// null here means that this case can never trigger. Not "auto" like it does in props.
enter: null | 'none' | 'auto' | string,
exit: null | 'none' | 'auto' | string,
share: null | 'none' | 'auto' | string,
enter: 'none' | 'auto' | string,
exit: 'none' | 'auto' | string,
share: 'none' | 'auto' | string,
name: 'auto' | string,
autoName: string, // a name that can be used if an explicit one is not defined.
nameIdx: number, // keeps track of how many duplicates of this name we've emitted.
@ -917,8 +916,8 @@ function getSuspenseViewTransition(
// we would've used (the parent ViewTransition name or auto-assign one).
const viewTransition: ViewTransitionContext = {
update: parentViewTransition.update, // For deep updates.
enter: null,
exit: null,
enter: 'none',
exit: 'none',
share: parentViewTransition.update, // For exit or enter of reveals.
name: parentViewTransition.autoName,
autoName: parentViewTransition.autoName,
@ -989,13 +988,8 @@ export function getViewTransitionFormatContext(
share = parentViewTransition.share;
} else {
name = 'auto';
share = null; // share is only relevant if there's an explicit name
share = 'none'; // share is only relevant if there's an explicit name
}
} else if (share === 'none') {
// I believe if share is disabled, it means the same thing as if it doesn't
// exit because enter/exit will take precedence and if it's deeply nested
// it just animates along whatever the parent does when disabled.
share = null;
} else {
if (share == null) {
share = 'auto';
@ -1008,12 +1002,12 @@ export function getViewTransitionFormatContext(
}
}
if (!(parentContext.tagScope & EXIT_SCOPE)) {
exit = null; // exit is only relevant for the first ViewTransition inside fallback
exit = 'none'; // exit is only relevant for the first ViewTransition inside fallback
} else {
resumableState.instructions |= NeedUpgradeToViewTransitions;
}
if (!(parentContext.tagScope & ENTER_SCOPE)) {
enter = null; // enter is only relevant for the first ViewTransition inside content
enter = 'none'; // enter is only relevant for the first ViewTransition inside content
} else {
resumableState.instructions |= NeedUpgradeToViewTransitions;
}
@ -1125,13 +1119,13 @@ function pushViewTransitionAttributes(
viewTransition.nameIdx++;
}
pushStringAttribute(target, 'vt-update', viewTransition.update);
if (viewTransition.enter !== null) {
if (viewTransition.enter !== 'none') {
pushStringAttribute(target, 'vt-enter', viewTransition.enter);
}
if (viewTransition.exit !== null) {
if (viewTransition.exit !== 'none') {
pushStringAttribute(target, 'vt-exit', viewTransition.exit);
}
if (viewTransition.share !== null) {
if (viewTransition.share !== 'none') {
pushStringAttribute(target, 'vt-share', viewTransition.share);
}
}