Skip to content

Commit f77aa72

Browse files
fix(stepper,infieldbutton,picker): s2 foundations fast follows (#3536)
* fix(picker): update default border-color to gray-500 - also updates metadata.json * fix(infieldbutton): update tokens for background color - updates gray-50 to gray-100 for default background color - updates gray-100 to gray-200 for down and hover state background color - updates metadata.json to reflect changes These fixes should align the stepper infield buttons with the style behavior of other form elements (particularly to match picker). * fix(picker): update font color for focus state - in the keyboard focus state, the picker value/placeholder font color was resolving to gray-800, when gray-900 was expected. - create changeset * fix(stepper): fix border color for focus&hover fix(picker): add .spectrum-Picker-label to selector - this should avoid accidentally targeting the nested is-placeholder class - updates changeset
1 parent 5b6021c commit f77aa72

File tree

9 files changed

+23
-13
lines changed

9 files changed

+23
-13
lines changed

.changeset/nervous-penguins-matter.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
"@spectrum-css/infieldbutton": patch
3+
"@spectrum-css/stepper": patch
4+
"@spectrum-css/picker": patch
5+
---
6+
7+
S2 Foundations fixes
8+
9+
- Adjusts the background-color of the infield button components within stepper to use `gray-100` as opposed to `gray-25`.
10+
- This corresponds to the background-color updates picker has for S2.
11+
- Corrects the border color for the default picker for S2 foundations, using `gray-500` (instead of `gray-800`) to align with other field/form components.
12+
- Refactors the `&.is-keyboardFocused&.is-placeholder` selector to `&.is-keyboardFocused.spectrum-Picker-label.is-placeholder` to avoid unexpectedly targeting the nested placeholder class.

components/infieldbutton/dist/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
"--spectrum-disabled-content-color",
133133
"--spectrum-gray-100",
134134
"--spectrum-gray-200",
135-
"--spectrum-gray-50",
136135
"--spectrum-neutral-content-color-default",
137136
"--spectrum-neutral-content-color-down",
138137
"--spectrum-neutral-content-color-hover",

components/infieldbutton/themes/spectrum-two.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
--spectrum-infield-button-stacked-top-border-radius-start-start: var(--spectrum-infield-button-border-radius-reset);
2424
--spectrum-infield-button-stacked-bottom-border-radius-end-start: var(--spectrum-infield-button-border-radius-reset);
2525

26-
--spectrum-infield-button-background-color: var(--spectrum-gray-50);
27-
--spectrum-infield-button-background-color-hover: var(--spectrum-gray-100);
26+
--spectrum-infield-button-background-color: var(--spectrum-gray-100);
27+
--spectrum-infield-button-background-color-hover: var(--spectrum-gray-200);
2828
--spectrum-infield-button-background-color-down: var(--spectrum-gray-200);
29-
--spectrum-infield-button-background-color-key-focus: var(--spectrum-gray-100);
29+
--spectrum-infield-button-background-color-key-focus: var(--spectrum-gray-200);
3030
}
3131
}

components/picker/dist/metadata.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled):focus-visible",
5050
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled):hover",
5151
".spectrum-Picker.is-keyboardFocused",
52+
".spectrum-Picker.is-keyboardFocused .spectrum-Picker-label.is-placeholder",
5253
".spectrum-Picker.is-keyboardFocused .spectrum-Picker-menuIcon",
53-
".spectrum-Picker.is-keyboardFocused.is-placeholder",
5454
".spectrum-Picker.is-keyboardFocused:after",
5555
".spectrum-Picker.is-loading .spectrum-Picker-label",
5656
".spectrum-Picker.is-loading .spectrum-Picker-menuIcon",
@@ -59,7 +59,6 @@
5959
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled):hover",
6060
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled):hover .spectrum-Picker-menuIcon",
6161
".spectrum-Picker.is-placeholder:active .spectrum-Picker-label",
62-
".spectrum-Picker.is-placeholder:focus-visible",
6362
".spectrum-Picker::-moz-focus-inner",
6463
".spectrum-Picker:active",
6564
".spectrum-Picker:active:after",
@@ -71,6 +70,7 @@
7170
".spectrum-Picker:disabled .spectrum-Picker-validationIcon",
7271
".spectrum-Picker:focus",
7372
".spectrum-Picker:focus-visible",
73+
".spectrum-Picker:focus-visible .spectrum-Picker-label.is-placeholder",
7474
".spectrum-Picker:focus-visible .spectrum-Picker-menuIcon",
7575
".spectrum-Picker:focus-visible:after",
7676
".spectrum-Picker:hover",
@@ -281,7 +281,6 @@
281281
"--spectrum-gray-500",
282282
"--spectrum-gray-600",
283283
"--spectrum-gray-700",
284-
"--spectrum-gray-800",
285284
"--spectrum-gray-900",
286285
"--spectrum-line-height-100",
287286
"--spectrum-negative-border-color-default",

