progress on using static functions

TanStack · Aug 15, 2024 · c578c2b · c578c2b
1 parent 4316af3
commit c578c2b
Show file tree

Hide file tree

Showing 38 changed files with 762 additions and 433 deletions.
diff --git a/examples/react/column-pinning/src/main.tsx b/examples/react/column-pinning/src/main.tsx
@@ -15,6 +15,7 @@ import { makeData } from './makeData'
 import type {
   ColumnDef,
   ColumnOrderState,
+  ColumnPinningState,
   ColumnVisibilityState,
 } from '@tanstack/react-table'
 import type { Person } from './makeData'
@@ -80,7 +81,10 @@ function App() {
   const [columnVisibility, setColumnVisibility] =
     React.useState<ColumnVisibilityState>({})
   const [columnOrder, setColumnOrder] = React.useState<ColumnOrderState>([])
-  const [columnPinning, setColumnPinning] = React.useState({})
+  const [columnPinning, setColumnPinning] = React.useState<ColumnPinningState>({
+    left: [],
+    right: [],
+  })
 
   const [isSplit, setIsSplit] = React.useState(false)
   const rerender = () => setData(() => makeData(5000))

diff --git a/packages/solid-table/src/FlexRender.tsx b/packages/solid-table/src/FlexRender.tsx
@@ -15,7 +15,9 @@ export function flexRender<TProps>(
 }
 
 export function FlexRender<TProps>(
-  props: { Comp: ((_props: TProps) => JSX.Element) | JSX.Element | undefined } & TProps,
+  props: {
+    Comp: ((_props: TProps) => JSX.Element) | JSX.Element | undefined
+  } & TProps,
 ): JSX.Element {
   return flexRender(props.Comp, props)
-}
+}
diff --git a/packages/table-core/src/core/headers/buildHeaderGroups.ts b/packages/table-core/src/core/headers/buildHeaderGroups.ts
@@ -32,7 +32,7 @@ export function buildHeaderGroups<
     maxDepth = Math.max(maxDepth, depth)
 
     columns
-      .filter((column) => column.getIsVisible())
+      .filter((column) => column_getIsVisible(column, table))
       .forEach((column) => {
         if (column.columns.length) {
           findMaxDepth(column.columns, depth + 1)

diff --git a/packages/table-core/src/core/table/createCoreRowModel.ts b/packages/table-core/src/core/table/createCoreRowModel.ts
@@ -1,6 +1,7 @@
 import { _createRow } from '../rows/createRow'
 import { getMemoOptions, memo } from '../../utils'
 import { table_getRowId } from '../rows/Rows.utils'
+import { table_autoResetPageIndex } from '../../features/row-pagination/RowPagination.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../types/RowModel'
@@ -73,7 +74,7 @@ export function createCoreRowModel<
         return rowModel
       },
       getMemoOptions(table.options, 'debugTable', 'getRowModel', () =>
-        table._autoResetPageIndex(),
+        table_autoResetPageIndex(table),
       ),
     )
 }
diff --git a/packages/table-core/src/features/column-faceting/ColumnFaceting.utils.ts b/packages/table-core/src/features/column-faceting/ColumnFaceting.utils.ts
@@ -24,11 +24,11 @@ export function column_getFacetedRowModel<
   TData extends RowData,
   TValue extends CellData = CellData,
 >(
-  column: Column<TFeatures, TData, TValue>,
+  column: Column<TFeatures, TData, TValue> | undefined,
   table: Table<TFeatures, TData>,
 ): () => RowModel<TFeatures, TData> {
   return (
-    table.options._rowModels?.Faceted?.(table, column.id) ??
+    table.options._rowModels?.Faceted?.(table, column?.id ?? '') ??
     (() => table_getPreFilteredRowModel(table))
   )
 }

diff --git a/packages/table-core/src/features/column-faceting/createFacetedMinMaxValues.ts b/packages/table-core/src/features/column-faceting/createFacetedMinMaxValues.ts
@@ -1,5 +1,6 @@
 import { getMemoOptions, memo } from '../../utils'
 import { row_getUniqueValues } from '../../core/rows/Rows.utils'
