Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(a11y): CheckboxInput & Switch focus rings + indeterminate aria (#699)

Joeydbdad0946549
diff --git a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
index a72f7fb97f..f9b3a69f82 100644
--- a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
+++ b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
@@ -75,9 +75,16 @@ const styles = stylex.create({
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easingVars['--easing-standard'],
},
- checkboxFocused: {
- outline: `2px solid ${colorVars['--color-focus-outline']}`,
- outlineOffset: 2,
+ checkboxFocus: {
+ outline: {
+ default: 'none',
+ [stylex.when.ancestor(':focus-within')]:
+ `2px solid ${colorVars['--color-focus-outline']}`,
+ },
+ outlineOffset: {
+ default: null,
+ [stylex.when.ancestor(':focus-within')]: '2px',
+ },
},
// State-dependent colors with ancestor hover behavior
checkboxUnchecked: {
@@ -357,6 +364,7 @@ export function XDSCheckboxInput({
}}
onFocus={onFocus}
onBlur={onBlur}
+ aria-checked={isIndeterminate ? 'mixed' : undefined}
aria-describedby={ariaDescribedBy}
aria-invalid={status?.type === 'error' ? true : undefined}
aria-busy={isBusy || undefined}
@@ -371,6 +379,7 @@ export function XDSCheckboxInput({
{...stylex.props(
styles.checkbox,
checkboxSizeStyles[size],
+ !isDisabled && styles.checkboxFocus,
isCheckedOrIndeterminate
? styles.checkboxChecked
: styles.checkboxUnchecked,
diff --git a/packages/core/src/Switch/XDSSwitch.tsx b/packages/core/src/Switch/XDSSwitch.tsx
index 78f09248d9..b6e245a8bc 100644
--- a/packages/core/src/Switch/XDSSwitch.tsx
+++ b/packages/core/src/Switch/XDSSwitch.tsx
@@ -96,9 +96,16 @@ const styles = stylex.create({
transitionTimingFunction: easingVars['--easing-standard'],
boxSizing: 'border-box',
},
- trackFocused: {
- outline: `2px solid ${colorVars['--color-focus-outline']}`,
- outlineOffset: 2,
+ trackFocus: {
+ outline: {
+ default: 'none',
+ [stylex.when.ancestor(':focus-within')]:
+ `2px solid ${colorVars['--color-focus-outline']}`,
+ },
+ outlineOffset: {
+ default: null,
+ [stylex.when.ancestor(':focus-within')]: '2px',
+ },
},
// State-dependent colors with ancestor hover behavior
trackOff: {
@@ -337,6 +344,7 @@ export function XDSSwitch({
stylex.props(
styles.track,
isOn ? styles.trackOn : styles.trackOff,
+ !isDisabled && styles.trackFocus,
isDisabled && styles.trackDisabled,
isDisabled && !isOn && styles.trackDisabledOff,
),