Skip to content
Merged
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
13 changes: 10 additions & 3 deletions src/usePagination/usePagination.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useMemo, useState } from 'react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'

export interface PaginationData {
/** The current page */
Expand Down Expand Up @@ -100,8 +100,16 @@ export function usePagination<T = void>({
setPageInternal((page) => Math.max(1, Math.min(page, totalPages)))
}, [totalPages])

const savedCallback = useRef<(data: PaginationData) => T>(queryCallback)

// Remember the latest callback.
useEffect(() => {
savedCallback.current = queryCallback
}, [queryCallback])

const query = useMemo(() => {
return queryCallback({
const callback = savedCallback.current
return callback({
page,
pageSize,
totalPages,
Expand All @@ -111,7 +119,6 @@ export function usePagination<T = void>({
isPreviousDisabled,
})
}, [
queryCallback,
page,
pageSize,
totalPages,
Expand Down