From d045ba2d698b474c8e1ce941ed9325b565cf03a1 Mon Sep 17 00:00:00 2001 From: Ivaylo Plashkov Date: Tue, 27 Oct 2020 14:14:39 +0200 Subject: [PATCH] fix(ui5-multi-combobox): n-more popover in readonly fixed (#2394) FIXES: #2369 --- packages/main/src/MultiComboBox.js | 10 +++++----- packages/main/src/MultiComboBoxPopover.hbs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/main/src/MultiComboBox.js b/packages/main/src/MultiComboBox.js index 47c9432f9c1b..4fca4e74aefc 100644 --- a/packages/main/src/MultiComboBox.js +++ b/packages/main/src/MultiComboBox.js @@ -400,10 +400,6 @@ class MultiComboBox extends UI5Element { } _showMorePopover() { - if (this.readonly) { - return; - } - this.filterSelected = true; this._toggleRespPopover(); } @@ -757,6 +753,10 @@ class MultiComboBox extends UI5Element { return this.readonly ? "None" : "MultiSelect"; } + get _listItemsType() { + return this.readonly ? "Inactive" : "Active"; + } + get hasValueState() { return this.valueState !== ValueState.None; } @@ -816,7 +816,7 @@ class MultiComboBox extends UI5Element { } get _tokenizerExpanded() { - return this._rootFocused || this.open; + return (this._rootFocused || this.open) && !this.readonly; } get classes() { diff --git a/packages/main/src/MultiComboBoxPopover.hbs b/packages/main/src/MultiComboBoxPopover.hbs index 3a410f6fc266..8b4c9f782799 100644 --- a/packages/main/src/MultiComboBoxPopover.hbs +++ b/packages/main/src/MultiComboBoxPopover.hbs @@ -68,7 +68,7 @@ {{#each _filteredItems}} - {{this.text}} + {{this.text}} {{/each}}