Fix an issue where pageIndex becomes invalid when data is changed (re…

…moved) and autoResetPageIndex is false.
TanStack · Aug 20, 2023 · bb83e52 · bb83e52
1 parent b49ff74
commit bb83e52
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/table-core/src/features/Pagination.ts b/packages/table-core/src/features/Pagination.ts
@@ -92,14 +92,24 @@ export const Pagination: TableFeature = {
  }
 
  if (
- table.options.autoResetAll ??
- table.options.autoResetPageIndex ??
+ table.getState().pagination &&
  !table.options.manualPagination
  ) {
  if (queued) return
  queued = true
  table._queue(() => {
- table.resetPageIndex()
+ if (
+ table.options.autoResetAll ??
+ table.options.autoResetPageIndex
+ ) {
+ table.resetPageIndex()
+ } else {
+ const currentPageIndex = table.getState().pagination.pageIndex
+ const lastPageIndex = table.getPageCount() - 1
+ if (currentPageIndex > lastPageIndex) {
+ table.setPageIndex(lastPageIndex)
+ }
+ }
  queued = false
  })
  }