@tanstack/table-core 8.0.0-beta.2 → 8.0.0-beta.5

package/build/types/core/instance.d.ts

@@ -30,6 +30,7 @@ export declare type CoreOptions<TGenerics extends TableGenerics> = {
     getRowId?: (originalRow: TGenerics['Row'], index: number, parent?: Row<TGenerics>) => string;
     columns: ColumnDef<TGenerics>[];
     defaultColumn?: Partial<ColumnDef<TGenerics>>;
+    renderFallbackValue: any;
 };
 export declare type CoreInstance<TGenerics extends TableGenerics> = {
     initialState: TableState;

package/build/types/features/Filters.d.ts

@@ -34,9 +34,6 @@ export declare type FiltersColumnDef<TGenerics extends TableGenerics> = {
     enableGlobalFilter?: boolean;
 };
 export declare type FiltersColumn<TGenerics extends TableGenerics> = {
-    filterFn: FilterFnOption<Overwrite<TGenerics, {
-        Value: any;
-    }>>;
     getAutoFilterFn: () => FilterFn<TGenerics> | undefined;
     getFilterFn: () => FilterFn<TGenerics> | undefined;
     setFilterValue: (updater: Updater<any>) => void;

package/build/types/features/Grouping.d.ts

@@ -24,9 +24,6 @@ export declare type GroupingColumnDef<TGenerics extends TableGenerics> = {
     enableGrouping?: boolean;
 };
 export declare type GroupingColumn<TGenerics extends TableGenerics> = {
-    aggregationFn?: AggregationFnOption<Overwrite<TGenerics, {
-        Value: any;
-    }>>;
     getCanGroup: () => boolean;
     getIsGrouped: () => boolean;
     getGroupedIndex: () => number;

package/build/types/features/RowSelection.d.ts

@@ -28,8 +28,8 @@ export declare type RowSelectionInstance<TGenerics extends TableGenerics> = {
     getIsAllPageRowsSelected: () => boolean;
     getIsSomeRowsSelected: () => boolean;
     getIsSomePageRowsSelected: () => boolean;
-    toggleAllRowsSelected: (value: boolean) => void;
-    toggleAllPageRowsSelected: (value: boolean) => void;
+    toggleAllRowsSelected: (value?: boolean) => void;
+    toggleAllPageRowsSelected: (value?: boolean) => void;
     getPreSelectedRowModel: () => RowModel<TGenerics>;
     getSelectedRowModel: () => RowModel<TGenerics>;
     getFilteredSelectedRowModel: () => RowModel<TGenerics>;

package/build/types/features/Sorting.d.ts

@@ -31,6 +31,7 @@ export declare type SortingColumn<TGenerics extends TableGenerics> = {
     getAutoSortingFn: () => SortingFn<TGenerics>;
     getAutoSortDir: () => SortDirection;
     getSortingFn: () => SortingFn<TGenerics>;
+    getNextSortingOrder: () => SortDirection | false;
     getCanSort: () => boolean;
     getCanMultiSort: () => boolean;
     getSortIndex: () => number;

package/build/types/types.d.ts

@@ -31,7 +31,7 @@ export declare type TableGenerics = {
 export declare type AnyRender = (Comp: any, props: any) => any;
 export declare type TableInstance<TGenerics extends TableGenerics> = CoreInstance<TGenerics> & HeadersInstance<TGenerics> & VisibilityInstance<TGenerics> & ColumnOrderInstance<TGenerics> & ColumnPinningInstance<TGenerics> & FiltersInstance<TGenerics> & SortingInstance<TGenerics> & GroupingInstance<TGenerics> & ColumnSizingInstance<TGenerics> & ExpandedInstance<TGenerics> & PaginationInstance<TGenerics> & RowSelectionInstance<TGenerics>;
 export declare type TableOptionsResolved<TGenerics extends TableGenerics> = CoreOptions<TGenerics> & VisibilityOptions & ColumnOrderOptions & ColumnPinningOptions & FiltersOptions<TGenerics> & SortingOptions<TGenerics> & GroupingOptions<TGenerics> & ExpandedOptions<TGenerics> & ColumnSizingOptions & PaginationOptions<TGenerics> & RowSelectionOptions<TGenerics>;
-export declare type TableOptions<TGenerics extends TableGenerics> = Omit<PartialKeys<TableOptionsResolved<TGenerics>, 'state' | 'onStateChange'>, 'render'>;
+export declare type TableOptions<TGenerics extends TableGenerics> = Omit<PartialKeys<TableOptionsResolved<TGenerics>, 'state' | 'onStateChange'>, 'render' | 'renderFallbackValue'>;
 export declare type TableState = CoreTableState & VisibilityTableState & ColumnOrderTableState & ColumnPinningTableState & FiltersTableState & SortingTableState & ExpandedTableState & GroupingTableState & ColumnSizingTableState & PaginationTableState & RowSelectionTableState;
 export declare type InitialTableState = Partial<CoreTableState & VisibilityTableState & ColumnOrderTableState & ColumnPinningTableState & FiltersTableState & SortingTableState & ExpandedTableState & GroupingTableState & ColumnSizingTableState & PaginationInitialTableState & RowSelectionTableState>;
 export declare type Row<TGenerics extends TableGenerics> = CoreRow<TGenerics> & VisibilityRow<TGenerics> & ColumnPinningRow<TGenerics> & FiltersRow<TGenerics> & GroupingRow & RowSelectionRow & ExpandedRow;

package/build/umd/index.development.js

@@ -1098,7 +1098,6 @@
     },
     createColumn: (column, instance) => {
       return {
-        filterFn: column.filterFn,
         getAutoFilterFn: () => {
           const firstRow = instance.getCoreRowModel().flatRows[0];
           const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
@@ -1129,7 +1128,7 @@
           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;
@@ -1418,6 +1417,11 @@
   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'
       };
     },
@@ -1478,8 +1482,6 @@
           if (Object.prototype.toString.call(value) === '[object Date]') {
             return aggregationFns.extent;
           }
-
-          return aggregationFns.count;
         },
         getAggregationFn: () => {
           var _ref4;
@@ -1490,7 +1492,7 @@
             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];
         }
       };
     },
@@ -1523,6 +1525,12 @@
       };
     },
     createCell: (cell, column, row, instance) => {
+      const getRenderValue = () => {
+        var _cell$getValue;
+
+        return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
+      };
+
       return {
         getIsGrouped: () => column.getIsGrouped() && column.id === row.groupingColumnId,
         getIsPlaceholder: () => !cell.getIsGrouped() && column.getIsGrouped(),
@@ -1532,15 +1540,19 @@
           return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
         },
         renderAggregatedCell: () => {
-          var _column$columnDef$agg;
+          {
+            if (!column.columnDef.aggregatedCell) {
+              console.warn('A columnDef.aggregatedCell template is recommended for displaying aggregated values.');
+            }
+          }
 
-          const template = (_column$columnDef$agg = column.columnDef.aggregatedCell) != null ? _column$columnDef$agg : column.columnDef.cell;
+          const template = column.columnDef.aggregatedCell || column.columnDef.cell;
           return template ? instance._render(template, {
             instance,
             column,
             row,
             cell,
-            getValue: cell.getValue
+            getValue: getRenderValue
           }) : null;
         }
       };
