Skip to content

Commit

Permalink
fix(ui5-multi-combobox): n-more popover in readonly fixed (#2394)
Browse files Browse the repository at this point in the history
FIXES: #2369
  • Loading branch information
ivoplashkov authored Oct 27, 2020
1 parent 2194b16 commit d045ba2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions packages/main/src/MultiComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,6 @@ class MultiComboBox extends UI5Element {
}

_showMorePopover() {
if (this.readonly) {
return;
}

this.filterSelected = true;
this._toggleRespPopover();
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -816,7 +816,7 @@ class MultiComboBox extends UI5Element {
}

get _tokenizerExpanded() {
return this._rootFocused || this.open;
return (this._rootFocused || this.open) && !this.readonly;
}

get classes() {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/MultiComboBoxPopover.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<ui5-list separators="None" mode="MultiSelect" class="ui5-multi-combobox-all-items-list">
{{#each _filteredItems}}
<ui5-li type="Active" ?selected={{this.selected}} data-ui5-token-id="{{this._id}}">{{this.text}}</ui5-li>
<ui5-li type="{{../_listItemsType}}" ?selected={{this.selected}} data-ui5-token-id="{{this._id}}">{{this.text}}</ui5-li>
{{/each}}
</ui5-list>

Expand Down

0 comments on commit d045ba2

Please sign in to comment.