Skip to content

fix(table-core): expand rows with manual pagination #6440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
KevinVandy wants to merge 1 commit into
base: beta
Choose a base branch
from
+20 −1
Draft

fix(table-core): expand rows with manual pagination #6440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/table-core/src/features/row-expanding/createExpandedRowModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export function createExpandedRowModel<
table.atoms.expanded?.get(),
table.getPreExpandedRowModel(),
table.options.paginateExpandedRows,
table.options.manualPagination,
],
fn: () => _createExpandedRowModel(table),
})
Expand All @@ -45,7 +46,7 @@ function _createExpandedRowModel<
return rowModel
}

if (!table.options.paginateExpandedRows) {
if (!table.options.paginateExpandedRows && !table.options.manualPagination) {
// Only expand rows at this point if they are being paginated
return rowModel
}
Expand Down
18 changes: 18 additions & 0 deletions ...s/table-core/tests/implementation/features/row-pagination/createPaginatedRowModel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,5 +232,23 @@ describe('createPaginatedRowModel', () => {
'4',
])
})

it('should include expanded children when expanded rows bypass manual pagination', () => {
const table = createTable({
data: makeNestedData(),
manualPagination: true,
paginateExpandedRows: false,
})

table.getRow('0').toggleExpanded()

expect(table.getRowModel().rows.map((row) => row.id)).toEqual([
'0',
'0.0',
'0.1',
'1',
'2',
])
})
})
})
Loading