@elderbyte/ngx-starter 13.8.0 → 13.8.1

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -4406,6 +4406,57 @@ class DelegateContinuableDataSource extends DelegateDataSource {
     }
 }
 
+class FilterUtil {
+    static filterData(data, filters) {
+        FilterUtil.logger.debug('Filtering data with ' + data.length + ' items.', filters);
+        if (filters && filters.length > 0) {
+            for (const filter of filters) {
+                data = data.filter(e => FilterUtil.matches(e, filter));
+            }
+        }
+        return data;
+    }
+    static matches(entity, filter) {
+        if (filter.value === null || filter.value === undefined) {
+            return true;
+        }
+        let value;
+        if (entity === null || entity === undefined) {
+            value = null;
+        }
+        else if (typeof entity === 'object') {
+            value = entity[filter.key];
+        }
+        else {
+            value = String(entity); // Support filtering primitive values
+        }
+        if (Array.isArray(filter.value)) {
+            for (const val of filter.value) {
+                if (FilterUtil.matchesValue(value, val)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else {
+            return FilterUtil.matchesValue(value, filter.value);
+        }
+    }
+    static matchesValue(haystack, needle) {
+        if (haystack === needle) {
+            return true;
+        }
+        if (haystack === null || haystack === undefined) {
+            return false;
+        }
+        const str = String(haystack);
+        const match = str.toLowerCase().startsWith(needle.toLowerCase());
+        // FilterUtil.logger.debug('Haystack: ' + str + ' starts with needle: ' + needle + ' --> ' + match);
+        return match;
+    }
+}
+FilterUtil.logger = LoggerFactory.getLogger(FilterUtil.constructor.name);
+
 /**
  * Provides the ability to build a IDataContext<T>.
  */
@@ -4531,12 +4582,12 @@ class DataContextBuilder {
      *                                                                         *
      **************************************************************************/
     buildLocal(items, idProperty) {
-        return this.build(LocalListDataSource.from(items, idProperty));
+        return this.build(LocalListDataSource.from(items, idProperty, this._localSort, FilterUtil.filterData));
     }
     buildLocalActivePaged(data, idProperty) {
         this._skipLocalSort = true;
         this.activePaged();
-        return this.build(LocalPagedDataSource.from(data, idProperty, this._localSort));
+        return this.build(LocalPagedDataSource.from(data, idProperty, this._localSort, FilterUtil.filterData));
     }
     /***************************************************************************
      *                                                                         *
@@ -6096,48 +6147,6 @@ class PropertyPathUtil {
     }
 }
 
-class FilterUtil {
-    static filterData(data, filters) {
-        FilterUtil.logger.debug('Filtering data with ' + data.length + ' items.', filters);
-        if (filters && filters.length > 0) {
-            for (const filter of filters) {
-                data = data.filter(e => FilterUtil.matches(e, filter));
-            }
-        }
-        return data;
-    }
-    static matches(entity, filter) {
-        if (filter.value === null || filter.value === undefined) {
-            return true;
-        }
-        const value = entity[filter.key];
-        if (Array.isArray(filter.value)) {
-            for (const val of filter.value) {
-                if (FilterUtil.matchesValue(value, val)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        else {
-            return FilterUtil.matchesValue(value, filter.value);
-        }
-    }
-    static matchesValue(haystack, needle) {
-        if (haystack === needle) {
-            return true;
-        }
-        if (haystack === null || haystack === undefined) {
-            return false;
-        }
-        const str = String(haystack);
-        const match = str.toLowerCase().startsWith(needle.toLowerCase());
-        // FilterUtil.logger.debug('Haystack: ' + str + ' starts with needle: ' + needle + ' --> ' + match);
-        return match;
-    }
-}
-FilterUtil.logger = LoggerFactory.getLogger(FilterUtil.constructor.name);
-
 class NextNumberUtil {
     /***************************************************************************
      *                                                                         *
@@ -20348,6 +20357,7 @@ class ElderSelectBase extends FormFieldBaseComponent {
         this.autoCleanUp();
         if (data instanceof Array) {
             this.suggestionsDc = DataContextBuilder.start()
+                .localSort()
                 .buildLocal(data); // Memory leak
             this.suggestionsDc.start();
         }