An open source design system that's fully customizable and agent ready
TypeScript
fix(Field): a focusable disabled field shows its focus under forced colors (#9410)
Cindy Zhangce052bf0aa5e
diff --git a/.changeset/disabled-field-focus-forced-colors.md b/.changeset/disabled-field-focus-forced-colors.mdnew file mode 100644index 0000000000..7360a86084--- /dev/null+++ b/.changeset/disabled-field-focus-forced-colors.md@@ -0,0 +1,7 @@+---+'@astryxdesign/core': patch+---++[fix] A disabled field that keeps its tab stop (TextInput, TextArea, NumberInput, Typeahead, Tokenizer, Selector, MultiSelector, and DateInput, TimeInput, DateRangeInput and DateTimeInput on every surface: popover, native and bottom sheet) now shows keyboard focus under forced colors, such as Windows High Contrast. Its focus border takes the system Highlight color there, as enabled fields' does. Nothing changes outside forced colors.++@cixzhangdiff --git a/packages/core/src/DateInput/DateInput.tsx b/packages/core/src/DateInput/DateInput.tsxindex 1b9c9a8ee2..1d040e2053 100644--- a/packages/core/src/DateInput/DateInput.tsx+++ b/packages/core/src/DateInput/DateInput.tsx@@ -26,6 +26,7 @@ import {useTransition,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {colorVars,sizeVars,@@ -81,19 +82,6 @@ import {import {useDevWarning} from '../hooks/useDevWarning';const styles = stylex.create({- // While disabled or busy the field takes no hover ring, but the focus ring- // returns while this field's own input holds focus (spec:AST-085 FR6).- // Defaults repeat the shared border and shadow.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':has(input:focus)': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':has(input:focus)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },iconButton: {display: 'flex',alignItems: 'center',@@ -856,7 +844,7 @@ function PointerDateField({// keeps its ordinary paint and shows the Spinner (spec:AST-085// FR6, family:buttons FR4).isDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.inputFocusRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/DateInput/NativeDateField.tsx b/packages/core/src/DateInput/NativeDateField.tsxindex 0f3f65bbec..ed68702b93 100644--- a/packages/core/src/DateInput/NativeDateField.tsx+++ b/packages/core/src/DateInput/NativeDateField.tsx@@ -36,6 +36,7 @@ import {useTransition,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {useCalendarConstraints} from '../Calendar';import type {DateInputProps} from './DateInput';import {hasEditableDateSegments} from './nativeDateSegments';@@ -83,18 +84,6 @@ import {import {chainEventHandlers} from '../utils/chainEventHandlers';const styles = stylex.create({- // Same as DateInput's: no hover ring while disabled or busy, and the- // focus ring while the field's input holds focus.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':has(input:focus)': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':has(input:focus)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },wrapper: {gap: spacingVars['--spacing-2'],},@@ -603,7 +592,7 @@ export function NativeDateField({// keeps its ordinary paint and shows the Spinner (spec:AST-085// FR6, family:buttons FR4).isDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.inputFocusRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/DateInput/TouchDateField.tsx b/packages/core/src/DateInput/TouchDateField.tsxindex 7a6f53c2ed..f0cc9a427e 100644--- a/packages/core/src/DateInput/TouchDateField.tsx+++ b/packages/core/src/DateInput/TouchDateField.tsx@@ -59,6 +59,7 @@ import {useTransition,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {BottomSheet} from '../BottomSheet';import {Button} from '../Button';import {useCalendarConstraints} from '../Calendar';@@ -167,18 +168,6 @@ const sizeStyles = stylex.create({});const styles = stylex.create({- // Same as DateInput's: no hover ring while disabled or busy, and the- // focus ring while the field's input holds focus.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':has(input:focus)': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':has(input:focus)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },// ---- the closed field ----wrapper: {gap: spacingVars['--spacing-2'],@@ -1249,7 +1238,7 @@ export function TouchDateField({// keeps its ordinary paint and shows the Spinner (spec:AST-085// FR6, family:buttons FR4).isDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.inputFocusRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/DateRangeInput/DateRangeInput.tsx b/packages/core/src/DateRangeInput/DateRangeInput.tsxindex 5e86120022..aac978255b 100644--- a/packages/core/src/DateRangeInput/DateRangeInput.tsx+++ b/packages/core/src/DateRangeInput/DateRangeInput.tsx@@ -25,6 +25,7 @@ import {useTransition,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {plainDateFromISO,plainDateToday,@@ -98,18 +99,6 @@ export type {} from '../Field';const styles = stylex.create({- // The shared disabled style drops the focus ring; restore it while a- // control inside the field holds focus (spec:AST-085 FR6). Defaults repeat it.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':focus-within': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },trigger: {display: 'block',flex: 1,@@ -720,7 +709,7 @@ export function DateRangeInput({inputWrapperStyles.base,sizeStyles[size],isEffectivelyDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/DateTimeInput/DateTimeInput.tsx b/packages/core/src/DateTimeInput/DateTimeInput.tsxindex 39e13cd10c..546cb0ff0d 100644--- a/packages/core/src/DateTimeInput/DateTimeInput.tsx+++ b/packages/core/src/DateTimeInput/DateTimeInput.tsx@@ -33,6 +33,7 @@ import {type KeyboardEvent,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {colorVars,sizeVars,@@ -149,18 +150,6 @@ export type {const HORIZONTAL_SEGMENT_BASIS = 196;const styles = stylex.create({- // The shared disabled style drops the focus ring; restore it while a- // control inside the field holds focus (spec:AST-085 FR6). Defaults repeat it.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':focus-within': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },row: {display: 'flex',flexWrap: 'wrap',@@ -1692,7 +1681,7 @@ function PointerDateTimeField({sizeStyles[size],styles.dateWrapper,isEffectivelyDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&@@ -1841,7 +1830,7 @@ function PointerDateTimeField({sizeStyles[size],styles.timeWrapper,isEffectivelyDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/DateTimeInput/TouchDateTimeField.tsx b/packages/core/src/DateTimeInput/TouchDateTimeField.tsxindex 00418f5dc5..69dac46bae 100644--- a/packages/core/src/DateTimeInput/TouchDateTimeField.tsx+++ b/packages/core/src/DateTimeInput/TouchDateTimeField.tsx@@ -34,6 +34,7 @@ import {useTransition,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {BottomSheet} from '../BottomSheet';import {Button} from '../Button';import {useCalendarConstraints, type ISODateString} from '../Calendar';@@ -159,17 +160,6 @@ const sizeStyles = stylex.create({const HORIZONTAL_SEGMENT_BASIS = 196;const styles = stylex.create({- // Same as DateTimeInput's: the focus ring for a focused disabled field.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':focus-within': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },iconButton: {display: 'flex',alignItems: 'center',@@ -1346,7 +1336,7 @@ export function TouchDateTimeField({sizeStyles[size],styles.touchDateWrapper,isEffectivelyDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&@@ -1437,7 +1427,7 @@ export function TouchDateTimeField({sizeStyles[size],styles.touchTimeWrapper,isEffectivelyDisabled && inputWrapperStyles.disabled,- isEffectivelyDisabled && styles.disabledFocusRing,+ isEffectivelyDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status &&!isEffectivelyDisabled &&diff --git a/packages/core/src/Field/__tests__/FieldDisabledForcedColorsFocus.a11y.chromium.spec.ts b/packages/core/src/Field/__tests__/FieldDisabledForcedColorsFocus.a11y.chromium.spec.tsnew file mode 100644index 0000000000..320b54fa0b--- /dev/null+++ b/packages/core/src/Field/__tests__/FieldDisabledForcedColorsFocus.a11y.chromium.spec.ts@@ -0,0 +1,94 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.+// @pr-a11y scope ^(packages/core/src/Field/inputDisabledFocus\.ts|packages/core/src/Field/__tests__/FieldDisabledForcedColorsFocus|packages/core/src/(Selector|MultiSelector|DateInput|TimeInput|DateRangeInput|DateTimeInput|TextInput|Typeahead)/|apps/storybook/stories/(TextInput|Selector|DateInput|TimeInput|DateRangeInput|DateTimeInput|Typeahead)\.stories)++/**+ * @file FieldDisabledForcedColorsFocus.a11y.chromium.spec.ts+ * @input Checked-in disabled field stories+ * @output Real-browser evidence that a focusable disabled field shows keyboard+ * focus under forced colors (Windows High Contrast)+ * @position Browser lane for `spec:AST-085` FR6 and `spec:AST-020` FR1+ * (WCAG 2.4.7) on the disabled field focus styles+ */++import {expect, test, type Locator} from '@playwright/test';+import {+ DEFAULT_STORYBOOK_DIR,+ serveStorybook,+ type StaticServer,+} from '@astryxdesign/a11y-spec/storybook';++let storybook: StaticServer;++test.beforeAll(async () => {+ storybook = await serveStorybook(+ process.env.ASTRYX_STORYBOOK_DIR ?? DEFAULT_STORYBOOK_DIR,+ );+});++test.afterAll(async () => storybook?.close());++/** The border color of the bordered wrapper around a field's control. */+async function wrapperBorder(control: Locator): Promise<string> {+ return control.evaluate(el => {+ let node: HTMLElement | null = el as HTMLElement;+ while (node != null) {+ const style = getComputedStyle(node);+ if (+ style.borderTopStyle === 'solid' &&+ parseFloat(style.borderTopWidth) > 0+ ) {+ return style.borderTopColor;+ }+ node = node.parentElement;+ }+ throw new Error('no bordered wrapper around the control');+ });+}++// The field's own control: DateInput's text input, not its calendar button,+// which paints its own outline.+for (const [story, selector] of [+ ['core-textinput--disabled', '[aria-disabled="true"]'],+ ['core-typeahead--disabled', '[aria-disabled="true"]'],+ ['core-selector--disabled', '[aria-disabled="true"]'],+ ['core-dateinput--disabled', 'input[aria-disabled="true"]'],+ ['core-timeinput--disabled', '[aria-disabled="true"]'],+ [+ 'core-dateinput--disabled&args=presentation:native',+ 'input[aria-disabled="true"]',+ ],+ [+ 'core-dateinput--disabled&args=presentation:bottom-sheet',+ 'input[aria-disabled="true"]',+ ],+ [+ 'core-timeinput--disabled&args=presentation:bottom-sheet',+ '[aria-disabled="true"]:not([tabindex="-1"])',+ ],+ [+ 'core-daterangeinput--disabled',+ '[aria-disabled="true"]:not([tabindex="-1"])',+ ],+ ['core-datetimeinput--disabled', 'input[aria-disabled="true"]'],+] as const) {+ test(`${story}: a focusable disabled field shows keyboard focus under forced colors`, async ({+ page,+ }) => {+ await page.emulateMedia({forcedColors: 'active', reducedMotion: 'reduce'});+ await page.goto(+ `${storybook.origin}/iframe.html?id=${story}&viewMode=story`,+ );+ const control = page.locator(selector).first();+ await expect(control).toBeVisible();+ const atRest = await wrapperBorder(control);++ for (let i = 0; i < 6; i++) {+ await page.keyboard.press('Tab');+ if (await control.evaluate(el => el === document.activeElement)) {+ break;+ }+ }+ await expect(control).toBeFocused();+ expect(await wrapperBorder(control)).not.toBe(atRest);+ });+}diff --git a/packages/core/src/Field/inputDisabledFocus.ts b/packages/core/src/Field/inputDisabledFocus.tsindex 7f6229ab63..7f3dd81afe 100644--- a/packages/core/src/Field/inputDisabledFocus.ts+++ b/packages/core/src/Field/inputDisabledFocus.ts@@ -3,7 +3,8 @@/*** @file inputDisabledFocus.ts* @input Uses StyleX and theme tokens- * @output inputDisabledFocusStyles (internal; not re-exported from Field/index.ts)+ * @output inputDisabledFocusStyles (internal; not re-exported from Field/index.ts):+ * the one place every field's disabled focus ring is defined* @position Field wrapper style shared by the text-entry fields*/@@ -17,8 +18,12 @@ export const inputDisabledFocusStyles = stylex.create({ring: {borderColor: {default: colorVars['--color-border-emphasized'],- ':has(> [aria-disabled="true"]:focus-visible)':- colorVars['--color-accent'],+ ':has(> [aria-disabled="true"]:focus-visible)': {+ default: colorVars['--color-accent'],+ // Forced colors repaint author borders in one system color and drop+ // the inset shadow; Highlight keeps the focused field visible.+ '@media (forced-colors: active)': 'Highlight',+ },},boxShadow: {default: 'none',@@ -31,12 +36,51 @@ export const inputDisabledFocusStyles = stylex.create({nestedRing: {borderColor: {default: colorVars['--color-border-emphasized'],- ':has(input[aria-disabled="true"]:focus-visible)':- colorVars['--color-accent'],+ ':has(input[aria-disabled="true"]:focus-visible)': {+ default: colorVars['--color-accent'],+ // Forced colors repaint author borders in one system color and drop+ // the inset shadow; Highlight keeps the focused field visible.+ '@media (forced-colors: active)': 'Highlight',+ },},boxShadow: {default: 'none',':has(input[aria-disabled="true"]:focus-visible)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,},},++ // The same ring for a field that restores it while focus is anywhere inside+ // it (TimeInput, DateRangeInput, DateTimeInput and their touch fields).+ withinRing: {+ borderColor: {+ default: colorVars['--color-border-emphasized'],+ ':focus-within': {+ default: colorVars['--color-accent'],+ // Forced colors repaint author borders in one system color and drop+ // the inset shadow; Highlight keeps the focused field visible.+ '@media (forced-colors: active)': 'Highlight',+ },+ },+ boxShadow: {+ default: 'none',+ ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,+ },+ },+ // The same ring for a field that restores it while its text input has focus+ // (DateInput and its native and touch fields).+ inputFocusRing: {+ borderColor: {+ default: colorVars['--color-border-emphasized'],+ ':has(input:focus)': {+ default: colorVars['--color-accent'],+ // Forced colors repaint author borders in one system color and drop+ // the inset shadow; Highlight keeps the focused field visible.+ '@media (forced-colors: active)': 'Highlight',+ },+ },+ boxShadow: {+ default: 'none',+ ':has(input:focus)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,+ },+ },});diff --git a/packages/core/src/MultiSelector/MultiSelector.tsx b/packages/core/src/MultiSelector/MultiSelector.tsxindex 689d7955eb..f08252e060 100644--- a/packages/core/src/MultiSelector/MultiSelector.tsx+++ b/packages/core/src/MultiSelector/MultiSelector.tsx@@ -31,6 +31,7 @@ import React, {type ReactNode,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {useTooltip} from '../Tooltip';import {Icon, renderIconSlot, type IconType} from '../Icon';import type {IconName} from '../Icon';@@ -278,21 +279,6 @@ const styles = stylex.create({'[data-astryx-press="on"]': 'scale(0.98)',},},- // A disabled input-variant trigger keeps its tab stop (`spec:AST-085` FR1),- // and the shared disabled wrapper style drops the field focus ring, so the- // trigger shows keyboard focus here instead (FR6). It keys on the trigger- // itself, a direct child, so a focused status button keeps its own outline.- triggerDisabledFocus: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':has(> [aria-disabled="true"]:focus-visible)':- colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':has(> [aria-disabled="true"]:focus-visible)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },triggerGhostDisabled: {backgroundImage: 'none',transform: {@@ -2636,7 +2622,7 @@ export function MultiSelector<T extends MultiSelectorOptionType>({variant === 'input' &&isDisabled &&!surface.isTriggerFocusRingSuppressed &&- styles.triggerDisabledFocus,+ inputDisabledFocusStyles.ring,isEffectivelyReadOnly && styles.triggerReadOnly,variant !== 'input' && isDisabled && styles.triggerGhostDisabled,variant !== 'input' &&diff --git a/packages/core/src/Selector/Selector.tsx b/packages/core/src/Selector/Selector.tsxindex d32fc05e6a..26c52b0825 100644--- a/packages/core/src/Selector/Selector.tsx+++ b/packages/core/src/Selector/Selector.tsx@@ -32,6 +32,7 @@ import React, {type ReactNode,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {useTooltip} from '../Tooltip';import {Icon, renderIconSlot, type IconType} from '../Icon';import {useIndicator} from '../Indicator';@@ -302,21 +303,6 @@ const styles = stylex.create({'[data-astryx-press="on"]': 'scale(0.98)',},},- // A disabled input-variant trigger keeps its tab stop (`spec:AST-085` FR1),- // and the shared disabled wrapper style drops the field focus ring, so the- // trigger shows keyboard focus here instead (FR6). It keys on the trigger- // itself, a direct child, so a focused status button keeps its own outline.- triggerDisabledFocus: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':has(> [aria-disabled="true"]:focus-visible)':- colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':has(> [aria-disabled="true"]:focus-visible)': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },triggerGhostDisabled: {backgroundImage: 'none',transform: {@@ -2014,7 +2000,7 @@ export function Selector<T extends SelectorOptionType>(variant === 'input' &&isDisabled &&!surface.isTriggerFocusRingSuppressed &&- styles.triggerDisabledFocus,+ inputDisabledFocusStyles.ring,isEffectivelyReadOnly && styles.triggerReadOnly,variant !== 'input' && isDisabled && styles.triggerGhostDisabled,variant !== 'input' &&diff --git a/packages/core/src/TimeInput/TimeInput.tsx b/packages/core/src/TimeInput/TimeInput.tsxindex 128877640a..ac85d43132 100644--- a/packages/core/src/TimeInput/TimeInput.tsx+++ b/packages/core/src/TimeInput/TimeInput.tsx@@ -31,6 +31,7 @@ import {type FocusEvent,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {colorVars,sizeVars,@@ -98,18 +99,6 @@ import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';const TOUCH_POINTER_QUERY = '(pointer: coarse)';const styles = stylex.create({- // The shared disabled style drops the focus ring; restore it while a- // control inside the field holds focus (spec:AST-085 FR6). Defaults repeat it.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':focus-within': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },icon: {display: 'flex',alignItems: 'center',@@ -785,7 +774,7 @@ function TimeField({inputWrapperStyles.base,sizeStyles[size],isDisabled && inputWrapperStyles.disabled,- isDisabled && styles.disabledFocusRing,+ isDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status && !isDisabled && inputStatusHoverShadowStyles[status.type],status && inputStatusFocusWithinStyles[status.type],diff --git a/packages/core/src/TimeInput/TouchTimeField.tsx b/packages/core/src/TimeInput/TouchTimeField.tsxindex bd8df9dc57..0c120430a5 100644--- a/packages/core/src/TimeInput/TouchTimeField.tsx+++ b/packages/core/src/TimeInput/TouchTimeField.tsx@@ -27,6 +27,7 @@ import {type KeyboardEvent,} from 'react';import * as stylex from '@stylexjs/stylex';+import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import {BottomSheet} from '../BottomSheet';import {Button} from '../Button';import {@@ -48,7 +49,7 @@ import {useResolvedRequired} from '../hooks/useResolvedRequired';import {Icon} from '../Icon';import {useLocale, useTranslator} from '../i18n';import {formatLocaleTime} from '../utils/timeFormat';-import {colorVars, sizeVars, spacingVars} from '../theme/tokens.stylex';+import {sizeVars, spacingVars} from '../theme/tokens.stylex';import {useSize} from '../SizeContext/SizeContext';import {Spinner} from '../Spinner';import {useTooltip} from '../Tooltip';@@ -75,17 +76,6 @@ const sizeStyles = stylex.create({});const styles = stylex.create({- // Same as TimeInput's: the focus ring for a focused disabled field.- disabledFocusRing: {- borderColor: {- default: colorVars['--color-border-emphasized'],- ':focus-within': colorVars['--color-accent'],- },- boxShadow: {- default: 'none',- ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,- },- },iconButton: {display: 'flex',alignItems: 'center',@@ -468,7 +458,7 @@ export function TouchTimeField({inputWrapperStyles.base,sizeStyles[size],isDisabled && inputWrapperStyles.disabled,- isDisabled && styles.disabledFocusRing,+ isDisabled && inputDisabledFocusStyles.withinRing,status && inputStatusBorderStyles[status.type],status && !isDisabled && inputStatusHoverShadowStyles[status.type],status && inputStatusFocusWithinStyles[status.type],