igniteui-angular 13.1.1 → 13.1.2

package/fesm2020/igniteui-angular.mjs

@@ -55976,9 +55976,6 @@ class IgxFilteringService {
             grid.paginator.page = 0;
         }
         const fieldFilterIndex = filteringTree.findIndex(fieldName);
-        if (fieldFilterIndex > -1) {
-            filteringTree.filteringOperands.splice(fieldFilterIndex, 1);
-        }
         this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
         grid.filteringExpressionsTree = filteringTree;
     }
@@ -55987,14 +55984,20 @@ class IgxFilteringService {
      * but a new object is created and returned.
      */
     prepare_filtering_expression(filteringState, fieldName, searchVal, conditionOrExpressionsTree, ignoreCase, insertAtIndex = -1, createNewTree = false) {
-        const expressionsTree = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
+        let expressionsTree = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
             conditionOrExpressionsTree : null;
         const condition = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
             null : conditionOrExpressionsTree;
-        const newExpression = { fieldName, searchVal, condition, ignoreCase };
-        const newExpressionsTree = createNewTree ?
-            new FilteringExpressionsTree(filteringState.operator, filteringState.fieldName) : filteringState;
-        // no expressions tree found for this field
+        let newExpressionsTree = filteringState;
+        if (createNewTree) {
+            newExpressionsTree = new FilteringExpressionsTree(filteringState.operator, filteringState.fieldName);
+            newExpressionsTree.filteringOperands = [...filteringState.filteringOperands];
+        }
+        if (condition) {
+            const newExpression = { fieldName, searchVal, condition, ignoreCase };
+            expressionsTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
+            expressionsTree.filteringOperands.push(newExpression);
+        }
         if (expressionsTree) {
             if (insertAtIndex > -1) {
                 newExpressionsTree.filteringOperands[insertAtIndex] = expressionsTree;
@@ -56003,12 +56006,6 @@ class IgxFilteringService {
                 newExpressionsTree.filteringOperands.push(expressionsTree);
             }
         }
-        else if (condition) {
-            // create expressions tree for this field and add the new expression to it
-            const newExprTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
-            newExprTree.filteringOperands.push(newExpression);
-            newExpressionsTree.filteringOperands.push(newExprTree);
-        }
         return newExpressionsTree;
     }
     isFilteringTreeComplex(expressions) {