@tanstack/table-core 8.9.2 → 8.9.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.9.2",
+  "version": "8.9.3",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/features/Sorting.ts

@@ -116,6 +116,7 @@ export const Sorting: TableFeature = {
   getDefaultColumnDef: <TData extends RowData>(): SortingColumnDef<TData> => {
     return {
       sortingFn: 'auto',
+      sortUndefined: 1,
     }
   },
 

package/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