Skip to content

Make labels optional for text inputs #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
100stacks merged 5 commits into from
Apr 15, 2021
Merged

Make labels optional for text inputs #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3021c5d
Make labels optional on text-like inputs
nicko-winner Feb 2, 2021
2ee122b
make it pretty
nicko-winner Feb 2, 2021
ff5b7a7
simplify code
nicko-winner Mar 16, 2021
6a008d7
Merge remote-tracking branch 'origin/master' into make-labels-optional
nicko-winner Mar 16, 2021
a483ca5
only show labels if they exist
nicko-winner Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/PasswordText/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ const Password = React.forwardRef(
ref={ref}
>
<input {...rest} id={id} required={required} placeholder={placeholder} type="password" />
<label
className={classnames({
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
{label && (
<label
className={classnames({
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
)}
{children}
</hx-password-control>
);
Expand Down
20 changes: 11 additions & 9 deletions src/Text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ const Text = React.forwardRef(
ref={ref}
>
<input {...rest} id={id} required={required} type="text" />
<label
className={classnames({
hxOptional: optional,
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
{label && (
<label
className={classnames({
hxOptional: optional,
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
)}
{prefix && <span className="hxPrefix">{prefix}</span>}
{suffix && <span className="hxSuffix">{suffix}</span>}
{children}
Expand Down
20 changes: 11 additions & 9 deletions src/TextArea/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ const TextArea = React.forwardRef(
ref={ref}
>
<textarea {...rest} id={id} required={required} disabled={disabled} />
<label
className={classnames({
hxOptional: optional,
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
{label && (
<label
className={classnames({
hxOptional: optional,
hxRequired: required,
})}
htmlFor={id}
>
{label}
</label>
)}
{children}
</hx-textarea-control>
);
Expand Down