@tanstack/table-core 8.0.0-beta.7 → 8.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.0.0-beta.7",
+  "version": "8.0.0",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/features/Pagination.ts

@@ -11,7 +11,6 @@ import { functionalUpdate, makeStateUpdater, memo } from '../utils'
 export type PaginationState = {
   pageIndex: number
   pageSize: number
-  pageCount?: number
 }
 
 export type PaginationTableState = {
@@ -23,6 +22,7 @@ export type PaginationInitialTableState = {
 }
 
 export type PaginationOptions<TGenerics extends TableGenerics> = {
+  pageCount?: number
   manualPagination?: boolean
   onPaginationChange?: OnChangeFn<PaginationState>
   autoResetPageIndex?: boolean
@@ -131,9 +131,9 @@ export const Pagination: TableFeature = {
           let pageIndex = functionalUpdate(updater, old.pageIndex)
 
           const maxPageIndex =
-            typeof old.pageCount !== 'undefined'
-              ? old.pageCount - 1
-              : Number.MAX_SAFE_INTEGER
+            (typeof instance.options.pageCount === 'undefined' || instance.options.pageCount === -1) ?
+              Number.MAX_SAFE_INTEGER
+              : instance.options.pageCount - 1
 
           pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex)
 
@@ -172,7 +172,10 @@ export const Pagination: TableFeature = {
       },
       setPageCount: updater =>
         instance.setPagination(old => {
-          let newPageCount = functionalUpdate(updater, old.pageCount ?? -1)
+          let newPageCount = functionalUpdate(
+            updater,
+            instance.options.pageCount ?? -1
+          )
 
           if (typeof newPageCount === 'number') {
             newPageCount = Math.max(-1, newPageCount)
@@ -185,11 +188,8 @@ export const Pagination: TableFeature = {
         }),
 
       getPageOptions: memo(
-        () => [
-          instance.getState().pagination.pageSize,
-          instance.getState().pagination.pageCount,
-        ],
-        (pageSize, pageCount) => {
+        () => [instance.getPageCount()],
+        pageCount => {
           let pageOptions: number[] = []
           if (pageCount && pageCount > 0) {
             pageOptions = [...new Array(pageCount)].fill(null).map((_, i) => i)
@@ -251,15 +251,12 @@ export const Pagination: TableFeature = {
       },
 
       getPageCount: () => {
-        const { pageCount } = instance.getState().pagination
-
-        if (typeof pageCount !== 'undefined') {
-          return pageCount
-        }
-
-        return Math.ceil(
-          instance.getPrePaginationRowModel().rows.length /
+        return (
+          instance.options.pageCount ??
+          Math.ceil(
+            instance.getPrePaginationRowModel().rows.length /
             instance.getState().pagination.pageSize
+          )
         )
       },
     }

package/src/filterFns.ts

@@ -6,7 +6,7 @@ const includesString: FilterFn<any> = (
   filterValue: string
 ) => {
   const search = filterValue.toLowerCase()
-  return row.getValue(columnId).toLowerCase().includes(search)
+  return row.getValue(columnId)?.toLowerCase().includes(search)
 }
 
 includesString.autoRemove = (val: any) => testFalsey(val)
@@ -16,7 +16,7 @@ const includesStringSensitive: FilterFn<any> = (
   columnId: string,
   filterValue: string
 ) => {
-  return row.getValue(columnId).includes(filterValue)
+  return row.getValue(columnId)?.includes(filterValue)
 }
 
 includesStringSensitive.autoRemove = (val: any) => testFalsey(val)
@@ -26,7 +26,7 @@ const equalsString: FilterFn<any> = (
   columnId: string,
   filterValue: string
 ) => {
-  return row.getValue(columnId).toLowerCase() === filterValue.toLowerCase()
+  return row.getValue(columnId)?.toLowerCase() === filterValue.toLowerCase()
 }
 
 equalsString.autoRemove = (val: any) => testFalsey(val)
@@ -36,7 +36,7 @@ const arrIncludes: FilterFn<any> = (
   columnId: string,
   filterValue: unknown
 ) => {
-  return row.getValue(columnId).includes(filterValue)
+  return row.getValue(columnId)?.includes(filterValue)
 }
 
 arrIncludes.autoRemove = (val: any) => testFalsey(val) || !val?.length
@@ -46,7 +46,7 @@ const arrIncludesAll: FilterFn<any> = (
   columnId: string,
   filterValue: unknown[]
 ) => {
-  return !filterValue.some(val => !row.getValue(columnId).includes(val))
+  return !filterValue.some(val => !row.getValue(columnId)?.includes(val))
 }
 
 arrIncludesAll.autoRemove = (val: any) => testFalsey(val) || !val?.length
@@ -56,7 +56,7 @@ const arrIncludesSome: FilterFn<any> = (
   columnId: string,
   filterValue: unknown[]
 ) => {
-  return filterValue.some(val => row.getValue(columnId).includes(val))
+  return filterValue.some(val => row.getValue(columnId)?.includes(val))
 }
 
 arrIncludesSome.autoRemove = (val: any) => testFalsey(val) || !val?.length

package/src/utils/filterRowsUtils.ts

@@ -21,18 +21,16 @@ export function filterRowModelFromLeafs<TGenerics extends TableGenerics>(
   const newFilteredFlatRows: Row<TGenerics>[] = []
   const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
 
-  let row
-  let newRow
 
   const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
     const rows: Row<TGenerics>[] = []
 
     // Filter from children up first
     for (let i = 0; i < rowsToFilter.length; i++) {
-      row = rowsToFilter[i]!
+      let row = rowsToFilter[i]!
 
       if (row.subRows?.length) {
-        newRow = createRow(instance, row.id, row.original, row.index, row.depth)
+        const newRow = createRow(instance, row.id, row.original, row.index, row.depth)
         newRow.columnFilters = row.columnFilters
         newRow.subRows = recurseFilterRows(row.subRows, depth + 1)
         if (!newRow.subRows.length) {
@@ -66,25 +64,21 @@ export function filterRowModelFromRoot<TGenerics extends TableGenerics>(
   const newFilteredFlatRows: Row<TGenerics>[] = []
   const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
 
-  let rows
-  let row
-  let newRow
-
   // Filters top level and nested rows
   const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
     // Filter from parents downward first
 
-    rows = []
+    const rows = []
 
     // Apply the filter to any subRows
     for (let i = 0; i < rowsToFilter.length; i++) {
-      row = rowsToFilter[i]!
+      let row = rowsToFilter[i]!
 
       const pass = filterRow(row)
 
       if (pass) {
         if (row.subRows?.length) {
-          newRow = createRow(
+          const newRow = createRow(
             instance,
             row.id,
             row.original,