@tanstack/react-table 8.4.0 → 8.5.2

package/build/esm/index.js

@@ -1157,7 +1157,9 @@ const Filters = {
         return filterFns.weakEquals;
       },
       getFilterFn: () => {
-        return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : filterFns[column.columnDef.filterFn];
+        var _table$options$filter, _table$options$filter2;
+
+        return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : (_table$options$filter = (_table$options$filter2 = table.options.filterFns) == null ? void 0 : _table$options$filter2[column.columnDef.filterFn]) != null ? _table$options$filter : filterFns[column.columnDef.filterFn];
       },
       getCanFilter: () => {
         var _column$columnDef$ena, _table$options$enable, _table$options$enable2;
@@ -1256,10 +1258,12 @@ const Filters = {
         return filterFns.includesString;
       },
       getGlobalFilterFn: () => {
+        var _table$options$filter3, _table$options$filter4;
+
         const {
           globalFilterFn: globalFilterFn
         } = table.options;
-        return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? table.getGlobalAutoFilterFn() : filterFns[globalFilterFn];
+        return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? table.getGlobalAutoFilterFn() : (_table$options$filter3 = (_table$options$filter4 = table.options.filterFns) == null ? void 0 : _table$options$filter4[globalFilterFn]) != null ? _table$options$filter3 : filterFns[globalFilterFn];
       },
       setColumnFilters: updater => {
         const leafColumns = table.getAllLeafColumns();
@@ -1296,8 +1300,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();
         }
@@ -1513,11 +1520,13 @@ const Grouping = {
         }
       },
       getAggregationFn: () => {
+        var _table$options$aggreg, _table$options$aggreg2;
+
         if (!column) {
           throw new Error();
         }
 
-        return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : aggregationFns[column.columnDef.aggregationFn];
+        return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_table$options$aggreg = (_table$options$aggreg2 = table.options.aggregationFns) == null ? void 0 : _table$options$aggreg2[column.columnDef.aggregationFn]) != null ? _table$options$aggreg : aggregationFns[column.columnDef.aggregationFn];
       }
     };
   },
@@ -2534,11 +2543,13 @@ const Sorting = {
         return 'desc';
       },
       getSortingFn: () => {
+        var _table$options$sortin, _table$options$sortin2;
+
         if (!column) {
           throw new Error();
         }
 
-        return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : sortingFns[column.columnDef.sortingFn];
+        return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_table$options$sortin = (_table$options$sortin2 = table.options.sortingFns) == null ? void 0 : _table$options$sortin2[column.columnDef.sortingFn]) != null ? _table$options$sortin : sortingFns[column.columnDef.sortingFn];
       },
       toggleSorting: (desc, multi) => {
         // if (column.columns.length) {
@@ -2924,8 +2935,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;
 
@@ -3162,7 +3185,8 @@ function createColumnHelper() {
         accessorKey: accessor
       };
     },
-    display: column => column
+    display: column => column,
+    group: column => column
   };
 }