Skip to content

Commit fb4c256

Browse files
committed
fix labels
1 parent 760294e commit fb4c256

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

demo/site/src/common/components/form/CheckboxField.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ interface CheckboxFieldProps {
77
export function CheckboxField({ label, helperText }: CheckboxFieldProps): React.ReactElement {
88
return (
99
<div>
10-
<div>
11-
<input type="checkbox" />
12-
{label}
13-
</div>
10+
<input type="checkbox" />
11+
<label>{label}</label>
1412
{helperText && <div>{helperText}</div>}
1513
</div>
1614
);

demo/site/src/common/components/form/InputField.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { FormattedMessage } from "react-intl";
2+
13
interface InputProps {
24
label: React.ReactNode;
35
required?: boolean;
@@ -9,10 +11,14 @@ interface InputProps {
911
export function InputField({ label, required = false, placeholder, helperText, textArea = false }: InputProps): React.ReactElement {
1012
return (
1113
<div>
12-
<div>
14+
<label>
1315
{label}
14-
{!required && <span>(optional)</span>}
15-
</div>
16+
{!required && (
17+
<span>
18+
<FormattedMessage id="inputField.optional" defaultMessage="(optional)" />
19+
</span>
20+
)}
21+
</label>
1622
{textArea ? <textarea required={required} placeholder={placeholder} /> : <input required={required} placeholder={placeholder} />}
1723
{helperText && <div>{helperText}</div>}
1824
</div>

demo/site/src/common/components/form/SelectField.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { SvgUse } from "@src/common/helpers/SvgUse";
22
import { useState } from "react";
3+
import { FormattedMessage } from "react-intl";
34

45
interface SelectFieldProps {
56
label: React.ReactNode;
@@ -35,10 +36,14 @@ export function SelectField({
3536

3637
return (
3738
<div>
38-
<div>
39+
<label>
3940
{label}
40-
{!required && <span>(optional)</span>}
41-
</div>
41+
{!required && (
42+
<span>
43+
<FormattedMessage id="inputField.optional" defaultMessage="(optional)" />
44+
</span>
45+
)}
46+
</label>
4247
<div>
4348
<button type="button" onClick={handleToggle}>
4449
<span>{selectedOption?.label || placeholder}</span>

0 commit comments

Comments
 (0)