+import { column_getFacetedRowModel } from './ColumnFaceting.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table } from '../../types/Table'
@@ -13,7 +14,7 @@ export function createFacetedMinMaxValues<
 ) => () => undefined | [number, number] {
   return (table, columnId) =>
     memo(
-      () => [table.getColumn(columnId)?.getFacetedRowModel()],
+      () => [column_getFacetedRowModel(table.getColumn(columnId), table)()],
       (facetedRowModel) => {
         if (!facetedRowModel) return undefined
 

diff --git a/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts b/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts
@@ -1,6 +1,10 @@
 import { getMemoOptions, memo } from '../../utils'
 import { filterRows } from '../column-filtering/filterRowsUtils'
 import { _table_getState } from '../../core/table/Tables.utils'
+import {
+  table_getFilteredRowModel,
+  table_getPreFilteredRowModel,
+} from '../column-filtering/ColumnFiltering.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../types/RowModel'
@@ -17,10 +21,10 @@ export function createFacetedRowModel<
   return (table, columnId) =>
     memo(
       () => [
-        table.getPreFilteredRowModel(),
+        table_getPreFilteredRowModel(table),
         _table_getState(table).columnFilters,
         _table_getState(table).globalFilter,
-        table.getFilteredRowModel(),
+        table_getFilteredRowModel(table),
       ],
       (preRowModel, columnFilters, globalFilter) => {
         if (

diff --git a/packages/table-core/src/features/column-faceting/createFacetedUniqueValues.ts b/packages/table-core/src/features/column-faceting/createFacetedUniqueValues.ts
@@ -1,5 +1,6 @@
 import { getMemoOptions, memo } from '../../utils'
 import { row_getUniqueValues } from '../../core/rows/Rows.utils'
+import { column_getFacetedRowModel } from './ColumnFaceting.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table } from '../../types/Table'
@@ -13,7 +14,7 @@ export function createFacetedUniqueValues<
 ) => () => Map<any, number> {
   return (table, columnId) =>
     memo(
-      () => [table.getColumn(columnId)?.getFacetedRowModel()],
+      () => [column_getFacetedRowModel(table.getColumn(columnId), table)()],
       (facetedRowModel) => {
         if (!facetedRowModel) return new Map()
 

diff --git a/packages/table-core/src/features/column-filtering/ColumnFiltering.utils.ts b/packages/table-core/src/features/column-filtering/ColumnFiltering.utils.ts
@@ -11,7 +11,12 @@ import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../types/RowModel'
 import type { Table } from '../../types/Table'
 import type { Column } from '../../types/Column'
-import type { ColumnFiltersState, FilterFn } from './ColumnFiltering.types'
+import type {
+  ColumnDef_ColumnFiltering,
+  ColumnFiltersState,
+  FilterFn,
+  TableOptions_ColumnFiltering,
+} from './ColumnFiltering.types'
 
 export function column_getAutoFilterFn<
   TFeatures extends TableFeatures,
@@ -49,11 +54,18 @@ export function column_getFilterFn<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
+>(
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+) {
   return isFunction(column.columnDef.filterFn)
     ? column.columnDef.filterFn
     : column.columnDef.filterFn === 'auto'
-      ? column.getAutoFilterFn()
+      ? column_getAutoFilterFn(column, table)
       : table.options.filterFns?.[column.columnDef.filterFn as string] ??
         filterFns[column.columnDef.filterFn as BuiltInFilterFn]
 }
@@ -62,7 +74,14 @@ export function column_getCanFilter<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
+>(
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+) {
   return (
     (column.columnDef.enableColumnFilter ?? true) &&
     (table.options.enableColumnFilters ?? true) &&
@@ -75,15 +94,29 @@ export function column_getIsFiltered<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
+>(
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+) {
   return column_getFilterIndex(column, table) > -1
 }
 
 export function column_getFilterValue<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
+>(
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+) {
   return _table_getState(table).columnFilters?.find((d) => d.id === column.id)
     ?.value
 }
@@ -93,8 +126,12 @@ export function column_getFilterIndex<
   TData extends RowData,
   TValue extends CellData = CellData,
 >(
-  column: Column<TFeatures, TData, TValue>,
-  table: Table<TFeatures, TData>,
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
 ): number {
   return (
     _table_getState(table).columnFilters?.findIndex(
@@ -108,12 +145,16 @@ export function column_setFilterValue<
   TData extends RowData,
   TValue extends CellData = CellData,
 >(
-  column: Column<TFeatures, TData, TValue>,
-  table: Table<TFeatures, TData>,
+  column: Column<TFeatures, TData, TValue> & {
+    columnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  },
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
   value: any,
 ) {
   table_setColumnFilters(table, (old) => {
-    const filterFn = column.getFilterFn()
+    const filterFn = column_getFilterFn(column, table)
     const previousFilter = old.find((d) => d.id === column.id)
 
     const newFilter = functionalUpdate(
@@ -147,17 +188,22 @@ export function column_setFilterValue<
 export function table_setColumnFilters<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(table: Table<TFeatures, TData>, updater: Updater<ColumnFiltersState>) {
+>(
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+  updater: Updater<ColumnFiltersState>,
+) {
   const leafColumns = table.getAllLeafColumns()
 
   const updateFn = (old: ColumnFiltersState) => {
     return functionalUpdate(updater, old).filter((filter) => {
       const column = leafColumns.find((d) => d.id === filter.id)
 
       if (column) {
-        const filterFn = column.getFilterFn()
+        const filterFn = column_getFilterFn(column, table)
 
-        if (shouldAutoRemoveFilter(filterFn, filter.value, column)) {
+        if (shouldAutoRemoveFilter(filterFn, filter.value, column as any)) {
           return false
         }
       }
@@ -172,7 +218,12 @@ export function table_setColumnFilters<
 export function table_resetColumnFilters<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(table: Table<TFeatures, TData>, defaultState?: boolean) {
+>(
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+  defaultState?: boolean,
+) {
   table_setColumnFilters(
     table,
     defaultState ? [] : table.initialState.columnFilters ?? [],
@@ -182,14 +233,22 @@ export function table_resetColumnFilters<
 export function table_getPreFilteredRowModel<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(table: Table<TFeatures, TData>) {
+>(
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+) {
   return table_getCoreRowModel(table)
 }
 
 export function table_getFilteredRowModel<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(table: Table<TFeatures, TData>): RowModel<TFeatures, TData> {
+>(
+  table: Table<TFeatures, TData> & {
+    options: TableOptions_ColumnFiltering<TFeatures, TData>
+  },
+): RowModel<TFeatures, TData> {
   if (!table._rowModels.Filtered) {
     table._rowModels.Filtered = table.options._rowModels?.Filtered?.(table)
   }