@dmlibs/dm-cmps 0.1.10 → 0.1.11

package/fesm2022/dmlibs-dm-cmps.mjs

@@ -67,6 +67,7 @@ class DmCmpsDataSource {
                 value.toString().toLowerCase().includes(term.toLowerCase()));
         };
         if (this.speratedSearch) {
+            console.log('sperated search active !!!');
             const terms = filter
                 .split(' ')
                 .map((t) => t.trim())
@@ -1587,6 +1588,7 @@ class DmTable {
                 this.datasource().setFilterPredicate(this._filterPredicate);
             }
             if (this.enableSperatedSearch()) {
+                console.log('enableSperatedSearch');
                 this.datasource().applySperatedSearch(true);
             }
             if (this.enablePagination() || dataSource.length >= this.autoPaginationAboveRowsCount()) {
@@ -1680,13 +1682,20 @@ class DmTable {
             return;
         this.datasource().setFilterPredicate((row, filter) => {
             const filterLower = filter.toLowerCase();
-            for (const col of this.runtimeColumns()) {
+            const match = (term) => this.runtimeColumns().some((col) => {
+                if (col.type && ['actions', '$index', 'component', 'customHtml'].includes(col.type))
+                    return false;
                 const cellValue = this.resolveCellValue(row, col);
-                if (cellValue != null && cellValue.toString().toLowerCase().includes(filterLower)) {
-                    return true;
-                }
+                return cellValue != null && cellValue.toString().includes(term);
+            });
+            if (this.enableSperatedSearch()) {
+                const terms = filterLower
+                    .split(' ')
+                    .map((term) => term.trim())
+                    .filter((term) => !!term);
+                return terms.every((term) => match(term));
             }
-            return false;
+            return match(filterLower);
         });
     }
     createCellContext = (row, column) => ({