fix: actually handle undefined sorting out of the box

tannerlinsley · tannerlinsley · commit 17a03735525a · 2023-06-08T11:17:22.000-06:00
diff --git a/packages/table-core/src/features/Sorting.ts b/packages/table-core/src/features/Sorting.ts
@@ -116,6 +116,7 @@ export const Sorting: TableFeature = {
   getDefaultColumnDef: <TData extends RowData>(): SortingColumnDef<TData> => {
     return {
       sortingFn: 'auto',
+      sortUndefined: 1,
     }
   },
 
diff --git a/packages/table-core/src/utils/getSortedRowModel.ts b/packages/table-core/src/utils/getSortedRowModel.ts
@@ -53,32 +53,31 @@ export function getSortedRowModel<TData extends RowData>(): (
               const columnInfo = columnInfoById[sortEntry.id]!
               const isDesc = sortEntry?.desc ?? false
 
+              let sortInt = 0
+
+              // All sorting ints should always return in ascending order
               if (columnInfo.sortUndefined) {
                 const aValue = rowA.getValue(sortEntry.id)
                 const bValue = rowB.getValue(sortEntry.id)
 
-                const aUndefined = typeof aValue === 'undefined'
-                const bUndefined = typeof bValue === 'undefined'
+                const aUndefined = aValue === undefined
+                const bUndefined = bValue === undefined
 
                 if (aUndefined || bUndefined) {
-                  let undefinedSort =
+                  sortInt =
                     aUndefined && bUndefined
                       ? 0
                       : aUndefined
                       ? columnInfo.sortUndefined
                       : -columnInfo.sortUndefined
-
-                  if (isDesc && undefinedSort !== 0) {
-                    undefinedSort *= -1
-                  }
-
-                  return undefinedSort
                 }
               }
 
-              // This function should always return in ascending order
-              let sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id)
+              if (sortInt === 0) {
+                sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id)
+              }
 
+              // If sorting is non-zero, take care of desc and inversion
               if (sortInt !== 0) {
                 if (isDesc) {
                   sortInt *= -1

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ export const Sorting: TableFeature = {`
`116`	`116`	`getDefaultColumnDef: <TData extends RowData>(): SortingColumnDef<TData> => {`
`117`	`117`	`return {`
`118`	`118`	`sortingFn: 'auto',`
	`119`	`+ sortUndefined: 1,`
`119`	`120`	`}`
`120`	`121`	`},`
`121`	`122`