From f51a09ddf0dc30aeab5beaf9c16edff8aa791d73 Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Thu, 8 Feb 2024 12:46:08 -0500
Subject: [PATCH] backport 1840

---
 docs/src/content/docs/resources/changelog.md | 18 ++++++++++++++++--
 src/components/option/option.component.ts    |  2 +-
 src/components/option/option.test.ts         |  5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/docs/src/content/docs/resources/changelog.md b/docs/src/content/docs/resources/changelog.md
index 898b30c46..351e687fd 100644
--- a/docs/src/content/docs/resources/changelog.md
+++ b/docs/src/content/docs/resources/changelog.md
@@ -23,20 +23,34 @@ New versions of Web Awesome are released as-needed and generally occur when a cr
 
 ## Next
 
-- Added the `loading` attribute and the `spinner` and `spinner__base` part to `<sl-menu-item>` [#1700]
+- Fixed a bug in `<sl-option>` that caused HTML tags to be included in `getTextLabel()`
+
+## 2.13.1
+
+- Fixed a bug where the safe triangle was always visible when selecting nested `<sl-menu>` elements [#1835]
+
+## 2.13.0
+
 - Added the `hover-bridge` feature to `<sl-popup>` to support better tooltip accessibility [#1734]
 - Added the `loading` attribute and the `spinner` and `spinner__base` part to `<sl-menu-item>` [#1700]
 - Fixed files that did not have `.js` extensions. [#1770]
 - Fixed `<sl-dialog>` not accounting for elements with hidden dialog controls like `<video>` [#1755]
-- Added the `hover-bridge` feature to `<sl-popup>` to support better tooltip accessibility [#1734]
+- Fixed focus trapping not scrolling elements into view. [#1750]
+- Fixed more performance issues with focus trapping performance. [#1750]
 - 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-dialog>` with focus trapping [#1813]
 - Fixed a bug that caused form controls to submit even after they were removed from the DOM [#1823]
 - Fixed a bug that caused empty `<sl-radio-group>` elements to log an error in the console [#1795]
 - Fixed a bug that caused modal scroll locking to conflict with the `scrollbar-gutter` property [#1805]
 - Fixed a bug in `<sl-option>` that caused slotted content to show up when calling `getTextLabel()` [#1730]
+- Fixed a bug in `<sl-color-picker>` that caused picker values to not match the preview color [#1831]
+- Fixed a bug in `<sl-carousel>` where pagination dots don't update when swiping slide in iOS Safari [#1748]
+- Fixed a bug in`<sl-carousel>` where trying to swipe doesn't change the slide in Firefox for Android [#1748]
 - Improved the accessibility of `<sl-tooltip>` so they persist when hovering over the tooltip and dismiss when pressing [[Esc]] [#1734]
+- Improved "close" behavior of multiple components in supportive browsers using the `CloseWatcher` API [#1788]
+- Removed the scroll controller from the experimental `<sl-carousel>` and moved all mouse related logic into the component [#1748]
 
 ## 2.12.0
 
diff --git a/src/components/option/option.component.ts b/src/components/option/option.component.ts
index 438949ca0..94c4277cc 100644
--- a/src/components/option/option.component.ts
+++ b/src/components/option/option.component.ts
@@ -112,7 +112,7 @@ export default class WaOption extends WebAwesomeElement {
     [...nodes].forEach(node => {
       if (node.nodeType === Node.ELEMENT_NODE) {
         if (!(node as HTMLElement).hasAttribute('slot')) {
-          label += (node as HTMLElement).outerHTML;
+          label += (node as HTMLElement).textContent;
         }
       }
 
diff --git a/src/components/option/option.test.ts b/src/components/option/option.test.ts
index 132483c63..ed57c2f75 100644
--- a/src/components/option/option.test.ts
+++ b/src/components/option/option.test.ts
@@ -52,4 +52,9 @@ describe('<wa-option>', () => {
 
     expect(el.value).to.equal('10');
   });
+
+  it('should escape HTML when calling getTextLabel()', async () => {
+    const el = await fixture<WaOption>(html` <wa-option><strong>Option</strong></wa-option> `);
+    expect(el.getTextLabel()).to.equal('Option');
+  });
 });