Skip to content

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

TypeScript

fix(theme): make shared focus outlines themeable (#4654)

Cindy Zhang041a0ef49ebc
diff --git a/.changeset/focus-outline-consistency.md b/.changeset/focus-outline-consistency.md
new file mode 100644
index 0000000000..0286a5342c
--- /dev/null
+++ b/.changeset/focus-outline-consistency.md
@@ -0,0 +1,11 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Consolidate general interactive focus outlines onto one definition — 2px `--color-accent` at 3px offset, matching Design Conventions.
+
+Most general controls had drifted to a 2px offset; Button, Calendar, Dialog and Pagination were the ones still on spec. Their value wins, so a focus ring on the drifted components (Link, TabList, Token, TreeList, SegmentedControl, TopNav items) now sits 1px further from its control.
+
+Destructive buttons keep their error-colored ring, and `--button-focus-offset` is unchanged. Form and input focus treatments are out of scope.
+
+@cixzhang
diff --git a/packages/cli/clients/cli/commands/build-theme.registry.test.mjs b/packages/cli/clients/cli/commands/build-theme.registry.test.mjs
index 5162874eae..221b4e37c5 100644
--- a/packages/cli/clients/cli/commands/build-theme.registry.test.mjs
+++ b/packages/cli/clients/cli/commands/build-theme.registry.test.mjs
@@ -60,7 +60,10 @@ function renderedClassLiterals() {
const full = path.join(dir, entry.name);
if (entry.isDirectory()) {
walk(full);
- } else if (entry.name.endsWith('.tsx') && !entry.name.endsWith('.test.tsx')) {
+ } else if (
+ (entry.name.endsWith('.tsx') || entry.name.endsWith('.ts')) &&
+ !entry.name.includes('.test.')
+ ) {
const text = fs.readFileSync(full, 'utf8');
for (const re of [
/themeProps\(\s*'([^']+)'/g,
diff --git a/packages/core/src/Avatar/Avatar.tsx b/packages/core/src/Avatar/Avatar.tsx
index 56d29185b4..2707a90650 100644
--- a/packages/core/src/Avatar/Avatar.tsx
+++ b/packages/core/src/Avatar/Avatar.tsx
@@ -31,6 +31,7 @@ import {AvatarSizeContext} from './AvatarSizeContext';
import {useAvatarGroup} from '../AvatarGroup/AvatarGroupContext';
import {mergeProps, mergeRefs} from '../utils';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTooltip} from '../Tooltip/useTooltip';
import {useLinkComponent} from '../Link/useLinkComponent';
import type {LinkComponentType} from '../Link/types';
@@ -153,16 +154,6 @@ const styles = stylex.create({
// Visible focus ring for the name-tooltip tab stop, matching the repo-wide
// focus-visible outline treatment (see Timestamp, Token, Thumbnail). Only
// applied when a tooltip is active so keyboard users can reveal it.
- focusable: {
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
- },
// Reset the intrinsic styling of the interactive element (<a>/<button>) so it
// is a transparent, correctly-sized wrapper around the avatar visuals. The
// element carries the focus-visible accent ring for keyboard users.
@@ -179,22 +170,6 @@ const styles = stylex.create({
cursor: 'pointer',
// Match the avatar's circular shape so the focus ring hugs it.
borderRadius: radiusVars['--radius-full'],
- outlineWidth: {
- default: 0,
- ':focus-visible': 2,
- },
- outlineStyle: {
- default: 'none',
- ':focus-visible': 'solid',
- },
- outlineColor: {
- default: null,
- ':focus-visible': colorVars['--color-accent'],
- },
- outlineOffset: {
- default: 0,
- ':focus-visible': 2,
- },
},
});
@@ -608,10 +583,9 @@ export function Avatar({
// `<a>`/`<button>` and the static `<div>` carry the exact same box.
const rootStylexProps = mergeProps(
themeProps('avatar', {size: resolvedSize}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.wrapper,
isInteractive && styles.interactive,
- !isInteractive && showTooltip && !avatarGroup && styles.focusable,
avatarGroup && groupStyles.ring,
avatarGroup && groupStyles.overlap,
avatarGroup && groupDynamicStyles.overlap(-avatarGroup.overlap),
diff --git a/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx b/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx
index 17702eafeb..2632ac89d3 100644
--- a/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx
+++ b/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx
@@ -26,6 +26,7 @@ import {mergeProps} from '../utils';
import {useAvatarGroup} from './AvatarGroupContext';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
const BORDER_WIDTH = 2;
@@ -93,14 +94,6 @@ const styles = stylex.create({
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']}), linear-gradient(${colorVars['--color-neutral']}, ${colorVars['--color-neutral']})`,
},
// Focus ring via focus-visible
- outline: {
- default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: null,
- ':focus-visible': '2px',
- },
},
overlap: {
marginInlineStart: 'var(--_avatar-group-overlap)',
@@ -170,7 +163,7 @@ export function AvatarGroupOverflow({
data-avatar-item=""
{...mergeProps(
themeProps('avatar-group-overflow'),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
styles.button,
styles.overlap,
diff --git a/packages/core/src/Button/Button.tsx b/packages/core/src/Button/Button.tsx
index 3f4151c74d..e67a7a8e7c 100644
--- a/packages/core/src/Button/Button.tsx
+++ b/packages/core/src/Button/Button.tsx
@@ -45,6 +45,7 @@ import {mergeProps, mergeRefs} from '../utils';
import {useLinkComponent} from '../Link/useLinkComponent';
import type {LinkComponentType} from '../Link/types';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
import type {ButtonVariantMap} from './index';
@@ -55,6 +56,15 @@ import type {ButtonVariantMap} from './index';
*/
const styles = stylex.create({
base: {
+ // Kept as a public themeable var (documented in Button.doc.mjs) even though
+ // its default now matches the shared outline: removing it would break any
+ // theme setting it, for no gain. It overrides the shared offset, so a theme
+ // can still tune the ring distance on buttons specifically.
+ '--button-focus-offset': '3px',
+ outlineOffset: {
+ default: '0',
+ ':focus-visible': 'var(--button-focus-offset)',
+ },
position: 'relative',
display: 'inline-flex',
alignItems: 'center',
@@ -179,7 +189,7 @@ const elevationStyles = stylex.create({
* Variant styles using backgroundImage for layered colors
* Pseudo-classes are nested within properties per StyleX recommendation
* Overlay is stacked on top of base color using multiple linear-gradients
- * Focus outline color matches variant (destructive uses negative color)
+ * Focus outline is shared across variants for consistent keyboard affordance.
*/
const variants = stylex.create({
primary: {
@@ -192,15 +202,6 @@ const variants = stylex.create({
},
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- '--button-focus-offset': '3px',
- outlineOffset: {
- default: '0',
- ':focus-visible': 'var(--button-focus-offset)',
- },
},
secondary: {
backgroundColor: colorVars['--color-neutral'],
@@ -212,15 +213,6 @@ const variants = stylex.create({
},
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- '--button-focus-offset': '3px',
- outlineOffset: {
- default: '0',
- ':focus-visible': 'var(--button-focus-offset)',
- },
},
ghost: {
backgroundColor: 'transparent',
@@ -232,19 +224,14 @@ const variants = stylex.create({
},
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- '--button-focus-offset': '3px',
- outlineOffset: {
- default: '0',
- ':focus-visible': 'var(--button-focus-offset)',
- },
},
destructive: {
backgroundColor: colorVars['--color-error'],
color: colorVars['--color-on-error'],
+ // The ring matches the variant it rings: an accent-colored outline on a
+ // red button reads as another control's focus. Only the color differs —
+ // width, style and offset come from the shared outline.
+ outlineColor: {default: null, ':focus-visible': colorVars['--color-error']},
backgroundImage: {
default: null,
':hover': {
@@ -252,15 +239,6 @@ const variants = stylex.create({
},
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-error']}`,
- },
- '--button-focus-offset': '3px',
- outlineOffset: {
- default: '0',
- ':focus-visible': 'var(--button-focus-offset)',
- },
},
});
@@ -676,10 +654,9 @@ export function Button({
const edgeCompAttr = isFlat ? {[EDGE_COMP_ATTR]: ''} : null;
// Shared StyleX props for both button and link rendering
- const sharedStylexProps = stylex.props(
+ const sharedStylexProps = focusOutlineProps.focusVisible(
styles.base,
sizeStyles[size],
- variants[variant],
isIconOnly && styles.iconOnly,
buttonDisabled && styles.disabled,
useAriaDisabled && styles.ariaDisabled,
@@ -693,11 +670,14 @@ export function Button({
(variant === 'primary' || variant === 'destructive') &&
(buttonGroup.orientation === 'horizontal'
? groupStyles.onSolidHorizontal
- : groupStyles.onSolidVertical),
- // Standalone floating buttons only — a grouped button's elevation is owned
+ : groupStyles.onSolidVertical), // Standalone floating buttons only — a grouped button's elevation is owned
// by the ButtonGroup so the shared surface lifts as one unit.
!buttonGroup && elevationStyles[elevation],
width != null && dynamicStyles.width(width),
+ // AFTER the shared focus outline: the outline supplies width/style/offset
+ // for every variant, and `destructive` re-colors just the ring to match
+ // its own surface. Ordering is the mechanism — StyleX is last-wins.
+ variants[variant],
xstyle,
);
diff --git a/packages/core/src/Calendar/Calendar.tsx b/packages/core/src/Calendar/Calendar.tsx
index e70ecca321..e5643ef78b 100644
--- a/packages/core/src/Calendar/Calendar.tsx
+++ b/packages/core/src/Calendar/Calendar.tsx
@@ -58,6 +58,7 @@ import {
DATE_FORMAT_MONTH_YEAR,
} from '../utils/plainDate';
import {mergeProps, composeEventHandlers, rtlStyles} from '../utils';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {
computeDayCellState,
computeRangeRounding,
@@ -1102,7 +1103,7 @@ function DayCell({
// the default rendering.
marker: markerState,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
dayCellStyles.day,
dayCellTheme.day,
isOutside && dayCellStyles.dayOutside,
diff --git a/packages/core/src/Calendar/styles.ts b/packages/core/src/Calendar/styles.ts
index 7845f05953..9c10795c1c 100644
--- a/packages/core/src/Calendar/styles.ts
+++ b/packages/core/src/Calendar/styles.ts
@@ -258,14 +258,6 @@ export const dayCellTheme = stylex.create({
'@media (hover: hover)': `linear-gradient(${colorVars['--color-overlay-hover']}, ${colorVars['--color-overlay-hover']})`,
},
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
// Outside days (adjacent months)
diff --git a/packages/core/src/ClickableCard/ClickableCard.tsx b/packages/core/src/ClickableCard/ClickableCard.tsx
index 644ce11d16..88776e27dc 100644
--- a/packages/core/src/ClickableCard/ClickableCard.tsx
+++ b/packages/core/src/ClickableCard/ClickableCard.tsx
@@ -46,6 +46,7 @@ import {useClickableContainer} from '../hooks/useClickableContainer';
import type {BaseProps} from '../BaseProps';
import {useLinkComponent} from '../Link/useLinkComponent';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
// =============================================================================
// Styles — only the interactive layer, Card handles everything else
@@ -57,13 +58,6 @@ const styles = stylex.create({
cursor: 'pointer',
textDecoration: 'none',
color: 'inherit',
- outlineOffset: '2px',
- },
- focusWithin: {
- ':has(:focus-visible)': {
- outline: `2px solid ${colorVars['--color-accent']}`,
- outlineOffset: '2px',
- },
},
// Hover overlay — guarded by @media (hover: hover) so touch devices
// don't show a stuck hover state. Active/pressed state works everywhere.
@@ -307,14 +301,15 @@ export function ClickableCard({
padding={padding}
variant={variant}
elevation={elevation}
- {...mergeProps(themeProps('clickable-card', {variant}), {
- className: classNameProp,
+ {...mergeProps(
+ themeProps('clickable-card', {variant}),
+ focusOutlineProps.focusWithin(),
+ classNameProp,
style,
- })}
+ )}
xstyle={
[
styles.interactive,
- styles.focusWithin,
hasBorder ? styles.bordered : styles.borderless,
!isDisabled && styles.overlay,
!isDisabled && styles.hoverOnPointer,
diff --git a/packages/core/src/CodeBlock/CodeBlock.tsx b/packages/core/src/CodeBlock/CodeBlock.tsx
index e05a85f89c..5f482cd566 100644
--- a/packages/core/src/CodeBlock/CodeBlock.tsx
+++ b/packages/core/src/CodeBlock/CodeBlock.tsx
@@ -45,6 +45,7 @@ import type {SyntaxToken, TokenLine} from './tokenizer';
import {ensureHighlightStyles} from './highlightStyles';
import {applyHighlightRangesChunked} from './highlightRanges';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
import {SyntaxTheme, type SyntaxThemeDefinition} from '../theme/syntax';
@@ -218,14 +219,6 @@ const styles = stylex.create({
// Restore a keyboard-only focus ring with the standard token/offset so this
// disclosure control matches the rest of the system (Collapsible, TabMenu);
// otherwise it falls back to the inconsistent UA default outline.
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
code: {
display: 'block',
@@ -871,7 +864,7 @@ export function CodeBlock({
}
: undefined
}
- {...stylex.props(
+ {...focusOutlineProps.focusVisible(
styles.header,
canCollapse && styles.headerCollapsible,
)}>
diff --git a/packages/core/src/Collapsible/Collapsible.tsx b/packages/core/src/Collapsible/Collapsible.tsx
index d6700eaa1a..fae58bbd44 100644
--- a/packages/core/src/Collapsible/Collapsible.tsx
+++ b/packages/core/src/Collapsible/Collapsible.tsx
@@ -46,6 +46,7 @@ import {Icon} from '../Icon';
import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
const styles = stylex.create({
root: {
@@ -73,14 +74,6 @@ const styles = stylex.create({
paddingBlock: 0,
// `all: unset` above wipes the UA focus outline; restore a keyboard-only
// focus ring using the standard token/offset (WCAG 2.4.7).
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
// Capsize: trim leading from text triggers
triggerLabel: {
@@ -332,7 +325,7 @@ export function Collapsible({
themeProps('collapsible-trigger', {
density: density ?? undefined,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.trigger,
density != null && triggerDensity[density],
isDisabled && styles.triggerDisabled,
diff --git a/packages/core/src/Dialog/Dialog.tsx b/packages/core/src/Dialog/Dialog.tsx
index fe9ccc42be..aa942028fa 100644
--- a/packages/core/src/Dialog/Dialog.tsx
+++ b/packages/core/src/Dialog/Dialog.tsx
@@ -50,6 +50,7 @@ import {devWarn} from '../utils/devWarning';
import {DialogContext} from './DialogContext';
import {themeProps} from '../utils/themeProps';
import type {DialogVariantMap} from './index';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
/**
* Calculate a directional translate offset for dialog entry animation.
@@ -137,14 +138,6 @@ const styles = stylex.create({
animationDuration: durationVars['--duration-medium-max'],
animationTimingFunction: easeVars['--ease-standard'],
animationFillMode: 'backwards' as const,
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
// Applied via isOpen prop — avoids :where([open]) attribute selectors
// which have zero specificity and can lose to default styles depending
@@ -640,7 +633,7 @@ export function Dialog({
{...safeProps}
{...mergeProps(
themeProps('dialog', {variant}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.dialog,
isOpen && styles.open,
styles.backdrop,
diff --git a/packages/core/src/Item/Item.tsx b/packages/core/src/Item/Item.tsx
index 0eefb7de96..99afbd7853 100644
--- a/packages/core/src/Item/Item.tsx
+++ b/packages/core/src/Item/Item.tsx
@@ -33,6 +33,7 @@ import {useLinkComponent} from '../Link/useLinkComponent';
import {useClickableContainer} from '../hooks/useClickableContainer';
import {useDevWarning} from '../hooks/useDevWarning';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
// =============================================================================
// Types
@@ -218,16 +219,6 @@ const styles = stylex.create({
':active': colorVars['--color-overlay-pressed'],
},
},
- focusVisibleOutline: {
- outline: {
- default: 'none',
- ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':has(:focus-visible)': '2px',
- },
- },
highlighted: {
backgroundColor: colorVars['--color-overlay-hover'],
},
@@ -558,12 +549,11 @@ export function Item({
aria-disabled={isDisabled || undefined}
{...mergeProps(
themeProps('item', {density, align}),
- stylex.props(
+ focusOutlineProps.focusWithin(
styles.root,
densityStyles[density],
align === 'start' && styles.alignStart,
isInteractive && styles.interactive,
- isInteractive && styles.focusVisibleOutline,
isHighlighted && styles.highlighted,
isSelected && styles.selected,
isDisabled && !hasParentRole && styles.disabled,
diff --git a/packages/core/src/Link/Link.tsx b/packages/core/src/Link/Link.tsx
index 3df8cde1b3..1bf3eb71b3 100644
--- a/packages/core/src/Link/Link.tsx
+++ b/packages/core/src/Link/Link.tsx
@@ -44,6 +44,7 @@ import {mergeProps} from '../utils';
import {computeTargetAndRel} from './computeTargetAndRel';
import {useInteractiveRole} from '../hooks/useInteractiveRole';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
/**
@@ -68,14 +69,6 @@ const styles = stylex.create({
transitionProperty: 'color, text-decoration',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
/**
* Reset styles for rendering as a <button> when href is undefined.
@@ -368,7 +361,7 @@ export function Link({
disabled={isDisabled}
{...mergeProps(
themeProps('link', {color}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
styles.buttonReset,
linkColorStyles[color],
@@ -400,7 +393,7 @@ export function Link({
tabIndex={-1}
{...mergeProps(
themeProps('link', {color}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
linkColorStyles[color],
hasUnderline && styles.hasUnderline,
@@ -428,7 +421,7 @@ export function Link({
tabIndex={isDisabled ? -1 : undefined}
{...mergeProps(
themeProps('link', {color}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
linkColorStyles[color],
hasUnderline && styles.hasUnderline,
diff --git a/packages/core/src/Outline/Outline.tsx b/packages/core/src/Outline/Outline.tsx
index 592bd61bab..ba0fd38c48 100644
--- a/packages/core/src/Outline/Outline.tsx
+++ b/packages/core/src/Outline/Outline.tsx
@@ -42,6 +42,7 @@ import type {BaseProps} from '../BaseProps';
import {useScrollSpy} from './useScrollSpy';
import type {OutlineItem} from './types';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
export type {OutlineItem} from './types';
@@ -211,10 +212,6 @@ const styles = stylex.create({
':active': {
backgroundColor: colorVars['--color-overlay-pressed'],
},
- ':focus-visible': {
- outline: `2px solid ${colorVars['--color-accent']}`,
- outlineOffset: 2,
- },
},
activeLink: {
color: colorVars['--color-text-primary'],
@@ -473,7 +470,7 @@ export function Outline({
active: isActive ? 'active' : null,
level: item.level,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.link,
densityStyles[density],
getIndentStyle(item.level),
diff --git a/packages/core/src/Pagination/Pagination.tsx b/packages/core/src/Pagination/Pagination.tsx
index 96452e7c65..0c8887877c 100644
--- a/packages/core/src/Pagination/Pagination.tsx
+++ b/packages/core/src/Pagination/Pagination.tsx
@@ -43,6 +43,7 @@ import {useListFocus} from '../hooks/useListFocus';
import {mergeProps, rtlStyles} from '../utils';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n/useTranslator';
import type {PaginationVariantMap} from './index';
@@ -217,14 +218,6 @@ const styles = stylex.create({
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
dotSm: {
width: spacingVars['--spacing-1-5'],
@@ -702,7 +695,7 @@ export function Pagination({
active: isActive ? 'active' : null,
size,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.dot,
isSm && styles.dotSm,
isActive && styles.dotActive,
diff --git a/packages/core/src/Resizable/ResizeHandle.tsx b/packages/core/src/Resizable/ResizeHandle.tsx
index c15cc678cc..cf75436254 100644
--- a/packages/core/src/Resizable/ResizeHandle.tsx
+++ b/packages/core/src/Resizable/ResizeHandle.tsx
@@ -34,6 +34,7 @@ import {
radiusVars,
spacingVars,
} from '../theme/tokens.stylex';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {mergeProps, mergeRefs, rtlStyles} from '../utils';
import type {ResizableProps} from './useResizable';
import {themeProps} from '../utils/themeProps';
@@ -94,14 +95,6 @@ const styles = stylex.create({
transitionProperty: 'background-color',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: null,
- ':focus-visible': spacingVars['--spacing-0-5'],
- },
},
// Overlay mode — absolutely positioned inside the parent panel
// instead of being a sibling in flex flow. Used when the handle
@@ -554,7 +547,7 @@ export function ResizeHandle({
data-resizing={isDragging || undefined}
{...mergeProps(
themeProps('resize-handle'),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.handle,
isOverlay && styles.overlay,
isOverlay &&
diff --git a/packages/core/src/SegmentedControl/SegmentedControlItem.tsx b/packages/core/src/SegmentedControl/SegmentedControlItem.tsx
index aa61bcb1df..96f3d7aede 100644
--- a/packages/core/src/SegmentedControl/SegmentedControlItem.tsx
+++ b/packages/core/src/SegmentedControl/SegmentedControlItem.tsx
@@ -32,6 +32,7 @@ import type {SegmentedControlSize} from './SegmentedControlContext';
import {mergeProps, composeEventHandlers} from '../utils';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
export interface SegmentedControlItemProps extends BaseProps<HTMLButtonElement> {
ref?: React.Ref<HTMLButtonElement>;
@@ -85,14 +86,6 @@ const styles = stylex.create({
transitionProperty: 'color, background-color, box-shadow',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
hover: {
backgroundColor: {
@@ -240,7 +233,7 @@ export function SegmentedControlItem({
selected: isSelected ? 'selected' : null,
disabled: isItemDisabled ? 'disabled' : null,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
sizeStyles[size],
isFill && styles.fill,
diff --git a/packages/core/src/SelectableCard/SelectableCard.tsx b/packages/core/src/SelectableCard/SelectableCard.tsx
index 00bddea883..0cbe494284 100644
--- a/packages/core/src/SelectableCard/SelectableCard.tsx
+++ b/packages/core/src/SelectableCard/SelectableCard.tsx
@@ -46,6 +46,7 @@ import type {CardVariant} from '../Card/Card';
import {useClickableContainer} from '../hooks/useClickableContainer';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
// =============================================================================
// Styles — selection + interaction; Card handles the rest
@@ -58,13 +59,6 @@ const styles = stylex.create({
transitionProperty: 'box-shadow, border-color',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outlineOffset: '2px',
- },
- focusWithin: {
- ':has(:focus-visible)': {
- outline: `2px solid ${colorVars['--color-accent']}`,
- outlineOffset: '2px',
- },
},
// Hover overlay — guarded by @media (hover: hover) so touch devices
// don't show a stuck hover state. Active/pressed state works everywhere.
@@ -361,12 +355,13 @@ export function SelectableCard({
variant,
selected: isSelected ? 'true' : 'false',
}),
- {className: classNameProp, style},
+ focusOutlineProps.focusWithin(),
+ classNameProp,
+ style,
)}
xstyle={
[
styles.interactive,
- styles.focusWithin,
isSelected && selectedStyleForVariant(variant),
!isDisabled && styles.overlay,
!isDisabled && styles.hoverOnPointer,
diff --git a/packages/core/src/TabList/Tab.tsx b/packages/core/src/TabList/Tab.tsx
index cd07d68e41..f27bae868f 100644
--- a/packages/core/src/TabList/Tab.tsx
+++ b/packages/core/src/TabList/Tab.tsx
@@ -37,6 +37,7 @@ import type {LinkComponentType} from '../Link/types';
import {mergeProps} from '../utils';
import {EDGE_COMP_ATTR} from '../Layout/edgeCompensation.stylex';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
export interface TabProps extends BaseProps<HTMLButtonElement> {
/**
@@ -106,14 +107,6 @@ const styles = stylex.create({
transitionProperty: 'color',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
hoverBg: {
position: 'absolute',
@@ -274,7 +267,7 @@ export function Tab({
themeProps('tab', {
selected: isSelected ? 'selected' : null,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
sizeStyles[size],
isSelected && styles.selected,
diff --git a/packages/core/src/TabList/TabMenu.tsx b/packages/core/src/TabList/TabMenu.tsx
index 94b22855b3..037f5ec15c 100644
--- a/packages/core/src/TabList/TabMenu.tsx
+++ b/packages/core/src/TabList/TabMenu.tsx
@@ -30,6 +30,7 @@ import {
fontWeightVars,
typeScaleVars,
} from '../theme/tokens.stylex';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {usePopover} from '../Popover/usePopover';
import {MENU_ITEM_SELECTOR} from '../DropdownMenu/menuItemRoles';
import {useListFocus} from '../hooks/useListFocus';
@@ -91,14 +92,6 @@ const styles = stylex.create({
transitionProperty: 'color',
transitionDuration: durationVars['--duration-fast'],
transitionTimingFunction: easeVars['--ease-standard'],
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
triggerSelected: {
color: colorVars['--color-text-primary'],
@@ -202,10 +195,6 @@ const styles = stylex.create({
'@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
},
menuItemSelected: {
fontWeight: fontWeightVars['--font-weight-medium'],
@@ -360,7 +349,7 @@ export function TabMenu({
onClick={handleToggle}
{...mergeProps(
themeProps('tab-menu'),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.trigger,
sizeStyles[size],
hasSelectedOption && styles.triggerSelected,
@@ -433,7 +422,7 @@ export function TabMenu({
}}
{...mergeProps(
themeProps('tab-menu-item'),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.menuItem,
isSelected && styles.menuItemSelected,
),
diff --git a/packages/core/src/Table/plugins/sortable/useTableSortable.tsx b/packages/core/src/Table/plugins/sortable/useTableSortable.tsx
index 7126fee04d..d2888e53b3 100644
--- a/packages/core/src/Table/plugins/sortable/useTableSortable.tsx
+++ b/packages/core/src/Table/plugins/sortable/useTableSortable.tsx
@@ -16,6 +16,7 @@
import {useRef, useMemo, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {colorVars, spacingVars, radiusVars} from '../../../theme/tokens.stylex';
+import {focusOutlineProps} from '../../../utils/focusOutline.stylex';
import {Icon} from '../../../Icon';
import {resolveContextActions} from '../../tableContextMenu';
import {useTranslator, type TranslatorFn} from '../../../i18n';
@@ -130,11 +131,6 @@ const sortStyles = stylex.create({
width: '100%',
height: '100%',
textAlign: 'inherit',
- outline: {
- default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: '2px',
borderRadius: radiusVars['--radius-inner'],
},
iconWrapperUnsorted: {
@@ -307,7 +303,7 @@ function SortHeaderButton<T extends Record<string, unknown>>({
return (
<button
type="button"
- {...stylex.props(sortStyles.button)}
+ {...focusOutlineProps.focusVisible(sortStyles.button)}
aria-label={ariaLabel}
onClick={handleClick}>
<span>{children}</span>
diff --git a/packages/core/src/Thumbnail/Thumbnail.tsx b/packages/core/src/Thumbnail/Thumbnail.tsx
index cb3737e8a9..4c329e7ae0 100644
--- a/packages/core/src/Thumbnail/Thumbnail.tsx
+++ b/packages/core/src/Thumbnail/Thumbnail.tsx
@@ -44,6 +44,7 @@ import {useContainerReveal} from '../hooks/useContainerReveal';
import type {BaseProps} from '../BaseProps';
import {mergeProps} from '../utils';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
export interface ThumbnailProps extends BaseProps<HTMLDivElement> {
@@ -159,14 +160,6 @@ const styles = stylex.create({
},
interactive: {
cursor: 'pointer',
- outline: {
- default: null,
- ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':has(:focus-visible)': '2px',
- },
},
// Hover/pressed overlay — the exact same treatment as ClickableCard and
// SelectableCard. A transparent `::after` tints on hover/press instead of
@@ -402,7 +395,7 @@ export function Thumbnail({
{...props}>
<div
{...mergeProps(
- stylex.props(
+ focusOutlineProps.focusWithin(
styles.imageContainer,
isInteractive && styles.interactive,
isInteractive && styles.overlay,
diff --git a/packages/core/src/Token/Token.tsx b/packages/core/src/Token/Token.tsx
index d22e9550dc..9b60a4aa21 100644
--- a/packages/core/src/Token/Token.tsx
+++ b/packages/core/src/Token/Token.tsx
@@ -36,6 +36,7 @@ import {useInteractiveRole} from '../hooks/useInteractiveRole';
import {TokenLink} from './TokenLink';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
import type {TokenColorMap} from './index';
@@ -146,14 +147,6 @@ const styles = stylex.create({
},
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
disabled: {
cursor: 'not-allowed',
@@ -180,16 +173,6 @@ const styles = stylex.create({
overflow: 'hidden',
minWidth: 0,
},
- focusVisibleOutline: {
- outline: {
- default: null,
- ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':has(:focus-visible)': '2px',
- },
- },
removeButton: {
all: 'unset',
display: 'inline-flex',
@@ -203,10 +186,6 @@ const styles = stylex.create({
width: '16px',
height: '16px',
color: 'inherit',
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
'::after': {
content: '""',
position: 'absolute',
@@ -337,7 +316,7 @@ export function Token({
onRemove(e);
}}
disabled={isDisabled}
- {...stylex.props(styles.removeButton)}>
+ {...focusOutlineProps.focusVisible(styles.removeButton)}>
<Icon icon="close" size="xsm" color="inherit" />
</button>
);
@@ -370,7 +349,7 @@ export function Token({
{...sharedProps}
{...mergeProps(
themeProps('token', {color, size}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
sizeStyles[size],
colorStyles[color],
@@ -415,12 +394,11 @@ export function Token({
{...sharedProps}
{...mergeProps(
themeProps('token', {color, size}),
- stylex.props(
+ focusOutlineProps.focusWithin(
styles.base,
sizeStyles[size],
colorStyles[color],
styles.interactive,
- styles.focusVisibleOutline,
isDisabled && styles.disabled,
xstyle,
),
@@ -447,12 +425,11 @@ export function Token({
{...sharedProps}
{...mergeProps(
themeProps('token', {color, size}),
- stylex.props(
+ focusOutlineProps.focusWithin(
styles.base,
sizeStyles[size],
colorStyles[color],
styles.interactive,
- styles.focusVisibleOutline,
isDisabled && styles.disabled,
xstyle,
),
diff --git a/packages/core/src/TopNav/TopNavItem.tsx b/packages/core/src/TopNav/TopNavItem.tsx
index b6f7872fed..a2e326369d 100644
--- a/packages/core/src/TopNav/TopNavItem.tsx
+++ b/packages/core/src/TopNav/TopNavItem.tsx
@@ -35,6 +35,7 @@ import {navItemStyles, type NavItemSize} from '../NavItem/navItemStyles.stylex';
import {mergeProps} from '../utils';
import {useAppShellMobile} from '../AppShell/AppShellMobileContext';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
/**
* NavItem styles with hover/selected states
@@ -63,14 +64,6 @@ const styles = stylex.create({
},
':active': colorVars['--color-overlay-pressed'],
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
selected: {
color: colorVars['--color-text-primary'],
@@ -87,16 +80,6 @@ const styles = stylex.create({
paddingInline: spacingVars['--spacing-2'],
},
// Drawer mode — focus outline (base item + selected come from navItemStyles)
- drawerFocus: {
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
- },
});
export interface TopNavItemProps extends BaseProps<HTMLAnchorElement> {
@@ -246,10 +229,9 @@ export function TopNavItem({
mode: 'drawer',
selected: isSelected ? 'selected' : null,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
navItemStyles.item,
navItemStyles[size],
- styles.drawerFocus,
isSelected && navItemStyles.selected,
isDisabled && navItemStyles.disabled,
xstyle,
@@ -283,7 +265,7 @@ export function TopNavItem({
themeProps('top-nav-item', {
selected: isSelected ? 'selected' : null,
}),
- stylex.props(
+ focusOutlineProps.focusVisible(
styles.base,
isSelected && styles.selected,
isDisabled && navItemStyles.disabled,
diff --git a/packages/core/src/TopNav/TopNavMegaMenu.tsx b/packages/core/src/TopNav/TopNavMegaMenu.tsx
index d9454785c3..8b1292ee01 100644
--- a/packages/core/src/TopNav/TopNavMegaMenu.tsx
+++ b/packages/core/src/TopNav/TopNavMegaMenu.tsx
@@ -51,6 +51,7 @@ import {navItemStyles} from '../NavItem/navItemStyles.stylex';
import {useTopNavSlot} from './TopNavContext';
import {useTopNavRenderMode} from './TopNavRenderContext';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
// =============================================================================
// Styles
@@ -79,14 +80,6 @@ const styles = stylex.create({
'@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
border: 'none',
fontFamily: 'inherit',
},
@@ -481,7 +474,10 @@ function DefaultMegaMenu({
onMouseLeave={handleMouseLeave}
{...mergeProps(
themeProps('top-nav-mega-menu'),
- stylex.props(styles.trigger, popover.isOpen && styles.triggerOpen),
+ focusOutlineProps.focusVisible(
+ styles.trigger,
+ popover.isOpen && styles.triggerOpen,
+ ),
)}>
{label}
<Icon
diff --git a/packages/core/src/TopNav/TopNavMegaMenuItem.tsx b/packages/core/src/TopNav/TopNavMegaMenuItem.tsx
index 7a078439a0..7be934dac7 100644
--- a/packages/core/src/TopNav/TopNavMegaMenuItem.tsx
+++ b/packages/core/src/TopNav/TopNavMegaMenuItem.tsx
@@ -34,6 +34,7 @@ import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {useAppShellMobile} from '../AppShell/AppShellMobileContext';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
// =============================================================================
// Styles
@@ -61,14 +62,6 @@ const styles = stylex.create({
':active': colorVars['--color-overlay-pressed'],
},
border: 'none',
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
color: 'inherit',
fontFamily: 'inherit',
textAlign: 'start',
@@ -249,7 +242,7 @@ export function TopNavMegaMenuItem({
tabIndex={tabIndex}
{...mergeProps(
themeProps('top-nav-mega-menu-item'),
- stylex.props(styles.desktop),
+ focusOutlineProps.focusVisible(styles.desktop),
)}>
{icon && <div {...stylex.props(styles.desktopIcon)}>{icon}</div>}
<div {...stylex.props(styles.desktopContent)}>
diff --git a/packages/core/src/TopNav/TopNavMenu.tsx b/packages/core/src/TopNav/TopNavMenu.tsx
index 37e663b995..3bfb3abf4e 100644
--- a/packages/core/src/TopNav/TopNavMenu.tsx
+++ b/packages/core/src/TopNav/TopNavMenu.tsx
@@ -37,6 +37,7 @@ import {useTopNavRenderMode} from './TopNavRenderContext';
import {useAppShellMobile} from '../AppShell/AppShellMobileContext';
import {useLinkComponent} from '../Link/useLinkComponent';
import {themeProps} from '../utils/themeProps';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {
colorVars,
spacingVars,
@@ -74,14 +75,6 @@ const styles = stylex.create({
'@media (hover: hover)': colorVars['--color-overlay-hover'],
},
},
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
border: 'none',
fontFamily: 'inherit',
},
@@ -136,14 +129,6 @@ const styles = stylex.create({
},
},
border: 'none',
- outline: {
- default: null,
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: '0',
- ':focus-visible': '2px',
- },
},
menuItemIcon: {
display: 'flex',
@@ -510,7 +495,10 @@ export function TopNavMenu({
{...triggerProps}
{...mergeProps(
themeProps('top-nav-menu'),
- stylex.props(styles.trigger, popover.isOpen && styles.triggerOpen),
+ focusOutlineProps.focusVisible(
+ styles.trigger,
+ popover.isOpen && styles.triggerOpen,
+ ),
)}>
{label}
<Icon
@@ -543,7 +531,7 @@ export function TopNavMenu({
tabIndex={-1}
href={item.href}
onClick={item.onClick}
- {...stylex.props(styles.menuItem)}>
+ {...focusOutlineProps.focusVisible(styles.menuItem)}>
<div {...stylex.props(styles.menuItemIcon)}>{item.icon}</div>
<div {...stylex.props(styles.menuItemContent)}>
<span {...stylex.props(styles.menuItemTitle)}>
diff --git a/packages/core/src/TreeList/TreeList.test.tsx b/packages/core/src/TreeList/TreeList.test.tsx
index f570da2c64..e5892698b5 100644
--- a/packages/core/src/TreeList/TreeList.test.tsx
+++ b/packages/core/src/TreeList/TreeList.test.tsx
@@ -299,16 +299,16 @@ describe('TreeList', () => {
expect(root).toHaveFocus();
expect(
- getComputedStyle(root).getPropertyValue('--_tree-focus-outline'),
+ getComputedStyle(root).getPropertyValue('--_focus-outline'),
).toContain('solid');
// Mid and Leaf are DOM descendants of Root's <li> (nested <ul role="group">
// subtrees) — their own outline var must stay unset, not inherit Root's.
- expect(
- getComputedStyle(mid).getPropertyValue('--_tree-focus-outline'),
- ).toBe('none');
- expect(
- getComputedStyle(leaf).getPropertyValue('--_tree-focus-outline'),
- ).toBe('none');
+ expect(getComputedStyle(mid).getPropertyValue('--_focus-outline')).toBe(
+ 'none',
+ );
+ expect(getComputedStyle(leaf).getPropertyValue('--_focus-outline')).toBe(
+ 'none',
+ );
});
// ===========================================================================
diff --git a/packages/core/src/TreeList/TreeListItem.tsx b/packages/core/src/TreeList/TreeListItem.tsx
index f1a06fd9b2..2e76a50c6f 100644
--- a/packages/core/src/TreeList/TreeListItem.tsx
+++ b/packages/core/src/TreeList/TreeListItem.tsx
@@ -24,6 +24,7 @@ import {
easeVars,
typeScaleVars,
} from '../theme/tokens.stylex';
+import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {Icon} from '../Icon';
import {mergeProps} from '../utils';
import {useLinkComponent} from '../Link/useLinkComponent';
@@ -51,14 +52,6 @@ const styles = stylex.create({
// redeclares these vars (default: 'none' / '0'), so a descendant row's
// default shadows an ancestor's active value — the ring can never leak
// past the nearest containing treeitem, however deep the tree nests.
- '--_tree-focus-outline': {
- default: 'none',
- ':focus-visible': `2px solid ${colorVars['--color-accent']}`,
- },
- '--_tree-focus-outline-offset': {
- default: '0',
- ':focus-visible': '2px',
- },
},
childGroup: {
margin: 0,
@@ -88,7 +81,8 @@ const styles = stylex.create({
alignItems: 'center',
gap: spacingVars['--spacing-2'],
paddingInline: spacingVars['--spacing-2'],
- outline: 'none',
+ // No `outline: 'none'` here: this element receives the shared focus ring,
+ // which already defaults to none, and the shorthand would erase it.
overflow: 'hidden',
position: 'relative',
boxSizing: 'border-box',
@@ -113,19 +107,6 @@ const styles = stylex.create({
':active': `linear-gradient(${colorVars['--color-overlay-pressed']}, ${colorVars['--color-overlay-pressed']})`,
},
},
- focusVisibleOutline: {
- outline: {
- // Reads the row's own --_tree-focus-outline (published on the <li> in
- // `wrapper`), which resolves to the nearest containing treeitem only.
- default: 'var(--_tree-focus-outline, none)',
- // Also support inner focusable actions.
- ':has(:focus-visible)': `2px solid ${colorVars['--color-accent']}`,
- },
- outlineOffset: {
- default: 'var(--_tree-focus-outline-offset, 0)',
- ':has(:focus-visible)': '2px',
- },
- },
disabled: {
cursor: 'not-allowed',
opacity: 0.5,
@@ -573,7 +554,7 @@ export function TreeListItem({
data-tree-id={id}
data-tree-level={nestedLevel + 1}
data-tree-disabled={isDisabled || undefined}
- {...stylex.props(styles.wrapper)}>
+ {...focusOutlineProps.publishFocusVisibleVars(styles.wrapper)}>
{variant !== 'noGuides' && (
<div {...stylex.props(styles.treeBranches)}>
<TreeListBranches
@@ -591,16 +572,20 @@ export function TreeListItem({
selected: isSelected ? 'selected' : null,
disabled: isDisabled ? 'disabled' : null,
}),
- stylex.props(
- styles.contentWrapper,
- densityStyles[density],
- (isInteractive || (hasChildren && onClick == null)) &&
- styles.interactive,
- (isInteractive || (hasChildren && onClick == null)) &&
- styles.focusVisibleOutline,
- isDisabled && styles.disabled,
- isSelected && styles.selected,
- ),
+ isInteractive || (hasChildren && onClick == null)
+ ? focusOutlineProps.focusWithinOrPublished(
+ styles.contentWrapper,
+ densityStyles[density],
+ styles.interactive,
+ isDisabled && styles.disabled,
+ isSelected && styles.selected,
+ )
+ : stylex.props(
+ styles.contentWrapper,
+ densityStyles[density],
+ isDisabled && styles.disabled,
+ isSelected && styles.selected,
+ ),
)}
style={indentStyle}
onClick={handleClick}>
diff --git a/packages/core/src/utils/focusOutline.stylex.ts b/packages/core/src/utils/focusOutline.stylex.ts
new file mode 100644
index 0000000000..b0861a24e5
--- /dev/null
+++ b/packages/core/src/utils/focusOutline.stylex.ts
@@ -0,0 +1,128 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file focusOutline.stylex.ts
+ * @input Uses StyleX and theme color tokens
+ * @output Exports shared focus-outline prop builders
+ * @position Internal utility for consistent keyboard focus outlines across core components
+ *
+ * Centralizes the standard Astryx focus outline, shown only for keyboard focus.
+ * Every focusable surface drew the same 2px accent ring at 2px offset already;
+ * writing it per component meant five identical definitions to keep in step.
+ *
+ * These are utility styles, deliberately NOT a theme target. A shared
+ * `astryx-focus-outline` class was tried and pulled: a theme can only override
+ * the ring unconditionally through it (`generateThemeRules` mangles
+ * `:focus-visible` into `.focus-visible` and truncates `:has(:focus-visible)`
+ * at the paren), so the one thing such a target exists for — restyling a
+ * STATE — is exactly what it cannot express. Making focus outlines themeable
+ * is worth doing on top of this consolidation, once that is fixed.
+ */
+
+import * as stylex from '@stylexjs/stylex';
+import {colorVars} from '../theme/tokens.stylex';
+
+const FOCUS_OUTLINE_WIDTH = '2px';
+// 3px, per Design Conventions §User Interaction States: "2px --color-accent
+// outline at 3px offset". Most components had drifted to 2px; Button, Calendar,
+// Dialog and Pagination were the ones matching the spec, so the consolidation
+// takes their value rather than the majority's.
+const FOCUS_OUTLINE_OFFSET = '3px';
+const FOCUS_OUTLINE_COLOR = colorVars['--color-accent'];
+
+/**
+ * Written as longhands rather than the `outline` shorthand.
+ *
+ * A shorthand resets every longhand it covers, so `outline: 2px solid accent`
+ * would clobber a later `outlineColor` no matter the order — which is how
+ * destructive buttons silently lost their red ring. With longhands, a variant
+ * can re-color the ring and inherit width, style and offset.
+ */
+const focusOutlineLonghands = {
+ outlineWidth: FOCUS_OUTLINE_WIDTH,
+ outlineStyle: 'solid',
+ outlineColor: FOCUS_OUTLINE_COLOR,
+} as const;
+
+export const focusOutlineStyles = stylex.create({
+ focusVisible: {
+ outlineWidth: {
+ default: '0',
+ ':focus-visible': focusOutlineLonghands.outlineWidth,
+ },
+ outlineStyle: {
+ default: 'none',
+ ':focus-visible': focusOutlineLonghands.outlineStyle,
+ },
+ outlineColor: {
+ default: null,
+ ':focus-visible': focusOutlineLonghands.outlineColor,
+ },
+ outlineOffset: {default: '0', ':focus-visible': FOCUS_OUTLINE_OFFSET},
+ },
+ focusWithin: {
+ outlineWidth: {
+ default: '0',
+ ':has(:focus-visible)': focusOutlineLonghands.outlineWidth,
+ },
+ outlineStyle: {
+ default: 'none',
+ ':has(:focus-visible)': focusOutlineLonghands.outlineStyle,
+ },
+ outlineColor: {
+ default: null,
+ ':has(:focus-visible)': focusOutlineLonghands.outlineColor,
+ },
+ outlineOffset: {default: '0', ':has(:focus-visible)': FOCUS_OUTLINE_OFFSET},
+ },
+ publishFocusVisibleVars: {
+ '--_focus-outline': {
+ default: 'none',
+ ':focus-visible': `${FOCUS_OUTLINE_WIDTH} solid ${FOCUS_OUTLINE_COLOR}`,
+ },
+ '--_focus-outline-offset': {
+ default: '0',
+ ':focus-visible': FOCUS_OUTLINE_OFFSET,
+ },
+ },
+ focusWithinOrPublished: {
+ outline: {
+ default: 'var(--_focus-outline, none)',
+ ':has(:focus-visible)': `${FOCUS_OUTLINE_WIDTH} solid ${FOCUS_OUTLINE_COLOR}`,
+ },
+ outlineOffset: {
+ default: 'var(--_focus-outline-offset, 0)',
+ ':has(:focus-visible)': FOCUS_OUTLINE_OFFSET,
+ },
+ },
+});
+
+// StyleX does not expose a stable public input type for stylex.props();
+// keep this helper permissive so it mirrors stylex.props() itself.
+type StyleXPropsArg = unknown;
+
+function makeFocusOutlineProps(style: StyleXPropsArg) {
+ return (...styles: StyleXPropsArg[]) =>
+ // Caller styles LAST, so a component can deliberately re-color its ring —
+ // destructive buttons ring in error red, not accent. StyleX is last-wins,
+ // and reversing this to protect the ring silently ate that override.
+ //
+ // The hazard in this direction is the opposite one: a caller whose base
+ // style carries `outline: 'none'` wipes the ring out entirely (TreeList
+ // did, and shipped a focusable row with no visible focus). Two things
+ // guard it — this file states the rule, and the ring is written as
+ // LONGHANDS, so an override has to name `outlineStyle`/`outlineWidth`
+ // explicitly rather than erasing them through the `outline` shorthand.
+ stylex.props(style as never, ...(styles as never[]));
+}
+
+export const focusOutlineProps = {
+ focusVisible: makeFocusOutlineProps(focusOutlineStyles.focusVisible),
+ focusWithin: makeFocusOutlineProps(focusOutlineStyles.focusWithin),
+ publishFocusVisibleVars: makeFocusOutlineProps(
+ focusOutlineStyles.publishFocusVisibleVars,
+ ),
+ focusWithinOrPublished: makeFocusOutlineProps(
+ focusOutlineStyles.focusWithinOrPublished,
+ ),
+} as const;