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: isLoading and isValidating should always respect cache value #2048

Merged
merged 2 commits into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions core/use-swr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ export const useSWRHandler = <Data = any, Error = any>(
isInitialMount &&
shouldDoInitialRevalidation
)
const isValidating = cached.isValidating || defaultValidatingState
const isLoading = cached.isLoading || defaultValidatingState
const isValidating = isUndefined(cached.isValidating) ? defaultValidatingState : cached.isValidating
const isLoading = isUndefined(cached.isLoading) ? defaultValidatingState : cached.isLoading

// The revalidation function is a carefully crafted wrapper of the original
// `fetcher`, to correctly handle the many edge cases.
Expand Down
19 changes: 19 additions & 0 deletions test/use-swr-loading.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,23 @@ describe('useSWR - loading', () => {
screen.getByText('loading,validating')
await screen.findByText('ready,ready')
})
it('isLoading and isValidating should always respect cache value', async () => {
const key = createKey()
const Page = () => {
const { data } = useSWR(key, () => createResponse('result', { delay: 10 }))
const { data: response } = useSWR(data, () => createResponse('data', { delay: 10 }))
// eslint-disable-next-line react/display-name
const Component = ((_: any) => () => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const { data: result, isLoading, isValidating } = useSWR(key, () => createResponse('result', { delay: 10 }))
return (
<div>{`result is ${result ? result : 'null'},${isLoading},${isValidating}`}</div>
)
})(response)
promer94 marked this conversation as resolved.
Show resolved Hide resolved
return <Component></Component>
}
renderWithConfig(<Page />)
screen.getByText('result is null,true,true')
await screen.findByText('result is result,false,false')
})
})