Skip to content

Commit 77c66a4

Browse files
feat(textfield): migrate to s2
1 parent f360c68 commit 77c66a4

File tree

7 files changed

+225
-289
lines changed

7 files changed

+225
-289
lines changed

.changeset/healthy-chicken-clap.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
"@spectrum-css/textfield": major
3+
---
4+
5+
Migrate to Spectrum 2
6+
7+
- Default styles are used for medium
8+
- Removal of quiet variant
9+
- Style adjustments to match design spec:
10+
- Spacing start/end edge to value for XL component should use `component-edge-to-text-300`, not `-200`
11+
- Spacing top edge to value should change with size, now uses different spacing tokens for each component tshirt size according to spec (`component-top-to-text-75`, `-100`, `-200`, and `-300`)
12+
- Spacing bottom edge to value should change with size, now uses different spacing tokens for each component tshirt size according to spec (`component-bottom-to-text-75`, `-100`, `-200`, and `-300`)
13+
- Adjust border thickness to 2px
14+
- Adjust side label inline spacing to field, should be `spacing-200` for all tshirt sizes
15+
- Adjust border colors to match spec
16+
- Change disabled background color to `gray-25`
17+
- Change disabled-border-color from transparent to `disabled-border-color`
18+
- Use new and updated tokens:
19+
- use tokens for textfield width (`field-default-width-small`, `-medium`, `-large`, `-extra-large`)
20+
- use updated corner radius tokens
21+
- use different component-bottom-to-text tokens for character-count-spacing-block
22+
- update tokens for alert icon block spacing
23+
- update tokens for alert and invalid inline-start spacing
24+
- update font tokens
25+
26+
Adds mods:
27+
28+
- `--mod-textfield-character-count-color`
29+
- `--mod-textfield-character-count-line-height`
30+
- `--mod-textfield-character-count-line-height-cjk`
31+
- `--mod-textfield-line-height-cjk`
32+
33+
Removes mods:
34+
35+
- `--mod-textfield-line-height`
36+
- `--mod-text-area-min-block-size-quiet`
37+
- `--mod-textfield-character-count-spacing-block-quiet`
38+
- `--mod-textfield-icon-spacing-inline-end-quiet-invalid`
39+
- `--mod-textfield-icon-spacing-inline-end-quiet-valid`
40+
- `--mod-textfield-label-spacing-block-quiet`
41+
- `--mod-textfield-spacing-block-quiet`
42+
- `--mod-textfield-spacing-inline-quiet`

