Skip to content

Commit

Permalink
Move DataTable header creation to before updating sort order (#3924)
Browse files Browse the repository at this point in the history
* Move header creation before sort order determination

* Create slimy-foxes-wash.md

---------

Co-authored-by: Josh Black <joshblack@github.com>
  • Loading branch information
thyeggman and joshblack authored Nov 13, 2023
1 parent 63d5254 commit 412618b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changeset/slimy-foxes-wash.md
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
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

0 comments on commit 412618b

Please sign in to comment.