@tanstack/table-core 8.0.0-alpha.80 → 8.0.0-alpha.84

package/src/features/Grouping.ts

@@ -1,5 +1,6 @@
 import { RowModel } from '..'
 import { BuiltInAggregationFn, aggregationFns } from '../aggregationFns'
+import { TableFeature } from '../core/instance'
 import {
   Cell,
   Column,
@@ -9,15 +10,14 @@ import {
   Updater,
   Renderable,
   TableGenerics,
-  TableFeature,
 } from '../types'
 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<
@@ -108,7 +108,7 @@ export type GroupingInstance<TGenerics extends TableGenerics> = {
 //
 
 export const Grouping: TableFeature = {
-  getDefaultColumn: <
+  getDefaultColumnDef: <
     TGenerics extends TableGenerics
   >(): GroupingColumnDef<TGenerics> => {
     return {
@@ -150,7 +150,7 @@ export const Grouping: TableFeature = {
 
       getCanGroup: () => {
         return (
-          column.enableGrouping ??
+          column.columnDef.enableGrouping ??
           true ??
           instance.options.enableGrouping ??
           true ??
@@ -264,7 +264,8 @@ export const Grouping: TableFeature = {
         !cell.getIsPlaceholder() &&
         row.subRows?.length > 1,
       renderAggregatedCell: () => {
-        const template = column.aggregatedCell ?? column.cell
+        const template =
+          column.columnDef.aggregatedCell ?? column.columnDef.cell
 
         return template
           ? instance._render(template, {

package/src/features/Ordering.ts

@@ -6,10 +6,10 @@ import {
   Updater,
   Column,
   TableGenerics,
-  TableFeature,
 } from '../types'
 
 import { Grouping, orderColumns } from './Grouping'
+import { TableFeature } from '../core/instance'
 
 export type ColumnOrderTableState = {
   columnOrder: ColumnOrderState

package/src/features/Pagination.ts

@@ -1,10 +1,10 @@
+import { TableFeature } from '../core/instance'
 import {
   OnChangeFn,
   TableGenerics,
   TableInstance,
   RowModel,
   Updater,
-  TableFeature,
 } from '../types'
 import { functionalUpdate, makeStateUpdater, memo } from '../utils'
 

package/src/features/Pinning.ts

@@ -1,3 +1,4 @@
+import { TableFeature } from '../core/instance'
 import {
   OnChangeFn,
   Updater,
@@ -6,7 +7,6 @@ import {
   TableGenerics,
   Row,
   Cell,
-  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 
@@ -50,7 +50,7 @@ export type ColumnPinningRow<TGenerics extends TableGenerics> = {
 export type ColumnPinningInstance<TGenerics extends TableGenerics> = {
   setColumnPinning: (updater: Updater<ColumnPinningState>) => void
   resetColumnPinning: (defaultState?: boolean) => void
-  getIsSomeColumnsPinned: () => boolean
+  getIsSomeColumnsPinned: (position?: ColumnPinningPosition) => boolean
   getLeftLeafColumns: () => Column<TGenerics>[]
   getRightLeafColumns: () => Column<TGenerics>[]
   getCenterLeafColumns: () => Column<TGenerics>[]
@@ -123,7 +123,7 @@ export const Pinning: TableFeature = {
 
         return leafColumns.some(
           d =>
-            (d.enablePinning ?? true) &&
+            (d.columnDef.enablePinning ?? true) &&
             (instance.options.enablePinning ?? true)
         )
       },
@@ -164,7 +164,7 @@ export const Pinning: TableFeature = {
         (allCells, left, right) => {
           const leftAndRight: string[] = [...(left ?? []), ...(right ?? [])]
 
-          return allCells.filter(d => !leftAndRight.includes(d.columnId))
+          return allCells.filter(d => !leftAndRight.includes(d.column.id))
         },
         {
           key:
@@ -181,7 +181,9 @@ export const Pinning: TableFeature = {
         ],
         (allCells, left) => {
           const cells = (left ?? [])
-            .map(columnId => allCells.find(cell => cell.columnId === columnId)!)
+            .map(
+              columnId => allCells.find(cell => cell.column.id === columnId)!
+            )
             .filter(Boolean)
             .map(d => ({ ...d, position: 'left' } as Cell<TGenerics>))
 
@@ -200,7 +202,9 @@ export const Pinning: TableFeature = {
         ],
         (allCells, right) => {
           const cells = (right ?? [])
-            .map(columnId => allCells.find(cell => cell.columnId === columnId)!)
+            .map(
+              columnId => allCells.find(cell => cell.column.id === columnId)!
+            )
             .filter(Boolean)
             .map(d => ({ ...d, position: 'left' } as Cell<TGenerics>))
 
@@ -229,10 +233,15 @@ export const Pinning: TableFeature = {
             : instance.initialState?.columnPinning ?? getDefaultPinningState()
         ),
 
-      getIsSomeColumnsPinned: () => {
-        const { left, right } = instance.getState().columnPinning
+      getIsSomeColumnsPinned: position => {
+        const pinningState = instance.getState().columnPinning
 
-        return Boolean(left?.length || right?.length)
+        if (!position) {
+          return Boolean(
+            pinningState.left?.length || pinningState.right?.length
+          )
+        }
+        return Boolean(pinningState[position]?.length)
       },
 
       getLeftLeafColumns: memo(

package/src/features/RowSelection.ts

@@ -1,3 +1,4 @@
+import { TableFeature } from '../core/instance'
 import {
   OnChangeFn,
   TableGenerics,
@@ -5,7 +6,6 @@ import {
   Row,
   RowModel,
   Updater,
-  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 

package/src/features/Sorting.ts

@@ -1,4 +1,5 @@
 import { RowModel } from '..'
+import { TableFeature } from '../core/instance'
 import {
   BuiltInSortingFn,
   reSplitAlphaNumeric,
@@ -12,7 +13,6 @@ import {
   TableInstance,
   Row,
   Updater,
-  TableFeature,
 } from '../types'
 
 import { isFunction, makeStateUpdater, Overwrite } from '../utils'
@@ -101,7 +101,7 @@ export const Sorting: TableFeature = {
     }
   },
 
-  getDefaultColumn: <
+  getDefaultColumnDef: <
     TGenerics extends TableGenerics
   >(): SortingColumnDef<TGenerics> => {
     return {
@@ -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
 
@@ -170,15 +170,15 @@ export const Sorting: TableFeature = {
           throw new Error()
         }
 
-        return isFunction(column.sortingFn)
-          ? column.sortingFn
-          : column.sortingFn === 'auto'
+        return isFunction(column.columnDef.sortingFn)
+          ? column.columnDef.sortingFn
+          : column.columnDef.sortingFn === 'auto'
           ? column.getAutoSortingFn()
           : (userSortingFn as Record<string, any>)?.[
-              column.sortingFn as string
+              column.columnDef.sortingFn as string
             ] ??
             (sortingFns[
-              column.sortingFn as BuiltInSortingFn
+              column.columnDef.sortingFn as BuiltInSortingFn
             ] as SortingFn<TGenerics>)
       },
       toggleSorting: (desc, multi) => {
@@ -220,7 +220,7 @@ export const Sorting: TableFeature = {
           }
 
           const sortDescFirst =
-            column.sortDescFirst ??
+            column.columnDef.sortDescFirst ??
             instance.options.sortDescFirst ??
             column.getAutoSortDir() === 'desc'
 
@@ -280,7 +280,7 @@ export const Sorting: TableFeature = {
 
       getCanSort: () => {
         return (
-          (column.enableSorting ?? true) &&
+          (column.columnDef.enableSorting ?? true) &&
           (instance.options.enableSorting ?? true) &&
           !!column.accessorFn
         )
@@ -288,7 +288,7 @@ export const Sorting: TableFeature = {
 
       getCanMultiSort: () => {
         return (
-          column.enableMultiSort ??
+          column.columnDef.enableMultiSort ??
           instance.options.enableMultiSort ??
           !!column.accessorFn
         )

package/src/features/Visibility.ts

@@ -1,3 +1,4 @@
+import { TableFeature } from '../core/instance'
 import {
   Cell,
   Column,
@@ -6,7 +7,6 @@ import {
   TableInstance,
   Updater,
   Row,
-  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 
@@ -76,7 +76,7 @@ export const Visibility: TableFeature = {
     }
   },
 
-  getDefaultColumn: () => {
+  getDefaultColumnDef: () => {
     return {
       defaultIsVisible: true,
     }
@@ -101,7 +101,7 @@ export const Visibility: TableFeature = {
 
       getCanHide: () => {
         return (
-          (column.enableHiding ?? true) &&
+          (column.columnDef.enableHiding ?? true) &&
           (instance.options.enableHiding ?? true)
         )
       },

package/src/index.ts

@@ -1,12 +1,14 @@
-export * from './core'
+export * from './core/instance'
 export * from './types'
 export * from './createTable'
+export * from './core/column'
+export * from './core/headers'
+export * from './core/row'
 export * from './features/ColumnSizing'
 export * from './features/ColumnSizing'
 export * from './features/Expanding'
 export * from './features/Filters'
 export * from './features/Grouping'
-export * from './features/Headers'
 export * from './features/Ordering'
 export * from './features/Pagination'
 export * from './features/Pinning'
@@ -14,6 +16,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'
@@ -24,9 +29,3 @@ export * from './utils/getSortedRowModel'
 export * from './utils/getGroupedRowModel'
 export * from './utils/getExpandedRowModel'
 export * from './utils/getPaginationRowModel'
-// Experimental Async
-// export * from './utils/getCoreRowModelAsync'
-// export * from './utils/getFilteredRowModelAsync'
-// export * from './utils/getFacetedRowModelAsync'
-// export * from './utils/getFacetedUniqueValuesAsync'
-// export * from './utils/getFacetedMinMaxValuesAsync'

package/src/types.ts

@@ -1,5 +1,5 @@
-import { CoreOptions, CoreTableState, CoreInstance } from './core'
-import { ColumnsOptions, CoreColumn, CoreColumnDef } from './features/Columns'
+import { CoreOptions, CoreTableState, CoreInstance } from './core/instance'
+import { CoreColumn, CoreColumnDef } from './core/column'
 import {
   VisibilityInstance,
   VisibilityTableState,
@@ -18,11 +18,10 @@ import {
   ColumnPinningColumnDef,
   ColumnPinningInstance,
   ColumnPinningOptions,
-  ColumnPinningPosition,
   ColumnPinningRow,
   ColumnPinningTableState,
 } from './features/Pinning'
-import { HeadersInstance } from './features/Headers'
+import { CoreHeader, CoreHeaderGroup, HeadersInstance } from './core/headers'
 import {
   FiltersColumn,
   FiltersColumnDef,
@@ -53,7 +52,6 @@ import {
   ExpandedTableState,
   ExpandedRow,
 } from './features/Expanding'
-import { Overwrite } from './utils'
 import {
   ColumnSizingColumn,
   ColumnSizingColumnDef,
@@ -74,9 +72,9 @@ import {
   RowSelectionRow,
   RowSelectionTableState,
 } from './features/RowSelection'
-import { ColumnsInstance } from './features/Columns'
-import { CellsInstance, CellsRow } from './features/Cells'
-import { CoreRow, RowsInstance, RowsOptions } from './features/Rows'
+import { CoreRow } from './core/row'
+import { PartialKeys } from './utils'
+import { CoreCell } from './core/cell'
 
 export type Updater<T> = T | ((old: T) => T)
 export type OnChangeFn<T> = (updaterOrValue: Updater<T>) => void
@@ -91,30 +89,17 @@ export type TableGenerics = {
   Rendered?: any
   ColumnMeta?: any
   TableMeta?: any
+  FilterMeta?: any
 }
 
 export type AnyRender = (Comp: any, props: any) => any
 
-export type TableFeature = {
-  getDefaultOptions?: (instance: any) => any
-  getInitialState?: (initialState?: InitialTableState) => any
-  createInstance?: (instance: any) => any
-  getDefaultColumn?: () => any
-  createColumn?: (column: any, instance: any) => any
-  createHeader?: (column: any, instance: any) => any
-  createCell?: (cell: any, column: any, row: any, instance: any) => any
-  createRow?: (row: any, instance: any) => any
-}
-
 export type TableInstance<TGenerics extends TableGenerics> =
   CoreInstance<TGenerics> &
-    ColumnsInstance<TGenerics> &
-    RowsInstance<TGenerics> &
-    CellsInstance<TGenerics> &
+    HeadersInstance<TGenerics> &
     VisibilityInstance<TGenerics> &
     ColumnOrderInstance<TGenerics> &
     ColumnPinningInstance<TGenerics> &
-    HeadersInstance<TGenerics> &
     FiltersInstance<TGenerics> &
     SortingInstance<TGenerics> &
     GroupingInstance<TGenerics> &
@@ -123,10 +108,8 @@ export type TableInstance<TGenerics extends TableGenerics> =
     PaginationInstance<TGenerics> &
     RowSelectionInstance<TGenerics>
 
-export type TableOptions<TGenerics extends TableGenerics> =
+export type TableOptionsResolved<TGenerics extends TableGenerics> =
   CoreOptions<TGenerics> &
-    ColumnsOptions<TGenerics> &
-    RowsOptions<TGenerics> &
     VisibilityOptions &
     ColumnOrderOptions &
     ColumnPinningOptions &
@@ -138,6 +121,11 @@ export type TableOptions<TGenerics extends TableGenerics> =
     PaginationOptions<TGenerics> &
     RowSelectionOptions<TGenerics>
 
+export type TableOptions<TGenerics extends TableGenerics> = Omit<
+  PartialKeys<TableOptionsResolved<TGenerics>, 'state' | 'onStateChange'>,
+  'render'
+>
+
 export type TableState = CoreTableState &
   VisibilityTableState &
   ColumnOrderTableState &
@@ -165,7 +153,6 @@ export type InitialTableState = Partial<
 >
 
 export type Row<TGenerics extends TableGenerics> = CoreRow<TGenerics> &
-  CellsRow<TGenerics> &
   VisibilityRow<TGenerics> &
   ColumnPinningRow<TGenerics> &
   FiltersRow<TGenerics> &
@@ -198,8 +185,7 @@ export type ColumnDef<TGenerics extends TableGenerics> =
     GroupingColumnDef<TGenerics> &
     ColumnSizingColumnDef
 
-export type Column<TGenerics extends TableGenerics> = ColumnDef<TGenerics> &
-  CoreColumn<TGenerics> &
+export type Column<TGenerics extends TableGenerics> = CoreColumn<TGenerics> &
   ColumnVisibilityColumn &
   ColumnPinningColumn &
   FiltersColumn<TGenerics> &
@@ -210,43 +196,10 @@ export type Column<TGenerics extends TableGenerics> = ColumnDef<TGenerics> &
 export type Cell<TGenerics extends TableGenerics> = CoreCell<TGenerics> &
   GroupingCell<TGenerics>
 
-export type CoreCell<TGenerics extends TableGenerics> = {
-  id: string
-  rowId: string
-  columnId: string
-  getValue: () => TGenerics['Value']
-  row: Row<TGenerics>
-  column: Column<TGenerics>
-  renderCell: () => string | null | TGenerics['Rendered']
-}
-
 export type Header<TGenerics extends TableGenerics> = CoreHeader<TGenerics> &
   ColumnSizingHeader<TGenerics>
 
-export type CoreHeader<TGenerics extends TableGenerics> = {
-  id: string
-  index: number
-  depth: number
-  column: Column<TGenerics>
-  headerGroup: HeaderGroup<TGenerics>
-  subHeaders: Header<TGenerics>[]
-  colSpan?: number
-  rowSpan?: number
-  getLeafHeaders: () => Header<TGenerics>[]
-  isPlaceholder?: boolean
-  placeholderId?: string
-  renderHeader: (options?: {
-    renderPlaceholder?: boolean
-  }) => string | null | TGenerics['Rendered']
-  renderFooter: (options?: {
-    renderPlaceholder?: boolean
-  }) => string | null | TGenerics['Rendered']
-}
-
-export type HeaderGroup<TGenerics extends TableGenerics> = {
-  id: string
-  depth: number
-  headers: Header<TGenerics>[]
-}
+export type HeaderGroup<TGenerics extends TableGenerics> =
+  CoreHeaderGroup<TGenerics>
 
 export type NoInfer<A extends any> = [A][A extends any ? 0 : never]

package/src/utils/filterRowsUtils.ts

@@ -1,3 +1,4 @@
+import { createRow } from '../core/row'
 import { TableGenerics, Row, RowModel, TableInstance } from '../types'
 
 export function filterRows<TGenerics extends TableGenerics>(
@@ -31,8 +32,8 @@ export function filterRowModelFromLeafs<TGenerics extends TableGenerics>(
       row = rowsToFilter[i]!
 
       if (row.subRows?.length) {
-        newRow = instance.createRow(row.id, row.original, row.index, row.depth)
-        newRow.columnFilterMap = row.columnFilterMap
+        newRow = createRow(instance, row.id, row.original, row.index, row.depth)
+        newRow.columnFilters = row.columnFilters
         newRow.subRows = recurseFilterRows(row.subRows, depth + 1)
         if (!newRow.subRows.length) {
           continue
@@ -83,7 +84,8 @@ export function filterRowModelFromRoot<TGenerics extends TableGenerics>(
 
       if (pass) {
         if (row.subRows?.length) {
-          newRow = instance.createRow(
+          newRow = createRow(
+            instance,
             row.id,
             row.original,
             row.index,

package/src/utils/getCoreRowModel.ts

@@ -1,3 +1,4 @@
+import { createRow } from '../core/row'
 import { TableInstance, Row, RowModel, TableGenerics } from '../types'
 import { memo } from '../utils'
 
@@ -42,8 +43,9 @@ export function getCoreRowModel<TGenerics extends TableGenerics>(): (
             // }
 
             // Make the row
-            row = instance.createRow(
-              instance.getRowId(originalRow, i, parent),
+            row = createRow(
+              instance,
+              instance._getRowId(originalRow, i, parent),
               originalRow,
               i,
               depth

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

package/src/utils/getGroupedRowModel.ts

@@ -1,4 +1,4 @@
-import { CoreRow } from '../features/Rows'
+import { createRow } from '../core/row'
 import { TableInstance, Row, RowModel, TableGenerics } from '../types'
 import { flattenBy, memo } from '../utils'
 
@@ -55,7 +55,7 @@ export function getGroupedRowModel<TGenerics extends TableGenerics>(): (
                 ? flattenBy(groupedRows, row => row.subRows)
                 : groupedRows
 
-              const row = instance.createRow(id, undefined, index, depth)
+              const row = createRow(instance, id, undefined, index, depth)
 
               Object.assign(row, {
                 groupingColumnId: columnId,
@@ -65,16 +65,16 @@ export function getGroupedRowModel<TGenerics extends TableGenerics>(): (
                 getValue: (columnId: string) => {
                   // Don't aggregate columns that are in the grouping
                   if (existingGrouping.includes(columnId)) {
-                    if (row.valuesCache.hasOwnProperty(columnId)) {
-                      return row.valuesCache[columnId]
+                    if (row._valuesCache.hasOwnProperty(columnId)) {
+                      return row._valuesCache[columnId]
                     }
 
                     if (groupedRows[0]) {
-                      row.valuesCache[columnId] =
+                      row._valuesCache[columnId] =
                         groupedRows[0].getValue(columnId) ?? undefined
                     }
 
-                    return row.valuesCache[columnId]
+                    return row._valuesCache[columnId]
                   }
 
                   if (row.groupingValuesCache.hasOwnProperty(columnId)) {
@@ -91,8 +91,9 @@ export function getGroupedRowModel<TGenerics extends TableGenerics>(): (
                         leafRows.map(row => {
                           let columnValue = row.getValue(columnId)
 
-                          if (!depth && column.aggregateValue) {
-                            columnValue = column.aggregateValue(columnValue)
+                          if (!depth && column.columnDef.aggregateValue) {
+                            columnValue =
+                              column.columnDef.aggregateValue(columnValue)
                           }
 
                           return columnValue

package/src/utils/getSortedRowModel.ts

@@ -35,8 +35,8 @@ export function getSortedRowModel<TGenerics extends TableGenerics>(): (
           const column = instance.getColumn(sortEntry.id)
 
           columnInfoById[sortEntry.id] = {
-            sortUndefined: column.sortUndefined,
-            invertSorting: column.invertSorting,
+            sortUndefined: column.columnDef.sortUndefined,
+            invertSorting: column.columnDef.invertSorting,
             sortingFn: column.getSortingFn(),
           }
         })