@tanstack/table-core 8.5.0 → 8.5.3

package/build/types/index.d.ts

@@ -8,107 +8,6 @@
  *
  * @license MIT
  */
-declare type CellContext<TData extends RowData, TValue> = {
-    table: Table<TData>;
-    column: Column<TData, TValue>;
-    row: Row<TData>;
-    cell: Cell<TData, TValue>;
-    getValue: Getter<TValue>;
-    renderValue: Getter<TValue | null>;
-};
-declare type CoreCell<TData extends RowData, TValue> = {
-    id: string;
-    getValue: CellContext<TData, TValue>['getValue'];
-    renderValue: CellContext<TData, TValue>['renderValue'];
-    row: Row<TData>;
-    column: Column<TData, TValue>;
-    getContext: () => CellContext<TData, TValue>;
-};
-declare function createCell<TData extends RowData, TValue>(table: Table<TData>, row: Row<TData>, column: Column<TData, TValue>, columnId: string): Cell<TData, TValue>;
-
-declare type CoreHeaderGroup<TData extends RowData> = {
-    id: string;
-    depth: number;
-    headers: Header<TData, unknown>[];
-};
-declare type HeaderContext<TData, TValue> = {
-    table: Table<TData>;
-    header: Header<TData, TValue>;
-    column: Column<TData, TValue>;
-};
-declare type CoreHeader<TData extends RowData, TValue> = {
-    id: string;
-    index: number;
-    depth: number;
-    column: Column<TData, TValue>;
-    headerGroup: HeaderGroup<TData>;
-    subHeaders: Header<TData, TValue>[];
-    colSpan: number;
-    rowSpan: number;
-    getLeafHeaders: () => Header<TData, unknown>[];
-    isPlaceholder: boolean;
-    placeholderId?: string;
-    getContext: () => HeaderContext<TData, TValue>;
-};
-declare type HeadersInstance<TData extends RowData> = {
-    getHeaderGroups: () => HeaderGroup<TData>[];
-    getLeftHeaderGroups: () => HeaderGroup<TData>[];
-    getCenterHeaderGroups: () => HeaderGroup<TData>[];
-    getRightHeaderGroups: () => HeaderGroup<TData>[];
-    getFooterGroups: () => HeaderGroup<TData>[];
-    getLeftFooterGroups: () => HeaderGroup<TData>[];
-    getCenterFooterGroups: () => HeaderGroup<TData>[];
-    getRightFooterGroups: () => HeaderGroup<TData>[];
-    getFlatHeaders: () => Header<TData, unknown>[];
-    getLeftFlatHeaders: () => Header<TData, unknown>[];
-    getCenterFlatHeaders: () => Header<TData, unknown>[];
-    getRightFlatHeaders: () => Header<TData, unknown>[];
-    getLeafHeaders: () => Header<TData, unknown>[];
-    getLeftLeafHeaders: () => Header<TData, unknown>[];
-    getCenterLeafHeaders: () => Header<TData, unknown>[];
-    getRightLeafHeaders: () => Header<TData, unknown>[];
-};
-declare const Headers: TableFeature;
-declare function buildHeaderGroups<TData extends RowData>(allColumns: Column<TData, unknown>[], columnsToGroup: Column<TData, unknown>[], table: Table<TData>, headerFamily?: 'center' | 'left' | 'right'): HeaderGroup<TData>[];
-
-declare type CoreColumnDefBase<TData extends RowData, TValue> = {
-    columns?: ColumnDef<TData, unknown>[];
-    header?: ColumnDefTemplate<HeaderContext<TData, TValue>>;
-    footer?: ColumnDefTemplate<HeaderContext<TData, TValue>>;
-    cell?: ColumnDefTemplate<CellContext<TData, TValue>>;
-    meta?: ColumnMeta<TData, TValue>;
-};
-declare type CoreColumnDefDisplay<TData extends RowData, TValue> = CoreColumnDefBase<TData, TValue> & {
-    id: string;
-};
-declare type CoreColumnDefDisplayWithStringHeader<TData extends RowData, TValue> = CoreColumnDefBase<TData, TValue> & {
-    header: string;
-    id?: string;
-};
-declare type CoreColumnDefAccessorFn<TData extends RowData, TValue> = CoreColumnDefBase<TData, TValue> & {
-    accessorFn: AccessorFn<TData, TValue>;
-    id: string;
-};
-declare type CoreColumnDefAccessorKey<TData extends RowData, TValue> = CoreColumnDefBase<TData, TValue> & {
-    accessorKey: DeepKeys<TData>;
-    id?: string;
-};
-declare type CoreColumnDef<TData extends RowData, TValue> = CoreColumnDefDisplay<TData, TValue> | CoreColumnDefDisplayWithStringHeader<TData, TValue> | CoreColumnDefAccessorFn<TData, TValue> | CoreColumnDefAccessorKey<TData, TValue>;
-declare type CoreColumnDefResolved<TData extends RowData, TValue = unknown> = Partial<UnionToIntersection<CoreColumnDef<TData, TValue>>> & {
-    accessorKey?: string;
-};
-declare type CoreColumn<TData extends RowData, TValue> = {
-    id: string;
-    depth: number;
-    accessorFn?: AccessorFn<TData, TValue>;
-    columnDef: ColumnDef<TData, TValue>;
-    columns: Column<TData, TValue>[];
-    parent?: Column<TData, TValue>;
-    getFlatColumns: () => Column<TData, TValue>[];
-    getLeafColumns: () => Column<TData, TValue>[];
-};
-declare function createColumn<TData extends RowData, TValue>(table: Table<TData>, columnDef: ColumnDef<TData, TValue>, depth: number, parent?: Column<TData, TValue>): Column<TData, TValue>;
-
 declare type VisibilityState = Record<string, boolean>;
 declare type VisibilityTableState = {
     columnVisibility: VisibilityState;
@@ -204,6 +103,51 @@ declare type ColumnPinningInstance<TData extends RowData> = {
 };
 declare const Pinning: TableFeature;
 
+declare type CoreHeaderGroup<TData extends RowData> = {
+    id: string;
+    depth: number;
+    headers: Header<TData, unknown>[];
+};
+declare type HeaderContext<TData, TValue> = {
+    table: Table<TData>;
+    header: Header<TData, TValue>;
+    column: Column<TData, TValue>;
+};
+declare type CoreHeader<TData extends RowData, TValue> = {
+    id: string;
+    index: number;
+    depth: number;
+    column: Column<TData, TValue>;
+    headerGroup: HeaderGroup<TData>;
+    subHeaders: Header<TData, TValue>[];
+    colSpan: number;
+    rowSpan: number;
+    getLeafHeaders: () => Header<TData, unknown>[];
+    isPlaceholder: boolean;
+    placeholderId?: string;
+    getContext: () => HeaderContext<TData, TValue>;
+};
+declare type HeadersInstance<TData extends RowData> = {
+    getHeaderGroups: () => HeaderGroup<TData>[];
+    getLeftHeaderGroups: () => HeaderGroup<TData>[];
+    getCenterHeaderGroups: () => HeaderGroup<TData>[];
+    getRightHeaderGroups: () => HeaderGroup<TData>[];
+    getFooterGroups: () => HeaderGroup<TData>[];
+    getLeftFooterGroups: () => HeaderGroup<TData>[];
+    getCenterFooterGroups: () => HeaderGroup<TData>[];
+    getRightFooterGroups: () => HeaderGroup<TData>[];
+    getFlatHeaders: () => Header<TData, unknown>[];
+    getLeftFlatHeaders: () => Header<TData, unknown>[];
+    getCenterFlatHeaders: () => Header<TData, unknown>[];
+    getRightFlatHeaders: () => Header<TData, unknown>[];
+    getLeafHeaders: () => Header<TData, unknown>[];
+    getLeftLeafHeaders: () => Header<TData, unknown>[];
+    getCenterLeafHeaders: () => Header<TData, unknown>[];
+    getRightLeafHeaders: () => Header<TData, unknown>[];
+};
+declare const Headers: TableFeature;
+declare function buildHeaderGroups<TData extends RowData>(allColumns: Column<TData, unknown>[], columnsToGroup: Column<TData, unknown>[], table: Table<TData>, headerFamily?: 'center' | 'left' | 'right'): HeaderGroup<TData>[];
+
 declare const filterFns: {
     includesString: FilterFn<any>;
     includesStringSensitive: FilterFn<any>;
@@ -643,6 +587,36 @@ declare type CoreRow<TData extends RowData> = {
 };
 declare const createRow: <TData extends unknown>(table: Table<TData>, id: string, original: TData, rowIndex: number, depth: number, subRows?: Row<TData>[] | undefined) => Row<TData>;
 
+declare type CellContext<TData extends RowData, TValue> = {
+    table: Table<TData>;
+    column: Column<TData, TValue>;
+    row: Row<TData>;
+    cell: Cell<TData, TValue>;
+    getValue: Getter<TValue>;
+    renderValue: Getter<TValue | null>;
+};
+declare type CoreCell<TData extends RowData, TValue> = {
+    id: string;
+    getValue: CellContext<TData, TValue>['getValue'];
+    renderValue: CellContext<TData, TValue>['renderValue'];
+    row: Row<TData>;
+    column: Column<TData, TValue>;
+    getContext: () => CellContext<TData, TValue>;
+};
+declare function createCell<TData extends RowData, TValue>(table: Table<TData>, row: Row<TData>, column: Column<TData, TValue>, columnId: string): Cell<TData, TValue>;
+
+declare type CoreColumn<TData extends RowData, TValue> = {
+    id: string;
+    depth: number;
+    accessorFn?: AccessorFn<TData, TValue>;
+    columnDef: ColumnDef<TData, TValue>;
+    columns: Column<TData, TValue>[];
+    parent?: Column<TData, TValue>;
+    getFlatColumns: () => Column<TData, TValue>[];
+    getLeafColumns: () => Column<TData, TValue>[];
+};
+declare function createColumn<TData extends RowData, TValue>(table: Table<TData>, columnDef: ColumnDef<TData, TValue>, depth: number, parent?: Column<TData, TValue>): Column<TData, TValue>;
+
 interface TableMeta<TData extends RowData> {
 }
 interface ColumnMeta<TData extends RowData, TValue> {
@@ -672,8 +646,43 @@ declare type RowModel<TData extends RowData> = {
 };
 declare type AccessorFn<TData extends RowData, TValue = unknown> = (originalRow: TData, index: number) => TValue;
 declare type ColumnDefTemplate<TProps extends object> = string | ((props: TProps) => any);
-declare type ColumnDef<TData extends RowData, TValue extends any = unknown> = CoreColumnDef<TData, TValue> & VisibilityColumnDef & ColumnPinningColumnDef & FiltersColumnDef<TData> & SortingColumnDef<TData> & GroupingColumnDef<TData, TValue> & ColumnSizingColumnDef;
-declare type Column<TData extends RowData, TValue> = CoreColumn<TData, TValue> & VisibilityColumn & ColumnPinningColumn & FiltersColumn<TData> & SortingColumn<TData> & GroupingColumn<TData> & ColumnSizingColumn;
+declare type StringOrTemplateHeader<TData, TValue> = string | ColumnDefTemplate<HeaderContext<TData, TValue>>;
+declare type StringHeaderIdentifier = {
+    header: string;
+    id?: string;
+};
+declare type IdIdentifier<TData extends RowData, TValue> = {
+    id: string;
+    header?: StringOrTemplateHeader<TData, TValue>;
+};
+declare type ColumnIdentifiers<TData extends RowData, TValue> = IdIdentifier<TData, TValue> | StringHeaderIdentifier;
+declare type ColumnDefBase<TData extends RowData, TValue = unknown> = {
+    footer?: ColumnDefTemplate<HeaderContext<TData, TValue>>;
+    cell?: ColumnDefTemplate<CellContext<TData, TValue>>;
+    meta?: ColumnMeta<TData, TValue>;
+} & VisibilityColumnDef & ColumnPinningColumnDef & FiltersColumnDef<TData> & SortingColumnDef<TData> & GroupingColumnDef<TData, TValue> & ColumnSizingColumnDef;
+declare type IdentifiedColumnDef<TData extends RowData, TValue = unknown> = ColumnDefBase<TData, TValue> & {
+    id?: string;
+    header?: StringOrTemplateHeader<TData, TValue>;
+};
+declare type DisplayColumnDef<TData extends RowData, TValue = unknown> = ColumnDefBase<TData, TValue> & ColumnIdentifiers<TData, TValue>;
+declare type GroupColumnDef<TData extends RowData, TValue = unknown> = ColumnDefBase<TData, TValue> & ColumnIdentifiers<TData, TValue> & {
+    columns?: ColumnDef<TData, any>[];
+};
+declare type AccessorFnColumnDef<TData extends RowData, TValue = unknown> = ColumnDefBase<TData, TValue> & ColumnIdentifiers<TData, TValue> & {
+    accessorFn: AccessorFn<TData, TValue>;
+};
+declare type AccessorKeyColumnDef<TData extends RowData, TValue = unknown> = {
+    id?: string;
+} & ColumnIdentifiers<TData, TValue> & ColumnDefBase<TData, TValue> & {
+    accessorKey: DeepKeys<TData>;
+};
+declare type AccessorColumnDef<TData extends RowData, TValue = unknown> = AccessorKeyColumnDef<TData, TValue> | AccessorFnColumnDef<TData, TValue>;
+declare type ColumnDef<TData extends RowData, TValue = unknown> = DisplayColumnDef<TData, TValue> | GroupColumnDef<TData, TValue> | AccessorColumnDef<TData, TValue>;
+declare type ColumnDefResolved<TData extends RowData, TValue = unknown> = Partial<UnionToIntersection<ColumnDef<TData, TValue>>> & {
+    accessorKey?: string;
+};
+declare type Column<TData extends RowData, TValue = unknown> = CoreColumn<TData, TValue> & VisibilityColumn & ColumnPinningColumn & FiltersColumn<TData> & SortingColumn<TData> & GroupingColumn<TData> & ColumnSizingColumn;
 declare type Cell<TData extends RowData, TValue> = CoreCell<TData, TValue> & GroupingCell;
 declare type Header<TData extends RowData, TValue> = CoreHeader<TData, TValue> & ColumnSizingHeader;
 declare type HeaderGroup<TData extends RowData> = CoreHeaderGroup<TData>;
@@ -765,9 +774,9 @@ declare type CoreInstance<TData extends RowData> = {
 declare function createTable<TData extends RowData>(options: TableOptionsResolved<TData>): Table<TData>;
 
 declare type ColumnHelper<TData extends RowData> = {
-    accessor: <TAccessor extends AccessorFn<TData> | DeepKeys<TData>, TValue extends TAccessor extends AccessorFn<TData, infer TReturn> ? TReturn : TAccessor extends DeepKeys<TData> ? DeepValue<TData, TAccessor> : never>(accessor: TAccessor, column: Omit<ColumnDef<TData, TValue>, 'accessorKey'>) => ColumnDef<TData, TValue>;
-    display: (column: RequiredKeys<Omit<ColumnDef<TData, unknown>, 'accessorKey' | 'accessorFn'>, 'id'>) => ColumnDef<TData, unknown>;
-    group: (column: RequiredKeys<Omit<ColumnDef<TData, unknown>, 'accessorKey' | 'accessorFn'>, 'id' | 'columns'>) => ColumnDef<TData, unknown>;
+    accessor: <TAccessor extends AccessorFn<TData> | DeepKeys<TData>, TValue extends TAccessor extends AccessorFn<TData, infer TReturn> ? TReturn : TAccessor extends DeepKeys<TData> ? DeepValue<TData, TAccessor> : never>(accessor: TAccessor, column: TAccessor extends AccessorFn<TData> ? DisplayColumnDef<TData, TValue> : IdentifiedColumnDef<TData, TValue>) => ColumnDef<TData, TValue>;
+    display: (column: DisplayColumnDef<TData>) => ColumnDef<TData, unknown>;
+    group: (column: GroupColumnDef<TData>) => ColumnDef<TData, unknown>;
 };
 declare function createColumnHelper<TData extends RowData>(): ColumnHelper<TData>;
 
@@ -796,4 +805,4 @@ declare function getPaginationRowModel<TData extends RowData>(opts?: {
     initialSync: boolean;
 }): (table: Table<TData>) => () => RowModel<TData>;
 
-export { AccessorFn, AggregationFn, AggregationFnOption, AggregationFns, AnyRender, BuiltInAggregationFn, BuiltInFilterFn, BuiltInSortingFn, Cell, CellContext, Column, ColumnDef, ColumnDefTemplate, ColumnDefaultOptions, ColumnFilter, ColumnFilterAutoRemoveTestFn, ColumnFiltersState, ColumnHelper, ColumnMeta, ColumnOrderDefaultOptions, ColumnOrderInstance, ColumnOrderOptions, ColumnOrderState, ColumnOrderTableState, ColumnPinningColumn, ColumnPinningColumnDef, ColumnPinningDefaultOptions, ColumnPinningInstance, ColumnPinningOptions, ColumnPinningPosition, ColumnPinningRow, ColumnPinningState, ColumnPinningTableState, ColumnResizeMode, ColumnSizing, ColumnSizingColumn, ColumnSizingColumnDef, ColumnSizingDefaultOptions, ColumnSizingHeader, ColumnSizingInfoState, ColumnSizingInstance, ColumnSizingOptions, ColumnSizingState, ColumnSizingTableState, ColumnSort, CoreCell, CoreColumn, CoreColumnDef, CoreColumnDefAccessorFn, CoreColumnDefAccessorKey, CoreColumnDefBase, CoreColumnDefDisplay, CoreColumnDefDisplayWithStringHeader, CoreColumnDefResolved, CoreHeader, CoreHeaderGroup, CoreInstance, CoreOptions, CoreRow, CoreTableState, CustomAggregationFns, CustomFilterFns, CustomSortingFns, DeepKeys, DeepValue, ExpandedInstance, ExpandedOptions, ExpandedRow, ExpandedState, ExpandedStateList, ExpandedTableState, Expanding, FilterFn, FilterFnOption, FilterFns, FilterMeta, Filters, FiltersColumn, FiltersColumnDef, FiltersInstance, FiltersOptions, FiltersRow, FiltersTableState, Getter, Grouping, GroupingCell, GroupingColumn, GroupingColumnDef, GroupingColumnMode, GroupingInstance, GroupingOptions, GroupingRow, GroupingState, GroupingTableState, Header, HeaderContext, HeaderGroup, Headers, HeadersInstance, InitialTableState, IsAny, IsKnown, NoInfer, OnChangeFn, Ordering, Overwrite, Pagination, PaginationDefaultOptions, PaginationInitialTableState, PaginationInstance, PaginationOptions, PaginationState, PaginationTableState, PartialKeys, Pinning, RequiredKeys, ResolvedColumnFilter, Row, RowData, RowModel, RowSelection, RowSelectionInstance, RowSelectionOptions, RowSelectionRow, RowSelectionState, RowSelectionTableState, SortDirection, Sorting, SortingColumn, SortingColumnDef, SortingFn, SortingFnOption, SortingFns, SortingInstance, SortingOptions, SortingState, SortingTableState, Table, TableFeature, TableMeta, TableOptions, TableOptionsResolved, TableState, TransformFilterValueFn, UnionToIntersection, Updater, Visibility, VisibilityColumn, VisibilityColumnDef, VisibilityDefaultOptions, VisibilityInstance, VisibilityOptions, VisibilityRow, VisibilityState, VisibilityTableState, aggregationFns, buildHeaderGroups, createCell, createColumn, createColumnHelper, createRow, createTable, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, isSubRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, selectRowsFn, shouldAutoRemoveFilter, sortingFns };
+export { AccessorColumnDef, AccessorFn, AccessorFnColumnDef, AccessorKeyColumnDef, AggregationFn, AggregationFnOption, AggregationFns, AnyRender, BuiltInAggregationFn, BuiltInFilterFn, BuiltInSortingFn, Cell, CellContext, Column, ColumnDef, ColumnDefBase, ColumnDefResolved, ColumnDefTemplate, ColumnDefaultOptions, ColumnFilter, ColumnFilterAutoRemoveTestFn, ColumnFiltersState, ColumnHelper, ColumnMeta, ColumnOrderDefaultOptions, ColumnOrderInstance, ColumnOrderOptions, ColumnOrderState, ColumnOrderTableState, ColumnPinningColumn, ColumnPinningColumnDef, ColumnPinningDefaultOptions, ColumnPinningInstance, ColumnPinningOptions, ColumnPinningPosition, ColumnPinningRow, ColumnPinningState, ColumnPinningTableState, ColumnResizeMode, ColumnSizing, ColumnSizingColumn, ColumnSizingColumnDef, ColumnSizingDefaultOptions, ColumnSizingHeader, ColumnSizingInfoState, ColumnSizingInstance, ColumnSizingOptions, ColumnSizingState, ColumnSizingTableState, ColumnSort, CoreCell, CoreColumn, CoreHeader, CoreHeaderGroup, CoreInstance, CoreOptions, CoreRow, CoreTableState, CustomAggregationFns, CustomFilterFns, CustomSortingFns, DeepKeys, DeepValue, DisplayColumnDef, ExpandedInstance, ExpandedOptions, ExpandedRow, ExpandedState, ExpandedStateList, ExpandedTableState, Expanding, FilterFn, FilterFnOption, FilterFns, FilterMeta, Filters, FiltersColumn, FiltersColumnDef, FiltersInstance, FiltersOptions, FiltersRow, FiltersTableState, Getter, GroupColumnDef, Grouping, GroupingCell, GroupingColumn, GroupingColumnDef, GroupingColumnMode, GroupingInstance, GroupingOptions, GroupingRow, GroupingState, GroupingTableState, Header, HeaderContext, HeaderGroup, Headers, HeadersInstance, IdentifiedColumnDef, InitialTableState, IsAny, IsKnown, NoInfer, OnChangeFn, Ordering, Overwrite, Pagination, PaginationDefaultOptions, PaginationInitialTableState, PaginationInstance, PaginationOptions, PaginationState, PaginationTableState, PartialKeys, Pinning, RequiredKeys, ResolvedColumnFilter, Row, RowData, RowModel, RowSelection, RowSelectionInstance, RowSelectionOptions, RowSelectionRow, RowSelectionState, RowSelectionTableState, SortDirection, Sorting, SortingColumn, SortingColumnDef, SortingFn, SortingFnOption, SortingFns, SortingInstance, SortingOptions, SortingState, SortingTableState, StringOrTemplateHeader, Table, TableFeature, TableMeta, TableOptions, TableOptionsResolved, TableState, TransformFilterValueFn, UnionToIntersection, Updater, Visibility, VisibilityColumn, VisibilityColumnDef, VisibilityDefaultOptions, VisibilityInstance, VisibilityOptions, VisibilityRow, VisibilityState, VisibilityTableState, aggregationFns, buildHeaderGroups, createCell, createColumn, createColumnHelper, createRow, createTable, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, isSubRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, selectRowsFn, shouldAutoRemoveFilter, sortingFns };

package/build/umd/index.development.js

@@ -1292,8 +1292,11 @@
           table.setColumnFilters(defaultState ? [] : (_table$initialState$c = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.columnFilters) != null ? _table$initialState$c : []);
         },
         getPreFilteredRowModel: () => table.getCoreRowModel(),
-        _getFilteredRowModel: table.options.getFilteredRowModel && table.options.getFilteredRowModel(table),
         getFilteredRowModel: () => {
+          if (!table._getFilteredRowModel && table.options.getFilteredRowModel) {
+            table._getFilteredRowModel = table.options.getFilteredRowModel(table);
+          }
+
           if (table.options.manualFiltering || !table._getFilteredRowModel) {
             return table.getPreFilteredRowModel();
           }
@@ -2147,14 +2150,14 @@
         //   return table.options.enableGroupingRowSelection ?? false
         // },
         getIsAllRowsSelected: () => {
-          const preFilteredFlatRows = table.getPreFilteredRowModel().flatRows;
+          const preGroupedFlatRows = table.getPreGroupedRowModel().flatRows;
           const {
             rowSelection
           } = table.getState();
-          let isAllRowsSelected = Boolean(preFilteredFlatRows.length && Object.keys(rowSelection).length);
+          let isAllRowsSelected = Boolean(preGroupedFlatRows.length && Object.keys(rowSelection).length);
 
           if (isAllRowsSelected) {
-            if (preFilteredFlatRows.some(row => row.getCanSelect() && !rowSelection[row.id])) {
+            if (preGroupedFlatRows.some(row => row.getCanSelect() && !rowSelection[row.id])) {
               isAllRowsSelected = false;
             }
           }
@@ -2922,8 +2925,20 @@
 
         defaultColumn = (_defaultColumn = defaultColumn) != null ? _defaultColumn : {};
         return {
-          header: props => props.header.column.id,
-          footer: props => props.header.column.id,
+          header: props => {
+            const resolvedColumnDef = props.header.column.columnDef;
+
+            if (resolvedColumnDef.accessorKey) {
+              return resolvedColumnDef.accessorKey;
+            }
+
+            if (resolvedColumnDef.accessorFn) {
+              return resolvedColumnDef.id;
+            }
+
+            return null;
+          },
+          // footer: props => props.header.column.id,
           cell: props => {
             var _props$renderValue$to, _props$renderValue;
 
@@ -2951,7 +2966,8 @@
 
           return columnDefs.map(columnDef => {
             const column = createColumn(table, columnDef, depth, parent);
-            column.columns = columnDef.columns ? recurseColumns(columnDef.columns, column, depth + 1) : [];
+            const groupingColumnDef = columnDef;
+            column.columns = groupingColumnDef.columns ? recurseColumns(groupingColumnDef.columns, column, depth + 1) : [];
             return column;
           });
         };