Skip to content

[major] Update focus token #2578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jialecl merged 1 commit into from
Oct 20, 2026
Merged

[major] Update focus token #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/website/screens/common/HeadingLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const HeadingAnchor = styled.a`
}
&:focus {
opacity: 1;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -4px;
}
&:hover {
Expand Down
2 changes: 1 addition & 1 deletion apps/website/screens/theme-generator/components/branding/ColorCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const ColorBox = styled.button<{ color: string }>`
&:focus {
outline-style: solid;
outline-width: var(--border-width-m);
outline-color: var(--border-color-secondary-medium);
outline-color: var(--border-color-neutral-dark);
outline-offset: 2px;
}
`;
Expand Down
4 changes: 2 additions & 2 deletions packages/lib/src/accordion/AccordionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ const AccordionTrigger = styled.button`
cursor: ${(props) => (props.disabled ? "not-allowed" : "pointer")};
:focus,
:focus-visible {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
:hover:enabled,
:active:enabled {
background-color: var(--color-bg-primary-lighter);
}
:active:enabled {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}

&[aria-expanded="true"] {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/action-icon/ActionIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const ActionIconContainer = styled.div<
&:active:enabled {
outline-style: solid;
outline-width: ${getOutlineWidth(size)};
outline-color: var(--border-color-secondary-medium);
outline-color: var(--border-color-neutral-dark);
outline-offset: -2px;
}
`}
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/base-menu/ItemAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Action = styled.a<{
selected ? "var(--color-bg-primary-medium)" : "var(--color-bg-neutral-light)"};
}
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/breadcrumbs/Item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const Link = styled.a`
cursor: pointer;

&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/button/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const getButtonStyles = (mode: Mode, semantic: Semantic | "unselected" |
border-radius: var(--border-radius-s);

&:focus:enabled {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}`;

