@tanstack/table-core 8.0.0-alpha.48 → 8.0.0-alpha.49

package/package.json

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

package/src/features/Filters.ts

@@ -17,12 +17,23 @@ import {
   Overwrite,
 } from '../utils'
 
+export type FiltersTableState = {
+  columnFilters: ColumnFiltersState
+  globalFilter: any
+  columnFiltersProgress: number
+  globalFilterProgress: number
+}
+
+export type ColumnFiltersState = ColumnFilter[]
+
 export type ColumnFilter = {
   id: string
   value: unknown
 }
 
-export type ColumnFiltersState = ColumnFilter[]
+/*
+A filter function is any function that takes an array of rows and returns an array of rows. Because filter functions can be used for both column and global filters, they are passed an array of columnIds to filter on. 
+*/
 
 export type FilterFn<TGenerics extends AnyGenerics> = {
   (rows: Row<TGenerics>[], columnIds: string[], filterValue: any): any
@@ -39,13 +50,6 @@ export type CustomFilterFns<TGenerics extends AnyGenerics> = Record<
   FilterFn<TGenerics>
 >
 
-export type FiltersTableState = {
-  columnFilters: ColumnFiltersState
-  globalFilter: any
-  columnFiltersProgress: number
-  globalFilterProgress: number
-}
-
 export type FilterFnOption<TGenerics extends AnyGenerics> =
   | 'auto'
   | BuiltInFilterFn
@@ -373,8 +377,8 @@ export const Filters = {
           column.enableColumnFilter ??
           instance.options.enableFilters ??
           instance.options.enableColumnFilters ??
-          column.defaultCanFilter ??
           column.defaultCanColumnFilter ??
+          column.defaultCanFilter ??
           !!column.accessorFn
         )
       },
@@ -391,8 +395,8 @@ export const Filters = {
             instance.options.enableGlobalFilter ??
             column.enableAllFilters ??
             column.enableGlobalFilter ??
-            column.defaultCanFilter ??
             column.defaultCanGlobalFilter ??
+            column.defaultCanFilter ??
             !!column.accessorFn) &&
             instance.options.getColumnCanGlobalFilterFn?.(column)) ??
           true