@sd-angular/core 19.0.30 → 19.0.31

package/components/table/src/services/table-local/table-local-sort.util.d.ts

@@ -0,0 +1,3 @@
+import type { SdTableColumn } from '../../models/table-column.model';
+/** Internal local-sort comparison; intentionally not exported from the table entry point. */
+export declare const compareLocalValues: (a: unknown, b: unknown, type: SdTableColumn["type"], direction: "ASC" | "DESC") => number;

package/fesm2022/sd-angular-core-components-table.mjs

@@ -3049,6 +3049,32 @@ const buildColumnWidthMap = (column) => {
     return result;
 };
 
+const sortValue = (value, type) => {
+    if (value === null || value === undefined || value === '')
+        return null;
+    if (type === 'number') {
+        const number = typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean' ? Number(value) : NaN;
+        return Number.isNaN(number) ? null : number;
+    }
+    if (type === 'date' || type === 'datetime' || type === 'time') {
+        const time = value instanceof Date ? value.getTime() : typeof value === 'string' || typeof value === 'number' ? new Date(value).getTime() : NaN;
+        return Number.isNaN(time) ? null : time;
+    }
+    return String(value);
+};
+/** Internal local-sort comparison; intentionally not exported from the table entry point. */
+const compareLocalValues = (a, b, type, direction) => {
+    const first = sortValue(a, type);
+    const second = sortValue(b, type);
+    // why: xếp rỗng trước khi xét chiều để DESC vẫn giữ rỗng ở cuối và không đảo các dòng bằng nhau.
+    if (first === null)
+        return second === null ? 0 : 1;
+    if (second === null)
+        return -1;
+    const order = first < second ? -1 : first > second ? 1 : 0;
+    return direction === 'DESC' ? -order : order;
+};
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const isTableItem = (item) => !!item && typeof item === 'object' && 'data' in item && 'meta' in item;
 const resolveItemData = (item) => (isTableItem(item) ? item.data : item);
@@ -3166,27 +3192,8 @@ const filterLocalItems = (localItems, option, filterInfo) => {
             items.sort((tableItemCurrent, tableItemNext) => {
                 const dataVal = Utilities.getNestedValue(resolveItemData(tableItemCurrent), field);
                 const nextVal = Utilities.getNestedValue(resolveItemData(tableItemNext), field);
-                if (type === 'number') {
-                    return (dataVal || 0) - (nextVal || 0);
-                }
-                if (type === 'date' || type === 'datetime' || type === 'time') {
-                    const d1 = new Date(dataVal || '').getTime();
-                    const d2 = new Date(nextVal || '').getTime();
-                    return d1 - d2;
-                }
-                const s1 = (dataVal || '').toString();
-                const s2 = (nextVal || '').toString();
-                if (s1 > s2) {
-                    return 1;
-                }
-                if (s1 < s2) {
-                    return -1;
-                }
-                return 0;
+                return compareLocalValues(dataVal, nextVal, type, orderDirection);
             });
-            if (orderDirection === 'DESC') {
-                items.reverse();
-            }
         }
     }
     return {