@tanstack/react-table 8.0.0-beta.0 → 8.0.0-beta.3

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

@@ -1108,7 +1108,6 @@ const Filters = {
   },
   createColumn: (column, instance) => {
     return {
-      filterFn: column.filterFn,
       getAutoFilterFn: () => {
         const firstRow = instance.getCoreRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
@@ -1139,7 +1138,7 @@ const Filters = {
         var _ref;
 
         const userFilterFns = instance.options.filterFns;
-        return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
+        return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.columnDef.filterFn]) != null ? _ref : filterFns[column.columnDef.filterFn];
       },
       getCanFilter: () => {
         var _column$columnDef$ena, _instance$options$ena, _instance$options$ena2;
@@ -1428,6 +1427,11 @@ const aggregationFns = {
 const Grouping = {
   getDefaultColumnDef: () => {
     return {
+      aggregatedCell: props => {
+        var _props$getValue$toStr, _props$getValue;
+
+        return (_props$getValue$toStr = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _props$getValue$toStr : null;
+      },
       aggregationFn: 'auto'
     };
   },
@@ -1488,8 +1492,6 @@ const Grouping = {
         if (Object.prototype.toString.call(value) === '[object Date]') {
           return aggregationFns.extent;
         }
-
-        return aggregationFns.count;
       },
       getAggregationFn: () => {
         var _ref4;
@@ -1500,7 +1502,7 @@ const Grouping = {
           throw new Error();
         }
 
-        return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
+        return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.columnDef.aggregationFn]) != null ? _ref4 : aggregationFns[column.columnDef.aggregationFn];
       }
     };
   },
@@ -2897,9 +2899,9 @@ function createTableInstance(options) {
         header: props => props.header.column.id,
         footer: props => props.header.column.id,
         cell: props => {
-          var _props$getValue$toStr, _props$getValue$toStr2, _props$getValue;
+          var _props$getValue$toStr, _props$getValue;
 
-          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;
+          return (_props$getValue$toStr = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _props$getValue$toStr : null;
         },
         ...instance._features.reduce((obj, feature) => {
           return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
@@ -3670,11 +3672,6 @@ function getGroupedRowModel() {
             if (aggregateFn) {
               row._groupingValuesCache[columnId] = aggregateFn(columnId, leafRows, groupedRows);
               return row._groupingValuesCache[columnId];
-            } else if (column.aggregationFn) {
-              console.info({
-                column
-              });
-              throw new Error(process.env.NODE_ENV !== 'production' ? "Table: Invalid column.aggregateType option for column listed above" : '');
             }
           }
         });