@tanstack/react-table 8.5.0 → 8.5.3

package/build/cjs/table-core/build/esm/index.js

@@ -1302,8 +1302,11 @@ const Filters = {
         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();
         }
@@ -2157,14 +2160,14 @@ const RowSelection = {
       //   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;
           }
         }
@@ -2934,8 +2937,20 @@ function createTable(options) {
 
       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;
 
@@ -2963,7 +2978,8 @@ function createTable(options) {
 
         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;
         });
       };