Skip to content

fix: use subtree option in getAnimations #8325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

fix: use subtree option in getAnimations #8325

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
923ddef
fix: use subtree option in getAnimations
kp047i May 30, 2025
4273f19
feat: add popover child element animation example
kp047i May 31, 2025
43faa34
fix: remove unnecessary blank line
kp047i May 31, 2025
9630a6f
fix: improve popover child animation example for Safari
kp047i Jun 2, 2025
f5f6653
Revert "fix: improve popover child animation example for Safari"
kp047i Jun 6, 2025
bdb21ff
Use finish() instead of cancel() to fix Safari
devongovett Jun 21, 2025
d1c03e2
Merge branch 'main' of github.com:adobe/react-spectrum into use-subtr…
devongovett Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@react-aria/utils/src/animation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function useEnterAnimation(ref: RefObject<HTMLElement | null>, isReady: b
// This can happen when isReady starts as false (e.g. popovers prior to placement calculation).
useLayoutEffect(() => {
if (isAnimationReady && ref.current && 'getAnimations' in ref.current) {
for (let animation of ref.current.getAnimations()) {
for (let animation of ref.current.getAnimations({subtree: true})) {
if (animation instanceof CSSTransition) {
animation.cancel();
}
Expand Down Expand Up @@ -80,7 +80,7 @@ function useAnimation(ref: RefObject<HTMLElement | null>, isActive: boolean, onE
return;
}

let animations = ref.current.getAnimations();
let animations = ref.current.getAnimations({subtree: true});
if (animations.length === 0) {
onEnd();
return;
Expand Down
42 changes: 42 additions & 0 deletions packages/react-aria-components/stories/Popover.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,3 +433,45 @@ export const PopoverTriggerWidthExample = () => (
</Popover>
</DialogTrigger>
);

export const PopoverChildElementAnimationExample = () => (
<DialogTrigger>
<Button>
Open popover
</Button>
<Popover
placement="bottom start"
style={{
zIndex: 5
}}>
<Dialog>
<div
className="content"
style={{
background: 'Canvas',
color: 'CanvasText',
border: '1px solid gray',
padding: 30,
transition: 'opacity 0.5s'
}}>
<style>
{`
@starting-style {
.react-aria-Popover .content {
opacity: 0;
}
}
.react-aria-Popover[data-exiting] .content,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the issue for Safari from what I can tell.

Suggested change
.react-aria-Popover[data-exiting] .content,
@starting-style {
.react-aria-Popover .content {
opacity: 0;
}
}
.react-aria-Popover[data-exiting] .content,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@snowystinger
Thanks for the Safari testing!

I've added @starting-style to the Storybook example to address the enter animation issue in Safari. However, this is a CSS-level consideration that developers will need to handle in their own implementations when targeting Safari.
I'm not sure of the best way for React Aria to help developers discover this Safari-specific requirement.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I don't think this should be necessary. data-entering should be enough. If it isn't working, then that's a bug we should investigate.

.react-aria-Popover[data-entering] .content {
opacity: 0;
}
`}
</style>
<p>
The popover waits for child element transitions to complete
</p>
</div>
</Dialog>
</Popover>
</DialogTrigger>
);