@tanstack/table-core 8.0.0-beta.4 → 8.0.0-beta.7

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/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);
@@ -1537,7 +1534,7 @@
         getIsAggregated: () => {
           var _row$subRows;
 
-          return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
+          return !cell.getIsGrouped() && !cell.getIsPlaceholder() && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
         },
         renderAggregatedCell: () => {
           {
@@ -2022,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;
         }),
@@ -2117,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: [],
@@ -2181,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 => {
@@ -2667,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);
@@ -3817,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: () => {