Skip to content

Commit 032001b

Browse files
authored
feat(picker): refactoring template markup, testing token passthroughs (#3792)
* feat(picker): add shirt size within template * feat(picker): adjusting picker markup to higher level of template * chore(picker): restore dropzone css file * feat(picker): remove duplicate icon template * feat(picker): fixing is quiet layout bugs * fix(picker): remove duplicate border on WHCM * feat(picker): readjusting picker popover mod passthroughs * feat(picker): updating changeset, story, css * feat(picker): update template and changeset
1 parent 523fc66 commit 032001b

File tree

6 files changed

+156
-127
lines changed

6 files changed

+156
-127
lines changed

.changeset/open-squids-refuse.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
"@spectrum-css/picker": major
3+
---
4+
5+
### S2 Picker component refactor
6+
7+
- Refactors Picker component to use proper custom property naming conventions
8+
- Adds size-specific animation distances for Popover component
9+
- Improves component structure with proper class by renaming `spectrum-Picker` to `spectrum-Picker-button`
10+
- `spectrum-Picker` now encapsulates help text, label, and popover components
11+
- Adds `flex-shrink` to progress circle for better layout control when truncation and loading is visible
12+
- Updates Popover animation distance to use `spectrum-Picker` custom properties
13+
14+
#### New token
15+
16+
`--spectrum-picker-popover-animation-distance`
17+
18+
#### Renamed tokens
19+
20+
`spectrum-picker-spacing-picker-to-popover` --> `--spectrum-picker-popover-animation-distance`

components/picker/dist/metadata.json

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,72 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-Picker",
5-
".spectrum-Picker + .spectrum-Popover--bottom-start.is-open",
65
".spectrum-Picker .spectrum-Picker-icon",
76
".spectrum-Picker .spectrum-Picker-label",
87
".spectrum-Picker .spectrum-ProgressCircle",
98
".spectrum-Picker--quiet",
10-
".spectrum-Picker--quiet.is-keyboardFocused:after",
9+
".spectrum-Picker--quiet .spectrum-Picker-button",
10+
".spectrum-Picker--quiet .spectrum-Picker-button.is-keyboardFocused:after",
11+
".spectrum-Picker--quiet .spectrum-Picker-button:after",
12+
".spectrum-Picker--quiet .spectrum-Picker-button:focus-visible:after",
1113
".spectrum-Picker--quiet.spectrum-Picker--sideLabel",
12-
".spectrum-Picker--quiet:after",
13-
".spectrum-Picker--quiet:focus-visible:after",
14+
".spectrum-Picker--quiet.spectrum-Picker--sideLabel .spectrum-Picker-button",
1415
".spectrum-Picker--sideLabel",
1516
".spectrum-Picker--sizeL",
16-
".spectrum-Picker--sizeL + .spectrum-Popover--bottom-start.is-open",
1717
".spectrum-Picker--sizeS",
18-
".spectrum-Picker--sizeS + .spectrum-Popover--bottom-start.is-open",
1918
".spectrum-Picker--sizeXL",
20-
".spectrum-Picker--sizeXL + .spectrum-Popover--bottom-start.is-open",
19+
".spectrum-Picker-button",
20+
".spectrum-Picker-button.is-disabled",
21+
".spectrum-Picker-button.is-disabled .spectrum-Picker-icon",
22+
".spectrum-Picker-button.is-disabled .spectrum-Picker-label.is-placeholder",
23+
".spectrum-Picker-button.is-disabled .spectrum-Picker-menuIcon",
24+
".spectrum-Picker-button.is-disabled .spectrum-Picker-validationIcon",
25+
".spectrum-Picker-button.is-disabled:not(.spectrum-Picker--quiet)",
26+
".spectrum-Picker-button.is-invalid.is-keyboardFocused:not(:disabled, .is-disabled)",
27+
".spectrum-Picker-button.is-invalid.is-open:not(:disabled, .is-disabled)",
28+
".spectrum-Picker-button.is-invalid.is-open:not(:disabled, .is-disabled):hover",
29+
".spectrum-Picker-button.is-invalid:not(:disabled, .is-disabled)",
30+
".spectrum-Picker-button.is-invalid:not(:disabled, .is-disabled) .spectrum-Picker-validationIcon",
31+
".spectrum-Picker-button.is-invalid:not(:disabled, .is-disabled):active",
32+
".spectrum-Picker-button.is-invalid:not(:disabled, .is-disabled):focus-visible",
33+
".spectrum-Picker-button.is-invalid:not(:disabled, .is-disabled):hover",
34+
".spectrum-Picker-button.is-keyboardFocused",
35+
".spectrum-Picker-button.is-keyboardFocused .spectrum-Picker-label.is-placeholder",
36+
".spectrum-Picker-button.is-keyboardFocused .spectrum-Picker-menuIcon",
37+
".spectrum-Picker-button.is-keyboardFocused:after",
38+
".spectrum-Picker-button.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading)",
39+
".spectrum-Picker-button.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading) .spectrum-Picker-menuIcon",
40+
".spectrum-Picker-button.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading):hover",
41+
".spectrum-Picker-button.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled, .is-loading):hover .spectrum-Picker-menuIcon",
42+
".spectrum-Picker-button::-moz-focus-inner",
43+
".spectrum-Picker-button:active",
44+
".spectrum-Picker-button:active .spectrum-Picker-label.is-placeholder",
45+
".spectrum-Picker-button:active:after",
46+
".spectrum-Picker-button:disabled",
47+
".spectrum-Picker-button:disabled .spectrum-Picker-icon",
48+
".spectrum-Picker-button:disabled .spectrum-Picker-label.is-placeholder",
49+
".spectrum-Picker-button:disabled .spectrum-Picker-menuIcon",
50+
".spectrum-Picker-button:disabled .spectrum-Picker-validationIcon",
51+
".spectrum-Picker-button:disabled:not(.spectrum-Picker--quiet)",
52+
".spectrum-Picker-button:focus",
53+
".spectrum-Picker-button:focus-visible",
54+
".spectrum-Picker-button:focus-visible .spectrum-Picker-label.is-placeholder",
55+
".spectrum-Picker-button:focus-visible .spectrum-Picker-menuIcon",
56+
".spectrum-Picker-button:focus-visible:after",
57+
".spectrum-Picker-button:hover",
58+
".spectrum-Picker-button:hover .spectrum-Picker-menuIcon",
2159
".spectrum-Picker-label",
2260
".spectrum-Picker-label.is-placeholder",
2361
".spectrum-Picker-label.is-placeholder:active",
2462
".spectrum-Picker-label.is-placeholder:hover",
2563
".spectrum-Picker-menuIcon",
2664
".spectrum-Picker-menuIcon:active",
2765
".spectrum-Picker-validationIcon",
28-
".spectrum-Picker.is-disabled",
29-
".spectrum-Picker.is-disabled .spectrum-Picker-icon",
30-
".spectrum-Picker.is-disabled .spectrum-Picker-label.is-placeholder",
31-
".spectrum-Picker.is-disabled .spectrum-Picker-menuIcon",
32-
".spectrum-Picker.is-disabled .spectrum-Picker-validationIcon",
33-
".spectrum-Picker.is-disabled:not(.spectrum-Picker--quiet)",
34-
".spectrum-Picker.is-invalid.is-keyboardFocused:not(:disabled, .is-disabled)",
35-
".spectrum-Picker.is-invalid.is-open:not(:disabled, .is-disabled)",
36-
".spectrum-Picker.is-invalid.is-open:not(:disabled, .is-disabled):hover",
37-
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled)",
38-
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled) .spectrum-Picker-validationIcon",
39-
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled):active",
40-
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled):focus-visible",
41-
".spectrum-Picker.is-invalid:not(:disabled, .is-disabled):hover",
4266
".spectrum-Picker.is-keyboardFocused",
43-
".spectrum-Picker.is-keyboardFocused .spectrum-Picker-label.is-placeholder",
44-
".spectrum-Picker.is-keyboardFocused .spectrum-Picker-menuIcon",
45-
".spectrum-Picker.is-keyboardFocused:after",
4667
".spectrum-Picker.is-loading",
4768
".spectrum-Picker.is-loading .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",
52-
".spectrum-Picker::-moz-focus-inner",
53-
".spectrum-Picker:active",
54-
".spectrum-Picker:active .spectrum-Picker-label.is-placeholder",
55-
".spectrum-Picker:active:after",
5669
".spectrum-Picker:after",
57-
".spectrum-Picker:disabled",
58-
".spectrum-Picker:disabled .spectrum-Picker-icon",
59-
".spectrum-Picker:disabled .spectrum-Picker-label.is-placeholder",
60-
".spectrum-Picker:disabled .spectrum-Picker-menuIcon",
61-
".spectrum-Picker:disabled .spectrum-Picker-validationIcon",
62-
".spectrum-Picker:disabled:not(.spectrum-Picker--quiet)",
63-
".spectrum-Picker:focus",
6470
".spectrum-Picker:focus-visible",
65-
".spectrum-Picker:focus-visible .spectrum-Picker-label.is-placeholder",
66-
".spectrum-Picker:focus-visible .spectrum-Picker-menuIcon",
67-
".spectrum-Picker:focus-visible:after",
68-
".spectrum-Picker:hover",
69-
".spectrum-Picker:hover .spectrum-Picker-menuIcon",
7071
".spectrum-Picker:lang(ja) .spectrum-Picker-label",
7172
".spectrum-Picker:lang(ko) .spectrum-Picker-label",
7273
".spectrum-Picker:lang(zh) .spectrum-Picker-label"
@@ -131,7 +132,6 @@
131132
"--mod-picker-spacing-icon-to-disclosure-icon",
132133
"--mod-picker-spacing-label-to-picker",
133134
"--mod-picker-spacing-label-to-picker-quiet",
134-
"--mod-picker-spacing-picker-to-popover",
135135
"--mod-picker-spacing-starting-icon-to-text",
136136
"--mod-picker-spacing-text-to-icon-inline-end",
137137
"--mod-picker-spacing-top-to-alert-icon",
@@ -190,13 +190,13 @@
190190
"--spectrum-picker-min-inline-size",
191191
"--spectrum-picker-minimum-width-multiplier",
192192
"--spectrum-picker-placeholder-font-style",
193+
"--spectrum-picker-popover-animation-distance",
193194
"--spectrum-picker-spacing-bottom-to-text",
194195
"--spectrum-picker-spacing-edge-to-disclosure-icon",
195196
"--spectrum-picker-spacing-edge-to-text",
196197
"--spectrum-picker-spacing-icon-to-disclosure-icon",
197198
"--spectrum-picker-spacing-label-to-picker",
198199
"--spectrum-picker-spacing-label-to-picker-quiet",
199-
"--spectrum-picker-spacing-picker-to-popover",
200200
"--spectrum-picker-spacing-starting-icon-to-text",
201201
"--spectrum-picker-spacing-text-to-icon-inline-end",
202202
"--spectrum-picker-spacing-top-to-alert-icon",
@@ -302,7 +302,8 @@
302302
"passthroughs": [
303303
"--mod-button-animation-duration",
304304
"--mod-button-font-family",
305-
"--mod-button-line-height"
305+
"--mod-button-line-height",
306+
"--mod-popover-animation-distance"
306307
],
307308
"high-contrast": [
308309
"--highcontrast-picker-background-color",

0 commit comments

Comments
 (0)