@tanstack/react-table 8.5.6 → 8.5.9

package/build/esm/index.js

@@ -3795,8 +3795,13 @@ function groupBy(rows, columnId) {
 
 function getExpandedRowModel() {
   return table => memo(() => [table.getState().expanded, table.getPreExpandedRowModel(), table.options.paginateExpandedRows], (expanded, rowModel, paginateExpandedRows) => {
-    if (!rowModel.rows.length || // Do not expand if rows are not included in pagination
-    !paginateExpandedRows || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
+    if (!rowModel.rows.length || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
+      return rowModel;
+    }
+
+    if (!paginateExpandedRows) {
+      // Only expand rows at this point if they are being paginated
+      console.log(rowModel.rows);
       return rowModel;
     }
 
@@ -3810,7 +3815,7 @@ function getExpandedRowModel() {
     }
   });
 }
-function expandRows(rowModel, table) {
+function expandRows(rowModel) {
   const expandedRows = [];
 
   const handleRow = row => {
@@ -3832,7 +3837,7 @@ function expandRows(rowModel, table) {
 }
 
 function getPaginationRowModel(opts) {
-  return table => memo(() => [table.getState().pagination, table.getPrePaginationRowModel()], (pagination, rowModel) => {
+  return table => memo(() => [table.getState().pagination, table.getPrePaginationRowModel(), table.options.paginateExpandedRows ? undefined : table.getState().expanded], (pagination, rowModel) => {
     if (!rowModel.rows.length) {
       return rowModel;
     }
@@ -3865,6 +3870,7 @@ function getPaginationRowModel(opts) {
       };
     }
 
+    console.log(paginatedRowModel.rows);
     paginatedRowModel.flatRows = [];
 
     const handleRow = row => {