@tanstack/table-core 8.0.0-beta.3 → 8.0.0-beta.6

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/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

@@ -818,7 +818,6 @@
     getDefaultOptions: instance => {
       return {
         onExpandedChange: makeStateUpdater('expanded', instance),
-        autoResetExpanded: true,
         paginateExpandedRows: true
       };
     },
@@ -827,6 +826,8 @@
       let queued = false;
       return {
         _autoResetExpanded: () => {
+          var _ref, _instance$options$aut;
+
           if (!registered) {
             instance._queue(() => {
               registered = true;
@@ -835,11 +836,7 @@
             return;
           }
 
-          if (instance.options.autoResetAll === false) {
-            return;
-          }
-
-          if (instance.options.autoResetAll === true || instance.options.autoResetExpanded) {
+          if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetExpanded) != null ? _ref : !instance.options.manualExpanding) {
             if (queued) return;
             queued = true;
 
@@ -903,7 +900,7 @@
           });
           return maxDepth;
         },
-        getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+        getPreExpandedRowModel: () => instance.getSortedRowModel(),
         getExpandedRowModel: () => {
           if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
             instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1504,7 +1501,7 @@
 
           instance.setGrouping(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
         },
-        getPreGroupedRowModel: () => instance.getSortedRowModel(),
+        getPreGroupedRowModel: () => instance.getFilteredRowModel(),
         getGroupedRowModel: () => {
           if (!instance._getGroupedRowModel && instance.options.getGroupedRowModel) {
             instance._getGroupedRowModel = instance.options.getGroupedRowModel(instance);
@@ -1525,6 +1522,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(),
@@ -1534,15 +1537,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;
         }
       };
@@ -2012,11 +2019,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;
         }),
@@ -2107,7 +2114,7 @@
             return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugTable;
           }
         }),
-        getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getGroupedRowModel()], (rowSelection, rowModel) => {
+        getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getSortedRowModel()], (rowSelection, rowModel) => {
           if (!Object.keys(rowSelection).length) {
             return {
               rows: [],
@@ -2171,7 +2178,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 => {
@@ -2525,8 +2532,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);
@@ -2551,30 +2560,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));
@@ -2583,7 +2591,7 @@
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                   };
                 }
 
@@ -2596,6 +2604,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;
 
@@ -2639,7 +2664,7 @@
 
           instance.setSorting(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
         },
-        getPreSortedRowModel: () => instance.getFilteredRowModel(),
+        getPreSortedRowModel: () => instance.getGroupedRowModel(),
         getSortedRowModel: () => {
           if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
             instance._getSortedRowModel = instance.options.getSortedRowModel(instance);
@@ -3043,6 +3068,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,
@@ -3054,7 +3085,7 @@
           column,
           row,
           cell: cell,
-          getValue: cell.getValue
+          getValue: getRenderValue
         }) : null;
       }
     };
@@ -3783,20 +3814,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: () => {