Skip to content

Spin button/alternate appearances #22519

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
spmonahan merged 7 commits into from
Apr 19, 2022
Merged

Spin button/alternate appearances #22519

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d02009
react-spinbutton: a11y updates
spmonahan Apr 12, 2022
b5782f7
react-spinbutton: remove commented out TODOs
spmonahan Apr 13, 2022
243e223
react-spinbutton: update styles for underline appearance
spmonahan Apr 14, 2022
89bf182
react-spinbutton: update styles for filledDarker appearance
spmonahan Apr 14, 2022
f798560
react-spinbutton: update styles for filledLigther appearance
spmonahan Apr 14, 2022
7bf3624
react-spinbutton: update high contrast button styles for underline ap…
spmonahan Apr 19, 2022
9c431c9
react-spinbutton: remove windows high contrast media queries
spmonahan Apr 19, 2022
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
106 changes: 47 additions & 59 deletions packages/react-spinbutton/src/components/SpinButton/useSpinButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,27 @@ const useRootStyles = makeStyles({
},

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

outlineDisabled: {
'::before': {
...shorthands.border('1px', 'solid', tokens.colorNeutralStrokeDisabled),
...shorthands.borderRadius(tokens.borderRadiusMedium), // because underline doesn't usually have a radius
'@media (forced-colors: active)': {
...shorthands.borderColor('GrayText'),
},
},
},

underlineDisabled: {
'::before': {
...shorthands.borderBottom('1px', 'solid', tokens.colorTransparentStrokeDisabled),
},
},

filledDisabled: {
'::before': {
...shorthands.border('1px', 'solid', tokens.colorTransparentStrokeDisabled),
},
},
});
Expand All @@ -159,7 +174,7 @@ const useButtonStyles = makeStyles({
outlineStyle: 'none',
height: '100%',

':hover': {
':enabled:hover': {
cursor: 'pointer',
},

Expand Down Expand Up @@ -231,34 +246,21 @@ const useButtonStyles = makeStyles({
':disabled': {
color: tokens.colorNeutralForegroundDisabled,
},
'@media (forced-colors: active)': {
color: 'ButtonText',
':enabled': {
':hover': {
color: 'ButtonText',
},
':active': {
color: 'ButtonText',
},
[`&.${spinButtonExtraClassNames.buttonActive}`]: {
color: 'ButtonText',
},
},
},
},

// These designs are not yet finalized so this is copy-paste for the "outline"
// appearance.
underline: {
backgroundColor: 'transparent',
color: tokens.colorNeutralForeground3,
...shorthands.borderRadius(0),
':enabled': {
':hover': {
color: tokens.colorNeutralForeground3Hover,
backgroundColor: tokens.colorSubtleBackgroundHover,
},
[`:active,&.${spinButtonExtraClassNames.buttonActive}`]: {
':active': {
color: tokens.colorNeutralForeground3Pressed,
backgroundColor: tokens.colorSubtleBackgroundPressed,
},
[`&.${spinButtonExtraClassNames.buttonActive}`]: {
color: tokens.colorNeutralForeground3Pressed,
backgroundColor: tokens.colorSubtleBackgroundPressed,
},
Expand All @@ -273,42 +275,40 @@ const useButtonStyles = makeStyles({

':enabled': {
':hover': {
color: tokens.colorNeutralForeground3BrandHover,
backgroundColor: tokens.colorSubtleBackgroundHover,
color: tokens.colorNeutralForeground3Hover,
backgroundColor: tokens.colorNeutralBackground3Hover,
},
[`:active,&.${spinButtonExtraClassNames.buttonActive}`]: {
color: tokens.colorNeutralForeground3BrandPressed,
backgroundColor: tokens.colorSubtleBackgroundPressed,
':active': {
color: tokens.colorNeutralForeground3Pressed,
backgroundColor: tokens.colorNeutralBackground3Pressed,
},
[`&.${spinButtonExtraClassNames.buttonActive}`]: {
color: tokens.colorNeutralForeground3Pressed,
backgroundColor: tokens.colorNeutralBackground3Pressed,
},
},
':disabled': {
color: tokens.colorNeutralForegroundDisabled,
},
},
filledLighter: {
color: tokens.colorNeutralForeground3,
backgroundColor: 'transparent',
color: tokens.colorNeutralForeground3,

':hover': {
color: tokens.colorNeutralForeground3BrandHover,
backgroundColor: tokens.colorSubtleBackgroundHover,
},
[`:active,&.${spinButtonExtraClassNames.buttonActive}`]: {
color: tokens.colorNeutralForeground3BrandPressed,
backgroundColor: tokens.colorSubtleBackgroundPressed,
':enabled': {
':hover': {
color: tokens.colorNeutralForeground3Hover,
backgroundColor: tokens.colorNeutralBackground1Hover,
},
[`:active,&.${spinButtonExtraClassNames.buttonActive}`]: {
color: tokens.colorNeutralForeground3Pressed,
backgroundColor: tokens.colorNeutralBackground1Pressed,
},
},
':disabled': {
color: tokens.colorNeutralForegroundDisabled,
},
},

filledIncrement: {
clipPath: `inset(1px 1px 0 0 round 0 ${tokens.borderRadiusMedium} 0 0)`,
},

filledDecrement: {
clipPath: `inset(0 1px 1px 0 round 0 0 ${tokens.borderRadiusMedium} 0)`,
},
});

// Cannot just disable button as they need to remain
Expand Down Expand Up @@ -338,20 +338,6 @@ const useButtonDisabledStyles = makeStyles({
backgroundColor: 'transparent',
},
},
'@media (forced-colors: active)': {
color: 'GrayText',
':enabled': {
':hover': {
color: 'GrayText',
},
':active': {
color: 'GrayText',
},
[`&.${spinButtonExtraClassNames.buttonActive}`]: {
color: 'GrayText',
},
},
},
},

underline: {
Expand Down Expand Up @@ -445,10 +431,14 @@ export const useSpinButtonStyles_unstable = (state: SpinButtonState): SpinButton
rootStyles.base,
appearance === 'outline' && rootStyles.outline,
appearance === 'underline' && rootStyles.underline,
filled && rootStyles.filled,
!disabled && appearance === 'outline' && rootStyles.outlineInteractive,
!disabled && appearance === 'underline' && rootStyles.underlineInteractive,
!disabled && filled && rootStyles.filledInteractive,
disabled && rootStyles.disabled,
disabled && appearance === 'outline' && rootStyles.outlineDisabled,
disabled && appearance === 'underline' && rootStyles.underlineDisabled,
disabled && filled && rootStyles.filledDisabled,
rootClassName, // Make sure any original class name is applied last
);

Expand All @@ -458,7 +448,6 @@ export const useSpinButtonStyles_unstable = (state: SpinButtonState): SpinButton
buttonStyles.base,
buttonStyles.incrementButton,
buttonStyles[appearance],
filled && buttonStyles.filledIncrement,
size === 'small' ? buttonStyles.incrementButtonSmall : buttonStyles.incrementButtonMedium,
(atBound === 'max' || atBound === 'both') && buttonDisabledStyles.base,
(atBound === 'max' || atBound === 'both') && buttonDisabledStyles[appearance],
Expand All @@ -470,7 +459,6 @@ export const useSpinButtonStyles_unstable = (state: SpinButtonState): SpinButton
buttonStyles.base,
buttonStyles.decrementButton,
buttonStyles[appearance],
filled && buttonStyles.filledDecrement,
size === 'small' ? buttonStyles.decrementButtonSmall : buttonStyles.decrementButtonMedium,
(atBound === 'min' || atBound === 'both') && buttonDisabledStyles.base,
(atBound === 'min' || atBound === 'both') && buttonDisabledStyles[appearance],
Expand Down