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

package/build/esm/index.js

@@ -826,7 +826,6 @@ const Expanding = {
   getDefaultOptions: instance => {
     return {
       onExpandedChange: makeStateUpdater('expanded', instance),
-      autoResetExpanded: true,
       paginateExpandedRows: true
     };
   },
@@ -835,6 +834,8 @@ const Expanding = {
     let queued = false;
     return {
       _autoResetExpanded: () => {
+        var _ref, _instance$options$aut;
+
         if (!registered) {
           instance._queue(() => {
             registered = true;
@@ -843,11 +844,7 @@ const Expanding = {
           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;
 
@@ -911,7 +908,7 @@ const Expanding = {
         });
         return maxDepth;
       },
-      getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+      getPreExpandedRowModel: () => instance.getSortedRowModel(),
       getExpandedRowModel: () => {
         if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
           instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1512,7 +1509,7 @@ const Grouping = {
 
         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);
@@ -1545,7 +1542,7 @@ const Grouping = {
       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: () => {
         if (process.env.NODE_ENV === 'development') {
@@ -2030,11 +2027,11 @@ const RowSelection = {
         });
       },
       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;
       }),
@@ -2125,7 +2122,7 @@ const RowSelection = {
           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: [],
@@ -2189,7 +2186,7 @@ const RowSelection = {
       },
       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 => {
@@ -2675,7 +2672,7 @@ const Sorting = {
 
         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);
@@ -3827,20 +3824,34 @@ function getPaginationRowModel(opts) {
     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: process.env.NODE_ENV === 'development' && 'getPaginationRowModel',
     debug: () => {