igniteui-angular 12.3.11 → 12.3.14

package/bundles/igniteui-angular.umd.js

@@ -26881,9 +26881,8 @@
          * ```
          */
         IgxTextSelectionDirective.prototype.trigger = function () {
-            var _this = this;
             if (this.selected && this.nativeElement.value.length) {
-                requestAnimationFrame(function () { return _this.nativeElement.setSelectionRange(0, _this.nativeElement.value.length); });
+                this.nativeElement.select();
             }
         };
         return IgxTextSelectionDirective;
@@ -39503,6 +39502,7 @@
             _this._data = [];
             _this._value = '';
             _this._groupKey = '';
+            _this._searchValue = '';
             _this._filteredData = [];
             _this._remoteSelection = {};
             _this._valid = IgxComboState.INITIAL;
@@ -39512,7 +39512,6 @@
             _this._onChangeCallback = rxjs.noop;
             _this._type = null;
             _this._dataType = '';
-            _this._searchValue = '';
             _this._itemHeight = null;
             _this._itemsMaxHeight = null;
             _this.onStatusChanged = function () {
@@ -41051,9 +41050,12 @@
             /** @hidden @internal */
             _this.composing = false;
             _this._updateInput = true;
+            // stores the last filtered value - move to common?
+            _this._internalFilter = '';
             _this.findMatch = function (element) {
                 var value = _this.displayKey ? element[_this.displayKey] : element;
-                return value.toString().toLowerCase().includes(_this.searchValue.trim().toLowerCase());
+                var searchValue = _this.searchValue || _this.comboInput.value;
+                return !!searchValue && value.toString().toLowerCase().includes(searchValue.trim().toLowerCase());
             };
             _this.comboAPI.register(_this);
             return _this;
@@ -41071,6 +41073,24 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(IgxSimpleComboComponent.prototype, "searchValue", {
+            /** @hidden @internal */
+            get: function () {
+                return this._searchValue;
+            },
+            set: function (val) {
+                this._searchValue = val;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(IgxSimpleComboComponent.prototype, "selectedItem", {
+            get: function () {
+                return this.selectionService.get(this.id).values().next().value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         /** @hidden @internal */
         IgxSimpleComboComponent.prototype.onArrowDown = function (event) {
             if (this.collapsed) {
@@ -41135,6 +41155,15 @@
                     _this.dropdown.navigateItem(index);
                 }
             });
+            this.dropdown.opening.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
+                var filtered = _this.filteredData.find(_this.findMatch);
+                if (filtered === undefined || filtered === null) {
+                    _this.filterValue = _this.searchValue = _this.comboInput.value;
+                    return;
+                }
+                _this._internalFilter = _this.filterValue;
+                _this.filterValue = _this.searchValue = '';
+            });
             this.dropdown.opened.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
                 if (_this.composing) {
                     _this.comboInput.focus();
@@ -41149,23 +41178,29 @@
                     _this._onTouchedCallback();
                 }
             });
+            this.dropdown.closed.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
+                _this.filterValue = _this._internalFilter = _this.comboInput.value;
+            });
             _super.prototype.ngAfterViewInit.call(this);
         };
         /** @hidden @internal */
         IgxSimpleComboComponent.prototype.handleInputChange = function (event) {
             if (event !== undefined) {
-                this.searchValue = typeof event === 'string' ? event : event.target.value;
+                this.filterValue = this._internalFilter = this.searchValue = typeof event === 'string' ? event : event.target.value;
             }
             this._onChangeCallback(this.searchValue);
             if (this.collapsed && this.comboInput.focused) {
                 this.open();
-                this.dropdown.navigateFirst();
             }
             if (!this.comboInput.value.trim()) {
                 // handle clearing of input by space
                 this.clearSelection();
                 this._onChangeCallback(null);
             }
+            // when filtering the focused item should be the first item or the currently selected item
+            if (!this.dropdown.focusedItem || this.dropdown.focusedItem.id !== this.dropdown.items[0].id) {
+                this.dropdown.navigateFirst();
+            }
             _super.prototype.handleInputChange.call(this, event);
             this.composing = true;
         };
@@ -41182,15 +41217,15 @@
                 this.close();
                 // manually trigger text selection as it will not be triggered during editing
                 this.textSelection.trigger();
+                this.filterValue = this.getElementVal(filtered);
                 return;
             }
             if (event.key === this.platformUtil.KEYMAP.BACKSPACE
                 || event.key === this.platformUtil.KEYMAP.DELETE) {
                 this._updateInput = false;
-                this.clearSelection();
+                this.clearSelection(true);
             }
             if (!this.collapsed && event.key === this.platformUtil.KEYMAP.TAB) {
-                this.close();
                 this.clearOnBlur();
             }
             this.composing = false;
@@ -41336,10 +41371,26 @@
         };
         IgxSimpleComboComponent.prototype.clearOnBlur = function () {
             var filtered = this.filteredData.find(this.findMatch);
-            if ((filtered === undefined || filtered === null)) {
+            if (filtered === undefined || filtered === null || !this.selectedItem) {
+                this.clearAndClose();
+                return;
+            }
+            if (this.isPartialMatch(filtered) || this.selectedItem !== this._internalFilter) {
+                this.clearAndClose();
+            }
+        };
+        IgxSimpleComboComponent.prototype.isPartialMatch = function (filtered) {
+            return !!this._internalFilter && this._internalFilter.length !== this.getElementVal(filtered).length;
+        };
+        IgxSimpleComboComponent.prototype.getElementVal = function (element) {
+            return this.displayKey ? element[this.displayKey] : element;
+        };
+        IgxSimpleComboComponent.prototype.clearAndClose = function () {
+            this.clearSelection(true);
+            this._internalFilter = '';
+            this.searchValue = '';
+            if (!this.collapsed) {
                 this.close();
-                this.clearSelection();
-                this.searchValue = '';
             }
         };
         return IgxSimpleComboComponent;
@@ -43810,7 +43861,7 @@
                     if (operand instanceof FilteringExpressionsTree) {
                         var columnExprTree = operand;
                         if (columnExprTree.fieldName === this.column.field) {
-                            break;
+                            continue;
                         }
                     }
                     expressionsTree.filteringOperands.push(operand);
@@ -44244,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 };
@@ -44607,42 +44655,36 @@
                 grid.paginator.page = 0;
             }
             var 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;
         };
-        /** 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 ?
                 null : conditionOrExpressionsTree;
-            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);
-                    }
+            var newExpressionsTree = filteringState;
+            if (createNewTree) {
+                newExpressionsTree = new FilteringExpressionsTree(filteringState.operator, filteringState.fieldName);
+                newExpressionsTree.filteringOperands = __spreadArray([], __read(filteringState.filteringOperands));
+            }
+            if (condition) {
+                var newExpression = { fieldName: fieldName, searchVal: searchVal, condition: condition, ignoreCase: ignoreCase };
+                expressionsTree = new FilteringExpressionsTree(filteringState.operator, fieldName);
+                expressionsTree.filteringOperands.push(newExpression);
+            }
+            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);
                 }
             }
             return newExpressionsTree;
@@ -44656,7 +44698,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;
@@ -47786,9 +47828,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;