Expand Down
10 changes: 5 additions & 5 deletions packages/lib/src/card/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ export const getCardStyles = (
if (mode === "elevated") {
hover = `box-shadow: var(--shadow-300);`;
focus = `box-shadow: var(--shadow-100);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);`;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);`;
active = `box-shadow: var(--shadow-100);`;
} else if (mode === "outlined") {
if (selected) {
hover = `border-width: var(--border-width-none);`;
focus = `border-width: var(--border-width-none); outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);`;
focus = `border-width: var(--border-width-none); outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);`;
active = `border-width: var(--border-width-none);`;
} else {
hover = `border-width: var(--border-width-m); border-color: var(--border-color-neutral-medium);outline-offset: var(--border-width-none);`;
focus = `border-width: var(--boselectedrder-width-m);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);outline-offset: var(--border-width-none);`;
focus = `border-width: var(--border-width-m);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);outline-offset: var(--border-width-none);`;
active = `border-width: var(--border-width-m); border-color: var(--border-color-neutral-strong);outline-offset: var(--border-width-none);`;
}
}
Expand All @@ -67,7 +67,7 @@ export const getSelectableWrapperStyles = (selected: boolean) => {

if (selected) {
hover = `outline-color: var(--border-color-primary-stronger);`;
focus = `outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);`;
focus = `outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);`;
active = `outline-color: var(--border-color-primary-strong);`;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/checkbox/Checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Checkbox = styled.span<{
${({ disabled }) => disabled && "pointer-events: none;"}

&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
svg {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/chip/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const getChipStyles = (mode: ChipPropsType["mode"], selected?: boolean) =
const commonStyles = `
&:focus {
border-color: transparent;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}`;

switch (mode) {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/container/Container.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ const Container = () => (
<ExampleContainer>
<DxcContainer
outline={{
color: "var(--border-color-secondary-medium)",
color: "var(--border-color-neutral-dark)",
style: "var(--border-style-default)",
offset: "var(--spacing-padding-xxxs)",
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/data-grid/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const DataGridContainer = styled.div<{
background-color: var(--color-bg-neutral-lightest);

&[aria-selected="true"] {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
.rdg-text-editor:focus {
border-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/date-input/Calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const DayCellButton = styled.button<{
`border: var(--border-width-s) var(--border-style-default) var(--border-color-primary-lighter);`}

&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
&:hover {
background-color: ${(props) =>
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/date-input/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const HeaderButton = styled.button`
background-color: var(--color-bg-primary-light);
}
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
&:active {
color: var(--color-fg-neutral-bright);
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/date-input/DateUnitPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const PickerButton = styled.button<{
color: var(--color-fg-neutral-dark);
}
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
&:active {
color: var(--color-fg-neutral-bright);
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const DropdownTrigger = styled.button<{
!props.disabled &&
`
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
&:hover, &:active {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/dropdown/DropdownMenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const DropdownMenuItemContainer = styled.li<{
${(props) =>
props.visuallyFocused &&
`
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: calc(-1 * var(--border-width-m));
`}
&:first-child {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/file-input/FileInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const DragDropArea = styled.div<{
props.isDragging &&
`
background-color: var(--color-bg-secondary-lightest);
border: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
border: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
`}
cursor: ${(props) => props.disabled && "not-allowed"};
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const SocialAnchor = styled.a`

&:focus,
&:focus-visible {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: 0px;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/link/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Link = styled.a<{
${({ disabled, inheritColor }) =>
!inheritColor && !disabled && "&:visited { color: var(--color-fg-primary-strongest); }"};
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
${({ disabled }) => disabled && "outline: none"}
}
`;
Expand Down
42 changes: 25 additions & 17 deletions packages/lib/src/message-input/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,47 @@ export const getFilePreview = (file: File): string => {
};

export const inputStylesByStatePromptInput = (disabled: boolean, error: boolean, focus?: boolean) => css`
background-color: ${disabled
? `var(--color-bg-neutral-lighter)`
: `var(--color-bg-neutral-lightest);
`};
background-color: ${
disabled
? `var(--color-bg-neutral-lighter)`
: `var(--color-bg-neutral-lightest);
`
};

border-radius: var(--border-radius-l);
border-width: ${!disabled && error ? "var(--border-width-m)" : "var(--border-width-s)"};
border-style: var(--border-style-default);
border-color: ${disabled
? "var(--border-color-neutral-strong)"
: error
? "var(--border-color-error-medium)"
: "var(--border-color-neutral-lighter)"};
border-color: ${
disabled
? "var(--border-color-neutral-strong)"
: error
? "var(--border-color-error-medium)"
: "var(--border-color-neutral-lighter)"
};

${!disabled
? `
${
!disabled
? `
&:hover {
border-color: ${error ? "var(--border-color-error-strong)" : "var(--border-color-primary-strong)"};
}

&:focus {
outline-offset: -2px;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
border-color: transparent;
}
`
: "cursor: not-allowed;"};
: "cursor: not-allowed;"
};

${focus && !disabled
? `
${
focus && !disabled
? `
outline-offset: -2px;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
border-color: transparent;
`
: ""};
: ""
};
`;
2 changes: 1 addition & 1 deletion packages/lib/src/nav-tabs/Tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const TabLink = styled.div<
background-color: var(--color-bg-primary-lighter);
}
:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: calc(var(--border-width-m) * -1);
}
:active {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/quick-nav/QuickNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const Link = styled.a`
color: var(--color-fg-primary-strong);
}
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
`;

Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/radio-group/RadioInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const RadioButton = styled.span<CommonStylingProps>`
${({ disabled }) => disabled && "pointer-events: none;"}

&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/resultset-table/ResultsetTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const SortingHeader = styled.span<{
? `border-radius: var(--border-radius-xs);
cursor: pointer;
&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);s
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}`
: "cursor: default;"}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/search-bar/SearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const SearchBarContainer = styled.div<{ disabled: Required<SearchBarProps>["disa
&:focus-visible {
border-color: transparent;
outline-offset: -2px;
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
`
: css`
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/select/ListOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const OptionItem = styled.li<{
}
${({ visualFocused }) =>
visualFocused &&
"outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium); outline-offset: -2px;"}
"outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark); outline-offset: -2px;"}
`;

const StyledOption = styled.span<{
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/slider/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const thumbStyles = (disabled: SliderPropsType["disabled"]) => css`
}
`;
const thumbFocusStyles = css`
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: 2px;
`;
const SliderInput = styled.input<{
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/switch/Switch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const SwitchContainer = styled.div<{
/* Thumb focus */
&:not([aria-disabled="true"]) {
> span::before {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: var(--spacing-padding-xxxs);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/tabs/Tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const sharedTabStyles = `
background: var(--color-bg-primary-lighter);
}
&:focus:enabled {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: -2px;
}
&:disabled {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/text-input/Suggestion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SuggestionContainer = styled.li<{
}
${({ visuallyFocused }) =>
visuallyFocused &&
"outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium); outline-offset: -2px;"}
"outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark); outline-offset: -2px;"}
`;

const StyledSuggestion = styled.span`
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/time-input/TimePickerColumn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const TimePickerOption = styled.li<{
color: ${(props) => (props.selected ? "var(--color-fg-neutral-bright);" : "var(--color-fg-neutral-dark);")};

&:focus {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
outline-offset: calc(var(--border-width-m) * -1);
}
&:hover {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/wizard/Wizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const Step = styled.button<{
}
`}
&:focus:enabled {
outline: var(--border-width-m) var(--border-style-default) var(--border-color-secondary-medium);
outline: var(--border-width-m) var(--border-style-default) var(--border-color-neutral-dark);
}
&:disabled {
cursor: not-allowed;
Expand Down
Loading