@ascentgl/ads-ui 21.76.1 → 21.77.0

package/fesm2022/ascentgl-ads-ui.mjs

@@ -7720,10 +7720,9 @@ class AdsTableComponent {
                 // For columns without explicit config (like supplier, destination),
                 // always apply the filter based on selectedValues
                 const cellValue = node.data[field];
-                // For objects, use JSON.stringify to match the format used in filterOptions
-                const cellValueStr = cellValue != null
-                    ? (typeof cellValue === 'object' ? JSON.stringify(cellValue) : String(cellValue))
-                    : '';
+                // Use formatter if available to produce a consistent key for comparison
+                const formatter = this.getFilterValueFormatterForField(field);
+                const cellValueStr = this.serializeCellValueForFilter(cellValue, formatter);
                 if (!selectedValues.includes(cellValueStr)) {
                     return false;
                 }
@@ -8096,6 +8095,22 @@ class AdsTableComponent {
         }
     }
     // ============ Custom Sort/Filter Menu Methods ============
+    /** @ignore - Get the filterValueFormatter for a given column field */
+    getFilterValueFormatterForField(field) {
+        const config = this.columnSortFilterConfigs.find(c => c.field === field);
+        return config?.filterValueFormatter;
+    }
+    /**
+     * @ignore - Serialize a cell value for filter key purposes.
+     * When a filterValueFormatter exists, uses the formatted value as the key
+     * so that values with the same display (e.g. same date, different time) are deduplicated.
+     */
+    serializeCellValueForFilter(value, formatter) {
+        if (formatter) {
+            return formatter(value);
+        }
+        return this.serializeCellValue(value);
+    }
     /** @ignore - Extract unique RAW values from a column in rowData (with caching) */
     getUniqueColumnValues(field) {
         if (!this.rowData || this.rowData.length === 0) {
@@ -8107,14 +8122,17 @@ class AdsTableComponent {
         if (cached) {
             return cached;
         }
+        const formatter = this.getFilterValueFormatterForField(field);
         // Use a Map to dedupe by serialized key while preserving raw values
         const byKey = new Map();
         this.rowData.forEach(row => {
             const value = row[field];
             if (value !== null && value !== undefined) {
-                const key = this.serializeCellValue(value);
+                const key = this.serializeCellValueForFilter(value, formatter);
                 if (!byKey.has(key)) {
-                    byKey.set(key, value);
+                    // When a formatter exists, store the formatted string as the value
+                    // so downstream consumers (menu, filter matching) use a consistent key
+                    byKey.set(key, formatter ? key : value);
                 }
             }
         });
@@ -8150,6 +8168,7 @@ class AdsTableComponent {
             this.filteredColumnValuesCache.set(cacheKey, values);
             return values;
         }
+        const formatter = this.getFilterValueFormatterForField(field);
         // Use a Map to dedupe by serialized key while preserving raw values
         const byKey = new Map();
         // Iterate through all rows and check if they pass filters from OTHER columns
@@ -8157,9 +8176,9 @@ class AdsTableComponent {
             if (this.doesRowPassFiltersExcluding(row, field)) {
                 const value = row[field];
                 if (value !== null && value !== undefined) {
-                    const key = this.serializeCellValue(value);
+                    const key = this.serializeCellValueForFilter(value, formatter);
                     if (!byKey.has(key)) {
-                        byKey.set(key, value);
+                        byKey.set(key, formatter ? key : value);
                     }
                 }
             }
@@ -8223,10 +8242,9 @@ class AdsTableComponent {
                 return false;
             }
             const cellValue = row[field];
-            // For objects, use JSON.stringify to match the format used in filterOptions
-            const cellValueStr = cellValue != null
-                ? (typeof cellValue === 'object' ? JSON.stringify(cellValue) : String(cellValue))
-                : '';
+            // Use formatter if available to produce a consistent key for comparison
+            const formatter = this.getFilterValueFormatterForField(field);
+            const cellValueStr = this.serializeCellValueForFilter(cellValue, formatter);
             if (!selectedValues.includes(cellValueStr)) {
                 return false;
             }