Skip to content
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

Jump to bottom

Apply enter and enterFrom classes in SSR for Transition component #2059

Merged
merged 2 commits into from Dec 2, 2022
Merged

Apply enter and enterFrom classes in SSR for Transition component #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e865dc
apply `enter` and `enterFrom` classes in SSR
RobinMalfait Dec 2, 2022
d9f785e
update changelog
RobinMalfait Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/@headlessui-react/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ensure `shift+home` and `shift+end` works as expected in the `Combobox.Input` component ([#2024](https://github.com/tailwindlabs/headlessui/pull/2024))
- Improve syncing of the `Combobox.Input` value ([#2042](https://github.com/tailwindlabs/headlessui/pull/2042))
- Fix crash when using `multiple` mode without `value` prop (uncontrolled) for `Listbox` and `Combobox` components ([#2058](https://github.com/tailwindlabs/headlessui/pull/2058))
- Apply `enter` and `enterFrom` classes in SSR for `Transition` component ([#2059](https://github.com/tailwindlabs/headlessui/pull/2059))

## [1.7.4] - 2022-11-03

Expand Down
10 changes: 10 additions & 0 deletions packages/@headlessui-react/src/components/transitions/transition.tsx
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ import { useSyncRefs } from '../../hooks/use-sync-refs'
import { useTransition } from '../../hooks/use-transition'
import { useEvent } from '../../hooks/use-event'
import { useDisposables } from '../../hooks/use-disposables'
import { classNames } from '../../utils/class-names'

type ContainerElement = MutableRefObject<HTMLElement | null>

Expand Down Expand Up @@ -412,6 +413,15 @@ let TransitionChild = forwardRefWithAs(function TransitionChild<
let theirProps = rest
let ourProps = { ref: transitionRef }

let isServer = typeof window === 'undefined' || typeof document === 'undefined'
if (appear && show && isServer) {
theirProps = {
...theirProps,
// Already apply the `enter` and `enterFrom` on the server if required
className: classNames(rest.className, ...classes.current.enter, ...classes.current.enterFrom),
}
}

return (
<NestingContext.Provider value={nesting}>
<OpenClosedProvider
Expand Down