igniteui-angular 13.0.12 → 13.0.13

package/fesm2020/igniteui-angular.mjs

@@ -9109,19 +9109,25 @@ class IgxScrollInertiaDirective {
         while (i < path.length && path[i].localName !== 'igx-display-container') {
             const e = path[i++];
             if (e.scrollHeight > e.clientHeight) {
-                if (scrollDeltaY > 0 && e.scrollHeight - Math.abs(Math.round(e.scrollTop)) !== e.clientHeight) {
-                    return true;
-                }
-                if (scrollDeltaY < 0 && e.scrollTop !== 0) {
-                    return true;
+                const overflowY = window.getComputedStyle(e)['overflow-y'];
+                if (overflowY === 'auto' || overflowY === 'scroll') {
+                    if (scrollDeltaY > 0 && e.scrollHeight - Math.abs(Math.round(e.scrollTop)) !== e.clientHeight) {
+                        return true;
+                    }
+                    if (scrollDeltaY < 0 && e.scrollTop !== 0) {
+                        return true;
+                    }
                 }
             }
             if (e.scrollWidth > e.clientWidth) {
-                if (scrollDeltaX > 0 && e.scrollWidth - Math.abs(Math.round(e.scrollLeft)) !== e.clientWidth) {
-                    return true;
-                }
-                if (scrollDeltaX < 0 && e.scrollLeft !== 0) {
-                    return true;
+                const overflowX = window.getComputedStyle(e)['overflow-x'];
+                if (overflowX === 'auto' || overflowX === 'scroll') {
+                    if (scrollDeltaX > 0 && e.scrollWidth - Math.abs(Math.round(e.scrollLeft)) !== e.clientWidth) {
+                        return true;
+                    }
+                    if (scrollDeltaX < 0 && e.scrollLeft !== 0) {
+                        return true;
+                    }
                 }
             }
         }
@@ -43547,9 +43553,7 @@ class IgxExcelStyleSearchComponent {
         if (!this.searchValue) {
             const anyFiltered = this.esf.listData.some(i => i.isFiltered);
             const anyUnfiltered = this.esf.listData.some(i => !i.isFiltered);
-            if (anyFiltered && anyUnfiltered) {
-                searchAllBtn.indeterminate = true;
-            }
+            searchAllBtn.indeterminate = anyFiltered && anyUnfiltered;
             this.esf.listData.forEach(i => i.isSelected = i.isFiltered);
             this.displayedListData = this.esf.listData;
             searchAllBtn.label = this.esf.grid.resourceStrings.igx_grid_excel_select_all;
@@ -44229,7 +44233,7 @@ class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent {
             if (operand instanceof FilteringExpressionsTree) {
                 const columnExprTree = operand;
                 if (columnExprTree.fieldName === this.column.field) {
-                    break;
+                    continue;
                 }
             }
             expressionsTree.filteringOperands.push(operand);
@@ -52700,12 +52704,9 @@ class IgxFilteringService {
         const col = grid.getColumnByName(field);
         const filteringIgnoreCase = ignoreCase || (col ? col.filteringIgnoreCase : false);
         const filteringTree = grid.filteringExpressionsTree;
-        const columnFilteringExpressionsTree = grid.filteringExpressionsTree.find(field);
+        const columnFilteringExpressionsTree = filteringTree.find(field);
         conditionOrExpressionTree = conditionOrExpressionTree ?? columnFilteringExpressionsTree;
         const fieldFilterIndex = filteringTree.findIndex(field);
-        if (fieldFilterIndex > -1) {
-            filteringTree.filteringOperands.splice(fieldFilterIndex, 1);
-        }
         const newFilteringTree = this.prepare_filtering_expression(filteringTree, field, value, conditionOrExpressionTree, filteringIgnoreCase, fieldFilterIndex, true);
         const eventArgs = {
             owner: grid,
@@ -53011,12 +53012,11 @@ class IgxFilteringService {
         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.
      */
     prepare_filtering_expression(filteringState, fieldName, searchVal, conditionOrExpressionsTree, ignoreCase, insertAtIndex = -1, createNewTree = false) {
-        const oldExpressionsTreeIndex = filteringState.findIndex(fieldName);
         const expressionsTree = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
             conditionOrExpressionsTree : null;
         const condition = conditionOrExpressionsTree instanceof FilteringExpressionsTree ?
@@ -53024,23 +53024,21 @@ class IgxFilteringService {
         const newExpression = { fieldName, searchVal, condition, ignoreCase };
         const 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
-                const 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
+            const newExprTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
+            newExprTree.filteringOperands.push(newExpression);
+            newExpressionsTree.filteringOperands.push(newExprTree);
+        }
         return newExpressionsTree;
     }
     isFilteringTreeComplex(expressions) {
@@ -53051,7 +53049,7 @@ class IgxFilteringService {
             const expressionsTree = expressions;
             if (expressionsTree.operator === FilteringLogic.Or) {
                 const 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;
             }
             let isComplex = false;