Skip to content

fix: make border configurable in form field #1311

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
merged 2 commits into from
Dec 8, 2021
Merged

fix: make border configurable in form field #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3962c
fix: make border configurable in form field
anandtiwary Dec 7, 2021
a3708d7
Merge branch 'main' into fix-form-field-border
anandtiwary Dec 8, 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
8 changes: 5 additions & 3 deletions projects/components/src/form-field/form-field.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@
.content {
flex: 1 1 auto;
width: 100%;
border: 1px solid $gray-2;
border-radius: 6px;
width: 100%;
background: white;

&.show-border {
border: 1px solid $gray-2;
border-radius: 6px;
}

&.error-border {
border: 1px solid $red-3;
}
Expand Down
13 changes: 10 additions & 3 deletions projects/components/src/form-field/form-field.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ describe('Form Field Component', () => {
}
}
);

expect(spectator.query('.content')).not.toHaveClass(['show-border', 'error-border']);
expect(spectator.query('.content')).toExist();

const labels = spectator.queryAll(LabelComponent);
expect(labels[0].label).toEqual('Label');
expect(labels[1].label).toEqual('Error message');
Expand Down Expand Up @@ -55,19 +59,21 @@ describe('Form Field Component', () => {
expect(labels[1].label).toEqual('(Optional)');
});

test('should show error when showFormError and errorLabel is present', () => {
test('should show error when showFormError, errorLabel and showBorder is present', () => {
const spectator = hostFactory(
`
<ht-form-field [label]="label" [showFormError]="showFormError" [errorLabel]="errorLabel">
<ht-form-field [label]="label" [showFormError]="showFormError" [errorLabel]="errorLabel" [showBorder]="showBorder">
</ht-form-field>`,
{
hostProps: {
label: 'Label',
errorLabel: 'Invalid Form element',
showFormError: true
showFormError: true,
showBorder: true
}
}
);
expect(spectator.query('.content')).toHaveClass(['content', 'show-border', 'error-border']);

expect(spectator.query('.error')).toExist();

Expand All @@ -81,5 +87,6 @@ describe('Form Field Component', () => {
});

expect(spectator.query('.error')).not.toExist();
expect(spectator.query('.content')).toHaveClass(['show-border']);
});
});
11 changes: 10 additions & 1 deletion projects/components/src/form-field/form-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ import { IconSize } from '../icon/icon-size';
[htTooltip]="this.iconTooltip"
></ht-icon>
</div>
<div class="content" [ngClass]="{ 'error-border': this.showFormError && this.errorLabel }">
<div
class="content"
[ngClass]="{
'show-border': this.showBorder,
'error-border': this.showFormError && this.errorLabel
}"
>
<ng-content></ng-content>
</div>
<!-- For Backward Compatibility: Start -->
Expand Down Expand Up @@ -56,6 +62,9 @@ export class FormFieldComponent {
@Input()
public errorLabel?: string = '';

@Input()
public showBorder: boolean = false;

@Input()
public showFormError?: boolean = true;
}