Skip to content

Commit bb404fb

Browse files
committed
feat: make Form/FieldLabel use new Textfield markup
BREAKING CHANGE: migrated to next Textfield markup
1 parent ef2d193 commit bb404fb

2 files changed

Lines changed: 51 additions & 17 deletions

File tree

components/fieldlabel/metadata/fieldlabel.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,32 @@ examples:
66
name: Standard
77
markup: |
88
<label for="lifestory" class="spectrum-FieldLabel">Life Story</label>
9-
<input id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield">
9+
<div class="spectrum-Textfield">
10+
<input id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input">
11+
</div>
1012
1113
<label for="lifestory2" class="spectrum-FieldLabel is-disabled">Life Story</label>
12-
<input id="lifestory2" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield" disabled>
14+
<div class="spectrum-Textfield is-disabled">
15+
<input id="lifestory2" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input" disabled>
16+
</div>
1317
- id: fieldlabel-side
1418
name: Left
1519
description: A left aligned field label.
1620
markup: |
1721
<label for="lifestory" class="spectrum-FieldLabel spectrum-FieldLabel--left" style="width: 72px">Life Story</label>
1822
19-
<textarea id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
23+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
24+
<textarea id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input"></textarea>
25+
</div>
2026
- id: fieldlabel-side
2127
name: Right
2228
description: A right aligned field label.
2329
markup: |
2430
<label for="lifestory" class="spectrum-FieldLabel spectrum-FieldLabel--right" style="width: 72px">Life Story</label>
2531
26-
<textarea id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
32+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
33+
<textarea id="lifestory" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input"></textarea>
34+
</div>
2735
- id: fieldlabel
2836
name: Required
2937
description: Field label for a required field.
@@ -33,10 +41,14 @@ examples:
3341
<use xlink:href="#spectrum-css-icon-Asterisk" />
3442
</svg>
3543
</label>
36-
<input id="lifestory3" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield">
44+
<div class="spectrum-Textfield">
45+
<input id="lifestory3" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input">
46+
</div>
3747
3848
<label for="lifestory4" class="spectrum-FieldLabel">Life Story (Required)</label>
39-
<input id="lifestory4" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield">
49+
<div class="spectrum-Textfield">
50+
<input id="lifestory4" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input">
51+
</div>
4052
4153
<br/>
4254
<br/>
@@ -46,12 +58,16 @@ examples:
4658
<use xlink:href="#spectrum-css-icon-Asterisk" />
4759
</svg>
4860
</label>
49-
<textarea id="lifestory5" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
61+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
62+
<textarea id="lifestory5" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input"></textarea>
63+
</div>
5064
5165
5266
<label for="lifestory6" class="spectrum-FieldLabel is-disabled">Life Story
5367
<svg class="spectrum-Icon spectrum-UIIcon-Asterisk spectrum-FieldLabel-requiredIcon" focusable="false" aria-hidden="true">
5468
<use xlink:href="#spectrum-css-icon-Asterisk" />
5569
</svg>
5670
</label>
57-
<input id="lifestory6" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield" disabled>
71+
<div class="spectrum-Textfield is-disabled">
72+
<input id="lifestory6" placeholder="Enter your life story" name="field" value="" class="spectrum-Textfield-input" disabled>
73+
</div>

