Skip to content

Error message does not take up space in form #613

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Error message does not take up space in form #613

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
e6628a6
Adding support for help text -> error text conversion
Apr 25, 2021
6a5e247
allocate built in space
May 7, 2021
b760def
lint and prettier
May 19, 2021
e4216f4
making spacing work for form elements with just error message
May 19, 2021
09f0920
cleaning up unused styles
May 20, 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
9 changes: 8 additions & 1 deletion src/Components/Form/Form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
display: flex;
flex-direction: column;
align-items: stretch;
margin-bottom: $cf-marg-b;
margin-bottom: $cf-marg-a;
}

/*
Expand All @@ -36,6 +36,12 @@
@extend %no-user-select;
}

.cf-form--element-error-container {
position: relative;
height: 20px;
width: 100%;
}

.cf-form--label {
width: 100%;
color: $cf-label--default;
Expand All @@ -60,6 +66,7 @@
}

.cf-form--element-error {
position: absolute;
line-height: 16px;
color: $c-dreamsicle;
margin: $cf-marg-a 0 0 0;
Expand Down
16 changes: 9 additions & 7 deletions src/Components/Form/FormElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ export const FormElement = forwardRef<FormElementRef, FormElementProps>(
</FormLabel>
)}
{children}
{!!errorMessage && (
<FormElementError
testID={errorMessageTestId}
message={errorMessage}
/>
)}
{!!helpText && <FormHelpText text={helpText} />}
<div className="cf-form--element-error-container">
{!!errorMessage && (
<FormElementError
testID={errorMessageTestId}
message={errorMessage}
/>
)}
{!!helpText && !errorMessage && <FormHelpText text={helpText} />}
</div>
</>
)

Expand Down
6 changes: 4 additions & 2 deletions src/Components/Form/FormValidationElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ export const FormValidationElement = forwardRef<
</FormLabel>
)}
{children(status)}
{!!errorMessage && <FormElementError message={errorMessage} />}
{!!helpText && <FormHelpText text={helpText} />}
<div className="cf-form--element-error-container">
{!!errorMessage && <FormElementError message={errorMessage} />}
{!!helpText && !errorMessage && <FormHelpText text={helpText} />}
</div>
</label>
)
}
Expand Down