components/picker/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
border-color: var(--highcontrast-picker-focus-indicator-color, var(--mod-picker-focus-indicator-color, var(--spectrum-picker-focus-indicator-color)));
266266
}
267267

268-
&.is-placeholder {
268+
.spectrum-Picker-label.is-placeholder {
269269
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-key-focus, var(--spectrum-picker-font-color-key-focus)));
270270
}
271271

components/picker/themes/spectrum-two.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
--spectrum-picker-background-color-active: var(--spectrum-gray-200);
2121
--spectrum-picker-background-color-key-focus: var(--spectrum-gray-200);
2222

23-
--spectrum-picker-border-color-default: var(--spectrum-gray-800);
23+
--spectrum-picker-border-color-default: var(--spectrum-gray-500);
2424
--spectrum-picker-border-color-default-open: var(--spectrum-gray-500);
2525
--spectrum-picker-border-color-hover: var(--spectrum-gray-600);
2626
--spectrum-picker-border-color-hover-open: var(--spectrum-gray-900);

components/stepper/dist/metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
".spectrum-Stepper.spectrum-Stepper--sizeS",
3737
".spectrum-Stepper.spectrum-Stepper--sizeXL",
3838
".spectrum-Stepper:before",
39-
".spectrum-Stepper:hover:not(.is-invalid, .is-disabled)",
39+
".spectrum-Stepper:hover:not(.is-invalid, .is-disabled, .is-focused)",
4040
".spectrum-Stepper:not(.is-disabled) .is-focused",
4141
".spectrum-Stepper:not(.is-disabled) .is-focused:hover",
4242
".spectrum-Stepper:not(.is-disabled):focus",
@@ -125,7 +125,7 @@
125125
"--spectrum-focus-indicator-color",
126126
"--spectrum-focus-indicator-gap",
127127
"--spectrum-focus-indicator-thickness",
128-
"--spectrum-gray-25",
128+
"--spectrum-gray-100",
129129
"--spectrum-gray-300",
130130
"--spectrum-gray-50",
131131
"--spectrum-gray-500",

components/stepper/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
--mod-textfield-border-color-disabled: var(--spectrum-stepper-border-color-disabled);
171171
}
172172

173-
&:hover:not(.is-invalid, .is-disabled) {
173+
&:hover:not(.is-invalid, .is-disabled, .is-focused) {
174174
--mod-infield-button-border-color: var(--mod-stepper-buttons-border-color-hover, var(--spectrum-stepper-buttons-border-color-hover));
175175
}
176176

components/stepper/themes/spectrum-two.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
--spectrum-stepper-buttons-border-style: none;
2424
--spectrum-stepper-buttons-border-width: 0;
2525
--spectrum-stepper-buttons-border-color: var(--spectrum-gray-500);
26-
--spectrum-stepper-buttons-background-color: var(--spectrum-gray-25);
26+
--spectrum-stepper-buttons-background-color: var(--spectrum-gray-100);
2727
--spectrum-stepper-buttons-border-color-hover: var(--spectrum-gray-600);
2828
--spectrum-stepper-buttons-border-color-focus: var(--spectrum-gray-800);
2929
--spectrum-stepper-buttons-border-color-keyboard-focus: var(--spectrum-gray-900);

0 commit comments

Comments
 (0)