@tanstack/table-core 8.9.2 → 8.9.3

package/build/lib/index.mjs

@@ -2305,7 +2305,8 @@ const Sorting = {
   },
   getDefaultColumnDef: () => {
     return {
-      sortingFn: 'auto'
+      sortingFn: 'auto',
+      sortUndefined: 1
     };
   },
   getDefaultOptions: table => {
@@ -3353,22 +3354,23 @@ function getSortedRowModel() {
           const sortEntry = availableSorting[i];
           const columnInfo = columnInfoById[sortEntry.id];
           const isDesc = (_sortEntry$desc = sortEntry == null ? void 0 : sortEntry.desc) != null ? _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 = aUndefined && bUndefined ? 0 : aUndefined ? columnInfo.sortUndefined : -columnInfo.sortUndefined;
-              if (isDesc && undefinedSort !== 0) {
-                undefinedSort *= -1;
-              }
-              return undefinedSort;
+              sortInt = aUndefined && bUndefined ? 0 : aUndefined ? columnInfo.sortUndefined : -columnInfo.sortUndefined;
             }
           }
+          if (sortInt === 0) {
+            sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id);
+          }
 
-          // This function should always return in ascending order
-          let 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;