@datorama/core 21.4.0-rc.15 → 21.4.0-rc.18

package/fesm5/datorama-core.js

@@ -11603,9 +11603,9 @@ function validateStringCondition(rowValue, _a) {
             return !isEmpty(valueLowerCase);
     }
 }
-function validateNumberCondition(unparsedRowValue, _a) {
+function validateNumberCondition(unparsedRowValue, _a, filterKey) {
     var condition = _a.condition, value = _a.value, rangeEnd = _a.rangeEnd;
-    var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue) : null;
+    var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue[filterKey] || unparsedRowValue) : null;
     var filterValue = parseFloat(value);
     switch (condition) {
         case DatoFilterConditions.EQUALS:
@@ -11653,14 +11653,14 @@ function validateDateCondition(rowValue, _a) {
     }
 }
 function validateCondition(_a) {
-    var rowValue = _a.rowValue, filter = _a.filter, type = _a.type;
+    var rowValue = _a.rowValue, condition = _a.condition, type = _a.type, filterKey = _a.filterKey;
     switch (type) {
         case DatoGridFilterTypes.Date:
-            return validateDateCondition(rowValue, filter);
+            return validateDateCondition(rowValue, condition);
         case DatoGridFilterTypes.Number:
-            return validateNumberCondition(rowValue, filter);
+            return validateNumberCondition(rowValue, condition, filterKey);
         default:
-            return validateStringCondition(rowValue, filter);
+            return validateStringCondition(rowValue, condition);
     }
 }
 function validateFilter(_a, activeFilters) {
@@ -11680,7 +11680,9 @@ function validateFilter(_a, activeFilters) {
             if (conditional) {
                 var operator = conditional.operator, conditions = conditional.conditions, type_1 = conditional.type;
                 var conditionsRelation = operator === OperatorTypes.AND ? 'every' : 'some';
-                filterPasses = conditions[conditionsRelation](function (filter) { return validateCondition({ rowValue: rowValue, filter: filter, type: type_1 }); });
+                filterPasses = conditions[conditionsRelation](function (condition) {
+                    return validateCondition({ rowValue: rowValue, condition: condition, type: type_1, filterKey: filter });
+                });
             }
             if (filterPasses && byValue) {
                 var includesValue = byValue.values.includes(rowValue);
@@ -12627,14 +12629,14 @@ var DatoGridFilterComponent = /** @class */ (function () {
         var colDefs = gridQuery.api.columns.getAllColumns().map(function (column) { return column.getColDef(); });
         this.colField = getColField(this.colDef);
         var colDef = colDefs.find(function (colDef) { return colDef.field === _this.colField; });
+        var colFilter = filter || colDef.filter;
+        var filterOptions = DatoGridFilterOptionsMap[colFilter];
         this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
         if (filtersConfig.sections) {
             this.filterSections = (_a = {}, _a[filtersConfig.sections] = true, _a);
         }
         this.keepPredefinedListOriginalOrder =
             filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
-        var colFilter = filter || colDef.filter;
-        var filterOptions = DatoGridFilterOptionsMap[colFilter];
         this.filterType = filterOptions ? colFilter : DatoGridFilterTypes.String;
         this.listLabelType = this.filterType.toLowerCase();
         this.listSortByKey = this.filterType === DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
@@ -14720,7 +14722,7 @@ var GridService = /** @class */ (function () {
         var _this = this;
         var gridOptions = _a.gridOptions;
         gridOptions.processSecondaryColDef = function (colDef) {
-            var userProvidedColDef = colDef.pivotValueColumn.getUserProvidedColDef();
+            var userProvidedColDef = colDef.pivotValueColumn && colDef.pivotValueColumn.getUserProvidedColDef();
             if (userProvidedColDef) {
                 colDef.filter = userProvidedColDef.filter;
             }