Skip to content
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

Jump to bottom

Move DataTable header creation to before updating sort order #3924

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Move DataTable header creation to before updating sort order #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f515f62
Move header creation before sort order determination
thyeggman Nov 8, 2023
ed6f176
Create slimy-foxes-wash.md
joshblack Nov 9, 2023
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
5 changes: 5 additions & 0 deletions .changeset/slimy-foxes-wash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Fix issue in DataTable so that sort order is determined after column headers are created
18 changes: 9 additions & 9 deletions src/DataTable/useTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,6 @@ export function useTable<Data extends UniqueRow>({
}
}

// Update the row order and apply the current sort column to the incoming data
if (data !== prevData) {
setPrevData(data)
setRowOrder(data)
if (sortByColumn) {
sortRows(sortByColumn)
}
}

const headers = columns.map(column => {
const id = column.id ?? column.field
if (id === undefined) {
Expand All @@ -102,6 +93,15 @@ export function useTable<Data extends UniqueRow>({
}
})

// Update the row order and apply the current sort column to the incoming data
if (data !== prevData) {
setPrevData(data)
setRowOrder(data)
if (sortByColumn) {
sortRows(sortByColumn)
}
}

/**
* Sort the input row data by the given header
*/
Expand Down
Loading