@saydar/table-builder 1.0.9-beta.6 → 1.0.9-beta.8

package/fesm2022/saydar-table-builder.mjs

@@ -1444,14 +1444,15 @@ const isNull = (filterInfo) => {
     return func;
 };
 
-function normalizeStringFilterValue(v) {
-    if (typeof v === 'string' && v.includes(',')) {
-        return v.split(',').map(s => s.trim()).filter(s => s);
+function splitCommaValue(value) {
+    if (typeof value === 'string' && value.includes(',')) {
+        return value.split(',').map(s => s.trim()).filter(s => s);
     }
-    return v;
+    return value;
 }
+
 const makeStringFunc = (op) => (filterInfo) => {
-    const filterValue = normalizeStringFilterValue(filterInfo.filterValue);
+    const filterValue = splitCommaValue(filterInfo.filterValue);
     if (Array.isArray(filterValue)) {
         const vals = filterValue.map((v) => prepareForStringCompare(v));
         return (val) => vals.some((v) => op(prepareForStringCompare(val), v));
@@ -1486,18 +1487,13 @@ const EnumFilterFuncs = {
 };
 const prepareForStringCompare = (val) => val?.toString().trim().toLowerCase();
 
-function normalizeNumberFilterValue(v) {
-    if (typeof v === 'string' && v.includes(',')) {
-        return v.split(',').map(s => Number(s.trim())).filter(n => !isNaN(n));
-    }
-    return v;
-}
 const numberEqalsFunc = (filterInfo) => {
-    const filterValue = normalizeNumberFilterValue(filterInfo.filterValue);
-    if (Array.isArray(filterValue)) {
-        return (val) => filterValue.some((v) => val === v);
+    const split = splitCommaValue(filterInfo.filterValue);
+    if (Array.isArray(split)) {
+        const nums = split.map(s => Number(s)).filter(n => !isNaN(n));
+        return (val) => nums.some(v => val === v);
     }
-    return (val) => val === filterValue;
+    return (val) => val === filterInfo.filterValue;
 };
 const numberNotEqualFunc = (filterInfo) => (val) => {
     return val !== filterInfo.filterValue;
@@ -1738,6 +1734,7 @@ class TableStore extends ComponentStore {
                 if (!filter.filterId) {
                     filter.filterId = v4();
                 }
+                filter.filterValue = splitCommaValue(filter.filterValue);
                 filtersObj[filter.filterId] = filter;
                 return filtersObj;
             }, {});
@@ -2992,9 +2989,9 @@ class InFilterComponent {
     }
     onValueChange(i, value) {
         this.value = [...this.value];
-        if (typeof value === 'string' && value.includes(',')) {
-            const parts = value.split(',').map(s => s.trim()).filter(s => s);
-            this.value.splice(i, 1, ...parts);
+        const split = splitCommaValue(value);
+        if (Array.isArray(split)) {
+            this.value.splice(i, 1, ...split);
         }
         else {
             this.value[i] = value;
@@ -3424,9 +3421,6 @@ class TableFilterStringContainsDirective extends TableFilterDirective {
         super.reset();
     }
     setFilter(filter) {
-        if (typeof filter.filterValue === 'string' && filter.filterValue.includes(',')) {
-            filter.filterValue = filter.filterValue.split(',').map(s => s.trim()).filter(s => s);
-        }
         filter.active = filter.filterValue && this._userActive;
         super.setFilter(filter);
     }