@tanstack/table-core 8.0.0-alpha.71 → 8.0.0-alpha.74

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.0.0-alpha.71",
+  "version": "8.0.0-alpha.74",
   "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
@@ -88,8 +88,6 @@ export type CoreInstance<TGenerics extends TableGenerics> = {
 //   facets: Batch[]
 // }
 
-// export type TaskPriority = keyof CoreBatches
-
 export function createTableInstance<TGenerics extends TableGenerics>(
   options: TableOptions<TGenerics>
 ): TableInstance<TGenerics> {
@@ -147,74 +145,6 @@ export function createTableInstance<TGenerics extends TableGenerics>(
   const queued: (() => void)[] = []
   let queuedTimeout = false
 
-  // let workScheduled = false
-  // let working = false
-  // let latestCallback: ReturnType<typeof requestIdleCallback>
-  // let batchUid = 0
-  // const onProgress = () => {}
-  // const getBatch = () => {
-  //   instance.batches.data = instance.batches.data.filter(d => d.tasks.length)
-  //   instance.batches.facets = instance.batches.facets.filter(
-  //     d => d.tasks.length
-  //   )
-
-  //   return (
-  //     instance.batches.data.find(d => d.tasks.length) ??
-  //     instance.batches.facets.find(d => d.tasks.length)
-  //   )
-  // }
-
-  // const startWorkLoop = () => {
-  //   working = true
-
-  //   const workLoop = (deadline: IdleDeadline) => {
-  //     const batch = getBatch()
-
-  //     if (!batch) {
-  //       working = false
-  //       return
-  //     }
-  //     // Prioritize tasks
-  //     while (deadline.timeRemaining() > 0 && batch.tasks.length) {
-  //       batch.tasks.shift()!()
-  //     }
-
-  //     onProgress()
-
-  //     if (working) {
-  //       latestCallback = requestIdleCallback(workLoop, { timeout: 10000 })
-  //     }
-  //   }
-
-  //   latestCallback = requestIdleCallback(workLoop, { timeout: 10000 })
-  // }
-
-  // const startWork = () => {
-  //   if (getBatch() && !working) {
-  //     if (
-  //       (process.env.NODE_ENV === 'development' && instance.options.debugAll) ??
-  //       instance.options.debugTable
-  //     ) {
-  //       console.info('Starting work...')
-  //     }
-  //     startWorkLoop()
-  //   }
-  // }
-
-  // const stopWork = () => {
-  //   if (working) {
-  //     if (
-  //       (process.env.NODE_ENV === 'development' && instance.options.debugAll) ??
-  //       instance.options.debugTable
-  //     ) {
-  //       console.info('Stopping work...')
-  //     }
-
-  //     working = false
-  //     cancelIdleCallback(latestCallback)
-  //   }
-  // }
-
   const midInstance: CoreInstance<TGenerics> = {
     ...instance,
     // init: () => {
@@ -231,7 +161,7 @@ export function createTableInstance<TGenerics extends TableGenerics>(
       ...options,
     },
     initialState,
-    queue: cb => {
+    _queue: cb => {
       queued.push(cb)
 
       if (!queuedTimeout) {
@@ -253,43 +183,6 @@ export function createTableInstance<TGenerics extends TableGenerics>(
           )
       }
     },
-    // batches: {
-    //   data: [],
-    //   facets: [],
-    // },
-    // createBatch: priority => {
-    //   const batchId = batchUid++
-    //   let canceled: boolean
-
-    //   const batch: Batch = {
-    //     id: batchId,
-    //     priority,
-    //     tasks: [],
-    //     schedule: cb => {
-    //       if (canceled) return
-    //       batch.tasks.push(cb)
-
-    //       if (!working && !workScheduled) {
-    //         workScheduled = true
-    //         instance.queue(() => {
-    //           workScheduled = false
-    //           instance.setState(old => ({ ...old }))
-    //         })
-    //       }
-    //     },
-    //     cancel: () => {
-    //       canceled = true
-    //       batch.tasks = []
-    //       instance.batches[priority] = instance.batches[priority].filter(
-    //         b => b.id !== batchId
-    //       )
-    //     },
-    //   }
-
-    //   instance.batches[priority].push(batch)
-
-    //   return batch
-    // },
     reset: () => {
       instance.setState(instance.initialState)
     },
@@ -297,7 +190,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/Expanding.ts

@@ -82,7 +82,7 @@ export const Expanding: TableFeature = {
     return {
       _autoResetExpanded: () => {
         if (!registered) {
-          instance.queue(() => {
+          instance._queue(() => {
             registered = true
           })
           return
@@ -98,7 +98,7 @@ export const Expanding: TableFeature = {
         ) {
           if (queued) return
           queued = true
-          instance.queue(() => {
+          instance._queue(() => {
             instance.resetExpanded()
             queued = false
           })

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,
     }
   },
 
@@ -95,23 +93,20 @@ export const Pagination: TableFeature = {
     return {
       _autoResetPageIndex: () => {
         if (!registered) {
-          instance.queue(() => {
+          instance._queue(() => {
             registered = true
           })
           return
         }
 
-        if (instance.options.autoResetAll === false) {
-          return
-        }
-
         if (
-          instance.options.autoResetAll === true ||
-          instance.options.autoResetPageIndex
+          instance.options.autoResetAll ??
+          instance.options.autoResetPageIndex ??
+          !instance.options.manualPagination
         ) {
           if (queued) return
           queued = true
-          instance.queue(() => {
+          instance._queue(() => {
             instance.resetPageIndex()
             queued = false
           })
@@ -138,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

@@ -14,78 +14,65 @@ export function getCoreRowModel<TGenerics extends TableGenerics>(): (
         flatRows: Row<TGenerics>[]
         rowsById: Record<string, Row<TGenerics>>
       } => {
-        // Access the row model using initial columns
-        const rows: Row<TGenerics>[] = []
-        const flatRows: Row<TGenerics>[] = []
-        const rowsById: Record<string, Row<TGenerics>> = {}
+        const rowModel: RowModel<TGenerics> = {
+          rows: [],
+          flatRows: [],
+          rowsById: {},
+        }
 
-        const leafColumns = instance.getAllLeafColumns()
+        let rows
+        let row
+        let originalRow
 
-        const accessRow = (
-          originalRow: TGenerics['Row'],
-          rowIndex: number,
+        const accessRows = (
+          originalRows: TGenerics['Row'][],
           depth = 0,
-          parentRows: Row<TGenerics>[],
           parent?: Row<TGenerics>
-        ) => {
-          const id = instance.getRowId(originalRow, rowIndex, parent)
-
-          if (!id) {
-            if (process.env.NODE_ENV !== 'production') {
-              throw new Error(`getRowId expected an ID, but got ${id}`)
-            }
-          }
+        ): Row<TGenerics>[] => {
+          rows = []
 
-          const values: Record<string, any> = {}
+          for (let i = 0; i < originalRows.length; i++) {
+            originalRow = originalRows[i]
 
-          for (let i = 0; i < leafColumns.length; i++) {
-            const column = leafColumns[i]
-            if (column && column.accessorFn) {
-              values[column.id] = column.accessorFn(originalRow, rowIndex)
-            }
-          }
+            // This could be an expensive check at scale, so we should move it somewhere else, but where?
+            // if (!id) {
+            //   if (process.env.NODE_ENV !== 'production') {
+            //     throw new Error(`getRowId expected an ID, but got ${id}`)
+            //   }
+            // }
 
-          // Make the row
-          const row = instance.createRow(id, originalRow, rowIndex, depth)
-
-          // Push instance row into the parentRows array
-          parentRows.push(row)
-          // Keep track of every row in a flat array
-          flatRows.push(row)
-          // Also keep track of every row by its ID
-          rowsById[id] = row
-
-          // Get the original subrows
-          if (instance.options.getSubRows) {
-            const originalSubRows = instance.options.getSubRows(
+            // Make the row
+            row = instance.createRow(
+              instance.getRowId(originalRow, i, parent),
               originalRow,
-              rowIndex
+              i,
+              depth
             )
 
-            // Then recursively access them
-            if (originalSubRows?.length) {
-              row.originalSubRows = originalSubRows
-              const subRows: Row<TGenerics>[] = []
+            // Keep track of every row in a flat array
+            rowModel.flatRows.push(row)
+            // Also keep track of every row by its ID
+            rowModel.rowsById[row.id] = row
+            // Push instance row into parent
+            rows.push(row)
+
+            // Get the original subrows
+            if (instance.options.getSubRows) {
+              row.originalSubRows = instance.options.getSubRows(originalRow, i)
 
-              for (let i = 0; i < row.originalSubRows.length; i++) {
-                accessRow(
-                  row.originalSubRows[i] as TGenerics['Row'],
-                  i,
-                  depth + 1,
-                  subRows,
-                  row
-                )
+              // Then recursively access them
+              if (row.originalSubRows?.length) {
+                row.subRows = accessRows(row.originalSubRows, depth + 1, row)
               }
-              row.subRows = subRows
             }
           }
-        }
 
-        for (let i = 0; i < data.length; i++) {
-          accessRow(data[i] as TGenerics['Row'], i, 0, rows)
+          return rows
         }
 
-        return { rows, flatRows, rowsById }
+        rowModel.rows = accessRows(data)
+
+        return rowModel
       },
       {
         key: process.env.NODE_ENV === 'development' && 'getRowModel',

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()
           })