@@ -2010,11 +2022,11 @@
           });
         },
         toggleAllPageRowsSelected: value => instance.setRowSelection(old => {
-          typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
+          const resolvedValue = typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
           const rowSelection = { ...old
           };
           instance.getRowModel().rows.forEach(row => {
-            mutateRowIsSelected(rowSelection, row.id, value, instance);
+            mutateRowIsSelected(rowSelection, row.id, resolvedValue, instance);
           });
           return rowSelection;
         }),
@@ -2169,7 +2181,7 @@
         },
         getIsSomePageRowsSelected: () => {
           const paginationFlatRows = instance.getPaginationRowModel().flatRows;
-          return instance.getIsAllPageRowsSelected() ? false : !!(paginationFlatRows != null && paginationFlatRows.length);
+          return instance.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
         },
         getToggleAllRowsSelectedHandler: () => {
           return e => {
@@ -2523,8 +2535,10 @@
           //   })
           //   return
           // }
+          // this needs to be outside of instance.setSorting to be in sync with rerender
+          const nextSortingOrder = column.getNextSortingOrder();
           instance.setSorting(old => {
-            var _ref2, _column$columnDef$sor, _instance$options$ena, _instance$options$ena2;
+            var _instance$options$ena, _instance$options$ena2;
 
             // Find any existing sorting for this column
             const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2549,30 +2563,29 @@
               } else {
                 sortAction = 'replace';
               }
-            }
+            } // Handle toggle states that will remove the sorting
 
-            const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
 
             if (sortAction === 'toggle' && ( // Must be toggling
             (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
             !hasDescDefined && ( // Must not be setting desc
-            multi ? (_instance$options$ena2 = instance.options.enableMultiRemove) != null ? _instance$options$ena2 : true : true) && ( // If multi, don't allow if enableMultiRemove
-            existingSorting != null && existingSorting.desc // Finally, detect if it should indeed be removed
-            ? !sortDescFirst : sortDescFirst)) {
+            multi ? (_instance$options$ena2 = instance.options.enableMultiRemove) != null ? _instance$options$ena2 : true : true) && // If multi, don't allow if enableMultiRemove
+            !nextSortingOrder // Finally, detect if it should indeed be removed
+            ) {
               sortAction = 'remove';
             }
 
             if (sortAction === 'replace') {
               newSorting = [{
                 id: column.id,
-                desc: hasDescDefined ? desc : !!sortDescFirst
+                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
               }];
             } else if (sortAction === 'add' && old != null && old.length) {
               var _instance$options$max;
 
               newSorting = [...old, {
                 id: column.id,
-                desc: hasDescDefined ? desc : !!sortDescFirst
+                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
               }]; // Take latest n columns
 
               newSorting.splice(0, newSorting.length - ((_instance$options$max = instance.options.maxMultiSortColCount) != null ? _instance$options$max : Number.MAX_SAFE_INTEGER));
@@ -2581,7 +2594,7 @@
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                   };
                 }
 
@@ -2594,6 +2607,23 @@
             return newSorting;
           });
         },