components/fieldlabel/metadata/form.yml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ examples:
99
<div class="spectrum-Form-item">
1010
<label for="fieldLabelExample-lifestory" class="spectrum-Form-itemLabel spectrum-FieldLabel--left">Company Title</label>
1111
<div class="spectrum-Form-itemField">
12-
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
12+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
13+
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield-input"></textarea>
14+
</div>
1315
</div>
1416
</div>
1517
<div class="spectrum-Form-item">
1618
<label class="spectrum-Form-itemLabel spectrum-FieldLabel--left" for="fieldLabelExample-emailaddress">Email Address</label>
1719
<div class="spectrum-Form-itemField">
18-
<input class="spectrum-Textfield" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
20+
<div class="spectrum-Textfield">
21+
<input class="spectrum-Textfield-input" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
22+
</div>
1923
</div>
2024
</div>
2125
<div class="spectrum-Form-item">
@@ -75,7 +79,9 @@ examples:
7579
<label class="spectrum-Form-itemLabel spectrum-FieldLabel--left" for="fieldLabelExample-stepper">Age</label>
7680
<div class="spectrum-Form-itemField">
7781
<div class="spectrum-Stepper">
78-
<input type="number" class="spectrum-Textfield spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
82+
<div class="spectrum-Textfield spectrum-Stepper-textfield">
83+
<input type="number" class="spectrum-Textfield-input spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
84+
</div>
7985
<span class="spectrum-Stepper-buttons">
8086
<button class="spectrum-ActionButton spectrum-Stepper-stepUp" tabindex="-1">
8187
<svg class="spectrum-Icon spectrum-UIIcon-ChevronUpSmall spectrum-Stepper-stepUpIcon" focusable="false" aria-hidden="true">
@@ -100,13 +106,17 @@ examples:
100106
<div class="spectrum-Form-item">
101107
<label for="fieldLabelExample-lifestory" class="spectrum-Form-itemLabel spectrum-FieldLabel--right">Company Title</label>
102108
<div class="spectrum-Form-itemField">
103-
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
109+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
110+
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield-input"></textarea>
111+
</div>
104112
</div>
105113
</div>
106114
<div class="spectrum-Form-item">
107115
<label class="spectrum-Form-itemLabel spectrum-FieldLabel--right" for="fieldLabelExample-emailaddress">Email Address</label>
108116
<div class="spectrum-Form-itemField">
109-
<input class="spectrum-Textfield" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
117+
<div class="spectrum-Textfield">
118+
<input class="spectrum-Textfield-input" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
119+
</div>
110120
</div>
111121
</div>
112122
<div class="spectrum-Form-item">
@@ -166,7 +176,9 @@ examples:
166176
<label class="spectrum-Form-itemLabel spectrum-FieldLabel--right" for="fieldLabelExample-stepper">Age</label>
167177
<div class="spectrum-Form-itemField">
168178
<div class="spectrum-Stepper">
169-
<input type="number" class="spectrum-Textfield spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
179+
<div class="spectrum-Textfield spectrum-Stepper-textfield">
180+
<input type="number" class="spectrum-Textfield-input spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
181+
</div>
170182
<span class="spectrum-Stepper-buttons">
171183
<button class="spectrum-ActionButton spectrum-Stepper-stepUp" tabindex="-1">
172184
<svg class="spectrum-Icon spectrum-UIIcon-ChevronUpSmall spectrum-Stepper-stepUpIcon" focusable="false" aria-hidden="true">
@@ -191,13 +203,17 @@ examples:
191203
<div class="spectrum-Form-item">
192204
<label for="fieldLabelExample-lifestory" class="spectrum-Form-itemLabel">Company Title</label>
193205
<div class="spectrum-Form-itemField">
194-
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield spectrum-Textfield--multiline"></textarea>
206+
<div class="spectrum-Textfield spectrum-Textfield--multiline">
207+
<textarea id="fieldLabelExample-lifestory" placeholder="Enter your life story" name="field" class="spectrum-Textfield-input"></textarea>
208+
</div>
195209
</div>
196210
</div>
197211
<div class="spectrum-Form-item">
198212
<label class="spectrum-Form-itemLabel" for="fieldLabelExample-emailaddress">Email Address</label>
199213
<div class="spectrum-Form-itemField">
200-
<input class="spectrum-Textfield" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
214+
<div class="spectrum-Textfield">
215+
<input class="spectrum-Textfield-input" aria-invalid="false" type="text" placeholder="Enter your e-mail address" id="fieldLabelExample-emailaddress">
216+
</div>
201217
</div>
202218
</div>
203219
<div class="spectrum-Form-item">
@@ -257,7 +273,9 @@ examples:
257273
<label class="spectrum-Form-itemLabel" for="fieldLabelExample-stepper">Age</label>
258274
<div class="spectrum-Form-itemField">
259275
<div class="spectrum-Stepper">
260-
<input type="number" class="spectrum-Textfield spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
276+
<div class="spectrum-Textfield spectrum-Stepper-textfield">
277+
<input type="number" class="spectrum-Textfield-input spectrum-Stepper-input" placeholder="Enter a number" min="-2" max="2" step="0.5" id="fieldLabelExample-stepper">
278+
</div>
261279
<span class="spectrum-Stepper-buttons">
262280
<button class="spectrum-ActionButton spectrum-Stepper-stepUp" tabindex="-1">
263281
<svg class="spectrum-Icon spectrum-UIIcon-ChevronUpSmall spectrum-Stepper-stepUpIcon" focusable="false" aria-hidden="true">

0 commit comments

Comments
 (0)