@tanstack/table-core 8.0.0-alpha.82 → 8.0.0-alpha.83

package/build/types/core.d.ts

@@ -1,5 +1,5 @@
 import { RequiredKeys } from './utils';
-import { Updater, TableOptions, TableState, TableInstance, Renderable, TableFeature, TableGenerics, InitialTableState } from './types';
+import { Updater, TableOptionsResolved, TableState, TableInstance, Renderable, TableFeature, TableGenerics, InitialTableState } from './types';
 export declare type CoreTableState = {};
 export declare type CoreOptions<TGenerics extends TableGenerics> = {
     data: TGenerics['Row'][];
@@ -19,12 +19,12 @@ export declare type CoreOptions<TGenerics extends TableGenerics> = {
 export declare type CoreInstance<TGenerics extends TableGenerics> = {
     initialState: TableState;
     reset: () => void;
-    options: RequiredKeys<TableOptions<TGenerics>, 'state'>;
-    setOptions: (newOptions: Updater<TableOptions<TGenerics>>) => void;
+    options: RequiredKeys<TableOptionsResolved<TGenerics>, 'state'>;
+    setOptions: (newOptions: Updater<TableOptionsResolved<TGenerics>>) => void;
     getState: () => TableState;
     setState: (updater: Updater<TableState>) => void;
     _queue: (cb: () => void) => void;
     _render: <TProps>(template: Renderable<TGenerics, TProps>, props: TProps) => string | null | TGenerics['Rendered'];
     _features: readonly TableFeature[];
 };
-export declare function createTableInstance<TGenerics extends TableGenerics>(options: TableOptions<TGenerics>): TableInstance<TGenerics>;
+export declare function createTableInstance<TGenerics extends TableGenerics>(options: TableOptionsResolved<TGenerics>): TableInstance<TGenerics>;

package/build/types/createTable.d.ts

@@ -1,7 +1,7 @@
 import { CustomFilterFns, FilterFn } from './features/Filters';
 import { AggregationFn, CustomAggregationFns } from './features/Grouping';
 import { CustomSortingFns, SortingFn } from './features/Sorting';
-import { ColumnDef, AccessorFn, AnyRender, TableGenerics, TableOptions } from './types';
+import { ColumnDef, AccessorFn, AnyRender, TableGenerics, TableOptionsResolved, TableOptions } from './types';
 import { IfDefined, Overwrite } from './utils';
 export declare type TableFactory<TGenerics extends TableGenerics> = () => Table<TGenerics>;
 export declare type CreateTableOptions<TRender extends AnyRender, TFilterFns extends CustomFilterFns<any>, TSortingFns extends CustomSortingFns<any>, TAggregationFns extends CustomAggregationFns<any>, TGenerics extends TableGenerics> = Partial<{
@@ -9,11 +9,10 @@ export declare type CreateTableOptions<TRender extends AnyRender, TFilterFns ext
     filterFns?: TFilterFns;
     sortingFns?: TSortingFns;
     aggregationFns?: TAggregationFns;
-} & Omit<TableOptions<TGenerics>, 'filterFns' | 'sortingFns' | 'aggregationFns'>>;
+} & Omit<TableOptionsResolved<TGenerics>, 'filterFns' | 'sortingFns' | 'aggregationFns'>>;
 export declare type Table<TGenerics extends TableGenerics> = {
     generics: TGenerics;
-    options: Partial<TableOptions<TGenerics>>;
-    setGenerics: <T extends TableGenerics>() => Table<T>;
+    options: Partial<TableOptionsResolved<TGenerics>>;
     setRowType: <TRow>() => Table<Overwrite<TGenerics, {
         Row: TRow;
     }>>;
@@ -54,6 +53,7 @@ export declare type Table<TGenerics extends TableGenerics> = {
         accessorKey?: never;
         columns?: ColumnDef<any>[];
     }>) => ColumnDef<TGenerics>;
+    createOptions: (options: TableOptions<TGenerics>) => TableOptions<TGenerics>;
 };
 export declare function createTableFactory<TRenderer extends AnyRender>(opts: {
     render: TRenderer;

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

@@ -37,10 +37,10 @@ export declare type CoreColumn<TGenerics extends TableGenerics> = {
 };
 export declare type ColumnsOptions<TGenerics extends TableGenerics> = {
     columns: ColumnDef<TGenerics>[];
-    defaultColumn?: Partial<ColumnDef<TGenerics>>;
+    defaultColumnDef?: Partial<ColumnDef<TGenerics>>;
 };
 export declare type ColumnsInstance<TGenerics extends TableGenerics> = {
-    getDefaultColumn: () => Partial<ColumnDef<TGenerics>>;
+    getDefaultColumnDef: () => Partial<ColumnDef<TGenerics>>;
     getColumnDefs: () => ColumnDef<TGenerics>[];
     createColumn: (columnDef: ColumnDef<TGenerics>, depth: number, parent?: Column<TGenerics>) => Column<TGenerics>;
     getAllColumns: () => Column<TGenerics>[];

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

@@ -31,7 +31,7 @@ export declare type ColumnPinningRow<TGenerics extends TableGenerics> = {
 export declare 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>[];

package/build/types/types.d.ts

@@ -8,6 +8,7 @@ import { FiltersColumn, FiltersColumnDef, FiltersInstance, FiltersOptions, Filte
 import { SortingColumn, SortingColumnDef, SortingInstance, SortingOptions, SortingTableState } from './features/Sorting';
 import { GroupingCell, GroupingColumn, GroupingColumnDef, GroupingInstance, GroupingOptions, GroupingRow, GroupingTableState } from './features/Grouping';
 import { ExpandedInstance, ExpandedOptions, ExpandedTableState, ExpandedRow } from './features/Expanding';
+import { PartialKeys } from './utils';
 import { ColumnSizingColumn, ColumnSizingColumnDef, ColumnSizingHeader, ColumnSizingInstance, ColumnSizingOptions, ColumnSizingTableState } from './features/ColumnSizing';
 import { PaginationInitialTableState, PaginationInstance, PaginationOptions, PaginationTableState } from './features/Pagination';
 import { RowSelectionInstance, RowSelectionOptions, RowSelectionRow, RowSelectionTableState } from './features/RowSelection';
@@ -33,14 +34,15 @@ export declare type TableFeature = {
     getDefaultOptions?: (instance: any) => any;
     getInitialState?: (initialState?: InitialTableState) => any;
     createInstance?: (instance: any) => any;
-    getDefaultColumn?: () => any;
+    getDefaultColumnDef?: () => 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 declare type TableInstance<TGenerics extends TableGenerics> = CoreInstance<TGenerics> & ColumnsInstance<TGenerics> & RowsInstance<TGenerics> & CellsInstance<TGenerics> & VisibilityInstance<TGenerics> & ColumnOrderInstance<TGenerics> & ColumnPinningInstance<TGenerics> & HeadersInstance<TGenerics> & FiltersInstance<TGenerics> & SortingInstance<TGenerics> & GroupingInstance<TGenerics> & ColumnSizingInstance<TGenerics> & ExpandedInstance<TGenerics> & PaginationInstance<TGenerics> & RowSelectionInstance<TGenerics>;
-export declare type TableOptions<TGenerics extends TableGenerics> = CoreOptions<TGenerics> & ColumnsOptions<TGenerics> & RowsOptions<TGenerics> & VisibilityOptions & ColumnOrderOptions & ColumnPinningOptions & FiltersOptions<TGenerics> & SortingOptions<TGenerics> & GroupingOptions<TGenerics> & ExpandedOptions<TGenerics> & ColumnSizingOptions & PaginationOptions<TGenerics> & RowSelectionOptions<TGenerics>;
+export declare type TableOptionsResolved<TGenerics extends TableGenerics> = CoreOptions<TGenerics> & ColumnsOptions<TGenerics> & RowsOptions<TGenerics> & VisibilityOptions & ColumnOrderOptions & ColumnPinningOptions & FiltersOptions<TGenerics> & SortingOptions<TGenerics> & GroupingOptions<TGenerics> & ExpandedOptions<TGenerics> & ColumnSizingOptions & PaginationOptions<TGenerics> & RowSelectionOptions<TGenerics>;
+export declare type TableOptions<TGenerics extends TableGenerics> = Omit<PartialKeys<TableOptionsResolved<TGenerics>, 'state' | 'onStateChange'>, 'render'>;
 export declare type TableState = CoreTableState & VisibilityTableState & ColumnOrderTableState & ColumnPinningTableState & FiltersTableState & SortingTableState & ExpandedTableState & GroupingTableState & ColumnSizingTableState & PaginationTableState & RowSelectionTableState;
 export declare type InitialTableState = Partial<CoreTableState & VisibilityTableState & ColumnOrderTableState & ColumnPinningTableState & FiltersTableState & SortingTableState & ExpandedTableState & GroupingTableState & ColumnSizingTableState & PaginationInitialTableState & RowSelectionTableState>;
 export declare type Row<TGenerics extends TableGenerics> = CoreRow<TGenerics> & CellsRow<TGenerics> & VisibilityRow<TGenerics> & ColumnPinningRow<TGenerics> & FiltersRow<TGenerics> & GroupingRow & RowSelectionRow & ExpandedRow;
@@ -55,7 +57,7 @@ export declare type RowModel<TGenerics extends TableGenerics> = {
 export declare type AccessorFn<TData> = (originalRow: TData, index: number) => any;
 export declare type Renderable<TGenerics extends TableGenerics, TProps> = string | ((props: TProps) => TGenerics['Rendered']);
 export declare type ColumnDef<TGenerics extends TableGenerics> = CoreColumnDef<TGenerics> & VisibilityColumnDef & ColumnPinningColumnDef & FiltersColumnDef<TGenerics> & SortingColumnDef<TGenerics> & GroupingColumnDef<TGenerics> & ColumnSizingColumnDef;
-export declare type Column<TGenerics extends TableGenerics> = ColumnDef<TGenerics> & CoreColumn<TGenerics> & ColumnVisibilityColumn & ColumnPinningColumn & FiltersColumn<TGenerics> & SortingColumn<TGenerics> & GroupingColumn<TGenerics> & ColumnSizingColumn<TGenerics>;
+export declare type Column<TGenerics extends TableGenerics> = CoreColumn<TGenerics> & ColumnVisibilityColumn & ColumnPinningColumn & FiltersColumn<TGenerics> & SortingColumn<TGenerics> & GroupingColumn<TGenerics> & ColumnSizingColumn<TGenerics>;
 export declare type Cell<TGenerics extends TableGenerics> = CoreCell<TGenerics> & GroupingCell<TGenerics>;
 export declare type CoreCell<TGenerics extends TableGenerics> = {
     id: string;

package/build/umd/index.development.js

@@ -95,7 +95,7 @@
   const Columns = {
     createInstance: instance => {
       return {
-        getDefaultColumn: memo(() => [instance.options.defaultColumn], defaultColumn => {
+        getDefaultColumnDef: memo(() => [instance.options.defaultColumnDef], defaultColumn => {
           var _defaultColumn;
 
           defaultColumn = (_defaultColumn = defaultColumn) != null ? _defaultColumn : {};
@@ -108,7 +108,7 @@
               return (_props$getValue$toStr = (_props$getValue$toStr2 = (_props$getValue = props.getValue()).toString) == null ? void 0 : _props$getValue$toStr2.call(_props$getValue)) != null ? _props$getValue$toStr : null;
             },
             ...instance._features.reduce((obj, feature) => {
-              return Object.assign(obj, feature.getDefaultColumn == null ? void 0 : feature.getDefaultColumn());
+              return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
             }, {}),
             ...defaultColumn
           };
@@ -118,13 +118,16 @@
 
             return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
           },
-          key: 'getDefaultColumn'
+          key: 'getDefaultColumnDef'
         }),
         getColumnDefs: () => instance.options.columns,
         createColumn: (columnDef, depth, parent) => {
           var _ref, _columnDef$id;
 
-          const defaultColumn = instance.getDefaultColumn();
+          const defaultColumnDef = instance.getDefaultColumnDef();
+          columnDef = { ...defaultColumnDef,
+            ...columnDef
+          };
           let id = (_ref = (_columnDef$id = columnDef.id) != null ? _columnDef$id : columnDef.accessorKey) != null ? _ref : typeof columnDef.header === 'string' ? columnDef.header : undefined;
           let accessorFn;
 
@@ -140,8 +143,7 @@
             }
           }
 
-          let column = { ...defaultColumn,
-            ...columnDef,
+          let column = { ...columnDef,
             id: "" + id,
             accessorFn,
             parent: parent,
@@ -375,7 +377,7 @@
             row,
             column,
             getValue: () => row.getValue(columnId),
-            renderCell: () => column.cell ? instance._render(column.cell, {
+            renderCell: () => column.columnDef.cell ? instance._render(column.columnDef.cell, {
               instance,
               column,
               row,
@@ -430,7 +432,7 @@
   });
 
   const ColumnSizing = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return defaultColumnSizing;
     },
     getInitialState: state => {
@@ -450,10 +452,10 @@
     createColumn: (column, instance) => {
       return {
         getSize: () => {
-          var _column$minSize, _ref, _column$maxSize;
+          var _column$columnDef$min, _ref, _column$columnDef$max;
 
           const columnSize = instance.getState().columnSizing[column.id];
-          return Math.min(Math.max((_column$minSize = column.minSize) != null ? _column$minSize : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.size) != null ? _ref : defaultColumnSizing.size), (_column$maxSize = column.maxSize) != null ? _column$maxSize : defaultColumnSizing.maxSize);
+          return Math.min(Math.max((_column$columnDef$min = column.columnDef.minSize) != null ? _column$columnDef$min : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.columnDef.size) != null ? _ref : defaultColumnSizing.size), (_column$columnDef$max = column.columnDef.maxSize) != null ? _column$columnDef$max : defaultColumnSizing.maxSize);
         },
         getStart: position => {
           const columns = !position ? instance.getVisibleLeafColumns() : position === 'left' ? instance.getLeftVisibleLeafColumns() : instance.getRightVisibleLeafColumns();
@@ -476,9 +478,9 @@
           });
         },
         getCanResize: () => {
-          var _column$enableResizin, _instance$options$ena;
+          var _column$columnDef$ena, _instance$options$ena;
 
-          return ((_column$enableResizin = column.enableResizing) != null ? _column$enableResizin : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
+          return ((_column$columnDef$ena = column.columnDef.enableResizing) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
         },
         getIsResizing: () => {
           return instance.getState().columnSizingInfo.isResizingColumn === column.id;
@@ -935,7 +937,7 @@
 
   //
   const Filters = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         filterFn: 'auto'
       };
@@ -978,6 +980,10 @@
             return filterFns.inNumberRange;
           }
 
+          if (typeof value === 'boolean') {
+            return filterFns.equals;
+          }
+
           if (value !== null && typeof value === 'object') {
             return filterFns.equals;
           }
@@ -995,14 +1001,14 @@
           return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
         },
         getCanFilter: () => {
-          var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
+          var _column$columnDef$ena, _instance$options$ena, _instance$options$ena2;
 
-          return ((_column$enableColumnF = column.enableColumnFilter) != null ? _column$enableColumnF : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
+          return ((_column$columnDef$ena = column.columnDef.enableColumnFilter) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
         },
         getCanGlobalFilter: () => {
-          var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
+          var _column$columnDef$ena2, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
 
-          return ((_column$enableGlobalF = column.enableGlobalFilter) != null ? _column$enableGlobalF : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
+          return ((_column$columnDef$ena2 = column.columnDef.enableGlobalFilter) != null ? _column$columnDef$ena2 : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
         },
         getIsFiltered: () => column.getFilterIndex() > -1,
         getFilterValue: () => {
@@ -1280,7 +1286,7 @@
 
   //
   const Grouping = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         aggregationFn: 'auto'
       };
@@ -1310,9 +1316,9 @@
           });
         },
         getCanGroup: () => {
-          var _ref, _ref2, _ref3, _column$enableGroupin;
+          var _ref, _ref2, _ref3, _column$columnDef$ena;
 
-          return (_ref = (_ref2 = (_ref3 = (_column$enableGroupin = column.enableGrouping) != null ? _column$enableGroupin : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
+          return (_ref = (_ref2 = (_ref3 = (_column$columnDef$ena = column.columnDef.enableGrouping) != null ? _column$columnDef$ena : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
         },
         getIsGrouped: () => {
           var _instance$getState$gr;
@@ -1396,9 +1402,9 @@
           return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
         },
         renderAggregatedCell: () => {
-          var _column$aggregatedCel;
+          var _column$columnDef$agg;
 
-          const template = (_column$aggregatedCel = column.aggregatedCell) != null ? _column$aggregatedCel : column.cell;
+          const template = (_column$columnDef$agg = column.columnDef.aggregatedCell) != null ? _column$columnDef$agg : column.columnDef.cell;
           return template ? instance._render(template, {
             instance,
             column,
@@ -1705,9 +1711,9 @@
         getCanPin: () => {
           const leafColumns = column.getLeafColumns();
           return leafColumns.some(d => {
-            var _d$enablePinning, _instance$options$ena;
+            var _d$columnDef$enablePi, _instance$options$ena;
 
-            return ((_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
+            return ((_d$columnDef$enablePi = d.columnDef.enablePinning) != null ? _d$columnDef$enablePi : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
           });
         },
         getIsPinned: () => {
@@ -1777,12 +1783,18 @@
 
           return instance.setColumnPinning(defaultState ? getDefaultPinningState() : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : getDefaultPinningState());
         },
-        getIsSomeColumnsPinned: () => {
-          const {
-            left,
-            right
-          } = instance.getState().columnPinning;
-          return Boolean((left == null ? void 0 : left.length) || (right == null ? void 0 : right.length));
+        getIsSomeColumnsPinned: position => {
+          var _pinningState$positio;
+
+          const pinningState = instance.getState().columnPinning;
+
+          if (!position) {
+            var _pinningState$left, _pinningState$right;
+
+            return Boolean(((_pinningState$left = pinningState.left) == null ? void 0 : _pinningState$left.length) || ((_pinningState$right = pinningState.right) == null ? void 0 : _pinningState$right.length));
+          }
+
+          return Boolean((_pinningState$positio = pinningState[position]) == null ? void 0 : _pinningState$positio.length);
         },
         getLeftLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.left], (allColumns, left) => {
           return (left != null ? left : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
@@ -2308,7 +2320,7 @@
         ...state
       };
     },
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         sortingFn: 'auto'
       };
@@ -2368,7 +2380,7 @@
             throw new Error();
           }
 
-          return isFunction(column.sortingFn) ? column.sortingFn : column.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.sortingFn]) != null ? _ref : sortingFns[column.sortingFn];
+          return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.columnDef.sortingFn]) != null ? _ref : sortingFns[column.columnDef.sortingFn];
         },
         toggleSorting: (desc, multi) => {
           // if (column.columns.length) {
@@ -2380,7 +2392,7 @@
           //   return
           // }
           instance.setSorting(old => {
-            var _ref2, _column$sortDescFirst, _instance$options$ena, _instance$options$ena2;
+            var _ref2, _column$columnDef$sor, _instance$options$ena, _instance$options$ena2;
 
             // Find any existing sorting for this column
             const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2407,7 +2419,7 @@
               }
             }
 
-            const sortDescFirst = (_ref2 = (_column$sortDescFirst = column.sortDescFirst) != null ? _column$sortDescFirst : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
+            const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
 
             if (sortAction === 'toggle' && ( // Must be toggling
             (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
@@ -2451,14 +2463,14 @@
           });
         },
         getCanSort: () => {
-          var _column$enableSorting, _instance$options$ena3;
+          var _column$columnDef$ena, _instance$options$ena3;
 
-          return ((_column$enableSorting = column.enableSorting) != null ? _column$enableSorting : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
+          return ((_column$columnDef$ena = column.columnDef.enableSorting) != null ? _column$columnDef$ena : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
         },
         getCanMultiSort: () => {
-          var _ref3, _column$enableMultiSo;
+          var _ref3, _column$columnDef$ena2;
 
-          return (_ref3 = (_column$enableMultiSo = column.enableMultiSort) != null ? _column$enableMultiSo : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
+          return (_ref3 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
         },
         getIsSorted: () => {
           var _instance$getState$so;
@@ -2522,7 +2534,7 @@
         onColumnVisibilityChange: makeStateUpdater('columnVisibility', instance)
       };
     },
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         defaultIsVisible: true
       };
@@ -2542,9 +2554,9 @@
           return (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[column.id]) != null ? _instance$getState$co : true;
         },
         getCanHide: () => {
-          var _column$enableHiding, _instance$options$ena;
+          var _column$columnDef$ena, _instance$options$ena;
 
-          return ((_column$enableHiding = column.enableHiding) != null ? _column$enableHiding : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
+          return ((_column$columnDef$ena = column.columnDef.enableHiding) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
         },
         getToggleVisibilityHandler: () => {
           return e => {
@@ -2655,12 +2667,12 @@
               recurseHeader(header);
               return leafHeaders;
             },
-            renderHeader: () => column.header ? instance._render(column.header, {
+            renderHeader: () => column.columnDef.header ? instance._render(column.columnDef.header, {
               instance,
               header: header,
               column
             }) : null,
-            renderFooter: () => column.footer ? instance._render(column.footer, {
+            renderFooter: () => column.columnDef.footer ? instance._render(column.columnDef.footer, {
               instance,
               header: header,
               column
@@ -3168,7 +3180,7 @@
           throw new Error('');
         })()
       },
-      setGenerics: () => table,
+      // setGenerics: () => table as any,
       setRowType: () => table,
       setTableMetaType: () => table,
       setColumnMetaType: () => table,
@@ -3204,7 +3216,8 @@
         }
 
         throw new Error('Invalid accessor');
-      }
+      },
+      createOptions: options => options
     };
     return table;
   }
@@ -3601,8 +3614,8 @@
       availableSorting.forEach(sortEntry => {
         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()
         };
       });
@@ -3750,8 +3763,8 @@
                 row.groupingValuesCache[columnId] = aggregateFn(() => 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;