♻️(react) make Input use LabelledBox

Let's use the power of reusability!
This commit is contained in:
Nathan Vasse
2023-05-05 16:03:49 +02:00
committed by NathanVss
parent df57fb8a57
commit 270484c0e7
2 changed files with 32 additions and 45 deletions

View File

@@ -1,5 +1,4 @@
.c__input__wrapper { .c__input__wrapper {
border-radius: var(--c--components--forms-input--border-radius); border-radius: var(--c--components--forms-input--border-radius);
border-width: var(--c--components--forms-input--border-width); border-width: var(--c--components--forms-input--border-width);
border-color: var(--c--components--forms-input--border-color); border-color: var(--c--components--forms-input--border-color);
@@ -19,18 +18,10 @@
font-weight: var(--c--components--forms-input--font-weight); font-weight: var(--c--components--forms-input--font-weight);
} }
.c__input__inner {
position: relative;
flex-grow: 1;
display: flex;
height: 100%;
.c__input { .c__input {
box-sizing: border-box; box-sizing: border-box;
outline: 0; outline: 0;
border: none; border: none;
padding: 1rem 0 0 0;
color: var(--c--theme--colors--greyscale-800); color: var(--c--theme--colors--greyscale-800);
flex-grow: 1; flex-grow: 1;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -59,7 +50,6 @@
top: 18px; top: 18px;
} }
} }
}
&:hover { &:hover {
border-radius: var(--c--components--forms-input--border-radius--hover); border-radius: var(--c--components--forms-input--border-radius--hover);

View File

@@ -10,6 +10,7 @@ import React, {
import classNames from "classnames"; import classNames from "classnames";
import { randomString } from ":/utils"; import { randomString } from ":/utils";
import { Field, FieldProps } from ":/components/Forms/Field"; import { Field, FieldProps } from ":/components/Forms/Field";
import { LabelledBox } from ":/components/Forms/LabelledBox";
export interface InputRefType { export interface InputRefType {
input: HTMLInputElement | null; input: HTMLInputElement | null;
@@ -106,7 +107,11 @@ export const Input = forwardRef<InputRefType, Props>(
}} }}
> >
{!!icon && icon} {!!icon && icon}
<div className="c__input__inner"> <LabelledBox
label={label}
htmlFor={idToUse.current}
labelAsPlaceholder={labelAsPlaceholder}
>
<input <input
type="text" type="text"
className={classes.join(" ")} className={classes.join(" ")}
@@ -127,15 +132,7 @@ export const Input = forwardRef<InputRefType, Props>(
}} }}
ref={inputRef} ref={inputRef}
/> />
{label && ( </LabelledBox>
<label
className={labelAsPlaceholder ? "placeholder" : ""}
htmlFor={idToUse.current}
>
{label}
</label>
)}
</div>
{!!rightIcon && rightIcon} {!!rightIcon && rightIcon}
</div> </div>
</Field> </Field>