@ni/nimble-components 20.5.3 → 20.5.4

package/dist/esm/table/models/sort-operations.d.ts

@@ -1,4 +1,4 @@
-import { SortingFnOption as TanStackSortingFnOption } from '@tanstack/table-core';
+import type { SortingFnOption as TanStackSortingFnOption } from '@tanstack/table-core';
 import { TableColumnSortOperation } from '../../table-column/base/types';
 /**
  * Returns the sorting function for TanStack to use based on the specified

package/dist/esm/table/models/sort-operations.js

@@ -1,4 +1,3 @@
-import { sortingFns as TanStackSortingFns } from '@tanstack/table-core';
 import { TableColumnSortOperation } from '../../table-column/base/types';
 /**
  * Returns the sorting function for TanStack to use based on the specified
@@ -7,11 +6,11 @@ import { TableColumnSortOperation } from '../../table-column/base/types';
 export function getTanStackSortingFunction(sortOperation) {
     switch (sortOperation) {
         case TableColumnSortOperation.basic:
-            return TanStackSortingFns.basic;
+            return basicSortFunction;
         case TableColumnSortOperation.localeAwareCaseSensitive:
             return localeAwareCaseSensitiveSortFunction;
         default:
-            return TanStackSortingFns.basic;
+            return basicSortFunction;
     }
 }
 /**
@@ -33,4 +32,38 @@ function localeAwareCaseSensitiveSortFunction(rowA, rowB, columnId) {
     }
     return 1;
 }
+/**
+ * A function to perform a basic sort of two rows from TanStack for a given column.
+ * The function sorts `undefined` followed by `null` before all other values.
+ */
+function basicSortFunction(rowA, rowB, columnId) {
+    const valueA = rowA.getValue(columnId);
+    const valueB = rowB.getValue(columnId);
+    if (Object.is(valueA, valueB)) {
+        return 0;
+    }
+    if (valueA === undefined) {
+        return -1;
+    }
+    if (valueB === undefined) {
+        return 1;
+    }
+    if (valueA === null) {
+        return -1;
+    }
+    if (valueB === null) {
+        return 1;
+    }
+    if (Number.isNaN(valueA)) {
+        return -1;
+    }
+    if (Number.isNaN(valueB)) {
+        return 1;
+    }
+    if (valueA === 0 && valueB === 0) {
+        // Both values equal 0, but one is -0 and one is +0 because Object.is(valueA, valueB) returned false.
+        return Object.is(valueA, -0) ? -1 : 1;
+    }
+    return valueA > valueB ? 1 : -1;
+}
 //# sourceMappingURL=sort-operations.js.map

package/dist/esm/table/models/sort-operations.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-operations.js","sourceRoot":"","sources":["../../../../src/table/models/sort-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,UAAU,IAAI,kBAAkB,EAEnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACtC,aAAuC;IAEvC,QAAQ,aAAa,EAAE;QACnB,KAAK,wBAAwB,CAAC,KAAK;YAC/B,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,wBAAwB,CAAC,wBAAwB;YAClD,OAAO,oCAAoC,CAAC;QAChD;YACI,OAAO,kBAAkB,CAAC,KAAK,CAAC;KACvC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,oCAAoC,CACzC,IAAwB,EACxB,IAAwB,EACxB,QAAgB;IAEhB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAA4B,QAAQ,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAA4B,QAAQ,CAAC,CAAC;IAElE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC1D,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;KACvC;IACD,IAAI,MAAM,KAAK,MAAM,EAAE;QACnB,OAAO,CAAC,CAAC;KACZ;IACD,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,CAAC,EAAE;QACnE,OAAO,CAAC,CAAC,CAAC;KACb;IACD,OAAO,CAAC,CAAC;AACb,CAAC"}
+{"version":3,"file":"sort-operations.js","sourceRoot":"","sources":["../../../../src/table/models/sort-operations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACtC,aAAuC;IAEvC,QAAQ,aAAa,EAAE;QACnB,KAAK,wBAAwB,CAAC,KAAK;YAC/B,OAAO,iBAAiB,CAAC;QAC7B,KAAK,wBAAwB,CAAC,wBAAwB;YAClD,OAAO,oCAAoC,CAAC;QAChD;YACI,OAAO,iBAAiB,CAAC;KAChC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,oCAAoC,CACzC,IAAwB,EACxB,IAAwB,EACxB,QAAgB;IAEhB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAA4B,QAAQ,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAA4B,QAAQ,CAAC,CAAC;IAElE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC1D,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;KACvC;IACD,IAAI,MAAM,KAAK,MAAM,EAAE;QACnB,OAAO,CAAC,CAAC;KACZ;IACD,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,CAAC,EAAE;QACnE,OAAO,CAAC,CAAC,CAAC;KACb;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CACtB,IAAwB,EACxB,IAAwB,EACxB,QAAgB;IAEhB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAkB,QAAQ,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAkB,QAAQ,CAAC,CAAC;IAExD,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC;KACZ;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,CAAC,CAAC;KACb;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,CAAC;KACZ;IACD,IAAI,MAAM,KAAK,IAAI,EAAE;QACjB,OAAO,CAAC,CAAC,CAAC;KACb;IACD,IAAI,MAAM,KAAK,IAAI,EAAE;QACjB,OAAO,CAAC,CAAC;KACZ;IACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QACtB,OAAO,CAAC,CAAC,CAAC;KACb;IACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QACtB,OAAO,CAAC,CAAC;KACZ;IAED,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE;QAC9B,qGAAqG;QACrG,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACzC;IACD,OAAO,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "20.5.3",
+  "version": "20.5.4",
   "description": "Styled web components for the NI Nimble Design System",
   "scripts": {
     "build": "npm run generate-icons && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",