@tanstack/table-core 8.0.0-beta.0 → 8.0.0-beta.3

package/package.json

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

package/src/core/instance.ts

@@ -73,9 +73,7 @@ export type CoreOptions<TGenerics extends TableGenerics> = {
   autoResetAll?: boolean
   mergeOptions?: <T>(defaultOptions: T, options: Partial<T>) => T
   meta?: TGenerics['TableMeta']
-  getCoreRowModel: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getCoreRowModel: (instance: TableInstance<any>) => () => RowModel<any>
   getSubRows?: (
     originalRow: TGenerics['Row'],
     index: number
@@ -256,7 +254,7 @@ export function createTableInstance<TGenerics extends TableGenerics>(
         return {
           header: props => props.header.column.id,
           footer: props => props.header.column.id,
-          cell: props => props.getValue().toString?.() ?? null,
+          cell: props => props.getValue()?.toString?.() ?? null,
           ...instance._features.reduce((obj, feature) => {
             return Object.assign(obj, feature.getDefaultColumnDef?.())
           }, {}),

package/src/createTable.ts

@@ -47,9 +47,9 @@ export type Table<TGenerics extends TableGenerics> = {
     Overwrite<TGenerics, { FilterMeta: TFilterMeta }>
   >
   setOptions: <
-    TFilterFns extends Record<string, FilterFn<TGenerics>>,
-    TSortingFns extends Record<string, SortingFn<TGenerics>>,
-    TAggregationFns extends Record<string, AggregationFn<TGenerics>>
+    TFilterFns extends Record<string, FilterFn<any>>,
+    TSortingFns extends Record<string, SortingFn<any>>,
+    TAggregationFns extends Record<string, AggregationFn<any>>
   >(
     options: CreateTableOptions<
       any,

package/src/features/Expanding.ts

@@ -27,9 +27,7 @@ export type ExpandedOptions<TGenerics extends TableGenerics> = {
   onExpandedChange?: OnChangeFn<ExpandedState>
   autoResetExpanded?: boolean
   enableExpanding?: boolean
-  getExpandedRowModel?: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getExpandedRowModel?: (instance: TableInstance<any>) => () => RowModel<any>
   getIsRowExpanded?: (row: Row<TGenerics>) => boolean
   getRowCanExpand?: (row: Row<TGenerics>) => boolean
   paginateExpandedRows?: boolean

package/src/features/Filters.ts

@@ -75,7 +75,6 @@ export type FiltersColumnDef<TGenerics extends TableGenerics> = {
 }
 
 export type FiltersColumn<TGenerics extends TableGenerics> = {
-  filterFn: FilterFnOption<Overwrite<TGenerics, { Value: any }>>
   getAutoFilterFn: () => FilterFn<TGenerics> | undefined
   getFilterFn: () => FilterFn<TGenerics> | undefined
   setFilterValue: (updater: Updater<any>) => void
@@ -102,9 +101,7 @@ export type FiltersOptions<TGenerics extends TableGenerics> = {
   manualFiltering?: boolean
   filterFromLeafRows?: boolean
   filterFns?: TGenerics['FilterFns']
-  getFilteredRowModel?: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getFilteredRowModel?: (instance: TableInstance<any>) => () => RowModel<any>
 
   // Column
   onColumnFiltersChange?: OnChangeFn<ColumnFiltersState>
@@ -199,7 +196,6 @@ export const Filters: TableFeature = {
     instance: TableInstance<TGenerics>
   ): FiltersColumn<TGenerics> => {
     return {
-      filterFn: column.filterFn,
       getAutoFilterFn: () => {
         const firstRow = instance.getCoreRowModel().flatRows[0]
 
@@ -230,15 +226,15 @@ export const Filters: TableFeature = {
       getFilterFn: () => {
         const userFilterFns = instance.options.filterFns
 
-        return isFunction(column.filterFn)
-          ? column.filterFn
-          : column.filterFn === 'auto'
+        return isFunction(column.columnDef.filterFn)
+          ? column.columnDef.filterFn
+          : column.columnDef.filterFn === 'auto'
           ? column.getAutoFilterFn()
           : (userFilterFns as Record<string, any>)?.[
-              column.filterFn as string
+              column.columnDef.filterFn as string
             ] ??
             (filterFns[
-              column.filterFn as BuiltInFilterFn
+              column.columnDef.filterFn as BuiltInFilterFn
             ] as FilterFn<TGenerics>)
       },
       getCanFilter: () => {

package/src/features/Grouping.ts

@@ -52,7 +52,6 @@ export type GroupingColumnDef<TGenerics extends TableGenerics> = {
 }
 
 export type GroupingColumn<TGenerics extends TableGenerics> = {
-  aggregationFn?: AggregationFnOption<Overwrite<TGenerics, { Value: any }>>
   getCanGroup: () => boolean
   getIsGrouped: () => boolean
   getGroupedIndex: () => number
@@ -87,9 +86,7 @@ export type GroupingOptions<TGenerics extends TableGenerics> = {
   aggregationFns?: TGenerics['AggregationFns']
   onGroupingChange?: OnChangeFn<GroupingState>
   enableGrouping?: boolean
-  getGroupedRowModel?: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getGroupedRowModel?: (instance: TableInstance<any>) => () => RowModel<any>
   groupedColumnMode?: false | 'reorder' | 'remove'
 }
 
@@ -110,6 +107,7 @@ export const Grouping: TableFeature = {
     TGenerics extends TableGenerics
   >(): GroupingColumnDef<TGenerics> => {
     return {
+      aggregatedCell: props => props.getValue()?.toString?.() ?? null,
       aggregationFn: 'auto',
     }
   },
@@ -182,8 +180,6 @@ export const Grouping: TableFeature = {
         if (Object.prototype.toString.call(value) === '[object Date]') {
           return aggregationFns.extent
         }
-
-        return aggregationFns.count
       },
       getAggregationFn: () => {
         const userAggregationFns = instance.options.aggregationFns
@@ -192,15 +188,15 @@ export const Grouping: TableFeature = {
           throw new Error()
         }
 
-        return isFunction(column.aggregationFn)
-          ? column.aggregationFn
-          : column.aggregationFn === 'auto'
+        return isFunction(column.columnDef.aggregationFn)
+          ? column.columnDef.aggregationFn
+          : column.columnDef.aggregationFn === 'auto'
           ? column.getAutoAggregationFn()
           : (userAggregationFns as Record<string, any>)?.[
-              column.aggregationFn as string
+              column.columnDef.aggregationFn as string
             ] ??
             (aggregationFns[
-              column.aggregationFn as BuiltInAggregationFn
+              column.columnDef.aggregationFn as BuiltInAggregationFn
             ] as AggregationFn<TGenerics>)
       },
     }

package/src/features/Pagination.ts

@@ -26,9 +26,7 @@ export type PaginationOptions<TGenerics extends TableGenerics> = {
   manualPagination?: boolean
   onPaginationChange?: OnChangeFn<PaginationState>
   autoResetPageIndex?: boolean
-  getPaginationRowModel?: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getPaginationRowModel?: (instance: TableInstance<any>) => () => RowModel<any>
 }
 
 export type PaginationDefaultOptions = {

package/src/features/Sorting.ts

@@ -76,9 +76,7 @@ export type SortingOptions<TGenerics extends TableGenerics> = {
   enableMultiRemove?: boolean
   enableMultiSort?: boolean
   sortDescFirst?: boolean
-  getSortedRowModel?: (
-    instance: TableInstance<TGenerics>
-  ) => () => RowModel<TGenerics>
+  getSortedRowModel?: (instance: TableInstance<any>) => () => RowModel<any>
   maxMultiSortColCount?: number
   isMultiSortEvent?: (e: unknown) => boolean
 }

package/src/utils/getGroupedRowModel.ts

@@ -93,13 +93,6 @@ export function getGroupedRowModel<TGenerics extends TableGenerics>(): (
                     )
 
                     return row._groupingValuesCache[columnId]
-                  } else if (column.aggregationFn) {
-                    console.info({ column })
-                    throw new Error(
-                      process.env.NODE_ENV !== 'production'
-                        ? `Table: Invalid column.aggregateType option for column listed above`
-                        : ''
-                    )
                   }
                 },
               })