+        getNextSortingOrder: () => {
+          var _ref2, _column$columnDef$sor;
+
+          const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc';
+          const firstSortDirection = sortDescFirst ? 'desc' : 'asc';
+          const isSorted = column.getIsSorted();
+
+          if (!isSorted) {
+            return firstSortDirection;
+          }
+
+          if (isSorted === firstSortDirection) {
+            return isSorted === 'desc' ? 'asc' : 'desc';
+          } else {
+            return false;
+          }
+        },
         getCanSort: () => {
           var _column$columnDef$ena, _instance$options$ena3;
 
@@ -2885,9 +2915,9 @@
           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());
@@ -3041,6 +3071,12 @@
   }
 
   function createCell(instance, row, column, columnId) {
+    const getRenderValue = () => {
+      var _cell$getValue;
+
+      return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
+    };
+
     const cell = {
       id: row.id + "_" + column.id,
       row,
@@ -3052,7 +3088,7 @@
           column,
           row,
           cell: cell,
-          getValue: cell.getValue
+          getValue: getRenderValue
         }) : null;
       }
     };
@@ -3658,11 +3694,6 @@
               if (aggregateFn) {
                 row._groupingValuesCache[columnId] = aggregateFn(columnId, leafRows, groupedRows);
                 return row._groupingValuesCache[columnId];
-              } else if (column.aggregationFn) {
-                console.info({
-                  column
-                });
-                throw new Error("Table: Invalid column.aggregateType option for column listed above" );
               }
             }
           });
@@ -3786,20 +3817,34 @@
       const pageStart = pageSize * pageIndex;
       const pageEnd = pageStart + pageSize;
       rows = rows.slice(pageStart, pageEnd);
+      let paginatedRowModel;
 
       if (!instance.options.paginateExpandedRows) {
-        return expandRows({
+        paginatedRowModel = expandRows({
           rows,
           flatRows,
           rowsById
         });
+      } else {
+        paginatedRowModel = {
+          rows,
+          flatRows,
+          rowsById
+        };
       }
 
-      return {
-        rows,
-        flatRows,
-        rowsById
+      paginatedRowModel.flatRows = [];
+
+      const handleRow = row => {
+        paginatedRowModel.flatRows.push(row);
+
+        if (row.subRows.length) {
+          row.subRows.forEach(handleRow);
+        }
       };
+
+      paginatedRowModel.rows.forEach(handleRow);
+      return paginatedRowModel;
     }, {
       key: 'getPaginationRowModel',
       debug: () => {