igniteui-angular 12.3.41 → 12.3.42

package/bundles/igniteui-angular.umd.js

@@ -41359,6 +41359,7 @@
             _this._updateInput = true;
             // stores the last filtered value - move to common?
             _this._internalFilter = '';
+            _this._collapsing = false;
             _this.findAllMatches = function (element) {
                 var value = _this.displayKey ? element[_this.displayKey] : element;
                 if (value === null || value === undefined || value === '') {
@@ -41473,7 +41474,11 @@
                     }
                 }
             });
-            this.dropdown.opening.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
+            this.dropdown.opening.pipe(operators.takeUntil(this.destroy$)).subscribe(function (args) {
+                if (args.cancel) {
+                    return;
+                }
+                _this._collapsing = false;
                 var filtered = _this.filteredData.find(_this.findAllMatches);
                 if (filtered === undefined || filtered === null) {
                     _this.filterValue = _this.searchValue = _this.comboInput.value;
@@ -41488,13 +41493,17 @@
                 _this._internalFilter = _this.comboInput.value;
             });
             this.dropdown.closing.pipe(operators.takeUntil(this.destroy$)).subscribe(function (args) {
+                if (args.cancel) {
+                    return;
+                }
                 if (_this.getEditElement() && !args.event) {
-                    _this.comboInput.focus();
+                    _this._collapsing = true;
                 }
                 else {
                     _this.clearOnBlur();
                     _this._onTouchedCallback();
                 }
+                _this.comboInput.focus();
             });
             this.dropdown.closed.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
                 _this.filterValue = _this._internalFilter = _this.comboInput.value;
@@ -41516,7 +41525,7 @@
             if (this.collapsed && this.comboInput.focused) {
                 this.open();
             }
-            if (!this.comboInput.value.trim() && this.selectionService.size(this.id) > 0) {
+            if (!this.comboInput.value.trim() && this.selection.length) {
                 // handle clearing of input by space
                 this.clearSelection();
                 this._onChangeCallback(null);
@@ -41551,6 +41560,7 @@
             }
             if (!this.collapsed && event.key === this.platformUtil.KEYMAP.TAB) {
                 this.clearOnBlur();
+                this.close();
             }
             this.composing = false;
             _super.prototype.handleKeyDown.call(this, event);
@@ -41582,6 +41592,15 @@
             this.comboInput.focus();
         };
         /** @hidden @internal */
+        IgxSimpleComboComponent.prototype.onBlur = function () {
+            // when clicking the toggle button to close the combo and immediately clicking outside of it
+            // the collapsed state is not modified as the dropdown is still not closed
+            if (this.collapsed || this._collapsing) {
+                this.clearOnBlur();
+            }
+            _super.prototype.onBlur.call(this);
+        };
+        /** @hidden @internal */
         IgxSimpleComboComponent.prototype.onFocus = function () {
             this._internalFilter = this.comboInput.value || '';
         };
@@ -41698,26 +41717,20 @@
         };
         IgxSimpleComboComponent.prototype.clearOnBlur = function () {
             var filtered = this.filteredData.find(this.findMatch);
-            if (filtered === undefined || filtered === null || this.getElementKey(filtered) !== this.selectedItem) {
-                this.clearAndClose();
+            // selecting null in primitive data returns undefined as the search text is '', but the item is null
+            if (filtered === undefined && this.selectedItem !== null || !this.selection.length) {
+                this.clear();
                 return;
             }
         };
-        IgxSimpleComboComponent.prototype.getElementKey = function (element) {
-            var elementVal = this.valueKey ? element[this.valueKey] : element;
-            return elementVal;
-        };
         IgxSimpleComboComponent.prototype.getElementVal = function (element) {
             var elementVal = this.displayKey ? element[this.displayKey] : element;
             return String(elementVal);
         };
-        IgxSimpleComboComponent.prototype.clearAndClose = function () {
+        IgxSimpleComboComponent.prototype.clear = function () {
             this.clearSelection(true);
             this._internalFilter = '';
             this.searchValue = '';
-            if (!this.collapsed) {
-                this.close();
-            }
         };
         IgxSimpleComboComponent.prototype.isValid = function (value) {
             return this.required