Skip to content

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

TypeScript

fix: use :focus-visible instead of :focus-within for focus outlines (#1511)

Cindy Zhang8b658f1c07ad
diff --git a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
index eabb8e4736..6656fbb6ba 100644
--- a/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
+++ b/packages/core/src/CheckboxInput/XDSCheckboxInput.tsx
@@ -86,12 +86,12 @@ const styles = stylex.create({
checkboxFocus: {
outline: {
default: 'none',
- [stylex.when.ancestor(':focus-within', checkboxScope)]:
+ [stylex.when.ancestor(':has(:focus-visible)', checkboxScope)]:
`2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: null,
- [stylex.when.ancestor(':focus-within', checkboxScope)]: '2px',
+ [stylex.when.ancestor(':has(:focus-visible)', checkboxScope)]: '2px',
},
},
// State-dependent colors with ancestor hover behavior
diff --git a/packages/core/src/List/XDSListItem.tsx b/packages/core/src/List/XDSListItem.tsx
index b24401e851..b9306cd17a 100644
--- a/packages/core/src/List/XDSListItem.tsx
+++ b/packages/core/src/List/XDSListItem.tsx
@@ -141,14 +141,14 @@ const styles = stylex.create({
':active': colorVars['--color-overlay-pressed'],
},
},
- focusWithinOutline: {
+ focusVisibleOutline: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-accent']}`,
+ ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: '0',
- ':focus-within': '2px',
+ ':has(:focus-visible)': '2px',
},
},
disabled: {
@@ -171,6 +171,8 @@ const styles = stylex.create({
flex: 1,
minWidth: 0,
textAlign: 'start',
+ // Suppress inner focus ring — the parent <li> handles it via :has(:focus-visible)
+ outline: 'none',
},
invisibleAnchor: {
all: 'unset',
@@ -183,6 +185,8 @@ const styles = stylex.create({
minWidth: 0,
textAlign: 'start',
textDecoration: 'none',
+ // Suppress inner focus ring — the parent <li> handles it via :has(:focus-visible)
+ outline: 'none',
},
content: {
display: 'flex',
@@ -453,7 +457,7 @@ export function XDSListItem({
hasDividers ? styles.noRadius : styles.withRadius,
hasDividers && styles.withDivider,
isInteractive && styles.interactive,
- isInteractive && styles.focusWithinOutline,
+ isInteractive && styles.focusVisibleOutline,
isDisabled && styles.disabled,
isSelected && styles.selected,
xstyle,
diff --git a/packages/core/src/RadioList/XDSRadioListItem.tsx b/packages/core/src/RadioList/XDSRadioListItem.tsx
index 6abf2a83ae..746b021076 100644
--- a/packages/core/src/RadioList/XDSRadioListItem.tsx
+++ b/packages/core/src/RadioList/XDSRadioListItem.tsx
@@ -96,11 +96,11 @@ const styles = stylex.create({
radioWrapperFocus: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-accent']}`,
+ ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: '0',
- ':focus-within': '2px',
+ ':has(:focus-visible)': '2px',
},
borderRadius: '50%',
},
diff --git a/packages/core/src/Switch/XDSSwitch.tsx b/packages/core/src/Switch/XDSSwitch.tsx
index 67d5daaca8..36ee229097 100644
--- a/packages/core/src/Switch/XDSSwitch.tsx
+++ b/packages/core/src/Switch/XDSSwitch.tsx
@@ -106,12 +106,12 @@ const styles = stylex.create({
trackFocus: {
outline: {
default: 'none',
- [stylex.when.ancestor(':focus-within', switchScope)]:
+ [stylex.when.ancestor(':has(:focus-visible)', switchScope)]:
`2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: null,
- [stylex.when.ancestor(':focus-within', switchScope)]: '2px',
+ [stylex.when.ancestor(':has(:focus-visible)', switchScope)]: '2px',
},
},
// State-dependent colors with ancestor hover behavior
diff --git a/packages/core/src/Token/XDSToken.test.tsx b/packages/core/src/Token/XDSToken.test.tsx
index 705c9149fb..7a9b5c0832 100644
--- a/packages/core/src/Token/XDSToken.test.tsx
+++ b/packages/core/src/Token/XDSToken.test.tsx
@@ -354,7 +354,7 @@ describe('XDSToken focus outline', () => {
const button = screen.getByRole('button', {name: 'Focusable'});
await user.tab();
expect(button).toHaveFocus();
- // The container should handle focus outline via :focus-within,
+ // The container should handle focus outline via :has(:focus-visible),
// not the button itself
const container = screen.getByTestId('focus-token');
expect(container.tagName).toBe('SPAN');
diff --git a/packages/core/src/Token/XDSToken.tsx b/packages/core/src/Token/XDSToken.tsx
index f378111ca7..9b895bee42 100644
--- a/packages/core/src/Token/XDSToken.tsx
+++ b/packages/core/src/Token/XDSToken.tsx
@@ -205,14 +205,14 @@ const styles = stylex.create({
overflow: 'hidden',
minWidth: 0,
},
- focusWithinOutline: {
+ focusVisibleOutline: {
outline: {
default: null,
- ':focus-within': `2px solid ${colorVars['--color-accent']}`,
+ ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: '0',
- ':focus-within': '2px',
+ ':has(:focus-visible)': '2px',
},
},
removeButton: {
@@ -413,7 +413,7 @@ export function XDSToken({
sizeStyles[size],
colorStyles[color],
styles.interactive,
- styles.focusWithinOutline,
+ styles.focusVisibleOutline,
isDisabled && styles.disabled,
xstyle,
),
diff --git a/packages/core/src/TreeList/XDSTreeListItem.tsx b/packages/core/src/TreeList/XDSTreeListItem.tsx
index 67a59d242f..e2bd37b0d1 100644
--- a/packages/core/src/TreeList/XDSTreeListItem.tsx
+++ b/packages/core/src/TreeList/XDSTreeListItem.tsx
@@ -74,14 +74,14 @@ const styles = stylex.create({
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
},
- focusWithinOutline: {
+ focusVisibleOutline: {
outline: {
default: 'none',
- ':focus-within': `2px solid ${colorVars['--color-accent']}`,
+ ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
},
outlineOffset: {
default: '0',
- ':focus-within': '2px',
+ ':has(:focus-visible)': '2px',
},
},
disabled: {
@@ -102,6 +102,8 @@ const styles = stylex.create({
flex: 1,
minWidth: 0,
textAlign: 'start',
+ // Suppress inner focus ring — the parent <li> handles it via :has(:focus-visible)
+ outline: 'none',
},
invisibleAnchor: {
all: 'unset',
@@ -114,6 +116,8 @@ const styles = stylex.create({
minWidth: 0,
textAlign: 'start',
textDecoration: 'none',
+ // Suppress inner focus ring — the parent <li> handles it via :has(:focus-visible)
+ outline: 'none',
},
content: {
display: 'flex',
@@ -408,7 +412,7 @@ export function XDSTreeListItem({
(isInteractive || (hasChildren && onClick == null)) &&
styles.interactive,
(isInteractive || (hasChildren && onClick == null)) &&
- styles.focusWithinOutline,
+ styles.focusVisibleOutline,
isDisabled && styles.disabled,
isSelected && styles.selected,
),