Skip to content

feat(field-aria-attributes): integrate FormField host directive via directive composition API #17

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
d-koppenhagen wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(field-aria-attributes): integrate FormField host directive via directive composition API #17

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
13 changes: 8 additions & 5 deletions src/app/field-aria-attributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
import { computed, Directive, input } from '@angular/core';
import { FieldTree } from '@angular/forms/signals';
import { FieldTree, FormField } from '@angular/forms/signals';

@Directive({
selector: '[formFieldAria]',
selector: '[formField]',
host: {
'[aria-invalid]': 'ariaInvalid()',
'[aria-busy]': 'ariaBusy()',
'[aria-describedby]': 'ariaDescribedBy()',
'[aria-errormessage]': 'ariaErrorMessage()',
},
hostDirectives: [
{ directive: FormField, inputs: ['formField'] }
]
})
export class FieldAriaAttributes<T> {
readonly formFieldAria = input.required<FieldTree<T>>();
readonly formField = input.required<FieldTree<T>>();
readonly fieldDescriptionId = input<string>();

readonly ariaInvalid = computed(() => {
const state = this.formFieldAria()();
const state = this.formField()();
return state.touched() && !state.pending() ? state.errors().length > 0 : undefined;
});
readonly ariaBusy = computed(() => {
const state = this.formFieldAria()();
const state = this.formField()();
return state.pending();
});
readonly ariaDescribedBy = computed(() => {
Expand Down
9 changes: 1 addition & 8 deletions src/app/registration-form-4/registration-form-4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
id="myField"
fieldDescriptionId="username-info"
[formField]="registrationForm.username"
[formFieldAria]="registrationForm.username"
/>
<app-form-field-info id="username-info" [fieldRef]="registrationForm.username" />
</label>
Expand All @@ -30,7 +29,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
type="number"
fieldDescriptionId="age-info"
[formField]="registrationForm.age"
[formFieldAria]="registrationForm.age"
/>
<app-form-field-info id="age-info" [fieldRef]="registrationForm.age" />
</label>
Expand All @@ -44,7 +42,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
autocomplete
fieldDescriptionId="pw1-info"
[formField]="registrationForm.password.pw1"
[formFieldAria]="registrationForm.password.pw1"
/>
<app-form-field-info id="pw-info pw1-info" [fieldRef]="registrationForm.password.pw1" />
</label>
Expand All @@ -55,7 +52,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
autocomplete
fieldDescriptionId="pw2-info"
[formField]="registrationForm.password.pw2"
[formFieldAria]="registrationForm.password.pw2"
/>
<app-form-field-info id="pw-info pw2-info" [fieldRef]="registrationForm.password.pw2" />
</label>
Expand All @@ -74,7 +70,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
type="email"
[fieldDescriptionId]="`email-info email${$index}-info`"
[formField]="emailField"
[formFieldAria]="emailField"
[aria-label]="'E-mail ' + $index"
/>
<button type="button" (click)="removeEmail($index)">-</button>
Expand All @@ -87,12 +82,11 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
</fieldset>
<label
>Subscribe to Newsletter?
<input type="checkbox" [formField]="registrationForm.newsletter" [formFieldAria]="registrationForm.newsletter" />
<input type="checkbox" [formField]="registrationForm.newsletter" />
</label>
<app-multiselect
fieldDescriptionId="newsletter-topics-info"
[formField]="registrationForm.newsletterTopics"
[formFieldAria]="registrationForm.newsletterTopics"
[selectOptions]="['Angular', 'React', 'Vue', 'Svelte']"
label="Topics (multiple possible):"
/>
Expand All @@ -103,7 +97,6 @@ <h1>Version 4: Metadata and Accessibility Handling</h1>
type="checkbox"
fieldDescriptionId="agree-info"
[formField]="registrationForm.agreeToTermsAndConditions"
[formFieldAria]="registrationForm.agreeToTermsAndConditions"
/>
</label>
<app-form-field-info id="agree-info" [fieldRef]="registrationForm.agreeToTermsAndConditions" />
Expand Down
2 changes: 0 additions & 2 deletions src/app/registration-form-4/registration-form-4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
debounce,
disabled,
email,
FormField,
form,
maxLength,
metadata,
Expand Down Expand Up @@ -168,7 +167,6 @@ export const formSchema = schema<RegisterFormData>((path) => {
selector: 'app-registration-form-4',
imports: [
BackButton,
FormField,
DebugOutput,
FormFieldInfo,
IdentityForm,
Expand Down