Skip to content

fix: Combobox and Dropdown hover/active borders and padding style fixes #24362

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 3 commits into from
Aug 29, 2022
Merged

fix: Combobox and Dropdown hover/active borders and padding style fixes #24362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed0fa86
fix: Combobox and Dropdown hover/active border colors and padding styles
smhigley Aug 12, 2022
27122ba
change file
smhigley Aug 12, 2022
845fee2
use fieldHeights instead of padding for input
smhigley Aug 29, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-combobox-0da3aa7d-1f93-4987-932b-52aaaf1e8f38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Combobox and Dropdown hover/active border colors and padding styles",
"packageName": "@fluentui/react-combobox",
"email": "[email protected]",
"dependentChangeType": "patch"
}
38 changes: 31 additions & 7 deletions packages/react-components/react-combobox/src/components/Combobox/useComboboxStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ export const comboboxClassNames: SlotClassNames<ComboboxSlots> = {
listbox: 'fui-Combobox__listbox',
};

// Matches internal heights for Select and Input, but there are no theme variables for these
// field heights are 2px less than other controls, since the border is on the parent element.
const fieldHeights = {
small: '22px',
medium: '30px',
large: '38px',
};

/**
* Styles for Combobox
*/
Expand All @@ -24,7 +32,7 @@ const useStyles = makeStyles({
display: 'inline-grid',
gridTemplateColumns: '1fr auto',
justifyContent: 'space-between',
minWidth: '160px',
minWidth: '250px',
position: 'relative',

// windows high contrast mode focus indicator
Expand All @@ -45,7 +53,7 @@ const useStyles = makeStyles({
height: `max(2px, ${tokens.borderRadiusMedium})`,
borderBottomLeftRadius: tokens.borderRadiusMedium,
borderBottomRightRadius: tokens.borderRadiusMedium,
...shorthands.borderBottom('2px', 'solid', tokens.colorCompoundBrandStroke),
...shorthands.borderBottom(tokens.strokeWidthThick, 'solid', tokens.colorCompoundBrandStroke),
clipPath: 'inset(calc(100% - 2px) 0 0 0)',
transform: 'scaleX(0)',
transitionProperty: 'transform',
Expand Down Expand Up @@ -94,12 +102,22 @@ const useStyles = makeStyles({
// appearance variants
outline: {
backgroundColor: tokens.colorNeutralBackground1,
...shorthands.border('1px', 'solid', tokens.colorNeutralStroke1),
...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1),
borderBottomColor: tokens.colorNeutralStrokeAccessible,

'&:hover': {
...shorthands.borderColor(tokens.colorNeutralStroke1Hover),
borderBottomColor: tokens.colorNeutralStrokeAccessible,
},

'&:active': {
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
borderBottomColor: tokens.colorNeutralStrokeAccessible,
},
},
underline: {
backgroundColor: tokens.colorTransparentBackground,
...shorthands.borderBottom('1px', 'solid', tokens.colorNeutralStrokeAccessible),
...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeAccessible),
...shorthands.borderRadius(0),
},
'filled-lighter': {
Expand Down Expand Up @@ -129,18 +147,21 @@ const useInputStyles = makeStyles({
// size variants
small: {
fontSize: tokens.fontSizeBase200,
height: fieldHeights.small,
lineHeight: tokens.lineHeightBase200,
...shorthands.padding('3px', 0, '3px', tokens.spacingHorizontalSNudge),
...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`),
},
medium: {
fontSize: tokens.fontSizeBase300,
height: fieldHeights.medium,
lineHeight: tokens.lineHeightBase300,
...shorthands.padding('5px', 0, '5px', tokens.spacingHorizontalMNudge),
...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`),
},
large: {
fontSize: tokens.fontSizeBase400,
height: fieldHeights.large,
lineHeight: tokens.lineHeightBase400,
...shorthands.padding('7px', 0, '7px', tokens.spacingHorizontalM),
...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`),
},
});

Expand All @@ -161,12 +182,15 @@ const useIconStyles = makeStyles({
// icon size variants
small: {
fontSize: iconSizes.small,
marginLeft: tokens.spacingHorizontalXXS,
},
medium: {
fontSize: iconSizes.medium,
marginLeft: tokens.spacingHorizontalXXS,
},
large: {
fontSize: iconSizes.large,
marginLeft: tokens.spacingHorizontalSNudge,
},
});

Expand Down
45 changes: 37 additions & 8 deletions packages/react-components/react-combobox/src/components/Dropdown/useDropdownStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const useStyles = makeStyles({
...shorthands.borderRadius(tokens.borderRadiusMedium),
boxSizing: 'border-box',
display: 'inline-block',
minWidth: '160px',
minWidth: '250px',
position: 'relative',

// windows high contrast mode focus indicator
Expand All @@ -38,10 +38,10 @@ const useStyles = makeStyles({
left: '-1px',
bottom: '-1px',
right: '-1px',
height: `max(2px, ${tokens.borderRadiusMedium})`,
height: `max(${tokens.strokeWidthThick}, ${tokens.borderRadiusMedium})`,
borderBottomLeftRadius: tokens.borderRadiusMedium,
borderBottomRightRadius: tokens.borderRadiusMedium,
...shorthands.borderBottom('2px', 'solid', tokens.colorCompoundBrandStroke),
...shorthands.borderBottom(tokens.strokeWidthThick, 'solid', tokens.colorCompoundBrandStroke),
clipPath: 'inset(calc(100% - 2px) 0 0 0)',
transform: 'scaleX(0)',
transitionProperty: 'transform',
Expand Down Expand Up @@ -77,6 +77,7 @@ const useStyles = makeStyles({
...shorthands.border('0'),
boxSizing: 'border-box',
columnGap: tokens.spacingHorizontalXXS,
cursor: 'pointer',
display: 'grid',
fontFamily: tokens.fontFamilyBase,
gridTemplateColumns: '1fr auto',
Expand All @@ -97,29 +98,54 @@ const useStyles = makeStyles({
small: {
fontSize: tokens.fontSizeBase200,
lineHeight: tokens.lineHeightBase200,
...shorthands.padding('3px', tokens.spacingHorizontalSNudge),
...shorthands.padding(
'3px',
tokens.spacingHorizontalSNudge,
'3px',
`calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`,
),
},
medium: {
fontSize: tokens.fontSizeBase300,
lineHeight: tokens.lineHeightBase300,
...shorthands.padding('5px', tokens.spacingHorizontalMNudge),
...shorthands.padding(
'5px',
tokens.spacingHorizontalMNudge,
'5px',
`calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`,
),
},
large: {
columnGap: tokens.spacingHorizontalSNudge,
fontSize: tokens.fontSizeBase400,
lineHeight: tokens.lineHeightBase400,
...shorthands.padding('7px', tokens.spacingHorizontalM),
...shorthands.padding(
'7px',
tokens.spacingHorizontalM,
'7px',
`calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`,
),
},

// appearance variants
outline: {
backgroundColor: tokens.colorNeutralBackground1,
...shorthands.border('1px', 'solid', tokens.colorNeutralStroke1),
...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1),
borderBottomColor: tokens.colorNeutralStrokeAccessible,

'&:hover': {
...shorthands.borderColor(tokens.colorNeutralStroke1Hover),
borderBottomColor: tokens.colorNeutralStrokeAccessible,
},

'&:active': {
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
borderBottomColor: tokens.colorNeutralStrokeAccessible,
},
},
underline: {
backgroundColor: tokens.colorTransparentBackground,
...shorthands.borderBottom('1px', 'solid', tokens.colorNeutralStrokeAccessible),
...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeAccessible),
...shorthands.borderRadius(0),
},
'filled-lighter': {
Expand Down Expand Up @@ -147,12 +173,15 @@ const useIconStyles = makeStyles({
// icon size variants
small: {
fontSize: iconSizes.small,
marginLeft: tokens.spacingHorizontalXXS,
},
medium: {
fontSize: iconSizes.medium,
marginLeft: tokens.spacingHorizontalXXS,
},
large: {
fontSize: iconSizes.large,
marginLeft: tokens.spacingHorizontalSNudge,
},
});

Expand Down