@tanstack/table-core 8.0.0-alpha.78 → 8.0.0-alpha.82

package/package.json

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

package/src/createTable.ts

@@ -42,10 +42,13 @@ export type Table<TGenerics extends TableGenerics> = {
   setColumnMetaType: <TColumnMeta>() => Table<
     Overwrite<TGenerics, { ColumnMeta: TColumnMeta }>
   >
+  setFilterMetaType: <TFilterMeta>() => Table<
+    Overwrite<TGenerics, { FilterMeta: TFilterMeta }>
+  >
   setOptions: <
-    TFilterFns extends Record<string, FilterFn<any>>,
-    TSortingFns extends Record<string, SortingFn<any>>,
-    TAggregationFns extends Record<string, AggregationFn<any>>
+    TFilterFns extends Record<string, FilterFn<TGenerics>>,
+    TSortingFns extends Record<string, SortingFn<TGenerics>>,
+    TAggregationFns extends Record<string, AggregationFn<TGenerics>>
   >(
     options: CreateTableOptions<
       any,
@@ -144,6 +147,7 @@ function createTable<TGenerics extends TableGenerics>(
     setRowType: () => table as any,
     setTableMetaType: () => table as any,
     setColumnMetaType: () => table as any,
+    setFilterMetaType: () => table as any,
     setOptions: newOptions =>
       createTable(_, __, {
         ...options,

package/src/features/ColumnSizing.ts

@@ -215,7 +215,7 @@ export const ColumnSizing: TableFeature = {
             }
           }
 
-          const startSize = column.getSize()
+          const startSize = header.getSize()
 
           const columnSizingStart: [string, number][] = header
             ? header

package/src/features/Filters.ts

@@ -38,7 +38,13 @@ export type ResolvedColumnFilter<TGenerics extends TableGenerics> = {
 }
 
 export type FilterFn<TGenerics extends TableGenerics> = {
-  (row: Row<TGenerics>, columnId: string, filterValue: any): boolean
+  (
+    row: Row<TGenerics>,
+    columnId: string,
+    filterValue: any,
+    addMeta: (meta: TGenerics['FilterMeta']) => void
+  ): boolean
+
   resolveFilterValue?: TransformFilterValueFn<TGenerics>
   autoRemove?: ColumnFilterAutoRemoveTestFn<TGenerics>
 }
@@ -90,7 +96,8 @@ export type FiltersColumn<TGenerics extends TableGenerics> = {
 }
 
 export type FiltersRow<TGenerics extends TableGenerics> = {
-  columnFilterMap: Record<string, boolean>
+  columnFilters: Record<string, boolean>
+  columnFiltersMeta: Record<string, TGenerics['FilterMeta']>
   subRowsByFacetId: Record<string, Row<TGenerics>[]>
 }
 
@@ -343,7 +350,8 @@ export const Filters: TableFeature = {
     instance: TableInstance<TGenerics>
   ): FiltersRow<TGenerics> => {
     return {
-      columnFilterMap: {},
+      columnFilters: {},
+      columnFiltersMeta: {},
       subRowsByFacetId: {},
     }
   },

package/src/features/Grouping.ts

@@ -16,8 +16,8 @@ import { isFunction, makeStateUpdater, Overwrite } from '../utils'
 export type GroupingState = string[]
 
 export type AggregationFn<TGenerics extends TableGenerics> = (
-  getLeafValues: () => TGenerics['Row'][],
-  getChildValues: () => TGenerics['Row'][]
+  getLeafValues: () => TGenerics['Value'][],
+  getChildValues: () => TGenerics['Value'][]
 ) => any
 
 export type CustomAggregationFns<TGenerics extends TableGenerics> = Record<

package/src/features/Rows.ts

@@ -85,14 +85,18 @@ export const Rows = {
             if (row.valuesCache.hasOwnProperty(columnId)) {
               return row.valuesCache[columnId]
             }
+
             const column = instance.getColumn(columnId)
+
             if (!column.accessorFn) {
-              throw new Error()
+              return undefined
             }
+
             row.valuesCache[columnId] = column.accessorFn(
               row.original,
               rowIndex
             )
+
             return row.valuesCache[columnId]
           },
           subRows: subRows ?? [],

package/src/features/Sorting.ts

@@ -126,7 +126,7 @@ export const Sorting: TableFeature = {
   ): SortingColumn<TGenerics> => {
     return {
       getAutoSortingFn: () => {
-        const firstRows = instance.getFilteredRowModel().flatRows.slice(100)
+        const firstRows = instance.getFilteredRowModel().flatRows.slice(10)
 
         let isString = false
 

package/src/index.ts

@@ -14,6 +14,9 @@ export * from './features/RowSelection'
 export * from './features/Sorting'
 export * from './features/Visibility'
 export * from './features/Expanding'
+export * from './filterFns'
+export * from './sortingFns'
+export * from './aggregationFns'
 export * from './utils'
 export * from './utils/getCoreRowModel'
 export * from './utils/getFilteredRowModel'

package/src/types.ts

@@ -91,6 +91,7 @@ export type TableGenerics = {
   Rendered?: any
   ColumnMeta?: any
   TableMeta?: any
+  FilterMeta?: any
 }
 
 export type AnyRender = (Comp: any, props: any) => any

package/src/utils/filterRowsUtils.ts

@@ -32,7 +32,7 @@ export function filterRowModelFromLeafs<TGenerics extends TableGenerics>(
 
       if (row.subRows?.length) {
         newRow = instance.createRow(row.id, row.original, row.index, row.depth)
-        newRow.columnFilterMap = row.columnFilterMap
+        newRow.columnFilters = row.columnFilters
         newRow.subRows = recurseFilterRows(row.subRows, depth + 1)
         if (!newRow.subRows.length) {
           continue

package/src/utils/getFacetedRowModel.ts

@@ -30,7 +30,7 @@ export function getFacetedRowModel<TGenerics extends TableGenerics>(): (
         const filterRowsImpl = (row: Row<TGenerics>) => {
           // Horizontally filter rows through each column
           for (let i = 0; i < filterableIds.length; i++) {
-            if (row.columnFilterMap[filterableIds[i]!] === false) {
+            if (row.columnFilters[filterableIds[i]!] === false) {
               return false
             }
           }

package/src/utils/getFilteredRowModel.ts

@@ -18,6 +18,10 @@ export function getFilteredRowModel<TGenerics extends TableGenerics>(): (
           !rowModel.rows.length ||
           (!columnFilters?.length && !globalFilter)
         ) {
+          for (let i = 0; i < rowModel.flatRows.length; i++) {
+            rowModel.flatRows[i]!.columnFilters = {}
+            rowModel.flatRows[i]!.columnFiltersMeta = {}
+          }
           return rowModel
         }
 
@@ -86,40 +90,47 @@ export function getFilteredRowModel<TGenerics extends TableGenerics>(): (
         for (let j = 0; j < rowModel.flatRows.length; j++) {
           const row = rowModel.flatRows[j]!
 
-          row.columnFilterMap = {}
+          row.columnFilters = {}
 
           if (resolvedColumnFilters.length) {
             for (let i = 0; i < resolvedColumnFilters.length; i++) {
               currentColumnFilter = resolvedColumnFilters[i]!
+              const id = currentColumnFilter.id
 
               // Tag the row with the column filter state
-              row.columnFilterMap[currentColumnFilter.id] =
-                currentColumnFilter.filterFn(
-                  row,
-                  currentColumnFilter.id,
-                  currentColumnFilter.resolvedValue
-                )
+              row.columnFilters[id] = currentColumnFilter.filterFn(
+                row,
+                id,
+                currentColumnFilter.resolvedValue,
+                filterMeta => {
+                  row.columnFiltersMeta[id] = filterMeta
+                }
+              )
             }
           }
 
           if (resolvedGlobalFilters.length) {
             for (let i = 0; i < resolvedGlobalFilters.length; i++) {
               currentGlobalFilter = resolvedGlobalFilters[i]!
+              const id = currentGlobalFilter.id
               // Tag the row with the first truthy global filter state
               if (
                 currentGlobalFilter.filterFn(
                   row,
-                  currentGlobalFilter.id,
-                  currentGlobalFilter.resolvedValue
+                  id,
+                  currentGlobalFilter.resolvedValue,
+                  filterMeta => {
+                    row.columnFiltersMeta[id] = filterMeta
+                  }
                 )
               ) {
-                row.columnFilterMap.__global__ = true
+                row.columnFilters.__global__ = true
                 break
               }
             }
 
-            if (row.columnFilterMap.__global__ !== true) {
-              row.columnFilterMap.__global__ = false
+            if (row.columnFilters.__global__ !== true) {
+              row.columnFilters.__global__ = false
             }
           }
         }
@@ -127,7 +138,7 @@ export function getFilteredRowModel<TGenerics extends TableGenerics>(): (
         const filterRowsImpl = (row: Row<TGenerics>) => {
           // Horizontally filter rows through each column
           for (let i = 0; i < filterableIds.length; i++) {
-            if (row.columnFilterMap[filterableIds[i]!] === false) {
+            if (row.columnFilters[filterableIds[i]!] === false) {
               return false
             }
           }