Skip to content

Commit 802a1c1

Browse files
skvalebcullman
skvale
authored and
bcullman
committed
fix: labelText-prop-mix-up (#397)
thanks @skvale!
1 parent 7571b40 commit 802a1c1

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎src/InputGroup/InputGroup.Component.js‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,96 +4,96 @@ import { Description, DocsText, DocsTile, Header, Import, Playground, Properties
44

55
export const InputGroupComponent = () => {
66
const textAddonCode = `<FormGroup>
7-
<FormLabel labelText="Left Aligned Text Addon" />
7+
<FormLabel>Left Aligned Text Addon</FormLabel>
88
<FormItem>
99
<InputGroup inputType="text" addonPos="before" inputValue="1234567890" addon="$" />
1010
</FormItem>
1111
</FormGroup>
1212
1313
<FormGroup>
14-
<FormLabel labelText="Right Aligned Text Addon" />
14+
<FormLabel>Right Aligned Text Addon</FormLabel>
1515
<FormItem>
1616
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" addon="€" />
1717
</FormItem>
1818
</FormGroup>
1919
2020
Compact Mode:
2121
<FormGroup>
22-
<FormLabel labelText="Left Aligned Text Addon" />
22+
<FormLabel>Left Aligned Text Addon</FormLabel>
2323
<FormItem>
2424
<InputGroup inputType="text" addonPos="before" inputValue="1234567890" addon="$" compact />
2525
</FormItem>
2626
</FormGroup>
2727
2828
<FormGroup>
29-
<FormLabel labelText="Right Aligned Text Addon" />
29+
<FormLabel>Right Aligned Text Addon</FormLabel>
3030
<FormItem>
3131
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" addon="€" compact />
3232
</FormItem>
3333
</FormGroup>`;
3434

3535
const numberInputCode = `<FormGroup>
36-
<FormLabel labelText="Right Aligned Text Addon" />
36+
<FormLabel>Right Aligned Text Addon</FormLabel>
3737
<FormItem>
3838
<InputGroup inputType="number" inputValue={100} />
3939
</FormItem>
4040
</FormGroup>
4141
4242
Compact mode:
4343
<FormGroup>
44-
<FormLabel labelText="Right Aligned Text Addon" />
44+
<FormLabel>Right Aligned Text Addon</FormLabel>
4545
<FormItem>
4646
<InputGroup inputType="number" inputValue={100} compact />
4747
</FormItem>
4848
</FormGroup>`;
4949

5050
const inputWithIconsCode = `<FormGroup>
51-
<FormLabel labelText="Search Input" />
51+
<FormLabel>Search Input</FormLabel>
5252
<FormItem>
5353
<InputGroup inputType="search" inputPlaceholder="Search Term" />
5454
</FormItem>
5555
</FormGroup>
5656
5757
Compact mode:
5858
<FormGroup>
59-
<FormLabel labelText="Search Input" />
59+
<FormLabel>Search Input</FormLabel>
6060
<FormItem>
6161
<InputGroup inputType="search" inputPlaceholder="Search Term" compact />
6262
</FormItem>
6363
</FormGroup>
6464
6565
<FormGroup>
66-
<FormLabel labelText="Input with icon on the left" />
66+
<FormLabel>Input with icon on the left</FormLabel>
6767
<FormItem>
6868
<InputGroup inputType="text" addonPos="before" inputValue="1234567890" glyph="globe" />
6969
</FormItem>
7070
</FormGroup>
7171
7272
Compact mode:
7373
<FormGroup>
74-
<FormLabel labelText="Input with icon on the left" />
74+
<FormLabel>Input with icon on the left</FormLabel>
7575
<FormItem>
7676
<InputGroup inputType="text" addonPos="before" inputValue="1234567890" glyph="globe" compact />
7777
</FormItem>
7878
</FormGroup>
7979
8080
<FormGroup>
81-
<FormLabel labelText="Input with icon on the right" />
81+
<FormLabel>Input with icon on the right</FormLabel>
8282
<FormItem>
8383
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" glyph="hide" />
8484
</FormItem>
8585
</FormGroup>
8686
8787
Compact mode:
8888
<FormGroup>
89-
<FormLabel labelText="Input with icon on the right" />
89+
<FormLabel>Input with icon on the right</FormLabel>
9090
<FormItem>
9191
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" glyph="hide" compact />
9292
</FormItem>
9393
</FormGroup>`;
9494

9595
const inputWithActionsCode = `<FormGroup>
96-
<FormLabel labelText="Input with text action" />
96+
<FormLabel>Input with text action</FormLabel>
9797
<FormItem>
9898
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" actions>
9999
<Button option="light">Button</Button>
@@ -103,7 +103,7 @@ Compact mode:
103103
104104
Compact mode:
105105
<FormGroup>
106-
<FormLabel labelText="Input with text action" />
106+
<FormLabel>Input with text action</FormLabel>
107107
<FormItem>
108108
<InputGroup inputType="text" addonPos="after" inputValue="1234567890" actions compact>
109109
<Button option="light">Button</Button>
@@ -112,7 +112,7 @@ Compact mode:
112112
</FormGroup>
113113
114114
<FormGroup>
115-
<FormLabel labelText="Input with icon text action" />
115+
<FormLabel>Input with icon text action</FormLabel>
116116
<FormItem>
117117
<InputGroup inputType="text" addonPos="after" actions>
118118
<Button option="light" glyph="navigation-down-arrow" />
@@ -122,7 +122,7 @@ Compact mode:
122122
123123
Compact mode:
124124
<FormGroup>
125-
<FormLabel labelText="Input with icon text action" />
125+
<FormLabel>Input with icon text action</FormLabel>
126126
<FormItem>
127127
<InputGroup inputType="text" addonPos="after" actions compact>
128128
<Button option="light" glyph="navigation-down-arrow" />
@@ -153,7 +153,7 @@ Compact mode:
153153
</Description>
154154
<DocsTile>
155155
<FormGroup>
156-
<FormLabel labelText='Left Aligned Text Addon' />
156+
<FormLabel>Left Aligned Text Addon</FormLabel>
157157
<FormItem>
158158
<InputGroup
159159
addon='$'
@@ -164,7 +164,7 @@ Compact mode:
164164
</FormGroup>
165165
<br />
166166
<FormGroup>
167-
<FormLabel labelText='Right Aligned Text Addon' />
167+
<FormLabel>Right Aligned Text Addon</FormLabel>
168168
<FormItem>
169169
<InputGroup
170170
addon='€'
@@ -178,7 +178,7 @@ Compact mode:
178178
<p>Compact mode</p>
179179

180180
<FormGroup>
181-
<FormLabel labelText='Left Aligned Text Addon' />
181+
<FormLabel>Left Aligned Text Addon</FormLabel>
182182
<FormItem>
183183
<InputGroup
184184
addon='$'
@@ -190,7 +190,7 @@ Compact mode:
190190
</FormGroup>
191191
<br />
192192
<FormGroup>
193-
<FormLabel labelText='Right Aligned Text Addon' />
193+
<FormLabel>Right Aligned Text Addon</FormLabel>
194194
<FormItem>
195195
<InputGroup
196196
addon='€'
@@ -212,7 +212,7 @@ Compact mode:
212212
</Description>
213213
<DocsTile>
214214
<FormGroup>
215-
<FormLabel labelText='Right Aligned Text Addon' />
215+
<FormLabel>Right Aligned Text Addon</FormLabel>
216216
<FormItem>
217217
<InputGroup inputType='number' inputValue={100} />
218218
</FormItem>
@@ -222,7 +222,7 @@ Compact mode:
222222
<p>Compact mode</p>
223223

224224
<FormGroup>
225-
<FormLabel labelText='Right Aligned Text Addon' />
225+
<FormLabel>Right Aligned Text Addon</FormLabel>
226226
<FormItem>
227227
<InputGroup compact inputType='number'
228228
inputValue={100} />
@@ -237,15 +237,15 @@ Compact mode:
237237
<Description>The Input with add-on supports icons.</Description>
238238
<DocsTile>
239239
<FormGroup>
240-
<FormLabel labelText='Search Input' />
240+
<FormLabel>Search Input</FormLabel>
241241
<FormItem>
242242
<InputGroup inputPlaceholder='Search Term' inputType='search' />
243243
</FormItem>
244244
</FormGroup>
245245
<br />
246246
<p>Compact mode</p>
247247
<FormGroup>
248-
<FormLabel labelText='Search Input' />
248+
<FormLabel>Search Input</FormLabel>
249249
<FormItem>
250250
<InputGroup
251251
compact
@@ -256,7 +256,7 @@ Compact mode:
256256
<br />
257257
<br />
258258
<FormGroup>
259-
<FormLabel labelText='Input with icon on the left' />
259+
<FormLabel>Input with icon on the left</FormLabel>
260260
<FormItem>
261261
<InputGroup
262262
addonPos='before'
@@ -268,7 +268,7 @@ Compact mode:
268268
<br />
269269
<p>Compact mode</p>
270270
<FormGroup>
271-
<FormLabel labelText='Input with icon on the left' />
271+
<FormLabel>Input with icon on the left</FormLabel>
272272
<FormItem>
273273
<InputGroup
274274
addonPos='before'
@@ -281,7 +281,7 @@ Compact mode:
281281
<br />
282282
<br />
283283
<FormGroup>
284-
<FormLabel labelText='Input with icon on the right' />
284+
<FormLabel>Input with icon on the right</FormLabel>
285285
<FormItem>
286286
<InputGroup
287287
addonPos='after'
@@ -293,7 +293,7 @@ Compact mode:
293293
<br />
294294
<p>Compact mode</p>
295295
<FormGroup>
296-
<FormLabel labelText='Input with icon on the right' />
296+
<FormLabel>Input with icon on the right</FormLabel>
297297
<FormItem>
298298
<InputGroup
299299
addonPos='after'
@@ -315,7 +315,7 @@ Compact mode:
315315
</Description>
316316
<DocsTile>
317317
<FormGroup>
318-
<FormLabel labelText='Input with text action' />
318+
<FormLabel>Input with text action</FormLabel>
319319
<FormItem>
320320
<InputGroup
321321
actions
@@ -329,7 +329,7 @@ Compact mode:
329329
<br />
330330
<p>Compact mode</p>
331331
<FormGroup>
332-
<FormLabel labelText='Input with text action' />
332+
<FormLabel>Input with text action</FormLabel>
333333
<FormItem>
334334
<InputGroup
335335
actions
@@ -344,7 +344,7 @@ Compact mode:
344344
<br />
345345
<br />
346346
<FormGroup>
347-
<FormLabel labelText='Input with icon text action' />
347+
<FormLabel>Input with icon text action</FormLabel>
348348
<FormItem>
349349
<InputGroup actions addonPos='after'
350350
inputType='text'>
@@ -355,7 +355,7 @@ Compact mode:
355355
<br />
356356
<p>Compact mode</p>
357357
<FormGroup>
358-
<FormLabel labelText='Input with icon text action' />
358+
<FormLabel>Input with icon text action</FormLabel>
359359
<FormItem>
360360
<InputGroup actions addonPos='after'
361361
compact inputType='text'>
@@ -1014,7 +1014,7 @@ Compact mode:
10141014
}
10151015
]}>
10161016
<FormGroup>
1017-
<FormLabel labelText='Input with text action' />
1017+
<FormLabel>Input with text action</FormLabel>
10181018
<FormItem>
10191019
<InputGroup
10201020
actions

‎src/InputGroup/InputGroup.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,21 @@ export class InputGroup extends Component {
5959

6060
render() {
6161
const {
62-
inputType,
62+
actions,
63+
addon,
64+
addonPos,
65+
children,
66+
compact,
67+
glyph,
6368
inputId,
6469
inputName,
6570
inputPlaceholder,
6671
inputProps,
72+
inputType,
6773
inputValue,
68-
numberUpButtonProps,
6974
numberDownButtonProps,
75+
numberUpButtonProps,
7076
searchButtonProps,
71-
addonPos,
72-
addon,
73-
glyph,
74-
actions,
75-
compact,
76-
children,
7777
...props
7878
} = this.props;
7979

‎src/_playground/documentation/Playground/Playground.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ export class Playground extends Component {
429429
case 'inputgroup':
430430
componentToGenerate = (
431431
<FormGroup>
432-
<FormLabel labelText='Input with text action' />
432+
<FormLabel>Input with text action</FormLabel>
433433
<FormItem>
434434
<InputGroup
435435
actions

0 commit comments

Comments
 (0)