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.

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

fix: react Deferred component error on partial visits #2223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions packages/react/src/Deferred.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ReactElement, useEffect, useState } from 'react'
import { ReactElement, useEffect, useMemo, useState } from 'react'
import usePage from './usePage'
import { router } from '.'

interface DeferredProps {
children: ReactElement | number | string
Expand All @@ -14,7 +15,12 @@ const Deferred = ({ children, data, fallback }: DeferredProps) => {

const [loaded, setLoaded] = useState(false)
const pageProps = usePage().props
const keys = Array.isArray(data) ? data : [data]
const keys = useMemo(() => Array.isArray(data) ? data : [data], [data])

useEffect(() => {
const removeListener = router.on("start", () => setLoaded(false));
return () => { removeListener() }
}, [])

useEffect(() => {
setLoaded(keys.every((key) => pageProps[key] !== undefined))
Expand Down
Loading