Skip to content

Commit

Permalink
fixes #1730
Browse files Browse the repository at this point in the history
  • Loading branch information
claviska committed Jan 16, 2024
1 parent dd483c0 commit 494c7ab
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/pages/resources/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
- Fixed a bug in `<sl-input>` and `<sl-textarea>` that made it work differently from `<input>` and `<textarea>` when using defaults [#1746]
- Fixed a bug in `<sl-select>` that prevented it from closing when tabbing to another select inside a shadow root [#1763]
- Fixed a bug in `<sl-spinner>` that caused the animation to appear strange in certain circumstances [#1787]
- Fixed a bug in `<sl-option>` that caused slotted content to show up when calling `getTextLabel()` [#1730]
- Improved the accessibility of `<sl-tooltip>` so they persist when hovering over the tooltip and dismiss when pressing [[Esc]] [#1734]

## 2.12.0
Expand Down
17 changes: 16 additions & 1 deletion src/components/option/option.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,22 @@ export default class SlOption extends ShoelaceElement {

/** Returns a plain text label based on the option's content. */
getTextLabel() {
return (this.textContent ?? '').trim();
const nodes = this.childNodes;
let label = '';

[...nodes].forEach(node => {
if (node.nodeType === Node.ELEMENT_NODE) {
if (!(node as HTMLElement).hasAttribute('slot')) {
label += (node as HTMLElement).outerHTML;
}
}

if (node.nodeType === Node.TEXT_NODE) {
label += node.textContent;
}
});

return label.trim();
}

render() {
Expand Down

0 comments on commit 494c7ab

Please sign in to comment.