components/textfield/dist/metadata.json

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".is-disabled .spectrum-FieldLabel",
5+
".is-disabled .spectrum-HelpText .spectrum-HelpText-text",
6+
".is-disabled .spectrum-Textfield-characterCount",
7+
".is-disabled .spectrum-Textfield-input:read-only::placeholder",
8+
".is-disabled .spectrum-Textfield.is-readOnly .spectrum-Textfield-input::placeholder",
9+
".is-disabled .spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input::placeholder",
10+
".is-disabled:hover .spectrum-Textfield-input:read-only::placeholder",
11+
".is-disabled:hover .spectrum-Textfield.is-readOnly .spectrum-Textfield-input::placeholder",
12+
".is-disabled:hover .spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input::placeholder",
513
".is-focused .spectrum-Textfield-input",
614
".is-focused .spectrum-Textfield-input::placeholder",
715
".is-focused .spectrum-Textfield-input:hover",
@@ -23,23 +31,13 @@
2331
".spectrum-Textfield",
2432
".spectrum-Textfield .spectrum-FieldLabel",
2533
".spectrum-Textfield .spectrum-HelpText",
34+
".spectrum-Textfield .spectrum-HelpText-text",
35+
".spectrum-Textfield .spectrum-Textfield-characterCount",
2636
".spectrum-Textfield .spectrum-Textfield-input",
2737
".spectrum-Textfield .spectrum-Textfield-input::placeholder",
28-
".spectrum-Textfield--multiline",
2938
".spectrum-Textfield--multiline .spectrum-Textfield-input",
3039
".spectrum-Textfield--multiline.spectrum-Textfield--grows .spectrum-Textfield-input",
3140
".spectrum-Textfield--multiline.spectrum-Textfield--grows.spectrum-Textfield--sideLabel .spectrum-Textfield-input",
32-
".spectrum-Textfield--multiline.spectrum-Textfield--quiet .spectrum-Textfield-input",
33-
".spectrum-Textfield--quiet .spectrum-FieldLabel",
34-
".spectrum-Textfield--quiet .spectrum-Textfield-characterCount",
35-
".spectrum-Textfield--quiet .spectrum-Textfield-input",
36-
".spectrum-Textfield--quiet .spectrum-Textfield-validationIcon",
37-
".spectrum-Textfield--quiet.is-disabled .spectrum-Textfield-input",
38-
".spectrum-Textfield--quiet.is-disabled .spectrum-Textfield-input::placeholder",
39-
".spectrum-Textfield--quiet.is-disabled:hover .spectrum-Textfield-input",
40-
".spectrum-Textfield--quiet.is-disabled:hover .spectrum-Textfield-input::placeholder",
41-
".spectrum-Textfield--quiet.is-invalid .spectrum-Textfield-validationIcon",
42-
".spectrum-Textfield--quiet.is-valid .spectrum-Textfield-validationIcon",
4341
".spectrum-Textfield--sideLabel",
4442
".spectrum-Textfield--sideLabel .spectrum-FieldLabel",
4543
".spectrum-Textfield--sideLabel .spectrum-HelpText",
@@ -51,12 +49,17 @@
5149
".spectrum-Textfield--sizeS",
5250
".spectrum-Textfield--sizeXL",
5351
".spectrum-Textfield-characterCount",
52+
".spectrum-Textfield-characterCount:lang(ja)",
53+
".spectrum-Textfield-characterCount:lang(ko)",
54+
".spectrum-Textfield-characterCount:lang(zh)",
5455
".spectrum-Textfield-input",
5556
".spectrum-Textfield-input:-moz-ui-invalid",
5657
".spectrum-Textfield-input::placeholder",
5758
".spectrum-Textfield-input:disabled",
5859
".spectrum-Textfield-input:disabled::placeholder",
5960
".spectrum-Textfield-input:focus",
61+
".spectrum-Textfield-input:focus-visible",
62+
".spectrum-Textfield-input:focus-visible::placeholder",
6063
".spectrum-Textfield-input:focus::placeholder",
6164
".spectrum-Textfield-input:focus:hover",
6265
".spectrum-Textfield-input:focus:hover::placeholder",
@@ -82,18 +85,13 @@
8285
".spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input",
8386
".spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input::placeholder",
8487
".spectrum-Textfield.is-valid .spectrum-Textfield-validationIcon",
85-
".spectrum-Textfield.spectrum-Textfield--quiet.is-invalid .spectrum-Textfield-input",
86-
".spectrum-Textfield.spectrum-Textfield--quiet.is-keyboardFocused:after",
87-
".spectrum-Textfield.spectrum-Textfield--quiet.is-valid .spectrum-Textfield-input",
88-
".spectrum-Textfield.spectrum-Textfield--quiet:after",
8988
".spectrum-Textfield.spectrum-Textfield--sideLabel .spectrum-Textfield-validationIcon",
9089
".spectrum-Textfield:hover .spectrum-Textfield-input",
9190
".spectrum-Textfield:hover .spectrum-Textfield-input::placeholder"
9291
],
9392
"modifiers": [
9493
"--mod-texfield-animation-duration",
9594
"--mod-text-area-min-block-size",
96-
"--mod-text-area-min-block-size-quiet",
9795
"--mod-text-area-min-inline-size",
9896
"--mod-textfield-background-color",
9997
"--mod-textfield-background-color-disabled",
@@ -109,11 +107,13 @@
109107
"--mod-textfield-border-color-invalid-keyboard-focus",
110108
"--mod-textfield-border-color-keyboard-focus",
111109
"--mod-textfield-border-width",
110+
"--mod-textfield-character-count-color",
112111
"--mod-textfield-character-count-font-family",
113112
"--mod-textfield-character-count-font-size",
114113
"--mod-textfield-character-count-font-weight",
114+
"--mod-textfield-character-count-line-height",
115+
"--mod-textfield-character-count-line-height-cjk",
115116
"--mod-textfield-character-count-spacing-block",
116-
"--mod-textfield-character-count-spacing-block-quiet",
117117
"--mod-textfield-character-count-spacing-block-side",
118118
"--mod-textfield-character-count-spacing-inline",
119119
"--mod-textfield-character-count-spacing-inline-side",
@@ -132,21 +132,17 @@
132132
"--mod-textfield-icon-spacing-block-invalid",
133133
"--mod-textfield-icon-spacing-block-valid",
134134
"--mod-textfield-icon-spacing-inline-end-invalid",
135-
"--mod-textfield-icon-spacing-inline-end-quiet-invalid",
136-
"--mod-textfield-icon-spacing-inline-end-quiet-valid",
137135
"--mod-textfield-icon-spacing-inline-end-valid",
138136
"--mod-textfield-icon-spacing-inline-start-invalid",
139137
"--mod-textfield-icon-spacing-inline-start-valid",
140138
"--mod-textfield-label-spacing-block",
141-
"--mod-textfield-label-spacing-block-quiet",
142139
"--mod-textfield-label-spacing-inline-side-label",
140+
"--mod-textfield-line-height",
143141
"--mod-textfield-min-width",
144142
"--mod-textfield-placeholder-font-size",
145143
"--mod-textfield-spacing-block-end",
146-
"--mod-textfield-spacing-block-quiet",
147144
"--mod-textfield-spacing-block-start",
148145
"--mod-textfield-spacing-inline",
149-
"--mod-textfield-spacing-inline-quiet",
150146
"--mod-textfield-text-color-default",
151147
"--mod-textfield-text-color-disabled",
152148
"--mod-textfield-text-color-focus",
@@ -174,11 +170,13 @@
174170
"--spectrum-textfield-border-color-invalid-keyboard-focus",
175171
"--spectrum-textfield-border-color-keyboard-focus",
176172
"--spectrum-textfield-border-width",
173+
"--spectrum-textfield-character-count-color",
177174
"--spectrum-textfield-character-count-font-family",
178175
"--spectrum-textfield-character-count-font-size",
179176
"--spectrum-textfield-character-count-font-weight",
177+
"--spectrum-textfield-character-count-line-height",
178+
"--spectrum-textfield-character-count-line-height-cjk",
180179
"--spectrum-textfield-character-count-spacing-block",
181-
"--spectrum-textfield-character-count-spacing-block-quiet",
182180
"--spectrum-textfield-character-count-spacing-block-side",
183181
"--spectrum-textfield-character-count-spacing-inline",
184182
"--spectrum-textfield-character-count-spacing-inline-side",
@@ -197,22 +195,19 @@
197195
"--spectrum-textfield-icon-spacing-block-invalid",
198196
"--spectrum-textfield-icon-spacing-block-valid",
199197
"--spectrum-textfield-icon-spacing-inline-end-invalid",
200-
"--spectrum-textfield-icon-spacing-inline-end-quiet-invalid",
201-
"--spectrum-textfield-icon-spacing-inline-end-quiet-valid",
202198
"--spectrum-textfield-icon-spacing-inline-end-valid",
203199
"--spectrum-textfield-icon-spacing-inline-start-invalid",
204200
"--spectrum-textfield-icon-spacing-inline-start-valid",
205201
"--spectrum-textfield-input-line-height",
206202
"--spectrum-textfield-label-spacing-block",
207-
"--spectrum-textfield-label-spacing-block-quiet",
208203
"--spectrum-textfield-label-spacing-inline-side-label",
204+
"--spectrum-textfield-line-height",
205+
"--spectrum-textfield-line-height-cjk",
209206
"--spectrum-textfield-min-width",
210207
"--spectrum-textfield-placeholder-font-size",
211208
"--spectrum-textfield-spacing-block-end",
212-
"--spectrum-textfield-spacing-block-quiet",
213209
"--spectrum-textfield-spacing-block-start",
214210
"--spectrum-textfield-spacing-inline",
215-
"--spectrum-textfield-spacing-inline-quiet",
216211
"--spectrum-textfield-text-color-default",
217212
"--spectrum-textfield-text-color-disabled",
218213
"--spectrum-textfield-text-color-focus",
@@ -226,57 +221,51 @@
226221
],
227222
"global": [
228223
"--spectrum-animation-duration-100",
229-
"--spectrum-border-width-100",
230-
"--spectrum-character-count-to-field-quiet-extra-large",
231-
"--spectrum-character-count-to-field-quiet-large",
232-
"--spectrum-character-count-to-field-quiet-medium",
233-
"--spectrum-character-count-to-field-quiet-small",
224+
"--spectrum-border-width-200",
234225
"--spectrum-checkmark-icon-size-100",
235226
"--spectrum-checkmark-icon-size-200",
236227
"--spectrum-checkmark-icon-size-300",
237228
"--spectrum-checkmark-icon-size-75",
229+
"--spectrum-cjk-line-height-100",
238230
"--spectrum-component-bottom-to-text-100",
239231
"--spectrum-component-bottom-to-text-200",
232+
"--spectrum-component-bottom-to-text-300",
240233
"--spectrum-component-bottom-to-text-75",
241234
"--spectrum-component-edge-to-text-100",
242235
"--spectrum-component-edge-to-text-200",
236+
"--spectrum-component-edge-to-text-300",
243237
"--spectrum-component-edge-to-text-75",
244238
"--spectrum-component-height-100",
245239
"--spectrum-component-height-200",
246240
"--spectrum-component-height-300",
247241
"--spectrum-component-height-75",
248242
"--spectrum-component-top-to-text-100",
249-
"--spectrum-corner-radius-100",
243+
"--spectrum-component-top-to-text-200",
244+
"--spectrum-component-top-to-text-300",
245+
"--spectrum-component-top-to-text-75",
246+
"--spectrum-component-top-to-workflow-icon-100",
247+
"--spectrum-component-top-to-workflow-icon-200",
248+
"--spectrum-component-top-to-workflow-icon-300",
249+
"--spectrum-component-top-to-workflow-icon-75",
250+
"--spectrum-corner-radius-medium-size-extra-large",
251+
"--spectrum-corner-radius-medium-size-large",
252+
"--spectrum-corner-radius-medium-size-medium",
253+
"--spectrum-corner-radius-medium-size-small",
254+
"--spectrum-disabled-border-color",
250255
"--spectrum-disabled-content-color",
256+
"--spectrum-field-default-width-extra-large",
257+
"--spectrum-field-default-width-large",
258+
"--spectrum-field-default-width-medium",
259+
"--spectrum-field-default-width-small",
251260
"--spectrum-field-edge-to-alert-icon-extra-large",
252261
"--spectrum-field-edge-to-alert-icon-large",
253262
"--spectrum-field-edge-to-alert-icon-medium",
254-
"--spectrum-field-edge-to-alert-icon-quiet",
255263
"--spectrum-field-edge-to-alert-icon-small",
256-
"--spectrum-field-edge-to-border-quiet",
257-
"--spectrum-field-edge-to-text-quiet",
258264
"--spectrum-field-edge-to-validation-icon-extra-large",
259265
"--spectrum-field-edge-to-validation-icon-large",
260266
"--spectrum-field-edge-to-validation-icon-medium",
261-
"--spectrum-field-edge-to-validation-icon-quiet",
262267
"--spectrum-field-edge-to-validation-icon-small",
263268
"--spectrum-field-label-to-component",
264-
"--spectrum-field-label-to-component-quiet-extra-large",
265-
"--spectrum-field-label-to-component-quiet-large",
266-
"--spectrum-field-label-to-component-quiet-medium",
267-
"--spectrum-field-label-to-component-quiet-small",
268-
"--spectrum-field-text-to-alert-icon-extra-large",
269-
"--spectrum-field-text-to-alert-icon-large",
270-
"--spectrum-field-text-to-alert-icon-medium",
271-
"--spectrum-field-text-to-alert-icon-small",
272-
"--spectrum-field-text-to-validation-icon-extra-large",
273-
"--spectrum-field-text-to-validation-icon-large",
274-
"--spectrum-field-text-to-validation-icon-medium",
275-
"--spectrum-field-text-to-validation-icon-small",
276-
"--spectrum-field-top-to-alert-icon-extra-large",
277-
"--spectrum-field-top-to-alert-icon-large",
278-
"--spectrum-field-top-to-alert-icon-medium",
279-
"--spectrum-field-top-to-alert-icon-small",
280269
"--spectrum-field-top-to-validation-icon-extra-large",
281270
"--spectrum-field-top-to-validation-icon-large",
282271
"--spectrum-field-top-to-validation-icon-medium",
@@ -289,11 +278,12 @@
289278
"--spectrum-font-size-300",
290279
"--spectrum-font-size-75",
291280
"--spectrum-gray-25",
292-
"--spectrum-gray-500",
293-
"--spectrum-gray-600",
281+
"--spectrum-gray-300",
282+
"--spectrum-gray-400",
294283
"--spectrum-gray-800",
295284
"--spectrum-gray-900",
296285
"--spectrum-help-text-to-component",
286+
"--spectrum-line-height-100",
297287
"--spectrum-negative-border-color-default",
298288
"--spectrum-negative-border-color-focus",
299289
"--spectrum-negative-border-color-focus-hover",
@@ -305,22 +295,21 @@
305295
"--spectrum-neutral-content-color-focus-hover",
306296
"--spectrum-neutral-content-color-hover",
307297
"--spectrum-neutral-content-color-key-focus",
298+
"--spectrum-neutral-subdued-content-color-default",
308299
"--spectrum-positive-visual-color",
309300
"--spectrum-regular-font-weight",
310301
"--spectrum-sans-font-family-stack",
311302
"--spectrum-side-label-character-count-to-field",
312-
"--spectrum-side-label-character-count-top-margin-extra-large",
313-
"--spectrum-side-label-character-count-top-margin-large",
314-
"--spectrum-side-label-character-count-top-margin-medium",
315-
"--spectrum-side-label-character-count-top-margin-small",
316-
"--spectrum-spacing-100",
317303
"--spectrum-spacing-200",
318304
"--spectrum-texfield-animation-duration",
319305
"--spectrum-text-area-min-block-size",
320-
"--spectrum-text-area-min-block-size-quiet",
321306
"--spectrum-text-area-min-inline-size",
322307
"--spectrum-text-area-minimum-height",
323308
"--spectrum-text-area-minimum-width",
309+
"--spectrum-text-to-visual-100",
310+
"--spectrum-text-to-visual-200",
311+
"--spectrum-text-to-visual-300",
312+
"--spectrum-text-to-visual-75",
324313
"--spectrum-workflow-icon-size-100",
325314
"--spectrum-workflow-icon-size-200",
326315
"--spectrum-workflow-icon-size-300",
@@ -329,16 +318,23 @@
329318
"passthroughs": [],
330319
"high-contrast": [
331320
"--highcontrast-textfield-border-color",
321+
"--highcontrast-textfield-border-color-disabled",
332322
"--highcontrast-textfield-border-color-focus",
323+
"--highcontrast-textfield-border-color-focus-hover",
333324
"--highcontrast-textfield-border-color-hover",
334325
"--highcontrast-textfield-border-color-invalid-default",
335326
"--highcontrast-textfield-border-color-invalid-focus",
327+
"--highcontrast-textfield-border-color-invalid-focus-hover",
336328
"--highcontrast-textfield-border-color-invalid-hover",
337329
"--highcontrast-textfield-border-color-invalid-keyboard-focus",
338330
"--highcontrast-textfield-border-color-keyboard-focus",
339331
"--highcontrast-textfield-focus-indicator-color",
332+
"--highcontrast-textfield-icon-color-invalid",
333+
"--highcontrast-textfield-icon-color-valid",
340334
"--highcontrast-textfield-text-color-default",
341335
"--highcontrast-textfield-text-color-disabled",
336+
"--highcontrast-textfield-text-color-focus",
337+
"--highcontrast-textfield-text-color-focus-hover",
342338
"--highcontrast-textfield-text-color-hover",
343339
"--highcontrast-textfield-text-color-invalid",
344340
"--highcontrast-textfield-text-color-keyboard-focus",

0 commit comments

Comments
 (0)