@tanstack/react-table 8.0.0-alpha.6 → 8.0.0-alpha.9

package/build/types/core.d.ts

@@ -1,50 +1,46 @@
 import { RequiredKeys } from './utils';
-import { Updater, PropGetterValue, Options, TableState, ColumnDef, Row, Column, Cell, Header, AccessorFn, TableProps, TableBodyProps, PropGetter, Getter, RowProps, CellProps, ReactTable, RowValues, Renderable } from './types';
+import { Updater, PropGetterValue, Options, TableState, ColumnDef, Row, Column, Cell, Header, AccessorFn, TableProps, TableBodyProps, PropGetter, Getter, RowProps, CellProps, TableInstance, RowValues, Renderable, Please_use_the_create_table_column_utilities_to_define_columns, PartialGenerics } from './types';
 import { RowModel } from '.';
-export declare type CoreOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
-    data: TData[];
-    columns: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    debug?: boolean;
-    defaultColumn?: Partial<ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+export declare type CoreOptions<TGenerics extends PartialGenerics> = {
+    data: TGenerics['Row'][];
+    columns: ColumnDef<TGenerics>[];
+    state: Partial<TableState>;
+    onStateChange: (updater: Updater<TableState>) => void;
+    debugAll?: boolean;
+    debugTable?: boolean;
+    debugHeaders?: boolean;
+    debugColumns?: boolean;
+    debugRows?: boolean;
+    defaultColumn?: Partial<ColumnDef<TGenerics>>;
     initialState?: Partial<TableState>;
-    state?: Partial<TableState>;
-    getSubRows?: (originalRow: TData, index: number) => TData[];
-    getRowId?: (originalRow: TData, index: number, parent?: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => string;
-    onStateChange?: (newState: TableState) => void;
+    getSubRows?: (originalRow: TGenerics['Row'], index: number) => TGenerics['Row'][];
+    getRowId?: (originalRow: TGenerics['Row'], index: number, parent?: Row<TGenerics>) => string;
     autoResetAll?: boolean;
 };
-export declare type TableCore<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
-    rerender: () => void;
+export declare type TableCore<TGenerics extends PartialGenerics> = {
     initialState: TableState;
-    internalState: TableState;
     reset: () => void;
-    options: RequiredKeys<Options<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, 'state'>;
-    updateOptions: (newOptions: Options<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => void;
-    getRowId: (_: TData, index: number, parent?: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => string;
+    options: RequiredKeys<Options<TGenerics>, 'state'>;
+    setOptions: (newOptions: Updater<Options<TGenerics>>) => void;
+    getRowId: (_: TGenerics['Row'], index: number, parent?: Row<TGenerics>) => string;
     getState: () => TableState;
     setState: (updater: Updater<TableState>) => void;
-    getDefaultColumn: () => Partial<ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getColumnDefs: () => ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    createColumn: (columnDef: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, depth: number, parent?: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getAllColumns: () => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getAllFlatColumns: () => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getAllFlatColumnsById: () => Record<string, Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getAllLeafColumns: () => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getColumn: (columnId: string) => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+    getDefaultColumn: () => Partial<ColumnDef<TGenerics>>;
+    getColumnDefs: () => ColumnDef<TGenerics>[];
+    createColumn: (columnDef: ColumnDef<TGenerics>, depth: number, parent?: Column<TGenerics>) => Column<TGenerics>;
+    getAllColumns: () => Column<TGenerics>[];
+    getAllFlatColumns: () => Column<TGenerics>[];
+    getAllFlatColumnsById: () => Record<string, Column<TGenerics>>;
+    getAllLeafColumns: () => Column<TGenerics>[];
+    getColumn: (columnId: string) => Column<TGenerics>;
     getColumnWidth: (columnId: string) => number;
     getTotalWidth: () => number;
-    createCell: (row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, value: any) => Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    createRow: (id: string, original: TData | undefined, rowIndex: number, depth: number, values: Record<string, any>) => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getCoreRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getCoreRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getCoreFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getCoreRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getRow: (id: string) => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getCell: (rowId: string, columnId: string) => Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+    createCell: (row: Row<TGenerics>, column: Column<TGenerics>, value: any) => Cell<TGenerics>;
+    createRow: (id: string, original: TGenerics['Row'] | undefined, rowIndex: number, depth: number, values: Record<string, any>) => Row<TGenerics>;
+    getCoreRowModel: () => RowModel<TGenerics>;
+    getRowModel: () => RowModel<TGenerics>;
+    getRow: (id: string) => Row<TGenerics>;
+    getCell: (rowId: string, columnId: string) => Cell<TGenerics>;
     getTableProps: PropGetter<TableProps>;
     getTableBodyProps: PropGetter<TableBodyProps>;
     getRowProps: <TGetter extends Getter<RowProps>>(rowId: string, userProps?: TGetter) => undefined | PropGetterValue<RowProps, TGetter>;
@@ -54,56 +50,56 @@ export declare type TableCore<TData, TValue, TFilterFns, TSortingFns, TAggregati
     getCenterTableWidth: () => number;
     getRightTableWidth: () => number;
 };
-export declare type CoreRow<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type CoreRow<TGenerics extends PartialGenerics> = {
     id: string;
     index: number;
-    original?: TData;
+    original?: TGenerics['Row'];
     depth: number;
     values: RowValues;
-    leafRows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    subRows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
+    leafRows: Row<TGenerics>[];
+    subRows: Row<TGenerics>[];
     getRowProps: PropGetter<RowProps>;
-    originalSubRows?: TData[];
-    getAllCells: () => Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getAllCellsByColumnId: () => Record<string, Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+    originalSubRows?: TGenerics['Row'][];
+    getAllCells: () => Cell<TGenerics>[];
+    getAllCellsByColumnId: () => Record<string, Cell<TGenerics>>;
 };
-export declare type CoreColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type CoreColumnDef<TGenerics extends PartialGenerics> = {
     id: string;
-    accessorKey?: string & keyof TData;
-    accessorFn?: AccessorFn<TData>;
+    accessorKey?: string & keyof TGenerics['Row'];
+    accessorFn?: AccessorFn<TGenerics['Row']>;
     header?: string | Renderable<{
-        instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        header: Header<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+        instance: TableInstance<TGenerics>;
+        header: Header<TGenerics>;
+        column: Column<TGenerics>;
     }>;
-    __generated: true;
     width?: number;
     minWidth?: number;
     maxWidth?: number;
-    columns?: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
+    columns?: ColumnDef<TGenerics>[];
     footer?: Renderable<{
-        instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        header: Header<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+        instance: TableInstance<TGenerics>;
+        header: Header<TGenerics>;
+        column: Column<TGenerics>;
     }>;
     cell?: Renderable<{
-        instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        cell: Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        value: TValue;
+        instance: TableInstance<TGenerics>;
+        row: Row<TGenerics>;
+        column: Column<TGenerics>;
+        cell: Cell<TGenerics>;
+        value: TGenerics['Value'];
     }>;
     defaultIsVisible?: boolean;
+    [Please_use_the_create_table_column_utilities_to_define_columns]: true;
 };
-export declare type CoreColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type CoreColumn<TGenerics extends PartialGenerics> = {
     id: string;
     depth: number;
-    accessorFn?: AccessorFn<TData>;
-    columnDef: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+    accessorFn?: AccessorFn<TGenerics['Row']>;
+    columnDef: ColumnDef<TGenerics>;
     getWidth: () => number;
-    columns: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    parent?: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getFlatColumns: () => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getLeafColumns: () => Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
+    columns: Column<TGenerics>[];
+    parent?: Column<TGenerics>;
+    getFlatColumns: () => Column<TGenerics>[];
+    getLeafColumns: () => Column<TGenerics>[];
 };
-export declare function createTableInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(options: Options<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, rerender: () => void): ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+export declare function createTableInstance<TGenerics extends PartialGenerics>(options: Options<TGenerics>): TableInstance<TGenerics>;

package/build/types/createTable.d.ts

@@ -1,52 +1,42 @@
-import { Cell, Column, Row } from '.';
-import { ReactTable, ColumnDef, AccessorFn, Options, Renderable, Header } from './types';
-import { Overwrite } from './utils';
-export declare type TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
-    RowType<TTData>(): TableHelper<TTData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    FilterFns: <TTFilterFns>(filterFns: TTFilterFns) => TableHelper<TData, TValue, TTFilterFns, TSortingFns, TAggregationFns>;
-    SortingFns: <TTSortingFns>(sortingFns: TTSortingFns) => TableHelper<TData, TValue, TFilterFns, TTSortingFns, TAggregationFns>;
-    AggregationFns: <TTAggregationFns>(aggregationFns: TTAggregationFns) => TableHelper<TData, TValue, TFilterFns, TSortingFns, TTAggregationFns>;
-    createColumns: (columns: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[]) => ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    createGroup: (column: Overwrite<ColumnDef<TData, unknown, TFilterFns, TSortingFns, TAggregationFns>, {
-        __generated?: never;
-        accessorFn?: never;
-        accessorKey?: never;
+import { CustomFilterTypes } from './features/Filters';
+import { CustomAggregationTypes } from './features/Grouping';
+import { CustomSortingTypes } from './features/Sorting';
+import { TableInstance, ColumnDef, AccessorFn, Options, DefaultGenerics, PartialGenerics, _NonGenerated } from './types';
+import { Overwrite, PartialKeys } from './utils';
+export declare type CreatTableFactory<TGenerics extends Partial<DefaultGenerics>> = <TRow>() => CreateTable<Overwrite<TGenerics, {
+    Row: TRow;
+}>>;
+export declare type CreateTableOptions<TFilterFns extends CustomFilterTypes<any>, TSortingFns extends CustomSortingTypes<any>, TAggregationFns extends CustomAggregationTypes<any>> = {
+    filterFns?: TFilterFns;
+    sortingFns?: TSortingFns;
+    aggregationFns?: TAggregationFns;
+};
+export declare function createTableFactory<TFilterFns extends CustomFilterTypes<any>, TSortingFns extends CustomSortingTypes<any>, TAggregationFns extends CustomAggregationTypes<any>>(opts: CreateTableOptions<TFilterFns, TSortingFns, TAggregationFns>): CreatTableFactory<Overwrite<PartialGenerics, {
+    FilterFns: TFilterFns;
+    SortingFns: TSortingFns;
+    AggregationFns: TAggregationFns;
+}>>;
+export declare type CreateTable<TGenerics extends Partial<DefaultGenerics>> = {
+    createColumns: (columns: ColumnDef<TGenerics>[]) => ColumnDef<TGenerics>[];
+    createGroup: (column: Overwrite<Overwrite<_NonGenerated<ColumnDef<TGenerics>>, {
         header: string;
         id?: string;
-    } | {
-        __generated?: never;
-        accessorFn?: never;
-        accessorKey?: never;
+    }> | Overwrite<_NonGenerated<ColumnDef<TGenerics>>, {
         id: string;
-        header?: string | Renderable<{
-            instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-            header: Header<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-            column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        }>;
-    }>) => ColumnDef<TData, unknown, TFilterFns, TSortingFns, TAggregationFns>;
-    createDisplayColumn: (column: Overwrite<ColumnDef<TData, unknown, TFilterFns, TSortingFns, TAggregationFns>, {
-        __generated?: never;
+        header?: string | ColumnDef<TGenerics>['header'];
+    }>, {
         accessorFn?: never;
         accessorKey?: never;
-    }>) => ColumnDef<TData, unknown, TFilterFns, TSortingFns, TAggregationFns>;
-    createDataColumn: <TAccessor extends AccessorFn<TData> | keyof TData>(accessor: TAccessor, column: TAccessor extends (...args: any[]) => any ? Overwrite<ColumnDef<TData, ReturnType<TAccessor>, TFilterFns, TSortingFns, TAggregationFns>, {
-        __generated?: never;
-        accessorFn?: never;
-        accessorKey?: never;
-        id: string;
-    }> : TAccessor extends keyof TData ? Overwrite<ColumnDef<TData, TData[TAccessor], TFilterFns, TSortingFns, TAggregationFns>, {
-        __generated?: never;
+    }>) => ColumnDef<TGenerics>;
+    createDisplayColumn: (column: PartialKeys<_NonGenerated<ColumnDef<TGenerics>>, 'accessorFn' | 'accessorKey'>) => ColumnDef<TGenerics>;
+    createDataColumn: <TAccessor extends AccessorFn<TGenerics['Row']> | keyof TGenerics['Row']>(accessor: TAccessor, column: Overwrite<TAccessor extends (...args: any[]) => any ? _NonGenerated<ColumnDef<TGenerics>> : TAccessor extends keyof TGenerics['Row'] ? Overwrite<_NonGenerated<ColumnDef<TGenerics>>, {
+        id?: string;
+    }> : never, {
         accessorFn?: never;
         accessorKey?: never;
-        id?: string;
-    }> : never) => ColumnDef<TData, TAccessor extends (...args: any[]) => any ? ReturnType<TAccessor> : TAccessor extends keyof TData ? TData[TAccessor] : never, TFilterFns, TSortingFns, TAggregationFns>;
-    useTable: <TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(options: Options<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    types: {
-        instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        columnDef: ColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-        cell: Cell<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    };
+    }>) => ColumnDef<TGenerics>;
+    useTable: (options: PartialKeys<Omit<Options<TGenerics>, keyof CreateTableOptions<any, any, any>>, 'state' | 'onStateChange'>) => TableInstance<TGenerics>;
 };
-export declare function createTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(): TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+export declare function createTable<TRow>(): CreateTable<Overwrite<Partial<DefaultGenerics>, {
+    Row: TRow;
+}>>;

package/build/types/features/ColumnSizing.d.ts

@@ -1,5 +1,5 @@
 import { MouseEvent as ReactMouseEvent, TouchEvent as ReactTouchEvent } from 'react';
-import { Column, Getter, OnChangeFn, PropGetterValue, ReactTable, Updater } from '../types';
+import { Column, Getter, Header, OnChangeFn, PartialGenerics, PropGetterValue, TableInstance, Updater } from '../types';
 export declare type ColumnSizing = Record<string, number>;
 export declare type ColumnSizingInfoState = {
     startOffset: null | number;
@@ -32,7 +32,7 @@ export declare type ColumnResizerProps = {
     draggable?: boolean;
     role?: string;
 };
-export declare type ColumnSizingInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type ColumnSizingInstance<TGenerics extends PartialGenerics> = {
     setColumnSizing: (updater: Updater<ColumnSizing>) => void;
     setColumnSizingInfo: (updater: Updater<ColumnSizingInfoState>) => void;
     resetColumnSizing: () => void;
@@ -41,7 +41,7 @@ export declare type ColumnSizingInstance<TData, TValue, TFilterFns, TSortingFns,
     resetHeaderSizeInfo: () => void;
     getColumnCanResize: (columnId: string) => boolean;
     getHeaderCanResize: (headerId: string) => boolean;
-    getColumnResizerProps: <TGetter extends Getter<ColumnResizerProps>>(columnId: string, userProps?: TGetter) => undefined | PropGetterValue<ColumnResizerProps, TGetter>;
+    getHeaderResizerProps: <TGetter extends Getter<ColumnResizerProps>>(headerId: string, userProps?: TGetter) => undefined | PropGetterValue<ColumnResizerProps, TGetter>;
     getColumnIsResizing: (columnId: string) => boolean;
     getHeaderIsResizing: (headerId: string) => boolean;
 };
@@ -49,7 +49,12 @@ export declare type ColumnSizingColumnDef = {
     enableResizing?: boolean;
     defaultCanResize?: boolean;
 };
-export declare type ColumnSizingColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type ColumnSizingColumn<TGenerics extends PartialGenerics> = {
+    getCanResize: () => boolean;
+    getIsResizing: () => boolean;
+    resetSize: () => void;
+};
+export declare type ColumnSizingHeader<TGenerics extends PartialGenerics> = {
     getCanResize: () => boolean;
     getIsResizing: () => boolean;
     getResizerProps: <TGetter extends Getter<ColumnResizerProps>>(userProps?: TGetter) => undefined | PropGetterValue<ColumnResizerProps, TGetter>;
@@ -61,7 +66,8 @@ export declare const defaultColumnSizing: {
     maxWidth: number;
 };
 export declare function getInitialState(): ColumnSizingTableState;
-export declare function getDefaultOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ColumnSizingDefaultOptions;
-export declare function getInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ColumnSizingInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function createColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ColumnSizingColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+export declare function getDefaultOptions<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): ColumnSizingDefaultOptions;
+export declare function getInstance<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): ColumnSizingInstance<TGenerics>;
+export declare function createColumn<TGenerics extends PartialGenerics>(column: Column<TGenerics>, instance: TableInstance<TGenerics>): ColumnSizingColumn<TGenerics>;
+export declare function createHeader<TGenerics extends PartialGenerics>(header: Header<TGenerics>, instance: TableInstance<TGenerics>): ColumnSizingHeader<TGenerics>;
 export declare function passiveEventSupported(): boolean;

package/build/types/features/Expanding.d.ts

@@ -1,6 +1,6 @@
 import { MouseEvent, TouchEvent } from 'react';
 import { RowModel } from '..';
-import { Getter, OnChangeFn, PropGetterValue, ReactTable, Row, Updater } from '../types';
+import { Getter, OnChangeFn, PartialGenerics, PropGetterValue, TableInstance, Row, Updater } from '../types';
 export declare type ExpandedStateList = Record<string, boolean>;
 export declare type ExpandedState = true | Record<string, boolean>;
 export declare type ExpandedTableState = {
@@ -12,22 +12,22 @@ export declare type ExpandedRow = {
     getCanExpand: () => boolean;
     getToggleExpandedProps: <TGetter extends Getter<ToggleExpandedProps>>(userProps?: TGetter) => undefined | PropGetterValue<ToggleExpandedProps, TGetter>;
 };
-export declare type ExpandedOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type ExpandedOptions<TGenerics extends PartialGenerics> = {
     onExpandedChange?: OnChangeFn<ExpandedState>;
     autoResetExpanded?: boolean;
     enableExpanded?: boolean;
-    expandRowsFn?: (instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, rowModel: RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+    expandRowsFn?: (instance: TableInstance<TGenerics>, rowModel: RowModel<TGenerics>) => RowModel<TGenerics>;
     expandSubRows?: boolean;
     defaultCanExpand?: boolean;
-    getIsRowExpanded?: (row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => boolean;
-    getRowCanExpand?: (row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => boolean;
+    getIsRowExpanded?: (row: Row<TGenerics>) => boolean;
+    getRowCanExpand?: (row: Row<TGenerics>) => boolean;
     paginateExpandedRows?: boolean;
 };
 export declare type ToggleExpandedProps = {
     title?: string;
     onClick?: (event: MouseEvent | TouchEvent) => void;
 };
-export declare type ExpandedInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type ExpandedInstance<TGenerics extends PartialGenerics> = {
     _notifyExpandedReset: () => void;
     setExpanded: (updater: Updater<ExpandedState>) => void;
     toggleRowExpanded: (rowId: string, expanded?: boolean) => void;
@@ -39,15 +39,10 @@ export declare type ExpandedInstance<TData, TValue, TFilterFns, TSortingFns, TAg
     getToggleAllRowsExpandedProps: <TGetter extends Getter<ToggleExpandedProps>>(userProps?: TGetter) => undefined | PropGetterValue<ToggleExpandedProps, TGetter>;
     getIsAllRowsExpanded: () => boolean;
     getExpandedDepth: () => number;
-    getExpandedRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getPreExpandedRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreExpandedFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreExpandedRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getExpandedRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getExpandedFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getExpandedRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+    getExpandedRowModel: () => RowModel<TGenerics>;
+    getPreExpandedRowModel: () => RowModel<TGenerics>;
 };
 export declare function getInitialState(): ExpandedTableState;
-export declare function getDefaultOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ExpandedOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function getInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ExpandedInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function createRow<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(row: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): ExpandedRow;
+export declare function getDefaultOptions<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): ExpandedOptions<TGenerics>;
+export declare function getInstance<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): ExpandedInstance<TGenerics>;
+export declare function createRow<TGenerics extends PartialGenerics>(row: Row<TGenerics>, instance: TableInstance<TGenerics>): ExpandedRow;

package/build/types/features/Filters.d.ts

@@ -1,24 +1,27 @@
 import { RowModel } from '..';
 import { BuiltInFilterType } from '../filterTypes';
-import { Column, OnChangeFn, ReactTable, Row, Updater } from '../types';
+import { Column, OnChangeFn, PartialGenerics, TableInstance, Row, Updater } from '../types';
+import { Overwrite } from '../utils';
 export declare type ColumnFilter = {
     id: string;
     value: unknown;
 };
 export declare type ColumnFiltersState = ColumnFilter[];
-export declare type FilterFn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
-    (rows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[], columnIds: string[], filterValue: any): any;
-    autoRemove?: ColumnFilterAutoRemoveTestFn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
+export declare type FilterFn<TGenerics extends PartialGenerics> = {
+    (rows: Row<TGenerics>[], columnIds: string[], filterValue: any): any;
+    autoRemove?: ColumnFilterAutoRemoveTestFn<TGenerics>;
 };
-export declare type ColumnFilterAutoRemoveTestFn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = (value: unknown, column?: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => boolean;
-export declare type CustomFilterTypes<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = Record<string, FilterFn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+export declare type ColumnFilterAutoRemoveTestFn<TGenerics extends PartialGenerics> = (value: unknown, column?: Column<TGenerics>) => boolean;
+export declare type CustomFilterTypes<TGenerics extends PartialGenerics> = Record<string, FilterFn<TGenerics>>;
 export declare type FiltersTableState = {
     columnFilters: ColumnFiltersState;
     globalFilter: any;
 };
-export declare type FilterType<TFilterFns> = 'auto' | BuiltInFilterType | keyof TFilterFns | FilterFn<unknown, unknown, TFilterFns, any, any>;
-export declare type FiltersColumnDef<TFilterFns> = {
-    filterType?: FilterType<TFilterFns>;
+export declare type FilterType<TGenerics extends PartialGenerics> = 'auto' | BuiltInFilterType | TGenerics['FilterFns'] | FilterFn<TGenerics>;
+export declare type FiltersColumnDef<TGenerics extends PartialGenerics> = {
+    filterType?: FilterType<Overwrite<TGenerics, {
+        Value: any;
+    }>>;
     enableAllFilters?: boolean;
     enableColumnFilter?: boolean;
     enableGlobalFilter?: boolean;
@@ -26,73 +29,62 @@ export declare type FiltersColumnDef<TFilterFns> = {
     defaultCanColumnFilter?: boolean;
     defaultCanGlobalFilter?: boolean;
 };
-export declare type FiltersColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
-    filterType: FilterType<TFilterFns>;
+export declare type FiltersColumn<TGenerics extends PartialGenerics> = {
+    filterType: FilterType<Overwrite<TGenerics, {
+        Value: any;
+    }>>;
     getCanColumnFilter: () => boolean;
     getCanGlobalFilter: () => boolean;
     getColumnFilterIndex: () => number;
     getIsColumnFiltered: () => boolean;
     getColumnFilterValue: () => unknown;
     setColumnFilterValue: (value: any) => void;
-    getPreFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[] | undefined;
+    getPreFilteredRows: () => Row<TGenerics>[] | undefined;
     getPreFilteredUniqueValues: () => Map<any, number>;
     getPreFilteredMinMaxValues: () => [any, any];
 };
-export declare type FiltersOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type FiltersOptions<TGenerics extends PartialGenerics> = {
     filterFromChildrenUp?: boolean;
-    filterTypes?: TFilterFns;
+    filterTypes?: TGenerics['FilterFns'];
     enableFilters?: boolean;
     onColumnFiltersChange?: OnChangeFn<ColumnFiltersState>;
     autoResetColumnFilters?: boolean;
     enableColumnFilters?: boolean;
-    columnFilterRowsFn?: (instance: ReactTable<any, any, any, any, any>, coreRowModel: RowModel<any, any, any, any, any>) => RowModel<any, any, any, any, any>;
-    globalFilterType?: FilterType<TFilterFns>;
+    columnFilterRowsFn?: (instance: TableInstance<TGenerics>, coreRowModel: RowModel<TGenerics>) => RowModel<TGenerics>;
+    globalFilterType?: FilterType<TGenerics>;
     onGlobalFilterChange?: OnChangeFn<any>;
     enableGlobalFilters?: boolean;
     autoResetGlobalFilter?: boolean;
     enableGlobalFilter?: boolean;
-    globalFilterRowsFn?: (instance: ReactTable<any, any, any, any, any>, rowModel: RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getColumnCanGlobalFilterFn?: (column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => boolean;
+    globalFilterRowsFn?: (instance: TableInstance<TGenerics>, rowModel: RowModel<TGenerics>) => RowModel<TGenerics>;
+    getColumnCanGlobalFilterFn?: (column: Column<TGenerics>) => boolean;
 };
-export declare type FiltersInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type FiltersInstance<TGenerics extends PartialGenerics> = {
     _notifyFiltersReset: () => void;
-    getColumnAutoFilterFn: (columnId: string) => FilterFn<any, any, any, any, any> | undefined;
-    getColumnFilterFn: (columnId: string) => FilterFn<any, any, any, any, any> | undefined;
+    getColumnAutoFilterFn: (columnId: string) => FilterFn<TGenerics> | undefined;
+    getColumnFilterFn: (columnId: string) => FilterFn<TGenerics> | undefined;
     setColumnFilters: (updater: Updater<ColumnFiltersState>) => void;
     setColumnFilterValue: (columnId: string, value: any) => void;
     resetColumnFilters: () => void;
     getColumnCanColumnFilter: (columnId: string) => boolean;
-    getColumnCanGlobalFilterFn?: (column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>) => boolean;
+    getColumnCanGlobalFilterFn?: (column: Column<TGenerics>) => boolean;
     getColumnIsFiltered: (columnId: string) => boolean;
     getColumnFilterValue: (columnId: string) => unknown;
     getColumnFilterIndex: (columnId: string) => number;
-    getColumnFilteredRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getPreFilteredRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getPreFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreFilteredFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreFilteredRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getPreColumnFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreColumnFilteredFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreColumnFilteredRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getColumnFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getColumnFilteredFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getColumnFilteredRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+    getPreFilteredRowModel: () => RowModel<TGenerics>;
+    getPreColumnFilteredRowModel: () => RowModel<TGenerics>;
+    getColumnFilteredRowModel: () => RowModel<TGenerics>;
     setGlobalFilter: (updater: Updater<any>) => void;
     resetGlobalFilter: () => void;
-    getGlobalAutoFilterFn: () => FilterFn<any, any, any, any, any> | undefined;
-    getGlobalFilterFn: () => FilterFn<any, any, any, any, any> | undefined;
+    getGlobalAutoFilterFn: () => FilterFn<TGenerics> | undefined;
+    getGlobalFilterFn: () => FilterFn<TGenerics> | undefined;
     getColumnCanGlobalFilter: (columnId: string) => boolean;
-    getGlobalFilteredRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-    getPreGlobalFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreGlobalFilteredFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getPreGlobalFilteredRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
-    getGlobalFilteredRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getGlobalFilteredFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
-    getGlobalFilteredRowsById: () => Record<string, Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>>;
+    getPreGlobalFilteredRowModel: () => RowModel<TGenerics>;
+    getGlobalFilteredRowModel: () => RowModel<TGenerics>;
 };
-export declare function getDefaultColumn<TFilterFns>(): FiltersColumnDef<TFilterFns>;
+export declare function getDefaultColumn<TGenerics extends PartialGenerics>(): FiltersColumnDef<TGenerics>;
 export declare function getInitialState(): FiltersTableState;
-export declare function getDefaultOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): FiltersOptions<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function createColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>, instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): FiltersColumn<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function getInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>): FiltersInstance<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export declare function shouldAutoRemoveFilter(filterFn?: FilterFn<any, any, any, any, any>, value?: any, column?: Column<any, any, any, any, any>): boolean;
+export declare function getDefaultOptions<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): FiltersOptions<TGenerics>;
+export declare function createColumn<TGenerics extends PartialGenerics>(column: Column<TGenerics>, instance: TableInstance<TGenerics>): FiltersColumn<TGenerics>;
+export declare function getInstance<TGenerics extends PartialGenerics>(instance: TableInstance<TGenerics>): FiltersInstance<TGenerics>;
+export declare function shouldAutoRemoveFilter<TGenerics extends PartialGenerics>(filterFn?: FilterFn<TGenerics>, value?: any, column?: Column<TGenerics>): boolean;