Skip to content

Commit 17389d3

Browse files
authored
fix: incorrect tokens used across multiple input components (#33927)
1 parent 027b6b0 commit 17389d3

File tree

7 files changed

+43
-8
lines changed

7 files changed

+43
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: use correct tokens for hover, active and focus states",
4+
"packageName": "@fluentui/react-combobox",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: use correct tokens for hover, active and focus states",
4+
"packageName": "@fluentui/react-tag-picker",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "fix: use correct tokens for hover, active and focus states",
4+
"packageName": "@fluentui/react-textarea",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/react-components/react-combobox/library/src/components/Combobox/useComboboxStyles.styles.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,20 @@ const useStyles = makeStyles({
119119
border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`,
120120
borderBottomColor: tokens.colorNeutralStrokeAccessible,
121121
},
122-
123122
outlineInteractive: {
124123
'&:hover': {
125124
...shorthands.borderColor(tokens.colorNeutralStroke1Hover),
126-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
125+
borderBottomColor: tokens.colorNeutralStrokeAccessibleHover,
127126
},
128127

129128
'&:active': {
130129
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
131-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
130+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
131+
},
132+
133+
'&:focus-within': {
134+
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
135+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
132136
},
133137
},
134138
underline: {

packages/react-components/react-combobox/library/src/components/Dropdown/useDropdownStyles.styles.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,17 @@ const useStyles = makeStyles({
149149
outlineInteractive: {
150150
'&:hover': {
151151
...shorthands.borderColor(tokens.colorNeutralStroke1Hover),
152-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
152+
borderBottomColor: tokens.colorNeutralStrokeAccessibleHover,
153153
},
154154

155155
'&:active': {
156156
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
157-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
157+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
158+
},
159+
160+
'&:focus-within': {
161+
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
162+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
158163
},
159164
},
160165
underline: {

packages/react-components/react-tag-picker/library/src/components/TagPickerControl/useTagPickerControlStyles.styles.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,17 @@ const useStyles = makeStyles({
110110
outlineInteractive: {
111111
'&:hover': {
112112
...shorthands.borderColor(tokens.colorNeutralStroke1Hover),
113-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
113+
borderBottomColor: tokens.colorNeutralStrokeAccessibleHover,
114114
},
115115

116116
'&:active': {
117117
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
118-
borderBottomColor: tokens.colorNeutralStrokeAccessible,
118+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
119+
},
120+
121+
'&:focus-within': {
122+
...shorthands.borderColor(tokens.colorNeutralStroke1Pressed),
123+
borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed,
119124
},
120125
},
121126
underline: {

packages/react-components/react-textarea/library/src/components/Textarea/useTextareaStyles.styles.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const useRootStyles = makeStyles({
132132
},
133133

134134
':focus-within': {
135-
border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`,
135+
border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1Pressed}`,
136136
borderBottomColor: tokens.colorCompoundBrandStroke,
137137
},
138138
},

0 commit comments

Comments
 (0)