Skip to content

Commit a77d2ea

Browse files
committed
Use single wrapper with aria-live
1 parent dbbf210 commit a77d2ea

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

src/material/form-field/form-field.html

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,23 @@
101101
>
102102
@let subscriptMessageType = _getSubscriptMessageType();
103103

104-
<div aria-atomic="true" aria-live="polite">
105-
@if (subscriptMessageType === 'error') {
106-
<div class="mat-mdc-form-field-error-wrapper">
107-
<ng-content select="mat-error, [matError]"></ng-content>
108-
</div>
109-
}
110-
</div>
104+
<div aria-atomic="true" aria-live="polite"
105+
[class.mat-mdc-form-field-error-wrapper]="subscriptMessageType === 'error'"
106+
[class.mat-mdc-form-field-hint-wrapper]="subscriptMessageType === 'hint'"
107+
>
108+
@switch (subscriptMessageType) {
109+
@case ('error') {
110+
<ng-content select="mat-error, [matError]"></ng-content>
111+
}
111112

112-
<div aria-atomic="true" aria-live="polite">
113-
@if (subscriptMessageType === 'hint') {
114-
<div class="mat-mdc-form-field-hint-wrapper">
115-
@if (hintLabel) {
116-
<mat-hint [id]="_hintLabelId">{{hintLabel}}</mat-hint>
117-
}
118-
<ng-content select="mat-hint:not([align='end'])"></ng-content>
119-
<div class="mat-mdc-form-field-hint-spacer"></div>
120-
<ng-content select="mat-hint[align='end']"></ng-content>
121-
</div>
113+
@case ('hint') {
114+
@if (hintLabel) {
115+
<mat-hint [id]="_hintLabelId">{{hintLabel}}</mat-hint>
116+
}
117+
<ng-content select="mat-hint:not([align='end'])"></ng-content>
118+
<div class="mat-mdc-form-field-hint-spacer"></div>
119+
<ng-content select="mat-hint[align='end']"></ng-content>
120+
}
122121
}
123122
</div>
124123
</div>

0 commit comments

Comments
 (0)