From d948a5f3c06cf4dbbdc8f77685cefff5cb36bd2d Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Wed, 15 Apr 2026 15:42:32 +0300
Subject: [PATCH 1/3] fix(switch): add static accessible label

Rename `label` property to `accessibleLabel` (attribute:
`accessible-label`) for consistency. Wire it to set `ariaLabel`
on element internals for a proper static accessible name.

Closes #2754

Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .changeset/fix-switch-a11y.md              |  6 ++++++
 elements/pf-switch/demo/without-label.html |  2 +-
 elements/pf-switch/pf-switch.ts            |  5 +++--
 elements/pf-switch/test/pf-switch.spec.ts  | 21 +++++++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/fix-switch-a11y.md

diff --git a/.changeset/fix-switch-a11y.md b/.changeset/fix-switch-a11y.md
new file mode 100644
index 0000000000..86201136d4
--- /dev/null
+++ b/.changeset/fix-switch-a11y.md
@@ -0,0 +1,6 @@
+---
+"@patternfly/elements": patch
+---
+
+`pf-switch`: the switch now has a proper static accessible label
+independent of its on/off state text.
diff --git a/elements/pf-switch/demo/without-label.html b/elements/pf-switch/demo/without-label.html
index c6c8a50b05..6662e471e2 100644
--- a/elements/pf-switch/demo/without-label.html
+++ b/elements/pf-switch/demo/without-label.html
@@ -2,7 +2,7 @@
   <form>
     <fieldset>
       <legend>Without label</legend>
-      <pf-switch checked></pf-switch>
+      <pf-switch accessible-label="Toggle option" checked></pf-switch>
     </fieldset>
   </form>
 </section>
diff --git a/elements/pf-switch/pf-switch.ts b/elements/pf-switch/pf-switch.ts
index 6b87fe359d..c8f559a2d5 100644
--- a/elements/pf-switch/pf-switch.ts
+++ b/elements/pf-switch/pf-switch.ts
@@ -24,8 +24,8 @@ export class PfSwitch extends LitElement {
 
   #internals = InternalsController.of(this, { role: 'switch' });
 
-  /** Accessible label text for the switch */
-  @property({ reflect: true }) label?: string;
+  /** Accessible label for the switch when there is no associated `<label>` element. */
+  @property({ reflect: true, attribute: 'accessible-label' }) accessibleLabel?: string;
 
   /** Flag to show if the switch has a check icon. */
   @property({ reflect: true, type: Boolean, attribute: 'show-check-icon' }) showCheckIcon = false;
@@ -57,6 +57,7 @@ export class PfSwitch extends LitElement {
   override willUpdate(): void {
     this.#internals.ariaChecked = String(!!this.checked);
     this.#internals.ariaDisabled = String(!!this.disabled);
+    this.#internals.ariaLabel = this.accessibleLabel || null;
   }
 
   override render(): TemplateResult<1> {
diff --git a/elements/pf-switch/test/pf-switch.spec.ts b/elements/pf-switch/test/pf-switch.spec.ts
index 7331c07010..af0e28d814 100644
--- a/elements/pf-switch/test/pf-switch.spec.ts
+++ b/elements/pf-switch/test/pf-switch.spec.ts
@@ -43,6 +43,27 @@ describe('<pf-switch>', function() {
     });
   });
 
+  describe('with accessible-label attribute', function() {
+    let element: PfSwitch;
+    let snapshot: A11yTreeSnapshot;
+    beforeEach(async function() {
+      element = await createFixture<PfSwitch>(html`
+        <pf-switch accessible-label="Dark Mode"></pf-switch>
+      `);
+      snapshot = await a11ySnapshot({ selector: 'pf-switch' });
+    });
+    it('has an accessible name from accessible-label', function() {
+      expect(snapshot.name).to.equal('Dark Mode');
+    });
+    it('keeps the same accessible name regardless of checked state', async function() {
+      element.click();
+      await element.updateComplete;
+      await nextFrame();
+      snapshot = await a11ySnapshot({ selector: 'pf-switch' });
+      expect(snapshot.name).to.equal('Dark Mode');
+    });
+  });
+
   describe('with labels for on and off state', function() {
     let element: PfSwitch;
     let snapshot: A11yTreeSnapshot;

From 2ae0459af02459d23ea73c1de8a1a63978e714fc Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Wed, 15 Apr 2026 15:58:05 +0300
Subject: [PATCH 2/3] docs: changeset

---
 .changeset/fix-switch-a11y.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fix-switch-a11y.md b/.changeset/fix-switch-a11y.md
index 86201136d4..7c2dbb57df 100644
--- a/.changeset/fix-switch-a11y.md
+++ b/.changeset/fix-switch-a11y.md
@@ -2,5 +2,5 @@
 "@patternfly/elements": patch
 ---
 
-`pf-switch`: the switch now has a proper static accessible label
+`<pf-switch>`: the switch now has a proper static accessible label
 independent of its on/off state text.

From aeb32bb813231919a2256c48027856615b5275ef Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Wed, 15 Apr 2026 18:56:52 +0300
Subject: [PATCH 3/3] fix(switch): keep label as deprecated, add
 accessible-label

Keep the existing `label` property as deprecated and fall back
to it when `accessible-label` is not set. JSDoc advises updating
the accessible label based on checked state.

Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 elements/pf-switch/pf-switch.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/elements/pf-switch/pf-switch.ts b/elements/pf-switch/pf-switch.ts
index c8f559a2d5..aace554008 100644
--- a/elements/pf-switch/pf-switch.ts
+++ b/elements/pf-switch/pf-switch.ts
@@ -24,7 +24,14 @@ export class PfSwitch extends LitElement {
 
   #internals = InternalsController.of(this, { role: 'switch' });
 
-  /** Accessible label for the switch when there is no associated `<label>` element. */
+  /** @deprecated use `accessible-label` instead */
+  @property({ reflect: true }) label?: string;
+
+  /**
+   * Accessible label for the switch when there is no associated `<label>` element.
+   * Update this value based on the checked state to communicate the meaning of
+   * each state to assistive technology users, e.g. "Wi-Fi on" / "Wi-Fi off".
+   */
   @property({ reflect: true, attribute: 'accessible-label' }) accessibleLabel?: string;
 
   /** Flag to show if the switch has a check icon. */
@@ -57,7 +64,7 @@ export class PfSwitch extends LitElement {
   override willUpdate(): void {
     this.#internals.ariaChecked = String(!!this.checked);
     this.#internals.ariaDisabled = String(!!this.disabled);
-    this.#internals.ariaLabel = this.accessibleLabel || null;
+    this.#internals.ariaLabel = this.accessibleLabel || this.label || null;
   }
 
   override render(): TemplateResult<1> {