Skip to content

fix(ui5-multi-combobox): n-more popover in readonly fixed #2394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2020
Merged

fix(ui5-multi-combobox): n-more popover in readonly fixed #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/main/src/MultiComboBox.js
View file
Open in desktop
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
View file
Open in desktop
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