@tanstack/table-core 8.0.0-alpha.22 → 8.0.0-alpha.25

package/src/filterTypes.ts

@@ -14,7 +14,7 @@ export const filterTypes = {
 
 export type BuiltInFilterType = keyof typeof filterTypes
 
-function includesString<TGenerics extends PartialGenerics>(
+function includesString<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -31,7 +31,7 @@ function includesString<TGenerics extends PartialGenerics>(
 
 includesString.autoRemove = (val: any) => testFalsey(val)
 
-function includesStringSensitive<TGenerics extends PartialGenerics>(
+function includesStringSensitive<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -48,7 +48,7 @@ function includesStringSensitive<TGenerics extends PartialGenerics>(
 
 includesStringSensitive.autoRemove = (val: any) => testFalsey(val)
 
-function equalsString<TGenerics extends PartialGenerics>(
+function equalsString<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -67,7 +67,7 @@ function equalsString<TGenerics extends PartialGenerics>(
 
 equalsString.autoRemove = (val: any) => testFalsey(val)
 
-function equalsStringSensitive<TGenerics extends PartialGenerics>(
+function equalsStringSensitive<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -83,7 +83,7 @@ function equalsStringSensitive<TGenerics extends PartialGenerics>(
 
 equalsStringSensitive.autoRemove = (val: any) => testFalsey(val)
 
-function arrIncludes<TGenerics extends PartialGenerics>(
+function arrIncludes<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -98,7 +98,7 @@ function arrIncludes<TGenerics extends PartialGenerics>(
 
 arrIncludes.autoRemove = (val: any) => testFalsey(val) || !val?.length
 
-function arrIncludesAll<TGenerics extends PartialGenerics>(
+function arrIncludesAll<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown[]
@@ -117,7 +117,7 @@ function arrIncludesAll<TGenerics extends PartialGenerics>(
 
 arrIncludesAll.autoRemove = (val: any) => testFalsey(val) || !val?.length
 
-function equals<TGenerics extends PartialGenerics>(
+function equals<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -132,7 +132,7 @@ function equals<TGenerics extends PartialGenerics>(
 
 equals.autoRemove = (val: any) => testFalsey(val)
 
-function weakEquals<TGenerics extends PartialGenerics>(
+function weakEquals<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: unknown
@@ -148,7 +148,7 @@ function weakEquals<TGenerics extends PartialGenerics>(
 
 weakEquals.autoRemove = (val: any) => testFalsey(val)
 
-function betweenNumberRange<TGenerics extends PartialGenerics>(
+function betweenNumberRange<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnIds: string[],
   filterValue: [unknown, unknown]

package/src/sortTypes.ts

@@ -13,7 +13,7 @@ export const sortTypes = {
 
 export type BuiltInSortType = keyof typeof sortTypes
 
-function alphanumeric<TGenerics extends PartialGenerics>(
+function alphanumeric<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string
@@ -24,7 +24,7 @@ function alphanumeric<TGenerics extends PartialGenerics>(
   )
 }
 
-function alphanumericCaseSensitive<TGenerics extends PartialGenerics>(
+function alphanumericCaseSensitive<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string
@@ -84,7 +84,7 @@ function compareAlphanumeric(aStr: string, bStr: string) {
 
 // The text filter is more basic (less numeric support)
 // but is much faster
-function text<TGenerics extends PartialGenerics>(
+function text<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string
@@ -97,7 +97,7 @@ function text<TGenerics extends PartialGenerics>(
 
 // The text filter is more basic (less numeric support)
 // but is much faster
-function textCaseSensitive<TGenerics extends PartialGenerics>(
+function textCaseSensitive<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string
@@ -108,7 +108,7 @@ function textCaseSensitive<TGenerics extends PartialGenerics>(
   )
 }
 
-function datetime<TGenerics extends PartialGenerics>(
+function datetime<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string
@@ -119,7 +119,7 @@ function datetime<TGenerics extends PartialGenerics>(
   )
 }
 
-function basic<TGenerics extends PartialGenerics>(
+function basic<TGenerics extends AnyGenerics>(
   rowA: Row<TGenerics>,
   rowB: Row<TGenerics>,
   columnId: string

package/src/types.ts

@@ -88,7 +88,7 @@ export type DefaultGenerics = {
 
 export type AnyRender = (Comp: any, props: any) => any
 
-export type UseRenderer<TGenerics extends PartialGenerics> =
+export type UseRenderer<TGenerics extends AnyGenerics> =
   TGenerics['Render'] extends (...args: any) => any ? TGenerics['Render'] : any
 
 export type PartialGenerics = Partial<DefaultGenerics>
@@ -97,7 +97,17 @@ export type AnyGenerics = {
   [TKey in keyof PartialGenerics]?: any
 }
 
-export type TableInstance<TGenerics extends PartialGenerics> =
+export type TableFeature = {
+  getDefaultOptions?: (instance: any) => any
+  getInitialState?: () => any
+  getInstance?: (instance: any) => any
+  getDefaultColumn?: () => any
+  createColumn?: (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 AnyGenerics> =
   TableCore<TGenerics> &
     VisibilityInstance<TGenerics> &
     ColumnOrderInstance<TGenerics> &
@@ -113,18 +123,17 @@ export type TableInstance<TGenerics extends PartialGenerics> =
 
 //
 
-export type Options<TGenerics extends PartialGenerics> =
-  CoreOptions<TGenerics> &
-    VisibilityOptions &
-    ColumnOrderOptions &
-    ColumnPinningOptions &
-    FiltersOptions<TGenerics> &
-    SortingOptions<TGenerics> &
-    GroupingOptions<TGenerics> &
-    ExpandedOptions<TGenerics> &
-    ColumnSizingOptions &
-    PaginationOptions<TGenerics> &
-    RowSelectionOptions<TGenerics>
+export type Options<TGenerics extends AnyGenerics> = CoreOptions<TGenerics> &
+  VisibilityOptions &
+  ColumnOrderOptions &
+  ColumnPinningOptions &
+  FiltersOptions<TGenerics> &
+  SortingOptions<TGenerics> &
+  GroupingOptions<TGenerics> &
+  ExpandedOptions<TGenerics> &
+  ColumnSizingOptions &
+  PaginationOptions<TGenerics> &
+  RowSelectionOptions<TGenerics>
 
 export type Updater<T> = T | ((old: T) => T)
 export type OnChangeFn<T> = (updaterOrValue: Updater<T>, value: T) => void
@@ -140,7 +149,7 @@ export type TableState = VisibilityTableState &
   PaginationTableState &
   RowSelectionTableState
 
-export type Row<TGenerics extends PartialGenerics> = CoreRow<TGenerics> &
+export type Row<TGenerics extends AnyGenerics> = CoreRow<TGenerics> &
   VisibilityRow<TGenerics> &
   HeadersRow<TGenerics> &
   GroupingRow &
@@ -151,7 +160,7 @@ export type RowValues = {
   [key: string]: any
 }
 
-export type RowModel<TGenerics extends PartialGenerics> = {
+export type RowModel<TGenerics extends AnyGenerics> = {
   rows: Row<TGenerics>[]
   flatRows: Row<TGenerics>[]
   rowsById: Record<string, Row<TGenerics>>
@@ -159,7 +168,7 @@ export type RowModel<TGenerics extends PartialGenerics> = {
 
 export type AccessorFn<TData> = (originalRow: TData, index: number) => any
 
-// export type UserColumnDef<TGenerics extends PartialGenerics> = Overwrite<
+// export type UserColumnDef<TGenerics extends AnyGenerics> = Overwrite<
 //   ColumnDef<TGenerics>,
 //   GeneratedProperties<false>
 // >
@@ -178,11 +187,11 @@ export type AccessorFn<TData> = (originalRow: TData, index: number) => any
 //     }
 // : never
 
-export type Renderable<TGenerics extends PartialGenerics, TProps> =
+export type Renderable<TGenerics extends AnyGenerics, TProps> =
   | string
   | ((props: TProps) => ReturnType<UseRenderer<TGenerics>>)
 
-export type ColumnDef<TGenerics extends PartialGenerics> =
+export type ColumnDef<TGenerics extends AnyGenerics> =
   CoreColumnDef<TGenerics> &
     VisibilityColumnDef &
     ColumnPinningColumnDef &
@@ -191,7 +200,7 @@ export type ColumnDef<TGenerics extends PartialGenerics> =
     GroupingColumnDef<TGenerics> &
     ColumnSizingColumnDef
 
-export type Column<TGenerics extends PartialGenerics> = ColumnDef<TGenerics> &
+export type Column<TGenerics extends AnyGenerics> = ColumnDef<TGenerics> &
   CoreColumn<TGenerics> &
   ColumnVisibilityColumn &
   ColumnPinningColumn &
@@ -200,10 +209,10 @@ export type Column<TGenerics extends PartialGenerics> = ColumnDef<TGenerics> &
   GroupingColumn<TGenerics> &
   ColumnSizingColumn<TGenerics>
 
-export type Cell<TGenerics extends PartialGenerics> = CoreCell<TGenerics> &
+export type Cell<TGenerics extends AnyGenerics> = CoreCell<TGenerics> &
   GroupingCell<TGenerics>
 
-export type CoreCell<TGenerics extends PartialGenerics> = {
+export type CoreCell<TGenerics extends AnyGenerics> = {
   id: string
   rowId: string
   columnId: string
@@ -214,10 +223,10 @@ export type CoreCell<TGenerics extends PartialGenerics> = {
   renderCell: () => string | null | ReturnType<UseRenderer<TGenerics>>
 }
 
-export type Header<TGenerics extends PartialGenerics> = CoreHeader<TGenerics> &
+export type Header<TGenerics extends AnyGenerics> = CoreHeader<TGenerics> &
   ColumnSizingHeader<TGenerics>
 
-export type CoreHeader<TGenerics extends PartialGenerics> = {
+export type CoreHeader<TGenerics extends AnyGenerics> = {
   id: string
   depth: number
   column: Column<TGenerics>
@@ -238,7 +247,7 @@ export type CoreHeader<TGenerics extends PartialGenerics> = {
   }) => string | null | ReturnType<UseRenderer<TGenerics>>
 }
 
-export type HeaderGroup<TGenerics extends PartialGenerics> = {
+export type HeaderGroup<TGenerics extends AnyGenerics> = {
   id: string
   depth: number
   headers: Header<TGenerics>[]

package/src/utils/columnFilterRowsFn.ts

@@ -1,24 +1,19 @@
+import { AnyGenerics, TableInstance, Row, RowModel } from '../types'
 import {
-  AnyGenerics,
-  TableInstance,
-  Row,
-  RowModel,
-  PartialGenerics,
-} from '../types'
+  filterRowModelFromLeafs,
+  filterRowModelFromRoot,
+} from './filterRowsUtils'
 
 export function columnFilterRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {
   const columnFilters = instance.getState().columnFilters
-
-  const newFilteredFlatRows: Row<TGenerics>[] = []
-  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
-
-  const filterFromChildrenUp = instance.options.filterFromChildrenUp
+  const filterFromLeafRows = instance.options.filterFromLeafRows
 
   const filterRows = (rowsToFilter: Row<TGenerics>[], depth: number) => {
-    columnFilters.forEach(({ id: columnId, value: filterValue }) => {
+    for (let i = 0; i < columnFilters.length; i++) {
+      const { id: columnId, value: filterValue } = columnFilters[i]
       // Find the columnFilters column
       const column = instance.getColumn(columnId)
 
@@ -42,76 +37,20 @@ export function columnFilterRowsFn<TGenerics extends AnyGenerics>(
             `Could not find a valid 'column.filterType' for column with the ID: ${column.id}.`
           )
         }
-        return
+        continue
       }
 
       // Pass the rows, id, filterValue and column to the filterFn
       // to get the filtered rows back
       rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue)
-    })
-
-    return rowsToFilter
-  }
-
-  if (filterFromChildrenUp) {
-    const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
-      // Filter from children up
-      rowsToFilter = rowsToFilter.filter(row => {
-        if (!row.subRows?.length) {
-          return true
-        }
-
-        row.subRows = recurseFilterRows(row.subRows, depth + 1)
-
-        return row.subRows.length
-      })
-
-      rowsToFilter = filterRows(rowsToFilter, depth)
-
-      // Apply the filter to any subRows
-      rowsToFilter.forEach(row => {
-        newFilteredFlatRows.push(row)
-        newFilteredRowsById[row.id] = row
-      })
-
-      return rowsToFilter
-    }
-
-    return {
-      rows: recurseFilterRows(rowModel.rows),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById,
     }
-  }
-
-  // Filters top level and nested rows
-  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
-    // Filter from parents downward
-    rowsToFilter = filterRows(rowsToFilter, depth)
-
-    // Apply the filter to any subRows
-    // We technically could do this recursively in the above loop,
-    // but that would severely hinder the API for the user, since they
-    // would be required to do that recursion in some scenarios
-    rowsToFilter.forEach(row => {
-      newFilteredFlatRows.push(row)
-      newFilteredRowsById[row.id] = row
-
-      if (!filterFromChildrenUp) {
-        if (!row.subRows?.length) {
-          return
-        }
-
-        row.subRows = recurseFilterRows(row.subRows, depth + 1)
-      }
-    })
 
     return rowsToFilter
   }
 
-  return {
-    rows: recurseFilterRows(rowModel.rows),
-    flatRows: newFilteredFlatRows,
-    rowsById: newFilteredRowsById,
+  if (filterFromLeafRows) {
+    return filterRowModelFromLeafs(rowModel.rows, filterRows, instance)
   }
+
+  return filterRowModelFromRoot(rowModel.rows, filterRows, instance)
 }

package/src/utils/filterRowsUtils.ts

@@ -0,0 +1,107 @@
+import { AnyGenerics, Row, RowModel, TableInstance } from '../types'
+
+export function filterRowModelFromLeafs<TGenerics extends AnyGenerics>(
+  rowsToFilter: Row<TGenerics>[],
+  filterRows: (
+    rowsToFilter: Row<TGenerics>[],
+    depth: number
+  ) => Row<TGenerics>[],
+  instance: TableInstance<TGenerics>
+): RowModel<TGenerics> {
+  const newFilteredFlatRows: Row<TGenerics>[] = []
+  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
+
+  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
+    rowsToFilter = rowsToFilter.slice()
+
+    // Filter from children up first
+    for (let i = 0; i < rowsToFilter.length; i++) {
+      const row = rowsToFilter[i]
+
+      if (!row.subRows?.length) {
+        continue
+      }
+
+      rowsToFilter[i] = instance.createRow(
+        row.id,
+        row.original,
+        row.index,
+        row.depth,
+        row.values
+      )
+
+      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1)
+
+      if (!rowsToFilter[i].subRows.length) {
+        rowsToFilter.splice(i, 1)
+        i--
+      }
+    }
+
+    rowsToFilter = filterRows(rowsToFilter, depth)
+
+    // Apply the filter to any subRows
+    rowsToFilter.forEach(row => {
+      newFilteredFlatRows.push(row)
+      newFilteredRowsById[row.id] = row
+    })
+
+    return rowsToFilter
+  }
+
+  return {
+    rows: recurseFilterRows(rowsToFilter),
+    flatRows: newFilteredFlatRows,
+    rowsById: newFilteredRowsById,
+  }
+}
+
+export function filterRowModelFromRoot<TGenerics extends AnyGenerics>(
+  rowsToFilter: Row<TGenerics>[],
+  filterRows: (
+    rowsToFilter: Row<TGenerics>[],
+    depth: number
+  ) => Row<TGenerics>[],
+  instance: TableInstance<TGenerics>
+): RowModel<TGenerics> {
+  const newFilteredFlatRows: Row<TGenerics>[] = []
+  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
+
+  // Filters top level and nested rows
+  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
+    // Filter from parents downward first
+    rowsToFilter = filterRows(rowsToFilter, depth)
+
+    // Apply the filter to any subRows
+    for (let i = 0; i < rowsToFilter.length; i++) {
+      const row = rowsToFilter[i]
+
+      newFilteredFlatRows.push(row)
+      newFilteredRowsById[row.id] = row
+
+      if (!row.subRows?.length) {
+        rowsToFilter.splice(i, 1)
+        i--
+        continue
+      }
+
+      rowsToFilter[i] = instance.createRow(
+        row.id,
+        row.original,
+        row.index,
+        row.depth,
+        row.values
+      )
+
+      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1)
+    }
+
+    return rowsToFilter
+  }
+
+  return {
+    rows: recurseFilterRows(rowsToFilter),
+    flatRows: newFilteredFlatRows,
+    rowsById: newFilteredRowsById,
+  }
+}

package/src/utils/globalFilterRowsFn.ts

@@ -1,20 +1,16 @@
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 import {
-  TableInstance,
-  Row,
-  RowModel,
-  AnyGenerics,
-  PartialGenerics,
-} from '../types'
+  filterRowModelFromLeafs,
+  filterRowModelFromRoot,
+} from './filterRowsUtils'
 
 export function globalFilterRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {
   const globalFilter = instance.getState().globalFilter
-  const newFilteredFlatRows: Row<TGenerics>[] = []
-  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}
 
-  const filterFromChildrenUp = instance.options.filterFromChildrenUp
+  const filterFromLeafRows = instance.options.filterFromLeafRows
 
   const filterFn = instance.getGlobalFilterFn()
 
@@ -31,65 +27,13 @@ export function globalFilterRowsFn<TGenerics extends AnyGenerics>(
 
   const filterableColumnIds = filterableColumns.map(d => d.id)
 
-  if (filterFromChildrenUp) {
-    const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
-      // Filter from children up
-      rowsToFilter = rowsToFilter.filter(row => {
-        if (!row.subRows?.length) {
-          return true
-        }
-
-        row.subRows = recurseFilterRows(row.subRows, depth + 1)
-
-        return row.subRows.length
-      })
-
-      rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter)
-
-      // Apply the filter to any subRows
-      rowsToFilter.forEach(row => {
-        newFilteredFlatRows.push(row)
-        newFilteredRowsById[row.id] = row
-      })
-
-      return rowsToFilter
-    }
-
-    return {
-      rows: recurseFilterRows(rowModel.rows),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById,
-    }
+  const filterRows = (rows: Row<TGenerics>[]) => {
+    return filterFn(rows, filterableColumnIds, globalFilter)
   }
 
-  // Filters top level and nested rows
-  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {
-    // Filter from parents downward
-    rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter)
-
-    // Apply the filter to any subRows
-    // We technically could do this recursively in the above loop,
-    // but that would severely hinder the API for the user, since they
-    // would be required to do that recursion in some scenarios
-    rowsToFilter.forEach(row => {
-      newFilteredFlatRows.push(row)
-      newFilteredRowsById[row.id] = row
-
-      if (!filterFromChildrenUp) {
-        if (!row.subRows?.length) {
-          return
-        }
-
-        row.subRows = recurseFilterRows(row.subRows, depth + 1)
-      }
-    })
-
-    return rowsToFilter
+  if (filterFromLeafRows) {
+    filterRowModelFromLeafs(rowModel.rows, filterRows, instance)
   }
 
-  return {
-    rows: recurseFilterRows(rowModel.rows),
-    flatRows: newFilteredFlatRows,
-    rowsById: newFilteredRowsById,
-  }
+  return filterRowModelFromRoot(rowModel.rows, filterRows, instance)
 }

package/src/utils/groupRowsFn.ts

@@ -39,21 +39,19 @@ export function groupRowsFn<TGenerics extends AnyGenerics>(
       const aggregateFn = instance.getColumnAggregationFn(column.id)
 
       if (aggregateFn) {
-        // Get the columnValues to aggregate
-        const groupedValues = groupedRows.map(row => row.values[column.id])
-
-        // Get the columnValues to aggregate
-        const leafValues = leafRows.map(row => {
-          let columnValue = row.values[column.id]
-
-          if (!depth && column.aggregateValue) {
-            columnValue = column.aggregateValue(columnValue)
-          }
-
-          return columnValue
-        })
-
-        values[column.id] = aggregateFn(leafValues, groupedValues)
+        values[column.id] = aggregateFn(
+          () =>
+            leafRows.map(row => {
+              let columnValue = row.values[column.id]
+
+              if (!depth && column.aggregateValue) {
+                columnValue = column.aggregateValue(columnValue)
+              }
+
+              return columnValue
+            }),
+          () => groupedRows.map(row => row.values[column.id])
+        )
       } else if (column.aggregationType) {
         console.info({ column })
         throw new Error(
@@ -103,7 +101,7 @@ export function groupRowsFn<TGenerics extends AnyGenerics>(
 
         // Flatten the leaf rows of the rows in this group
         const leafRows = depth
-          ? flattenBy(groupedRows, row => row.leafRows)
+          ? flattenBy(groupedRows, row => row.subRows)
           : groupedRows
 
         const values = aggregateRowsToValues(leafRows, groupedRows, depth)
@@ -157,7 +155,7 @@ export function groupRowsFn<TGenerics extends AnyGenerics>(
   }
 }
 
-function groupBy<TGenerics extends PartialGenerics>(
+function groupBy<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnId: string
 ) {

package/src/utils/sortRowsFn.ts

@@ -1,10 +1,4 @@
-import {
-  TableInstance,
-  Row,
-  RowModel,
-  AnyGenerics,
-  PartialGenerics,
-} from '../types'
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 import { SortingFn } from '../features/Sorting'
 
 export function sortRowsFn<TGenerics extends AnyGenerics>(
@@ -58,7 +52,11 @@ export function sortRowsFn<TGenerics extends AnyGenerics>(
           const bUndefined = typeof bValue === 'undefined'
 
           if (aUndefined || bUndefined) {
-            return aUndefined && bUndefined ? 0 : aUndefined ? 1 : -1
+            return aUndefined && bUndefined
+              ? 0
+              : aUndefined
+              ? columnInfo.sortUndefined
+              : -columnInfo.sortUndefined
           }
         }