Skip to content

fix: react-button high contrast mode primary variant #26623

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
smhigley merged 2 commits into from
Feb 4, 2023
Merged

fix: react-button high contrast mode primary variant #26623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7085479
fix: add forced-colors primary button variant
smhigley Feb 1, 2023
b2122fd
change file
smhigley Feb 1, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-button-6070b42d-35c8-4c8a-b515-e0893216885b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: add forced-colors primary button variant",
"packageName": "@fluentui/react-button",
"email": "[email protected]",
"dependentChangeType": "patch"
}
22 changes: 22 additions & 0 deletions packages/react-components/react-button/src/components/Button/useButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,25 @@ const useRootStyles = makeStyles({
...shorthands.borderColor('transparent'),
color: tokens.colorNeutralForegroundOnBrand,
},

'@media (forced-colors: active)': {
backgroundColor: 'Highlight',
...shorthands.borderColor('HighlightText'),
color: 'HighlightText',
forcedColorAdjust: 'none',

':hover': {
backgroundColor: 'HighlightText',
...shorthands.borderColor('Highlight'),
color: 'Highlight',
},

':hover:active': {
backgroundColor: 'HighlightText',
...shorthands.borderColor('Highlight'),
color: 'Highlight',
},
},
},
secondary: {
/* The secondary styles are exactly the same as the base styles. */
Expand Down Expand Up @@ -296,6 +315,7 @@ const useRootDisabledStyles = makeStyles({
// High contrast styles
highContrast: {
'@media (forced-colors: active)': {
backgroundColor: 'ButtonFace',
...shorthands.borderColor('GrayText'),
color: 'GrayText',

Expand All @@ -304,11 +324,13 @@ const useRootDisabledStyles = makeStyles({
},

':hover': {
backgroundColor: 'ButtonFace',
...shorthands.borderColor('GrayText'),
color: 'GrayText',
},

':hover:active': {
backgroundColor: 'ButtonFace',
...shorthands.borderColor('GrayText'),
color: 'GrayText',
},
Expand Down
6 changes: 6 additions & 0 deletions ...es/react-components/react-button/src/components/CompoundButton/useCompoundButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ const useRootStyles = makeStyles({
color: tokens.colorNeutralForegroundOnBrand,
},
},

'@media (forced-colors: active)': {
[`& .${compoundButtonClassNames.secondaryContent}`]: {
color: 'HighlightText',
},
},
},
secondary: {
/* The secondary styles are exactly the same as the base styles. */
Expand Down
18 changes: 18 additions & 0 deletions packages/react-components/react-button/src/components/SplitButton/useSplitButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,24 @@ const useRootStyles = makeStyles({
borderRightColor: tokens.colorNeutralForegroundOnBrand,
},
},

'@media (forced-colors: active)': {
[`& .${splitButtonClassNames.primaryActionButton}`]: {
borderRightColor: 'HighlightText',
},

':hover': {
[`& .${splitButtonClassNames.primaryActionButton}`]: {
borderRightColor: 'Highlight',
},
},

':hover:active': {
[`& .${splitButtonClassNames.primaryActionButton}`]: {
borderRightColor: 'Highlight',
},
},
},
},
secondary: {
/* The secondary styles are exactly the same as the base styles. */
Expand Down
29 changes: 29 additions & 0 deletions packages/react-components/react-button/src/components/ToggleButton/useToggleButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,45 @@ const useIconCheckedStyles = makeStyles({
},
});

const usePrimaryHighContrastStyles = makeStyles({
// Do not use primary variant high contrast styles for toggle buttons
// otherwise there isn't enough difference between on/off states
base: {
'@media (forced-colors: active)': {
backgroundColor: 'ButtonFace',
...shorthands.borderColor('ButtonBorder'),
color: 'ButtonText',
forcedColorAdjust: 'auto',
},
},

disabled: {
'@media (forced-colors: active)': {
...shorthands.borderColor('GrayText'),
color: 'GrayText',

':focus': {
...shorthands.borderColor('GrayText'),
},
},
},
});

export const useToggleButtonStyles_unstable = (state: ToggleButtonState): ToggleButtonState => {
const rootCheckedStyles = useRootCheckedStyles();
const rootDisabledStyles = useRootDisabledStyles();
const iconCheckedStyles = useIconCheckedStyles();
const primaryHighContrastStyles = usePrimaryHighContrastStyles();

const { appearance, checked, disabled, disabledFocusable } = state;

state.root.className = mergeClasses(
toggleButtonClassNames.root,

// Primary high contrast styles
appearance === 'primary' && primaryHighContrastStyles.base,
appearance === 'primary' && (disabled || disabledFocusable) && primaryHighContrastStyles.disabled,

// Checked styles
checked && rootCheckedStyles.base,
checked && rootCheckedStyles.highContrast,
Expand Down