diff --git a/packages/main/src/ComboBox.js b/packages/main/src/ComboBox.js index 05c8f0e5c678..e101c14912d9 100644 --- a/packages/main/src/ComboBox.js +++ b/packages/main/src/ComboBox.js @@ -468,6 +468,11 @@ class ComboBox extends UI5Element { _afterOpenPopover() { this._iconPressed = true; + + if (isPhone() && this.value) { + this.filterValue = this.value + } + this._clearFocus(); } @@ -631,7 +636,13 @@ class ComboBox extends UI5Element { } } - _closeRespPopover() { + _closeRespPopover(event) { + if (isPhone() && event && event.target.classList.contains("ui5-responsive-popover-close-btn") && this._selectedItemText) { + this.value = this._selectedItemText; + this.filterValue = this._selectedItemText; + this._tempValue = this._selectedItemText; + } + this.responsivePopover.close(); } @@ -693,6 +704,7 @@ class ComboBox extends UI5Element { const listItem = event.detail.item; this._tempValue = listItem.mappedItem.text; + this._selectedItemText = listItem.mappedItem.text; this.filterValue = this._tempValue; if (!listItem.mappedItem.selected) {