@tanstack/table-core 8.0.0-alpha.70 → 8.0.0-alpha.73

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.0.0-alpha.70",
+  "version": "8.0.0-alpha.73",
   "description": "Hooks for building lightweight, fast and extendable datagrids for React",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/react-table#readme",

package/src/core.ts

@@ -44,8 +44,8 @@ export type CoreOptions<TGenerics extends TableGenerics> = {
   initialState?: InitialTableState
   autoResetAll?: boolean
   mergeOptions?: <T>(defaultOptions: T, options: Partial<T>) => T
-  keepPreviousData?: boolean
   meta?: TGenerics['TableMeta']
+  // keepPreviousData?: boolean
 }
 
 export type CoreInstance<TGenerics extends TableGenerics> = {
@@ -54,20 +54,20 @@ export type CoreInstance<TGenerics extends TableGenerics> = {
   reset: () => void
   options: RequiredKeys<TableOptions<TGenerics>, 'state'>
   setOptions: (newOptions: Updater<TableOptions<TGenerics>>) => void
-  queue: (cb: () => void) => void
   getState: () => TableState
   setState: (updater: Updater<TableState>) => void
-  render: <TProps>(
+  _queue: (cb: () => void) => void
+  _render: <TProps>(
     template: Renderable<TGenerics, TProps>,
     props: TProps
   ) => string | null | TGenerics['Rendered']
+  _features: readonly TableFeature[]
   // getOverallProgress: () => number
   // getProgressStage: () =>
   //   | undefined
   //   | 'coreRowModel'
   //   | 'filteredRowModel'
   //   | 'facetedRowModel'
-  _features: readonly TableFeature[]
   // createBatch: (priority: keyof CoreBatches) => Batch
   // init: () => void
   // willUpdate: () => void
@@ -231,7 +231,7 @@ export function createTableInstance<TGenerics extends TableGenerics>(
       ...options,
     },
     initialState,
-    queue: cb => {
+    _queue: cb => {
       queued.push(cb)
 
       if (!queuedTimeout) {
@@ -297,7 +297,7 @@ export function createTableInstance<TGenerics extends TableGenerics>(
       const newOptions = functionalUpdate(updater, instance.options)
       instance.options = mergeOptions(newOptions)
     },
-    render: (template, props) => {
+    _render: (template, props) => {
       if (typeof instance.options.render === 'function') {
         return instance.options.render(template, props)
       }

package/src/features/Cells.ts

@@ -75,7 +75,7 @@ export const Cells = {
           getValue: () => row.getValue(columnId),
           renderCell: () =>
             column.cell
-              ? instance.render(column.cell, {
+              ? instance._render(column.cell, {
                   instance,
                   column,
                   row,

package/src/features/ColumnSizing.ts

@@ -370,19 +370,19 @@ export const ColumnSizing: TableFeature = {
       },
       getTotalSize: () =>
         instance.getHeaderGroups()[0]?.headers.reduce((sum, header) => {
-          return sum + header.column.getSize()
+          return sum + header.getSize()
         }, 0) ?? 0,
       getLeftTotalSize: () =>
         instance.getLeftHeaderGroups()[0]?.headers.reduce((sum, header) => {
-          return sum + header.column.getSize()
+          return sum + header.getSize()
         }, 0) ?? 0,
       getCenterTotalSize: () =>
         instance.getCenterHeaderGroups()[0]?.headers.reduce((sum, header) => {
-          return sum + header.column.getSize()
+          return sum + header.getSize()
         }, 0) ?? 0,
       getRightTotalSize: () =>
         instance.getRightHeaderGroups()[0]?.headers.reduce((sum, header) => {
-          return sum + header.column.getSize()
+          return sum + header.getSize()
         }, 0) ?? 0,
     }
   },

package/src/features/Expanding.ts

@@ -77,11 +77,14 @@ export const Expanding: TableFeature = {
     instance: TableInstance<TGenerics>
   ): ExpandedInstance<TGenerics> => {
     let registered = false
+    let queued = false
 
     return {
       _autoResetExpanded: () => {
         if (!registered) {
-          registered = true
+          instance._queue(() => {
+            registered = true
+          })
           return
         }
 
@@ -93,7 +96,12 @@ export const Expanding: TableFeature = {
           instance.options.autoResetAll === true ||
           instance.options.autoResetExpanded
         ) {
-          instance.resetExpanded()
+          if (queued) return
+          queued = true
+          instance._queue(() => {
+            instance.resetExpanded()
+            queued = false
+          })
         }
       },
       setExpanded: updater => instance.options.onExpandedChange?.(updater),

package/src/features/Filters.ts

@@ -85,8 +85,8 @@ export type FiltersColumn<TGenerics extends TableGenerics> = {
   getFilterIndex: () => number
   getFacetedUniqueValues: () => Map<any, number>
   _getFacetedUniqueValues?: () => Map<any, number>
-  getFacetedMinMaxValues: () => [any, any]
-  _getFacetedMinMaxValues?: () => [any, any]
+  getFacetedMinMaxValues: () => undefined | [number, number]
+  _getFacetedMinMaxValues?: () => undefined | [number, number]
 }
 
 export type FiltersRow<TGenerics extends TableGenerics> = {
@@ -125,7 +125,7 @@ export type FiltersOptions<TGenerics extends TableGenerics> = {
   getFacetedMinMaxValues?: (
     instance: TableInstance<TGenerics>,
     columnId: string
-  ) => () => [number, number]
+  ) => () => undefined | [number, number]
 }
 
 export type FiltersInstance<TGenerics extends TableGenerics> = {
@@ -147,8 +147,8 @@ export type FiltersInstance<TGenerics extends TableGenerics> = {
   _getGlobalFacetedRowModel?: () => RowModel<TGenerics>
   getGlobalFacetedUniqueValues: () => Map<any, number>
   _getGlobalFacetedUniqueValues?: () => Map<any, number>
-  getGlobalFacetedMinMaxValues: () => [number, number]
-  _getGlobalFacetedMinMaxValues?: () => [number, number]
+  getGlobalFacetedMinMaxValues: () => undefined | [number, number]
+  _getGlobalFacetedMinMaxValues?: () => undefined | [number, number]
 }
 
 //
@@ -328,7 +328,7 @@ export const Filters: TableFeature = {
         instance.options.getFacetedMinMaxValues(instance, column.id),
       getFacetedMinMaxValues: () => {
         if (!column._getFacetedMinMaxValues) {
-          return [NaN, NaN]
+          return undefined
         }
 
         return column._getFacetedMinMaxValues()
@@ -456,7 +456,7 @@ export const Filters: TableFeature = {
         instance.options.getFacetedMinMaxValues(instance, '__global__'),
       getGlobalFacetedMinMaxValues: () => {
         if (!instance._getGlobalFacetedMinMaxValues) {
-          return [NaN, NaN]
+          return
         }
 
         return instance._getGlobalFacetedMinMaxValues()

package/src/features/Grouping.ts

@@ -267,7 +267,7 @@ export const Grouping: TableFeature = {
         const template = column.aggregatedCell ?? column.cell
 
         return template
-          ? instance.render(template, {
+          ? instance._render(template, {
               instance,
               column,
               row,

package/src/features/Headers.ts

@@ -88,7 +88,7 @@ export const Headers = {
           },
           renderHeader: () =>
             column.header
-              ? instance.render(column.header, {
+              ? instance._render(column.header, {
                   instance,
                   header: header as Header<TGenerics>,
                   column,
@@ -96,7 +96,7 @@ export const Headers = {
               : null,
           renderFooter: () =>
             column.footer
-              ? instance.render(column.footer, {
+              ? instance._render(column.footer, {
                   instance,
                   header: header as Header<TGenerics>,
                   column,

package/src/features/Pagination.ts

@@ -33,7 +33,6 @@ export type PaginationOptions<TGenerics extends TableGenerics> = {
 
 export type PaginationDefaultOptions = {
   onPaginationChange: OnChangeFn<PaginationState>
-  autoResetPageIndex: boolean
 }
 
 export type PaginationInstance<TGenerics extends TableGenerics> = {
@@ -82,7 +81,6 @@ export const Pagination: TableFeature = {
   ): PaginationDefaultOptions => {
     return {
       onPaginationChange: makeStateUpdater('pagination', instance),
-      autoResetPageIndex: true,
     }
   },
 
@@ -90,23 +88,28 @@ export const Pagination: TableFeature = {
     instance: TableInstance<TGenerics>
   ): PaginationInstance<TGenerics> => {
     let registered = false
+    let queued = false
 
     return {
       _autoResetPageIndex: () => {
         if (!registered) {
-          registered = true
-          return
-        }
-
-        if (instance.options.autoResetAll === false) {
+          instance._queue(() => {
+            registered = true
+          })
           return
         }
 
         if (
-          instance.options.autoResetAll === true ||
-          instance.options.autoResetPageIndex
+          instance.options.autoResetAll ??
+          instance.options.autoResetPageIndex ??
+          !instance.options.manualPagination
         ) {
-          instance.resetPageIndex()
+          if (queued) return
+          queued = true
+          instance._queue(() => {
+            instance.resetPageIndex()
+            queued = false
+          })
         }
       },
       setPagination: updater => {
@@ -130,7 +133,7 @@ export const Pagination: TableFeature = {
           let pageIndex = functionalUpdate(updater, old.pageIndex)
 
           const maxPageIndex =
-            old.pageCount && old.pageCount > 0
+            typeof old.pageCount !== 'undefined'
               ? old.pageCount - 1
               : Number.MAX_SAFE_INTEGER
 

package/src/utils/getCoreRowModel.ts

@@ -91,9 +91,7 @@ export function getCoreRowModel<TGenerics extends TableGenerics>(): (
         key: process.env.NODE_ENV === 'development' && 'getRowModel',
         debug: () => instance.options.debugAll ?? instance.options.debugTable,
         onChange: () => {
-          instance.queue(() => {
-            instance._autoResetPageIndex()
-          })
+          instance._autoResetPageIndex()
         },
       }
     )

package/src/utils/getFacetedMinMaxValues.ts

@@ -4,15 +4,18 @@ import { memo } from '../utils'
 export function getFacetedMinMaxValues<TGenerics extends TableGenerics>(): (
   instance: TableInstance<TGenerics>,
   columnId: string
-) => () => [number, number] {
+) => () => undefined | [number, number] {
   return (instance, columnId) =>
     memo(
       () => [instance.getColumn(columnId).getFacetedRowModel()],
       facetedRowModel => {
-        let facetedMinMaxValues: [any, any] = [
-          facetedRowModel.flatRows[0]?.getValue(columnId) ?? null,
-          facetedRowModel.flatRows[0]?.getValue(columnId) ?? null,
-        ]
+        const firstValue = facetedRowModel.flatRows[0]?.getValue(columnId)
+
+        if (typeof firstValue === 'undefined') {
+          return undefined
+        }
+
+        let facetedMinMaxValues: [any, any] = [firstValue, firstValue]
 
         for (let i = 0; i < facetedRowModel.flatRows.length; i++) {
           const value = facetedRowModel.flatRows[i]?.getValue(columnId)

package/src/utils/getFilteredRowModel.ts

@@ -141,9 +141,7 @@ export function getFilteredRowModel<TGenerics extends TableGenerics>(): (
         key: process.env.NODE_ENV === 'development' && 'getFilteredRowModel',
         debug: () => instance.options.debugAll ?? instance.options.debugTable,
         onChange: () => {
-          instance.queue(() => {
-            instance._autoResetPageIndex()
-          })
+          instance._autoResetPageIndex()
         },
       }
     )

package/src/utils/getGroupedRowModel.ts

@@ -155,7 +155,7 @@ export function getGroupedRowModel<TGenerics extends TableGenerics>(): (
         key: process.env.NODE_ENV === 'development' && 'getGroupedRowModel',
         debug: () => instance.options.debugAll ?? instance.options.debugTable,
         onChange: () => {
-          instance.queue(() => {
+          instance._queue(() => {
             instance._autoResetExpanded()
             instance._autoResetPageIndex()
           })

package/src/utils/getSortedRowModel.ts

@@ -109,9 +109,7 @@ export function getSortedRowModel<TGenerics extends TableGenerics>(): (
         key: process.env.NODE_ENV === 'development' && 'getSortedRowModel',
         debug: () => instance.options.debugAll ?? instance.options.debugTable,
         onChange: () => {
-          instance.queue(() => {
-            instance._autoResetPageIndex()
-          })
+          instance._autoResetPageIndex()
         },
       }
     )