chore: Merge master into prerelease/minor [skip release]

Workday · Sep 6, 2023 · c78bbce · c78bbce
2 parents 9304dd5 + 81c6c52
commit c78bbce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/cypress/integration/Switch.spec.ts b/cypress/integration/Switch.spec.ts
@@ -1,7 +1,7 @@
 import * as h from '../helpers';
 
 const getSwitch = () => {
-  return cy.findByRole('checkbox');
+  return cy.findByRole('switch');
 };
 
 describe('Switch', () => {

diff --git a/modules/react/switch/lib/Switch.tsx b/modules/react/switch/lib/Switch.tsx
@@ -177,8 +177,7 @@ export const Switch = createComponent('input')({
           id={inputId}
           ref={ref}
           onChange={onChange}
-          role="checkbox"
-          tabIndex={0}
+          role="switch"
           type="checkbox"
           value={value}
           {...elemProps}

diff --git a/modules/react/switch/spec/Switch.spec.tsx b/modules/react/switch/spec/Switch.spec.tsx
@@ -5,15 +5,7 @@ import {Switch} from '../lib/Switch';
 describe('Switch', () => {
   const cb = jest.fn();
 
-  /**
-   * Today, this is hardcoded but this could possibly be
-   * configurable in the future (e.g. role='switch').
-   * In fact, 'checkbox' probably isn't the correct role
-   * according to MDN and ARIA
-   * https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/Switch_role
-   * https://www.w3.org/TR/wai-aria-1.1/#switch
-   */
-  const role = 'checkbox';
+  const role = 'switch';
 
   afterEach(() => {
     cb.mockClear();