igniteui-angular 12.3.12 → 12.3.13

package/bundles/igniteui-angular.umd.js

@@ -43861,7 +43861,7 @@
                     if (operand instanceof FilteringExpressionsTree) {
                         var columnExprTree = operand;
                         if (columnExprTree.fieldName === this.column.field) {
-                            break;
+                            continue;
                         }
                     }
                     expressionsTree.filteringOperands.push(operand);
@@ -44295,12 +44295,9 @@
             var col = grid.getColumnByName(field);
             var filteringIgnoreCase = ignoreCase || (col ? col.filteringIgnoreCase : false);
             var filteringTree = grid.filteringExpressionsTree;
-            var columnFilteringExpressionsTree = grid.filteringExpressionsTree.find(field);
+            var columnFilteringExpressionsTree = filteringTree.find(field);
             conditionOrExpressionTree = conditionOrExpressionTree !== null && conditionOrExpressionTree !== void 0 ? conditionOrExpressionTree : columnFilteringExpressionsTree;
             var fieldFilterIndex = filteringTree.findIndex(field);
-            if (fieldFilterIndex > -1) {
-                filteringTree.filteringOperands.splice(fieldFilterIndex, 1);
-            }
             var newFilteringTree = this.prepare_filtering_expression(filteringTree, field, value, conditionOrExpressionTree, filteringIgnoreCase, fieldFilterIndex, true);
             var eventArgs = { owner: grid,
                 filteringExpressions: newFilteringTree.find(field), cancel: false };
@@ -44664,14 +44661,13 @@
             this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
             grid.filteringExpressionsTree = filteringTree;
         };
-        /** Modifies the filteringState object to contain the newly added fitering conditions/expressions.
+        /** Modifies the filteringState object to contain the newly added filtering conditions/expressions.
          * If createNewTree is true, filteringState will not be modified (because it directly affects the grid.filteringExpressionsTree),
          * but a new object is created and returned.
          */
         IgxFilteringService.prototype.prepare_filtering_expression = function (filteringState, fieldName, searchVal, conditionOrExpressionsTree, ignoreCase, insertAtIndex, createNewTree) {
             if (insertAtIndex === void 0) { insertAtIndex = -1; }
             if (createNewTree === void 0) { createNewTree = false; }
-            var oldExpressionsTreeIndex = filteringState.findIndex(fieldName);
             var expressionsTree = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
                 conditionOrExpressionsTree : null;
             var condition = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
@@ -44679,23 +44675,21 @@
             var newExpression = { fieldName: fieldName, searchVal: searchVal, condition: condition, ignoreCase: ignoreCase };
             var newExpressionsTree = createNewTree ?
                 new FilteringExpressionsTree(filteringState.operator, filteringState.fieldName) : filteringState;
-            if (oldExpressionsTreeIndex === -1) {
-                // no expressions tree found for this field
-                if (expressionsTree) {
-                    if (insertAtIndex > -1) {
-                        newExpressionsTree.filteringOperands.splice(insertAtIndex, 0, expressionsTree);
-                    }
-                    else {
-                        newExpressionsTree.filteringOperands.push(expressionsTree);
-                    }
+            // no expressions tree found for this field
+            if (expressionsTree) {
+                if (insertAtIndex > -1) {
+                    newExpressionsTree.filteringOperands[insertAtIndex] = expressionsTree;
                 }
-                else if (condition) {
-                    // create expressions tree for this field and add the new expression to it
-                    var newExprTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
-                    newExprTree.filteringOperands.push(newExpression);
-                    newExpressionsTree.filteringOperands.push(newExprTree);
+                else {
+                    newExpressionsTree.filteringOperands.push(expressionsTree);
                 }
             }
+            else if (condition) {
+                // create expressions tree for this field and add the new expression to it
+                var newExprTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
+                newExprTree.filteringOperands.push(newExpression);
+                newExpressionsTree.filteringOperands.push(newExprTree);
+            }
             return newExpressionsTree;
         };
         IgxFilteringService.prototype.isFilteringTreeComplex = function (expressions) {
@@ -44707,7 +44701,7 @@
                 var expressionsTree = expressions;
                 if (expressionsTree.operator === exports.FilteringLogic.Or) {
                     var andOperatorsCount = this.getChildAndOperatorsCount(expressionsTree);
-                    // having more that 'And' and operator in the sub-tree means that the filter could not be represented without parentheses.
+                    // having more than one 'And' operator in the sub-tree means that the filter could not be represented without parentheses.
                     return andOperatorsCount > 1;
                 }
                 var isComplex = false;
@@ -47837,9 +47831,7 @@
             if (!this.searchValue) {
                 var anyFiltered = this.esf.listData.some(function (i) { return i.isFiltered; });
                 var anyUnfiltered = this.esf.listData.some(function (i) { return !i.isFiltered; });
-                if (anyFiltered && anyUnfiltered) {
-                    searchAllBtn.indeterminate = true;
-                }
+                searchAllBtn.indeterminate = anyFiltered && anyUnfiltered;
                 this.esf.listData.forEach(function (i) { return i.isSelected = i.isFiltered; });
                 this.displayedListData = this.esf.listData;
                 searchAllBtn.label = this.esf.grid.resourceStrings.igx_grid_excel_select_all;