@tanstack/react-table 8.0.0-alpha.84 → 8.0.0-alpha.85

package/build/esm/index.js

@@ -1224,8 +1224,7 @@ const Filters = {
   createRow: (row, instance) => {
     return {
       columnFilters: {},
-      columnFiltersMeta: {},
-      subRowsByFacetId: {}
+      columnFiltersMeta: {}
     };
   },
   createInstance: instance => {
@@ -1316,53 +1315,42 @@ function shouldAutoRemoveFilter(filterFn, value, column) {
   return (filterFn && filterFn.autoRemove ? filterFn.autoRemove(value, column) : false) || typeof value === 'undefined' || typeof value === 'string' && !value;
 }
 
-const aggregationFns = {
-  sum,
-  min,
-  max,
-  extent,
-  mean,
-  median,
-  unique,
-  uniqueCount,
-  count
-};
-
-function sum(_getLeafValues, getChildValues) {
+const sum = (columnId, _leafRows, childRows) => {
   // It's faster to just add the aggregations together instead of
   // process leaf nodes individually
-  return getChildValues().reduce((sum, next) => sum + (typeof next === 'number' ? next : 0), 0);
-}
+  return childRows.reduce((sum, next) => sum + (typeof next === 'number' ? next : 0), 0);
+};
 
-function min(_getLeafValues, getChildValues) {
+const min = (columnId, _leafRows, childRows) => {
   let min;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null && (min > value || min === undefined && value >= value)) {
       min = value;
     }
-  }
-
+  });
   return min;
-}
+};
 
-function max(_getLeafValues, getChildValues) {
+const max = (columnId, _leafRows, childRows) => {
   let max;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null && (max < value || max === undefined && value >= value)) {
       max = value;
     }
-  }
-
+  });
   return max;
-}
+};
 
-function extent(_getLeafValues, getChildValues) {
+const extent = (columnId, _leafRows, childRows) => {
   let min;
   let max;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null) {
       if (min === undefined) {
         if (value >= value) min = max = value;
@@ -1371,54 +1359,65 @@ function extent(_getLeafValues, getChildValues) {
         if (max < value) max = value;
       }
     }
-  }
-
+  });
   return [min, max];
-}
+};
 
-function mean(getLeafValues) {
+const mean = (columnId, leafRows) => {
   let count = 0;
   let sum = 0;
+  leafRows.forEach(row => {
+    let value = row.getValue(columnId);
 
-  for (let value of getLeafValues()) {
     if (value != null && (value = +value) >= value) {
       ++count, sum += value;
     }
-  }
-
+  });
   if (count) return sum / count;
   return;
-}
-
-function median(getLeafValues) {
-  const leafValues = getLeafValues();
+};
 
-  if (!leafValues.length) {
+const median = (columnId, leafRows) => {
+  if (!leafRows.length) {
     return;
   }
 
   let min = 0;
   let max = 0;
-  leafValues.forEach(value => {
+  leafRows.forEach(row => {
+    let value = row.getValue(columnId);
+
     if (typeof value === 'number') {
       min = Math.min(min, value);
       max = Math.max(max, value);
     }
   });
   return (min + max) / 2;
-}
+};
 
-function unique(getLeafValues) {
-  return Array.from(new Set(getLeafValues()).values());
-}
+const unique = (columnId, leafRows) => {
+  return Array.from(new Set(leafRows.map(d => d.getValue(columnId))).values());
+};
 
-function uniqueCount(getLeafValues) {
-  return new Set(getLeafValues()).size;
-}
+const uniqueCount = (columnId, leafRows) => {
+  return new Set(leafRows.map(d => d.getValue(columnId))).size;
+};
 
-function count(getLeafValues) {
-  return getLeafValues().length;
-}
+const count = (_columnId, leafRows) => {
+  return leafRows.length;
+};
+
+const aggregationFns = {
+  sum,
+  min,
+  max,
+  extent,
+  mean,
+  median,
+  unique,
+  uniqueCount,
+  count
+};
 
 //
 const Grouping = {
@@ -1473,7 +1472,7 @@ const Grouping = {
           column.toggleGrouping();
         };
       },
-      getColumnAutoAggregationFn: () => {
+      getAutoAggregationFn: () => {
         const firstRow = instance.getCoreRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
 
@@ -1487,7 +1486,7 @@ const Grouping = {
 
         return aggregationFns.count;
       },
-      getColumnAggregationFn: () => {
+      getAggregationFn: () => {
         var _ref4;
 
         const userAggregationFns = instance.options.aggregationFns;
@@ -1496,7 +1495,7 @@ const Grouping = {
           throw new Error();
         }
 
-        return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? column.getColumnAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
+        return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
       }
     };
   },
@@ -1522,10 +1521,10 @@ const Grouping = {
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: row => {
     return {
       getIsGrouped: () => !!row.groupingColumnId,
-      groupingValuesCache: {}
+      _groupingValuesCache: {}
     };
   },
   createCell: (cell, column, row, instance) => {
@@ -3660,25 +3659,17 @@ function getGroupedRowModel() {
               return row._valuesCache[columnId];
             }
 
-            if (row.groupingValuesCache.hasOwnProperty(columnId)) {
-              return row.groupingValuesCache[columnId];
+            if (row._groupingValuesCache.hasOwnProperty(columnId)) {
+              return row._groupingValuesCache[columnId];
             } // Aggregate the values
 
 
             const column = instance.getColumn(columnId);
-            const aggregateFn = column.getColumnAggregationFn();
+            const aggregateFn = column.getAggregationFn();
 
             if (aggregateFn) {
-              row.groupingValuesCache[columnId] = aggregateFn(() => leafRows.map(row => {
-                let columnValue = row.getValue(columnId);
-
-                if (!depth && column.columnDef.aggregateValue) {
-                  columnValue = column.columnDef.aggregateValue(columnValue);
-                }
-
-                return columnValue;
-              }), () => groupedRows.map(row => row.getValue(columnId)));
-              return row.groupingValuesCache[columnId];
+              row._groupingValuesCache[columnId] = aggregateFn(columnId, leafRows, groupedRows);
+              return row._groupingValuesCache[columnId];
             } else if (column.aggregationFn) {
               console.info({
                 column
@@ -3887,5 +3878,5 @@ function useTableInstance(table, options) {
   return instanceRef.current;
 }
 
-export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, aggregationFns, buildHeaderGroups, createColumn, createRow, createTable, createTableFactory, createTableInstance, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, makeStateUpdater, mean, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, render, selectRowsFn, shouldAutoRemoveFilter, sortingFns, useTableInstance };
+export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, aggregationFns, buildHeaderGroups, createColumn, createRow, createTable, createTableFactory, createTableInstance, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, render, selectRowsFn, shouldAutoRemoveFilter, sortingFns, useTableInstance };
 //# sourceMappingURL=index.js.map