@tanstack/table-core 8.0.0-alpha.52 → 8.0.0-alpha.55

package/package.json

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

package/src/core.ts

@@ -31,7 +31,7 @@ import {
   UseRenderer,
   RowModel,
   TableFeature,
-  AnyGenerics,
+  TableGenerics,
 } from './types'
 
 import { ColumnSizing } from './features/ColumnSizing'
@@ -65,7 +65,7 @@ export type CoreTableState = {
   coreProgress: number
 }
 
-export type CoreOptions<TGenerics extends AnyGenerics> = {
+export type CoreOptions<TGenerics extends TableGenerics> = {
   data: TGenerics['Row'][]
   columns: ColumnDef<TGenerics>[]
   state: Partial<TableState>
@@ -98,7 +98,7 @@ export type CoreOptions<TGenerics extends AnyGenerics> = {
   meta?: TGenerics['TableMeta']
 }
 
-export type TableCore<TGenerics extends AnyGenerics> = {
+export type TableCore<TGenerics extends TableGenerics> = {
   initialState: TableState
   reset: () => void
   options: RequiredKeys<Options<TGenerics>, 'state'>
@@ -164,7 +164,7 @@ export type TableCore<TGenerics extends AnyGenerics> = {
   getOverallProgress: () => number
 }
 
-export type CoreRow<TGenerics extends AnyGenerics> = {
+export type CoreRow<TGenerics extends TableGenerics> = {
   id: string
   index: number
   original?: TGenerics['Row']
@@ -178,7 +178,7 @@ export type CoreRow<TGenerics extends AnyGenerics> = {
   getAllCellsByColumnId: () => Record<string, Cell<TGenerics>>
 }
 
-export type CoreColumnDef<TGenerics extends AnyGenerics> = {
+export type CoreColumnDef<TGenerics extends TableGenerics> = {
   id: string
   accessorKey?: string & keyof TGenerics['Row']
   accessorFn?: AccessorFn<TGenerics['Row']>
@@ -215,7 +215,7 @@ export type CoreColumnDef<TGenerics extends AnyGenerics> = {
 
 export type CoreColumnDefType = 'data' | 'display' | 'group'
 
-export type CoreColumn<TGenerics extends AnyGenerics> = {
+export type CoreColumn<TGenerics extends TableGenerics> = {
   id: string
   depth: number
   accessorFn?: AccessorFn<TGenerics['Row']>
@@ -228,7 +228,7 @@ export type CoreColumn<TGenerics extends AnyGenerics> = {
   getLeafColumns: () => Column<TGenerics>[]
 }
 
-export function createTableInstance<TGenerics extends AnyGenerics>(
+export function createTableInstance<TGenerics extends TableGenerics>(
   options: Options<TGenerics>
 ): TableInstance<TGenerics> {
   if (options.debugAll || options.debugTable) {
@@ -405,7 +405,7 @@ export function createTableInstance<TGenerics extends AnyGenerics>(
           }
         ),
         getLeafColumns: memo(
-          () => [instance.getOrderColumnsFn()],
+          () => [instance._getOrderColumnsFn()],
           orderColumns => {
             if (column.columns?.length) {
               let leafColumns = column.columns.flatMap(column =>
@@ -488,7 +488,7 @@ export function createTableInstance<TGenerics extends AnyGenerics>(
     ),
 
     getAllLeafColumns: memo(
-      () => [instance.getAllColumns(), instance.getOrderColumnsFn()],
+      () => [instance.getAllColumns(), instance._getOrderColumnsFn()],
       (allColumns, orderColumns) => {
         let leafColumns = allColumns.flatMap(column => column.getLeafColumns())
         return orderColumns(leafColumns)

package/src/createTable.ts

@@ -1,17 +1,24 @@
 import { CustomFilterFns, FilterFn } from './features/Filters'
 import { AggregationFn, CustomAggregationFns } from './features/Grouping'
 import { CustomSortingFns, SortingFn } from './features/Sorting'
-import { ColumnDef, AccessorFn, AnyRender, AnyGenerics, Options } from './types'
+import {
+  ColumnDef,
+  AccessorFn,
+  AnyRender,
+  TableGenerics,
+  Options,
+} from './types'
 import { IfDefined, Overwrite, PartialKeys } from './utils'
 
-export type TableFactory<TGenerics extends AnyGenerics> = () => Table<TGenerics>
+export type TableFactory<TGenerics extends TableGenerics> =
+  () => Table<TGenerics>
 
 export type CreateTableOptions<
   TRender extends AnyRender,
   TFilterFns extends CustomFilterFns<any>,
   TSortingFns extends CustomSortingFns<any>,
   TAggregationFns extends CustomAggregationFns<any>,
-  TGenerics extends AnyGenerics
+  TGenerics extends TableGenerics
 > = Partial<
   {
     render?: TRender
@@ -21,7 +28,7 @@ export type CreateTableOptions<
   } & Omit<Options<TGenerics>, 'filterFns' | 'sortingFns' | 'aggregationFns'>
 >
 
-export type Table<TGenerics extends AnyGenerics> = {
+export type Table<TGenerics extends TableGenerics> = {
   generics: TGenerics
   options: Partial<Options<TGenerics>>
   setRowType: <TRow>() => Table<Overwrite<TGenerics, { Row: TRow }>>
@@ -125,7 +132,7 @@ export function createTableFactory<TRender extends AnyRender>(opts: {
 
 // A lot of returns in here are `as any` for a reason. Unless you
 // can find a better way to do this, then don't worry about them
-function createTable<TGenerics extends AnyGenerics>(
+function createTable<TGenerics extends TableGenerics>(
   _?: undefined,
   __?: undefined,
   options?: CreateTableOptions<any, any, any, any, TGenerics>

package/src/features/ColumnSizing.ts

@@ -3,16 +3,20 @@ import {
   Getter,
   Header,
   OnChangeFn,
-  AnyGenerics,
-  PartialGenerics,
+  TableGenerics,
   PropGetterValue,
   TableInstance,
   Updater,
 } from '../types'
-import { functionalUpdate, makeStateUpdater, memo, propGetter } from '../utils'
+import { makeStateUpdater, propGetter } from '../utils'
 
 //
 
+export type ColumnSizingTableState = {
+  columnSizing: ColumnSizing
+  columnSizingInfo: ColumnSizingInfoState
+}
+
 export type ColumnSizing = Record<string, number>
 
 export type ColumnSizingInfoState = {
@@ -24,11 +28,6 @@ export type ColumnSizingInfoState = {
   columnSizingStart: [string, number][]
 }
 
-export type ColumnSizingTableState = {
-  columnSizing: ColumnSizing
-  columnSizingInfo: ColumnSizingInfoState
-}
-
 export type ColumnResizeMode = 'onChange' | 'onEnd'
 
 export type ColumnSizingOptions = {
@@ -52,7 +51,7 @@ export type ColumnResizerProps = {
   role?: string
 }
 
-export type ColumnSizingInstance<TGenerics extends AnyGenerics> = {
+export type ColumnSizingInstance<TGenerics extends TableGenerics> = {
   getColumnWidth: (columnId: string) => number
   setColumnSizing: (updater: Updater<ColumnSizing>) => void
   setColumnSizingInfo: (updater: Updater<ColumnSizingInfoState>) => void
@@ -78,13 +77,13 @@ export type ColumnSizingColumnDef = {
   maxWidth?: number
 }
 
-export type ColumnSizingColumn<TGenerics extends AnyGenerics> = {
+export type ColumnSizingColumn<TGenerics extends TableGenerics> = {
   getCanResize: () => boolean
   getIsResizing: () => boolean
   resetSize: () => void
 }
 
-export type ColumnSizingHeader<TGenerics extends AnyGenerics> = {
+export type ColumnSizingHeader<TGenerics extends TableGenerics> = {
   getCanResize: () => boolean
   getIsResizing: () => boolean
   getResizerProps: <TGetter extends Getter<ColumnResizerProps>>(
@@ -119,7 +118,7 @@ export const ColumnSizing = {
     }
   },
 
-  getDefaultOptions: <TGenerics extends AnyGenerics>(
+  getDefaultOptions: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ColumnSizingDefaultOptions => {
     return {
@@ -129,7 +128,7 @@ export const ColumnSizing = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ColumnSizingInstance<TGenerics> => {
     return {
@@ -391,7 +390,7 @@ export const ColumnSizing = {
     }
   },
 
-  createColumn: <TGenerics extends AnyGenerics>(
+  createColumn: <TGenerics extends TableGenerics>(
     column: Column<TGenerics>,
     instance: TableInstance<TGenerics>
   ): ColumnSizingColumn<TGenerics> => {
@@ -402,7 +401,7 @@ export const ColumnSizing = {
     }
   },
 
-  createHeader: <TGenerics extends AnyGenerics>(
+  createHeader: <TGenerics extends TableGenerics>(
     header: Header<TGenerics>,
     instance: TableInstance<TGenerics>
   ): ColumnSizingHeader<TGenerics> => {

package/src/features/Expanding.ts

@@ -2,8 +2,7 @@ import { RowModel } from '..'
 import {
   Getter,
   OnChangeFn,
-  AnyGenerics,
-  PartialGenerics,
+  TableGenerics,
   PropGetterValue,
   TableInstance,
   Row,
@@ -26,7 +25,7 @@ export type ExpandedRow = {
   ) => undefined | PropGetterValue<ToggleExpandedProps, TGetter>
 }
 
-export type ExpandedOptions<TGenerics extends AnyGenerics> = {
+export type ExpandedOptions<TGenerics extends TableGenerics> = {
   onExpandedChange?: OnChangeFn<ExpandedState>
   autoResetExpanded?: boolean
   enableExpanded?: boolean
@@ -45,7 +44,7 @@ export type ToggleExpandedProps = {
   onClick?: (event: unknown) => void
 }
 
-export type ExpandedInstance<TGenerics extends AnyGenerics> = {
+export type ExpandedInstance<TGenerics extends TableGenerics> = {
   queueResetExpanded: () => void
   setExpanded: (updater: Updater<ExpandedState>) => void
   toggleRowExpanded: (rowId: string, expanded?: boolean) => void
@@ -78,7 +77,7 @@ export const Expanding = {
     }
   },
 
-  getDefaultOptions: <TGenerics extends AnyGenerics>(
+  getDefaultOptions: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ExpandedOptions<TGenerics> => {
     return {
@@ -89,7 +88,7 @@ export const Expanding = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ExpandedInstance<TGenerics> => {
     let registered = false
@@ -291,7 +290,7 @@ export const Expanding = {
     }
   },
 
-  createRow: <TGenerics extends AnyGenerics>(
+  createRow: <TGenerics extends TableGenerics>(
     row: Row<TGenerics>,
     instance: TableInstance<TGenerics>
   ): ExpandedRow => {

package/src/features/Filters.ts

@@ -3,8 +3,7 @@ import { BuiltInFilterFn, filterFns } from '../filterFns'
 import {
   Column,
   OnChangeFn,
-  AnyGenerics,
-  PartialGenerics,
+  TableGenerics,
   TableInstance,
   Row,
   Updater,
@@ -35,28 +34,28 @@ export type 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> = {
+export type FilterFn<TGenerics extends TableGenerics> = {
   (rows: Row<TGenerics>[], columnIds: string[], filterValue: any): any
   autoRemove?: ColumnFilterAutoRemoveTestFn<TGenerics>
 }
 
-export type ColumnFilterAutoRemoveTestFn<TGenerics extends AnyGenerics> = (
+export type ColumnFilterAutoRemoveTestFn<TGenerics extends TableGenerics> = (
   value: unknown,
   column?: Column<TGenerics>
 ) => boolean
 
-export type CustomFilterFns<TGenerics extends AnyGenerics> = Record<
+export type CustomFilterFns<TGenerics extends TableGenerics> = Record<
   string,
   FilterFn<TGenerics>
 >
 
-export type FilterFnOption<TGenerics extends AnyGenerics> =
+export type FilterFnOption<TGenerics extends TableGenerics> =
   | 'auto'
   | BuiltInFilterFn
   | keyof TGenerics['FilterFns']
   | FilterFn<TGenerics>
 
-export type FiltersColumnDef<TGenerics extends AnyGenerics> = {
+export type FiltersColumnDef<TGenerics extends TableGenerics> = {
   filterFn?: FilterFnOption<Overwrite<TGenerics, { Value: any }>>
   enableAllFilters?: boolean
   enableColumnFilter?: boolean
@@ -66,7 +65,7 @@ export type FiltersColumnDef<TGenerics extends AnyGenerics> = {
   defaultCanGlobalFilter?: boolean
 }
 
-export type FiltersColumn<TGenerics extends AnyGenerics> = {
+export type FiltersColumn<TGenerics extends TableGenerics> = {
   filterFn: FilterFnOption<Overwrite<TGenerics, { Value: any }>>
   getCanColumnFilter: () => boolean
   getCanGlobalFilter: () => boolean
@@ -79,7 +78,7 @@ export type FiltersColumn<TGenerics extends AnyGenerics> = {
   getPreFilteredMinMaxValues: () => [any, any]
 }
 
-export type FiltersOptions<TGenerics extends AnyGenerics> = {
+export type FiltersOptions<TGenerics extends TableGenerics> = {
   filterFromLeafRows?: boolean
   filterFns?: TGenerics['FilterFns']
   enableFilters?: boolean
@@ -101,7 +100,7 @@ export type FiltersOptions<TGenerics extends AnyGenerics> = {
   getColumnCanGlobalFilterFn?: (column: Column<TGenerics>) => boolean
 }
 
-export type FiltersInstance<TGenerics extends AnyGenerics> = {
+export type FiltersInstance<TGenerics extends TableGenerics> = {
   queueResetFilters: () => void
   getColumnAutoFilterFn: (columnId: string) => FilterFn<TGenerics> | undefined
 
@@ -136,7 +135,7 @@ export type FiltersInstance<TGenerics extends AnyGenerics> = {
 
 export const Filters = {
   getDefaultColumn: <
-    TGenerics extends AnyGenerics
+    TGenerics extends TableGenerics
   >(): FiltersColumnDef<TGenerics> => {
     return {
       filterFn: 'auto',
@@ -152,7 +151,7 @@ export const Filters = {
     }
   },
 
-  getDefaultOptions: <TGenerics extends AnyGenerics>(
+  getDefaultOptions: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): FiltersOptions<TGenerics> => {
     return {
@@ -172,7 +171,7 @@ export const Filters = {
     }
   },
 
-  createColumn: <TGenerics extends AnyGenerics>(
+  createColumn: <TGenerics extends TableGenerics>(
     column: Column<TGenerics>,
     instance: TableInstance<TGenerics>
   ): FiltersColumn<TGenerics> => {
@@ -231,7 +230,7 @@ export const Filters = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): FiltersInstance<TGenerics> => {
     let registered = false
@@ -498,7 +497,7 @@ export const Filters = {
   },
 }
 
-export function shouldAutoRemoveFilter<TGenerics extends AnyGenerics>(
+export function shouldAutoRemoveFilter<TGenerics extends TableGenerics>(
   filterFn?: FilterFn<TGenerics>,
   value?: any,
   column?: Column<TGenerics>

package/src/features/Grouping.ts

@@ -9,10 +9,9 @@ import {
   TableInstance,
   Row,
   Updater,
-  PartialGenerics,
   Renderable,
   UseRenderer,
-  AnyGenerics,
+  TableGenerics,
 } from '../types'
 import {
   functionalUpdate,
@@ -25,17 +24,17 @@ import {
 
 export type GroupingState = string[]
 
-export type AggregationFn<TGenerics extends AnyGenerics> = (
+export type AggregationFn<TGenerics extends TableGenerics> = (
   getLeafValues: () => TGenerics['Row'][],
   getChildValues: () => TGenerics['Row'][]
 ) => any
 
-export type CustomAggregationFns<TGenerics extends AnyGenerics> = Record<
+export type CustomAggregationFns<TGenerics extends TableGenerics> = Record<
   string,
   AggregationFn<TGenerics>
 >
 
-export type AggregationFnOption<TGenerics extends AnyGenerics> =
+export type AggregationFnOption<TGenerics extends TableGenerics> =
   | 'auto'
   | BuiltInAggregationFn
   | keyof TGenerics['AggregationFns']
@@ -45,7 +44,7 @@ export type GroupingTableState = {
   grouping: GroupingState
 }
 
-export type GroupingColumnDef<TGenerics extends AnyGenerics> = {
+export type GroupingColumnDef<TGenerics extends TableGenerics> = {
   aggregationFn?: AggregationFnOption<Overwrite<TGenerics, { Value: any }>>
   aggregateValue?: (columnValue: unknown) => any
   aggregatedCell?: Renderable<
@@ -62,7 +61,7 @@ export type GroupingColumnDef<TGenerics extends AnyGenerics> = {
   defaultCanGroup?: boolean
 }
 
-export type GroupingColumn<TGenerics extends AnyGenerics> = {
+export type GroupingColumn<TGenerics extends TableGenerics> = {
   aggregationFn?: AggregationFnOption<Overwrite<TGenerics, { Value: any }>>
   getCanGroup: () => boolean
   getIsGrouped: () => boolean
@@ -79,7 +78,7 @@ export type GroupingRow = {
   getIsGrouped: () => boolean
 }
 
-export type GroupingCell<TGenerics extends AnyGenerics> = {
+export type GroupingCell<TGenerics extends TableGenerics> = {
   getIsGrouped: () => boolean
   getIsPlaceholder: () => boolean
   getIsAggregated: () => boolean
@@ -93,7 +92,7 @@ export type ColumnDefaultOptions = {
   enableGrouping: boolean
 }
 
-export type GroupingOptions<TGenerics extends AnyGenerics> = {
+export type GroupingOptions<TGenerics extends TableGenerics> = {
   aggregationFns?: TGenerics['AggregationFns']
   onGroupingChange?: OnChangeFn<GroupingState>
   autoResetGrouping?: boolean
@@ -113,7 +112,7 @@ export type ToggleGroupingProps = {
   onClick?: (event: unknown) => void
 }
 
-export type GroupingInstance<TGenerics extends AnyGenerics> = {
+export type GroupingInstance<TGenerics extends TableGenerics> = {
   queueResetGrouping: () => void
   getColumnAutoAggregationFn: (
     columnId: string
@@ -141,7 +140,7 @@ export type GroupingInstance<TGenerics extends AnyGenerics> = {
 
 export const Grouping = {
   getDefaultColumn: <
-    TGenerics extends AnyGenerics
+    TGenerics extends TableGenerics
   >(): GroupingColumnDef<TGenerics> => {
     return {
       aggregationFn: 'auto',
@@ -154,7 +153,7 @@ export const Grouping = {
     }
   },
 
-  getDefaultOptions: <TGenerics extends AnyGenerics>(
+  getDefaultOptions: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): GroupingOptions<TGenerics> => {
     return {
@@ -164,7 +163,7 @@ export const Grouping = {
     }
   },
 
-  createColumn: <TGenerics extends AnyGenerics>(
+  createColumn: <TGenerics extends TableGenerics>(
     column: Column<TGenerics>,
     instance: TableInstance<TGenerics>
   ): GroupingColumn<TGenerics> => {
@@ -179,7 +178,7 @@ export const Grouping = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): GroupingInstance<TGenerics> => {
     let registered = false
@@ -316,7 +315,7 @@ export const Grouping = {
     }
   },
 
-  createRow: <TGenerics extends AnyGenerics>(
+  createRow: <TGenerics extends TableGenerics>(
     row: Row<TGenerics>,
     instance: TableInstance<TGenerics>
   ): GroupingRow => {
@@ -325,7 +324,7 @@ export const Grouping = {
     }
   },
 
-  createCell: <TGenerics extends AnyGenerics>(
+  createCell: <TGenerics extends TableGenerics>(
     cell: Cell<TGenerics>,
     column: Column<TGenerics>,
     row: Row<TGenerics>,
@@ -355,7 +354,7 @@ export const Grouping = {
     }
   },
 
-  orderColumns: <TGenerics extends AnyGenerics>(
+  orderColumns: <TGenerics extends TableGenerics>(
     leafColumns: Column<TGenerics>[],
     grouping: string[],
     groupedColumnMode?: GroupingColumnMode

package/src/features/Headers.ts

@@ -9,8 +9,7 @@ import {
   HeaderGroup,
   HeaderGroupProps,
   HeaderProps,
-  AnyGenerics,
-  PartialGenerics,
+  TableGenerics,
   PropGetterValue,
   TableInstance,
   Row,
@@ -18,7 +17,7 @@ import {
 import { propGetter, memo } from '../utils'
 import { ColumnSizing } from './ColumnSizing'
 
-export type HeadersRow<TGenerics extends AnyGenerics> = {
+export type HeadersRow<TGenerics extends TableGenerics> = {
   _getAllVisibleCells: () => Cell<TGenerics>[]
   getVisibleCells: () => Cell<TGenerics>[]
   getLeftVisibleCells: () => Cell<TGenerics>[]
@@ -26,7 +25,7 @@ export type HeadersRow<TGenerics extends AnyGenerics> = {
   getRightVisibleCells: () => Cell<TGenerics>[]
 }
 
-export type HeadersInstance<TGenerics extends AnyGenerics> = {
+export type HeadersInstance<TGenerics extends TableGenerics> = {
   createHeader: (
     column: Column<TGenerics>,
     options: {
@@ -80,7 +79,7 @@ export type HeadersInstance<TGenerics extends AnyGenerics> = {
 //
 
 export const Headers = {
-  createRow: <TGenerics extends AnyGenerics>(
+  createRow: <TGenerics extends TableGenerics>(
     row: Row<TGenerics>,
     instance: TableInstance<TGenerics>
   ): HeadersRow<TGenerics> => {
@@ -120,7 +119,7 @@ export const Headers = {
           instance.getState().columnPinning.right,
         ],
         (allCells, left, right) => {
-          const leftAndRight = [...(left ?? []), ...(right ?? [])]
+          const leftAndRight: string[] = [...(left ?? []), ...(right ?? [])]
 
           return allCells.filter(d => !leftAndRight.includes(d.columnId))
         },
@@ -167,7 +166,7 @@ export const Headers = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): HeadersInstance<TGenerics> => {
     return {
@@ -607,7 +606,7 @@ export const Headers = {
   },
 }
 
-export function buildHeaderGroups<TGenerics extends AnyGenerics>(
+export function buildHeaderGroups<TGenerics extends TableGenerics>(
   allColumns: Column<TGenerics>[],
   columnsToGroup: Column<TGenerics>[],
   instance: TableInstance<TGenerics>,

package/src/features/Ordering.ts

@@ -1,22 +1,21 @@
-import { functionalUpdate, makeStateUpdater, memo } from '../utils'
+import { makeStateUpdater, memo } from '../utils'
 
 import {
   TableInstance,
   OnChangeFn,
   Updater,
   Column,
-  AnyGenerics,
-  PartialGenerics,
+  TableGenerics,
 } from '../types'
 
 import { Grouping } from './Grouping'
 
-export type ColumnOrderState = string[]
-
 export type ColumnOrderTableState = {
   columnOrder: ColumnOrderState
 }
 
+export type ColumnOrderState = string[]
+
 export type ColumnOrderOptions = {
   onColumnOrderChange?: OnChangeFn<ColumnOrderState>
 }
@@ -25,10 +24,12 @@ export type ColumnOrderDefaultOptions = {
   onColumnOrderChange: OnChangeFn<ColumnOrderState>
 }
 
-export type ColumnOrderInstance<TGenerics extends AnyGenerics> = {
+export type ColumnOrderInstance<TGenerics extends TableGenerics> = {
   setColumnOrder: (updater: Updater<ColumnOrderState>) => void
   resetColumnOrder: () => void
-  getOrderColumnsFn: () => (columns: Column<TGenerics>[]) => Column<TGenerics>[]
+  _getOrderColumnsFn: () => (
+    columns: Column<TGenerics>[]
+  ) => Column<TGenerics>[]
 }
 
 //
@@ -40,7 +41,7 @@ export const Ordering = {
     }
   },
 
-  getDefaultOptions: <TGenerics extends AnyGenerics>(
+  getDefaultOptions: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ColumnOrderDefaultOptions => {
     return {
@@ -48,7 +49,7 @@ export const Ordering = {
     }
   },
 
-  getInstance: <TGenerics extends AnyGenerics>(
+  getInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): ColumnOrderInstance<TGenerics> => {
     return {
@@ -57,7 +58,7 @@ export const Ordering = {
       resetColumnOrder: () => {
         instance.setColumnOrder(instance.initialState.columnOrder ?? [])
       },
-      getOrderColumnsFn: memo(
+      _getOrderColumnsFn: memo(
         () => [
           instance.getState().columnOrder,
           instance.getState().grouping,