@tanstack/table-core 8.5.8 → 8.5.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.5.8",
+  "version": "8.5.9",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/utils/getExpandedRowModel.ts

@@ -14,14 +14,18 @@ export function getExpandedRowModel<TData extends RowData>(): (
       (expanded, rowModel, paginateExpandedRows) => {
         if (
           !rowModel.rows.length ||
-          // Do not expand if rows are not included in pagination
-          !paginateExpandedRows ||
           (expanded !== true && !Object.keys(expanded ?? {}).length)
         ) {
           return rowModel
         }
 
-        return expandRows(rowModel, table)
+        if (!paginateExpandedRows) {
+          // Only expand rows at this point if they are being paginated
+          console.log(rowModel.rows)
+          return rowModel
+        }
+
+        return expandRows(rowModel)
       },
       {
         key: process.env.NODE_ENV === 'development' && 'getExpandedRowModel',
@@ -30,10 +34,7 @@ export function getExpandedRowModel<TData extends RowData>(): (
     )
 }
 
-export function expandRows<TData extends RowData>(
-  rowModel: RowModel<TData>,
-  table: Table<TData>
-) {
+export function expandRows<TData extends RowData>(rowModel: RowModel<TData>) {
   const expandedRows: Row<TData>[] = []
 
   const handleRow = (row: Row<TData>) => {

package/src/utils/getPaginationRowModel.ts

@@ -7,7 +7,13 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
 }): (table: Table<TData>) => () => RowModel<TData> {
   return table =>
     memo(
-      () => [table.getState().pagination, table.getPrePaginationRowModel()],
+      () => [
+        table.getState().pagination,
+        table.getPrePaginationRowModel(),
+        table.options.paginateExpandedRows
+          ? undefined
+          : table.getState().expanded,
+      ],
       (pagination, rowModel) => {
         if (!rowModel.rows.length) {
           return rowModel
@@ -23,14 +29,11 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
         let paginatedRowModel: RowModel<TData>
 
         if (!table.options.paginateExpandedRows) {
-          paginatedRowModel = expandRows(
-            {
-              rows,
-              flatRows,
-              rowsById,
-            },
-            table
-          )
+          paginatedRowModel = expandRows({
+            rows,
+            flatRows,
+            rowsById,
+          })
         } else {
           paginatedRowModel = {
             rows,
@@ -39,6 +42,8 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
           }
         }
 
+        console.log(paginatedRowModel.rows)
+
         paginatedRowModel.flatRows = []
 
         const handleRow = (row: Row<TData>) => {