Skip to content

Commit 2cbe348

Browse files
jawinncastastrophe
jawinn
authored and
castastrophe
committed
feat(picker)!: migrate to spectrum 2 (#2697)
Migrates the Picker component to Spectrum 2, based on the updated Figma specs. - Integrate themes CSS files into index.css - Uses new S2 tokens for field width and corner rounding - Add down state with new calculated perspective - The top to alert icon in Spectrum 2 now uses the component-top-to-workflow-icon-* tokens as defined on the design. - Adds the CJK line-height token defined on the design specs. - Uses border-width-200 instead of border-width-100 * fix(picker): use correct spacing between icons and value text The spacing between alert icon and disclosure icon was incorrect because it was being overridden by a selector that shouldn't have been affecting this scenario (which was using the subsequent-sibling combinator ~). Some mods around the spacing for the three different types of icons were also not working as expected. Fixes this spacing and clarifies which spacing is which. Renames the mod that applies to the optional workflow icon to the left of the value. Simplifies quiet styles by changing custom property values instead of adding extra styles. * feat(picker): storybook - expanded and improved chromatic template Expands the Chromatic-only template in Storybook to increase coverage of different options. Organizes the stories into sections using the formatting and typography previously established with Action button. States in each section are based on the grid of options in the Desktop S2 design Figma, with some additions such as the loading state. And the Switch examples from the existing template. Removes the "Open" story which is now covered in the Chromatic template. Adds missing icon (to left of value/placeholder text) option to Storybook, along with VRT coverage. Improves display of Popover within these different contexts; fixes how it is aligned on the side label example. Changes the side label example to use flex row instead of using inline-block which could wrap as the screen shrunk. === Other Storybook fixes and additions === - Adds aria-labelledby and unique ids to make sure the label is associated with the Picker. - Includes downstate dimension capture - Popover does not show when in the loading state (per design feedback) - Makes sure HelpText appears below the Picker when using side label, by adjusting its wrapper markup. - Adds conditional controls to disabled and loading states, per the PR feedback that disabled + loading should not be a possible combo.
1 parent ded7dd0 commit 2cbe348

File tree

5 files changed

+340
-308
lines changed

5 files changed

+340
-308
lines changed

‎.changeset/hot-books-fail.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@spectrum-css/picker": major
3+
---
4+
5+
#### Spectrum 2 migration
6+
7+
Picker now uses Spectrum 2 tokens and specifications. A few notable changes:
8+
9+
- The mod custom property `--mod-line-height-100` has been renamed to `--mod-button-line-height`.
10+
- The mod custom property `--mod-sans-font-family-stack` has been renamed to `--mod-button-font-family`.
11+
- The mod custom property `--mod-animation-duration-100` has been renamed to `--mod-button-animation-duration`.
12+
- The mod custom property `--mod-picker-spacing-text-to-alert-icon-inline-start` has been renamed to `--mod-picker-spacing-text-to-icon-inline-end`. This removed the fallback that was marked as deprecated in a previous version.
13+
- The mod custom property `--mod-picker-spacing-text-to-icon` has been removed. Use `--mod-picker-spacing-text-to-icon-inline-end` for the spacing between text and visual (indicator or disclosure), or `--mod-picker-spacing-starting-icon-to-text` for the space between the optional workflow icon and the text.

‎components/picker/dist/metadata.json

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@
77
".spectrum-Picker .spectrum-Picker-label",
88
".spectrum-Picker .spectrum-ProgressCircle",
99
".spectrum-Picker--quiet",
10-
".spectrum-Picker--quiet .spectrum-Picker-menuIcon",
11-
".spectrum-Picker--quiet.is-keyboardFocused",
1210
".spectrum-Picker--quiet.is-keyboardFocused:after",
13-
".spectrum-Picker--quiet.is-open",
1411
".spectrum-Picker--quiet.spectrum-Picker--sideLabel",
15-
".spectrum-Picker--quiet.spectrum-Picker.is-disabled",
16-
".spectrum-Picker--quiet.spectrum-Picker:disabled",
17-
".spectrum-Picker--quiet:active",
1812
".spectrum-Picker--quiet:after",
19-
".spectrum-Picker--quiet:focus-visible",
2013
".spectrum-Picker--quiet:focus-visible:after",
21-
".spectrum-Picker--quiet:hover",
2214
".spectrum-Picker--sideLabel",
2315
".spectrum-Picker--sizeL",
2416
".spectrum-Picker--sizeL + .spectrum-Popover--bottom.is-open",
@@ -27,7 +19,6 @@
2719
".spectrum-Picker--sizeXL",
2820
".spectrum-Picker--sizeXL + .spectrum-Popover--bottom.is-open",
2921
".spectrum-Picker-label",
30-
".spectrum-Picker-label ~ .spectrum-Picker-menuIcon",
3122
".spectrum-Picker-label.is-placeholder",
3223
".spectrum-Picker-label.is-placeholder:active",
3324
".spectrum-Picker-label.is-placeholder:hover",
@@ -39,7 +30,7 @@
3930
".spectrum-Picker.is-disabled .spectrum-Picker-label.is-placeholder",
4031
".spectrum-Picker.is-disabled .spectrum-Picker-menuIcon",
4132
".spectrum-Picker.is-disabled .spectrum-Picker-validationIcon",
42-
".spectrum-Picker.is-invalid .spectrum-Picker-label",
33+
".spectrum-Picker.is-disabled:not(.spectrum-Picker--quiet)",
4334
".spectrum-Picker.is-invalid.is-keyboardFocused:not(:disabled, .is-disabled)",
4435
".spectrum-Picker.is-invalid.is-open:not(:disabled, .is-disabled)",
4536
".spectrum-Picker.is-invalid.is-open:not(:disabled, .is-disabled):hover",
@@ -52,12 +43,12 @@
5243
".spectrum-Picker.is-keyboardFocused .spectrum-Picker-menuIcon",
5344
".spectrum-Picker.is-keyboardFocused.is-placeholder",
5445
".spectrum-Picker.is-keyboardFocused:after",
55-
".spectrum-Picker.is-loading .spectrum-Picker-label",
46+
".spectrum-Picker.is-loading",
5647
".spectrum-Picker.is-loading .spectrum-Picker-menuIcon",
57-
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled)",
58-
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled) .spectrum-Picker-menuIcon",
59-
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled):hover",
60-
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled):hover .spectrum-Picker-menuIcon",
48+
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading)",
49+
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading) .spectrum-Picker-menuIcon",
50+
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading):hover",
51+
".spectrum-Picker.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading):hover .spectrum-Picker-menuIcon",
6152
".spectrum-Picker.is-placeholder:active .spectrum-Picker-label",
6253
".spectrum-Picker.is-placeholder:focus-visible",
6354
".spectrum-Picker::-moz-focus-inner",
@@ -69,12 +60,16 @@
6960
".spectrum-Picker:disabled .spectrum-Picker-label.is-placeholder",
7061
".spectrum-Picker:disabled .spectrum-Picker-menuIcon",
7162
".spectrum-Picker:disabled .spectrum-Picker-validationIcon",
63+
".spectrum-Picker:disabled:not(.spectrum-Picker--quiet)",
7264
".spectrum-Picker:focus",
7365
".spectrum-Picker:focus-visible",
7466
".spectrum-Picker:focus-visible .spectrum-Picker-menuIcon",
7567
".spectrum-Picker:focus-visible:after",
7668
".spectrum-Picker:hover",
77-
".spectrum-Picker:hover .spectrum-Picker-menuIcon"
69+
".spectrum-Picker:hover .spectrum-Picker-menuIcon",
70+
".spectrum-Picker:lang(ja) .spectrum-Picker-label",
71+
".spectrum-Picker:lang(ko) .spectrum-Picker-label",
72+
".spectrum-Picker:lang(zh) .spectrum-Picker-label"
7873
],
7974
"modifiers": [
8075
"--mod-picker-animation-duration",
@@ -121,7 +116,11 @@
121116
"--mod-picker-icon-color-hover-open",
122117
"--mod-picker-icon-color-key-focus",
123118
"--mod-picker-inline-size",
119+
"--mod-picker-inline-size-quiet",
124120
"--mod-picker-line-height",
121+
"--mod-picker-line-height-cjk",
122+
"--mod-picker-min-inline-size",
123+
"--mod-picker-min-inline-size-quiet",
125124
"--mod-picker-placeholder-font-style",
126125
"--mod-picker-placeholder-font-weight",
127126
"--mod-picker-spacing-bottom-to-text",
@@ -133,8 +132,7 @@
133132
"--mod-picker-spacing-label-to-picker",
134133
"--mod-picker-spacing-label-to-picker-quiet",
135134
"--mod-picker-spacing-picker-to-popover",
136-
"--mod-picker-spacing-text-to-alert-icon-inline-start",
137-
"--mod-picker-spacing-text-to-icon",
135+
"--mod-picker-spacing-starting-icon-to-text",
138136
"--mod-picker-spacing-text-to-icon-inline-end",
139137
"--mod-picker-spacing-top-to-alert-icon",
140138
"--mod-picker-spacing-top-to-disclosure-icon",
@@ -154,7 +152,6 @@
154152
"--spectrum-picker-border-color-active",
155153
"--spectrum-picker-border-color-default",
156154
"--spectrum-picker-border-color-default-open",
157-
"--spectrum-picker-border-color-disabled",
158155
"--spectrum-picker-border-color-error-active",
159156
"--spectrum-picker-border-color-error-default",
160157
"--spectrum-picker-border-color-error-default-open",
@@ -189,18 +186,18 @@
189186
"--spectrum-picker-icon-color-key-focus",
190187
"--spectrum-picker-inline-size",
191188
"--spectrum-picker-line-height",
189+
"--spectrum-picker-line-height-cjk",
190+
"--spectrum-picker-min-inline-size",
192191
"--spectrum-picker-minimum-width-multiplier",
193192
"--spectrum-picker-placeholder-font-style",
194193
"--spectrum-picker-spacing-bottom-to-text",
195194
"--spectrum-picker-spacing-edge-to-disclosure-icon",
196-
"--spectrum-picker-spacing-edge-to-disclosure-icon-quiet",
197195
"--spectrum-picker-spacing-edge-to-text",
198-
"--spectrum-picker-spacing-edge-to-text-quiet",
199196
"--spectrum-picker-spacing-icon-to-disclosure-icon",
200197
"--spectrum-picker-spacing-label-to-picker",
201198
"--spectrum-picker-spacing-label-to-picker-quiet",
202199
"--spectrum-picker-spacing-picker-to-popover",
203-
"--spectrum-picker-spacing-text-to-icon",
200+
"--spectrum-picker-spacing-starting-icon-to-text",
204201
"--spectrum-picker-spacing-text-to-icon-inline-end",
205202
"--spectrum-picker-spacing-top-to-alert-icon",
206203
"--spectrum-picker-spacing-top-to-disclosure-icon",
@@ -213,7 +210,8 @@
213210
],
214211
"global": [
215212
"--spectrum-animation-duration-100",
216-
"--spectrum-border-width-100",
213+
"--spectrum-border-width-200",
214+
"--spectrum-cjk-line-height-100",
217215
"--spectrum-component-bottom-to-text-100",
218216
"--spectrum-component-bottom-to-text-200",
219217
"--spectrum-component-bottom-to-text-300",
@@ -226,6 +224,8 @@
226224
"--spectrum-component-height-200",
227225
"--spectrum-component-height-300",
228226
"--spectrum-component-height-75",
227+
"--spectrum-component-size-difference-down",
228+
"--spectrum-component-size-width-ratio-down",
229229
"--spectrum-component-to-menu-extra-large",
230230
"--spectrum-component-to-menu-large",
231231
"--spectrum-component-to-menu-medium",
@@ -234,10 +234,23 @@
234234
"--spectrum-component-top-to-text-200",
235235
"--spectrum-component-top-to-text-300",
236236
"--spectrum-component-top-to-text-75",
237-
"--spectrum-corner-radius-100",
237+
"--spectrum-component-top-to-workflow-icon-100",
238+
"--spectrum-component-top-to-workflow-icon-200",
239+
"--spectrum-component-top-to-workflow-icon-300",
240+
"--spectrum-component-top-to-workflow-icon-75",
241+
"--spectrum-corner-radius-medium-size-extra-large",
242+
"--spectrum-corner-radius-medium-size-large",
243+
"--spectrum-corner-radius-medium-size-medium",
244+
"--spectrum-corner-radius-medium-size-small",
238245
"--spectrum-default-font-style",
239246
"--spectrum-disabled-background-color",
240247
"--spectrum-disabled-content-color",
248+
"--spectrum-downstate-height",
249+
"--spectrum-downstate-width",
250+
"--spectrum-field-default-width-extra-large",
251+
"--spectrum-field-default-width-large",
252+
"--spectrum-field-default-width-medium",
253+
"--spectrum-field-default-width-small",
241254
"--spectrum-field-edge-to-text-quiet",
242255
"--spectrum-field-end-edge-to-disclosure-icon-100",
243256
"--spectrum-field-end-edge-to-disclosure-icon-200",
@@ -248,14 +261,6 @@
248261
"--spectrum-field-label-to-component-quiet-large",
249262
"--spectrum-field-label-to-component-quiet-medium",
250263
"--spectrum-field-label-to-component-quiet-small",
251-
"--spectrum-field-text-to-alert-icon-extra-large",
252-
"--spectrum-field-text-to-alert-icon-large",
253-
"--spectrum-field-text-to-alert-icon-medium",
254-
"--spectrum-field-text-to-alert-icon-small",
255-
"--spectrum-field-top-to-alert-icon-extra-large",
256-
"--spectrum-field-top-to-alert-icon-large",
257-
"--spectrum-field-top-to-alert-icon-medium",
258-
"--spectrum-field-top-to-alert-icon-small",
259264
"--spectrum-field-top-to-disclosure-icon-100",
260265
"--spectrum-field-top-to-disclosure-icon-200",
261266
"--spectrum-field-top-to-disclosure-icon-300",
@@ -264,7 +269,6 @@
264269
"--spectrum-field-top-to-progress-circle-large",
265270
"--spectrum-field-top-to-progress-circle-medium",
266271
"--spectrum-field-top-to-progress-circle-small",
267-
"--spectrum-field-width",
268272
"--spectrum-focus-indicator-color",
269273
"--spectrum-focus-indicator-gap",
270274
"--spectrum-focus-indicator-thickness",
@@ -274,12 +278,6 @@
274278
"--spectrum-font-size-75",
275279
"--spectrum-gray-100",
276280
"--spectrum-gray-200",
277-
"--spectrum-gray-300",
278-
"--spectrum-gray-500",
279-
"--spectrum-gray-600",
280-
"--spectrum-gray-700",
281-
"--spectrum-gray-800",
282-
"--spectrum-gray-900",
283281
"--spectrum-line-height-100",
284282
"--spectrum-negative-border-color-default",
285283
"--spectrum-negative-border-color-down",

0 commit comments

Comments
 (0)