Skip to content

fix(forms): always require a label in si-form-item #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

Draft
spike-rabbit wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(forms): always require a label in si-form-item #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 19 additions & 21 deletions projects/element-ng/form/si-form-item/si-form-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,25 @@
}

<ng-template #labelTemplate>
@if (label()) {
@let labeledBy = formItemLabelledBy;
@if (labeledBy) {
<span
class="text-break"
[id]="labeledBy"
[class.form-label]="!fieldControl()?.isFormCheck"
[class.form-check-label]="fieldControl()?.isFormCheck"
[class.required]="required() && !this.fieldset?.hasOnlyRadios()"
>{{ label()! | translate }}</span
>
} @else {
<label
class="text-break"
[for]="formItemId"
[class.form-label]="!fieldControl()?.isFormCheck"
[class.form-check-label]="fieldControl()?.isFormCheck"
[class.required]="required() && !this.fieldset?.hasOnlyRadios()"
>{{ label()! | translate }}</label
>
}
@let labeledBy = formItemLabelledBy;
@if (labeledBy) {
<span
class="text-break"
[id]="labeledBy"
[class.form-label]="!fieldControl()?.isFormCheck"
[class.form-check-label]="fieldControl()?.isFormCheck"
[class.required]="required() && !this.fieldset?.hasOnlyRadios()"
>{{ label()! | translate }}</span
>
} @else {
<label
class="text-break"
[for]="formItemId"
[class.form-label]="!fieldControl()?.isFormCheck"
[class.form-check-label]="fieldControl()?.isFormCheck"
[class.required]="required() && !this.fieldset?.hasOnlyRadios()"
>{{ label()! | translate }}</label
>
}
</ng-template>
<ng-template #feedbackTemplate>
Expand Down
77 changes: 0 additions & 77 deletions projects/element-ng/form/si-form-item/si-form-item.component.spec.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions projects/element-ng/form/si-form-item/si-form-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
ValidationErrors,
ValidatorFn
} from '@angular/forms';
import { SiTranslatePipe } from '@siemens/element-translate-ng/translate';
import { SiTranslatePipe, TranslatableString } from '@siemens/element-translate-ng/translate';

import { SiFormFieldsetComponent } from '../form-fieldset/si-form-fieldset.component';
import { SiFormContainerComponent } from '../si-form-container/si-form-container.component';
Expand Down Expand Up @@ -65,7 +65,7 @@ export class SiFormItemComponent
* The label to be displayed in the form item.
* It will be translated if a translation key is available.
*/
readonly label = input<string | null>();
readonly label = input.required<TranslatableString>();

/**
* A custom width value to be applied to the label.
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/formly/wrapper/si-formly-wrapper.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<si-form-item
[class.ms-n8]="field.type === 'checkbox'"
[label]="label"
[label]="props.label ?? ''"
[labelWidth]="labelWidth"
[required]="props.required"
>
Expand Down
4 changes: 0 additions & 4 deletions projects/element-ng/formly/wrapper/si-formly-wrapper.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import { SiFormlyFormFieldProviderDirective } from './si-formly-form-field-provi
templateUrl: './si-formly-wrapper.component.html'
})
export class SiFormlyWrapperComponent extends FieldWrapper {
protected get label(): string | undefined {
return this.props.label && this.props.hideLabel !== true ? this.props.label : undefined;
}

protected get labelWidth(): number | undefined {
return this.props.labelWidth;
}
Expand Down
7 changes: 0 additions & 7 deletions src/app/examples/si-formly/si-dynamic-form-fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Button function handler',
clickListener: (a: string, b: string) => {
alert(
Expand All @@ -461,7 +460,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Button expression handler',
clickListener: 'formState.btnClicked',
clickArgs: ['1st', 23]
Expand All @@ -472,7 +470,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Primary',
clickListener: 'formState.btnClicked',
clickArgs: ['primary', 23],
Expand All @@ -484,7 +481,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Secondary (Default)',
clickListener: 'formState.btnClicked',
clickArgs: ['secondary', 23],
Expand All @@ -496,7 +492,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Tertiary',
clickListener: 'formState.btnClicked',
clickArgs: ['tertiary', 23],
Expand All @@ -508,7 +503,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Warning',
clickListener: 'formState.btnClicked',
clickArgs: ['warning', 23],
Expand All @@ -520,7 +514,6 @@ export class SampleComponent {
type: 'button',
className: 'd-block mb-4',
props: {
hideLabel: true, // Hide wrapper label
label: 'Danger',
clickListener: 'formState.btnClicked',
clickArgs: ['danger', 23],
Expand Down
Loading