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

First page of useSWRInfinite should reuse the cache from useSWR #799

Merged
merged 2 commits into from
Jan 7, 2021
Merged

First page of useSWRInfinite should reuse the cache from useSWR #799

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
2f00e77
fix type error
shuding Dec 8, 2020
01a2879
simplify code
shuding Dec 8, 2020
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
3 changes: 2 additions & 1 deletion src/use-swr-infinite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import SWRConfigContext from './swr-config-context'
import useSWR from './use-swr'

import { keyType, fetcherFn, ConfigInterface, responseInterface } from './types'

type KeyLoader<Data = any> = (
index: number,
previousPageData: Data | null
Expand Down Expand Up @@ -151,7 +152,7 @@ function useSWRInfinite<Data = any, Error = any>(
const shouldRevalidatePage =
revalidateAll ||
force ||
(typeof force === 'undefined' && i === 0) ||
(typeof force === 'undefined' && i === 0 && originalData) ||
(originalData && !config.compare(originalData[i], pageData)) ||
typeof pageData === 'undefined'

Expand Down
28 changes: 25 additions & 3 deletions test/use-swr-infinite.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
act
} from '@testing-library/react'

import { useSWRInfinite } from '../src'
import { useSWRInfinite, mutate } from '../src'

describe('useSWRInfinite', () => {
it('should render the first page component', async () => {
Expand Down Expand Up @@ -59,7 +59,7 @@ describe('useSWRInfinite', () => {
let pageData = ['apple', 'banana', 'pineapple']

function Page() {
const { data, mutate } = useSWRInfinite<string, string>(
const { data, mutate: boundMutate } = useSWRInfinite<string, string>(
index => [`pagetest-3`, index],
async (_, index) => {
await new Promise(res => setTimeout(res, 100))
Expand All @@ -74,7 +74,7 @@ describe('useSWRInfinite', () => {
<div
onClick={() => {
// reload the entire list
mutate()
boundMutate()
}}
>
{data}
Expand Down Expand Up @@ -441,4 +441,26 @@ describe('useSWRInfinite', () => {
expect(setSize).toEqual(setters[0])
}
})

it('should share initial cache from `useSWR`', async () => {
const cachedData = new Date().toISOString()
mutate('shared-cache-0', cachedData)

function Page() {
const { data } = useSWRInfinite<string, string>(
index => `shared-cache-${index}`,
async () => {
await new Promise(res => setTimeout(res, 200))
return cachedData
}
)

return <div>{data}</div>
}
const { container } = render(<Page />)
expect(container.textContent).toMatchInlineSnapshot(`""`)
// after a rerender we should already have the cached data rendered
await act(() => new Promise(res => setTimeout(res, 10)))
expect(container.textContent).toMatchInlineSnapshot(`"${cachedData}"`)
})
})