Skip to content
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

fix(ui5-select): remove the cloning of the value state message #9654

Merged
merged 1 commit into from
Aug 7, 2024
+3 −9
Merged

fix(ui5-select): remove the cloning of the value state message #9654

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
8 changes: 2 additions & 6 deletions packages/main/src/Select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ class Select extends UI5Element implements IFormInputElement {
if (this.shouldDisplayDefaultValueStateMessage) {
valueStateText = this.valueStateDefaultText;
} else {
valueStateText = this.valueStateMessageText.map(el => el.textContent).join(" ");
valueStateText = this.valueStateMessage.map(el => el.textContent).join(" ");
}

return `${this.valueStateTypeText} ${valueStateText}`;
Expand Down Expand Up @@ -854,12 +854,8 @@ class Select extends UI5Element implements IFormInputElement {
return getEffectiveAriaLabelText(this);
}

get valueStateMessageText() {
return this.getSlottedNodes("valueStateMessage").map(el => el.cloneNode(true));
}

get shouldDisplayDefaultValueStateMessage() {
return !this.valueStateMessageText.length && this.hasValueStateText;
return !this.valueStateMessage.length && this.hasValueStateText;
}

get hasValueStateText() {
Expand Down
4 changes: 1 addition & 3 deletions packages/main/src/SelectPopover.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@
{{#if shouldDisplayDefaultValueStateMessage}}
{{valueStateText}}
{{else}}
{{#each valueStateMessageText}}
{{this}}
{{/each}}
<slot name="valueStateMessage"></slot>
{{/if}}
{{/inline}}