Skip to content

fix(useInfiniteQuery): correctly set canFetchMore #822

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

Merged
tannerlinsley merged 1 commit into from
Aug 2, 2020
Merged

fix(useInfiniteQuery): correctly set canFetchMore #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/core/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ export class Query<TResult, TError> {
infiniteData[infiniteData.length - 1],
infiniteData
)
this.state.canFetchMore = this.fetchMoreVariable !== false
this.state.canFetchMore = Boolean(this.fetchMoreVariable)
}

// Here we seed the pageVariabes for the query
// Here we seed the pageVariables for the query
if (!this.pageVariables) {
this.pageVariables = [[...this.queryKey]]
}
Expand Down Expand Up @@ -460,7 +460,7 @@ export class Query<TResult, TError> {
data[data.length - 1],
data
)
this.state.canFetchMore = this.fetchMoreVariable !== false
this.state.canFetchMore = Boolean(this.fetchMoreVariable)
this.pageVariables = rebuiltPageVariables

return (data as unknown) as TResult
Expand Down Expand Up @@ -497,7 +497,7 @@ export class Query<TResult, TError> {
}

this.fetchMoreVariable = infiniteConfig.getFetchMore(newData, data)
this.state.canFetchMore = this.fetchMoreVariable !== false
this.state.canFetchMore = Boolean(this.fetchMoreVariable)

return (data as unknown) as TResult
} finally {
Expand Down
153 changes: 153 additions & 0 deletions src/react/tests/useInfiniteQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,84 @@ describe('useInfiniteQuery', () => {
})
})

it('should compute canFetchMore correctly for falsy getFetchMore return value', async () => {
function Page() {
const fetchCountRef = React.useRef(0)
const {
status,
data,
error,
isFetching,
isFetchingMore,
fetchMore,
canFetchMore,
refetch,
} = useInfiniteQuery<Result, Error, string>(
'items',
(_key, nextId = 0) => fetchItems(nextId, fetchCountRef.current++),
{
getFetchMore: (_lastGroup, _allGroups) => undefined,
}
)

return (
<div>
<h1>Pagination</h1>
{status === 'loading' ? (
'Loading...'
) : status === 'error' ? (
<span>Error: {error?.message}</span>
) : (
<>
<div>Data:</div>
{data?.map((page, i) => (
<div key={i}>
<div>
Page {i}: {page.ts}
</div>
<div key={i}>
{page.items.map(item => (
<p key={item}>Item: {item}</p>
))}
</div>
</div>
))}
<div>
<button
onClick={() => fetchMore()}
disabled={!canFetchMore || Boolean(isFetchingMore)}
>
{isFetchingMore
? 'Loading more...'
: canFetchMore
? 'Load More'
: 'Nothing more to load'}
</button>
<button onClick={() => refetch()}>Refetch</button>
</div>
<div>
{isFetching && !isFetchingMore
? 'Background Updating...'
: null}
</div>
</>
)}
</div>
)
}

const rendered = render(<Page />)

rendered.getByText('Loading...')

await waitFor(() => {
rendered.getByText('Item: 9')
rendered.getByText('Page 0: 0')
})

rendered.getByText('Nothing more to load')
})

it('should compute canFetchMore correctly using initialData', async () => {
function Page() {
const fetchCountRef = React.useRef(0)
Expand Down Expand Up @@ -293,6 +371,81 @@ describe('useInfiniteQuery', () => {
})
})

it('should compute canFetchMore correctly for falsy getFetchMore return value using initialData', async () => {
function Page() {
const fetchCountRef = React.useRef(0)
const {
status,
data,
error,
isFetching,
isFetchingMore,
fetchMore,
canFetchMore,
refetch,
} = useInfiniteQuery<Result, Error, string>(
'items',
(_key, nextId = 0) => fetchItems(nextId, fetchCountRef.current++),
{
initialData: [initialItems(0)],
getFetchMore: (_lastGroup, _allGroups) => undefined,
}
)

return (
<div>
<h1>Pagination</h1>
{status === 'loading' ? (
'Loading...'
) : status === 'error' ? (
<span>Error: {error?.message}</span>
) : (
<>
<div>Data:</div>
{data?.map((page, i) => (
<div key={i}>
<div>
Page {i}: {page.ts}
</div>
<div key={i}>
{page.items.map(item => (
<p key={item}>Item: {item}</p>
))}
</div>
</div>
))}
<div>
<button
onClick={() => fetchMore()}
disabled={!canFetchMore || Boolean(isFetchingMore)}
>
{isFetchingMore
? 'Loading more...'
: canFetchMore
? 'Load More'
: 'Nothing more to load'}
</button>
<button onClick={() => refetch()}>Refetch</button>
</div>
<div>
{isFetching && !isFetchingMore
? 'Background Updating...'
: null}
</div>
</>
)}
</div>
)
}

const rendered = render(<Page />)

rendered.getByText('Item: 9')
rendered.getByText('Page 0: 0')

rendered.getByText('Nothing more to load')
})

it('should build fresh cursors on refetch', async () => {
const genItems = (size: number) =>
[...new Array(size)].fill(null).map((_, d) => d)
Expand Down