diff --git a/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx b/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx index 852720fe5..b91d3dd9b 100644 --- a/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx +++ b/packages/material-react-table/src/head/MRT_TableHeadCellSortLabel.tsx @@ -37,12 +37,19 @@ export const MRT_TableHeadCellSortLabel = ({ isLoading || showSkeletons ? '' : column.getIsSorted() - ? column.getIsSorted() === 'desc' - ? localization.sortedByColumnDesc.replace('{column}', columnDef.header) - : localization.sortedByColumnAsc.replace('{column}', columnDef.header) - : column.getNextSortingOrder() === 'desc' - ? localization.sortByColumnDesc.replace('{column}', columnDef.header) - : localization.sortByColumnAsc.replace('{column}', columnDef.header); + ? column.getIsSorted() === 'desc' + ? localization.sortedByColumnDesc.replace( + '{column}', + columnDef.header, + ) + : localization.sortedByColumnAsc.replace('{column}', columnDef.header) + : column.getNextSortingOrder() === 'desc' + ? localization.sortByColumnDesc.replace('{column}', columnDef.header) + : localization.sortByColumnAsc.replace('{column}', columnDef.header); + + const direction = isSorted + ? (column.getIsSorted() as 'asc' | 'desc') + : undefined; return ( @@ -56,7 +63,7 @@ export const MRT_TableHeadCellSortLabel = ({ ? (props) => ( ({ } active aria-label={sortTooltip} - direction={ - isSorted ? (column.getIsSorted() as 'asc' | 'desc') : undefined - } + direction={direction} onClick={(e) => { e.stopPropagation(); header.column.getToggleSortingHandler()?.(e); diff --git a/packages/material-react-table/stories/features/RowDragging.stories.tsx b/packages/material-react-table/stories/features/RowDragging.stories.tsx index b2f406a4f..aa117f1dd 100644 --- a/packages/material-react-table/stories/features/RowDragging.stories.tsx +++ b/packages/material-react-table/stories/features/RowDragging.stories.tsx @@ -40,7 +40,7 @@ const initData = [...Array(25)].map(() => ({ age: faker.number.int(20) + 18, email: faker.internet.email(), firstName: faker.person.firstName(), - id: faker.random.alphaNumeric(6), + id: faker.string.alphanumeric(6), lastName: faker.person.lastName(), state: faker.location.state(), }));