File tree Expand file tree Collapse file tree
packages/@headlessui-react/src/components/portal Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ import { useDisposables } from '../../hooks/use-disposables'
1818import { useEvent } from '../../hooks/use-event'
1919import { useOnUnmount } from '../../hooks/use-on-unmount'
2020import { useOwnerDocument } from '../../hooks/use-owner'
21+ import { useServerHandoffComplete } from '../../hooks/use-server-handoff-complete'
2122import { optionalRef , useSyncRefs } from '../../hooks/use-sync-refs'
2223import { usePortalRoot } from '../../internal/portal-force-root'
2324import type { Props } from '../../types'
@@ -94,6 +95,7 @@ let InternalPortalFn = forwardRefWithAs(function InternalPortalFn<
9495 let target = usePortalTarget ( ownerDocument )
9596 let parent = useContext ( PortalParentContext )
9697 let d = useDisposables ( )
98+ let ready = useServerHandoffComplete ( )
9799 let render = useRender ( )
98100
99101 useOnUnmount ( ( ) => {
@@ -107,7 +109,7 @@ let InternalPortalFn = forwardRefWithAs(function InternalPortalFn<
107109
108110 let ourProps = { ref : portalRef }
109111
110- return ! target
112+ return ! target || ! ready
111113 ? null
112114 : createPortal (
113115 < div
You can’t perform that action at this time.
0 commit comments