clean up #805

KevinVandy · Dec 5, 2023 · 1d207cb · 1d207cb · vercel · Dec 5, 2023
1 parent 62ef9ba
commit 1d207cb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git 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 = <TData extends MRT_RowData>({
     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 (
     <Tooltip placement="top" title={sortTooltip}>
@@ -56,7 +63,7 @@ export const MRT_TableHeadCellSortLabel = <TData extends MRT_RowData>({
               ? (props) => (
                   <SyncAltIcon
                     {...props}
-                    direction={isSorted ? (column.getIsSorted() as 'asc' | 'desc') : undefined}
+                    direction={direction}
                     style={{
                       transform: 'rotate(-90deg) scaleX(0.9) translateX(-1px)',
                     }}
@@ -66,9 +73,7 @@ export const MRT_TableHeadCellSortLabel = <TData extends MRT_RowData>({
           }
           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
@@ -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(),
 }));