Skip to content

fix(material/datepicker): add aria labels to <input/>s for Start/En… #24949

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

Closed
wants to merge 1 commit into from
Closed

fix(material/datepicker): add aria labels to <input/>s for Start/En… #24949

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
10 changes: 6 additions & 4 deletions src/material/datepicker/date-range-input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
class="mat-date-range-input-container"
cdkMonitorSubtreeFocus
(cdkFocusChange)="_updateFocus($event)">
<div class="mat-date-range-input-start-wrapper">
<label class="mat-date-range-input-start-wrapper">
<ng-content select="input[matStartDate]"></ng-content>
<span
class="mat-date-range-input-mirror"
aria-hidden="true">{{_getInputMirrorValue()}}</span>
</div>
<span class="cdk-visually-hidden">{{_getStartDateLabel()}}</span>
</label>

<span
class="mat-date-range-input-separator"
[class.mat-date-range-input-separator-hidden]="_shouldHideSeparator()">{{separator}}</span>

<div class="mat-date-range-input-end-wrapper">
<label class="mat-date-range-input-end-wrapper">
<ng-content select="input[matEndDate]"></ng-content>
</div>
<span class="cdk-visually-hidden">{{_getEndDateLabel()}}</span>
</label>
</div>

4 changes: 2 additions & 2 deletions src/material/datepicker/date-range-input.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ describe('MatDateRangeInput', () => {
it('should point the label aria-owns to the id of the start input', () => {
const fixture = createComponent(StandardRangePicker);
fixture.detectChanges();
const label = fixture.nativeElement.querySelector('label');
const label = fixture.nativeElement.querySelector('label.mat-form-field-label');
const start = fixture.componentInstance.start.nativeElement;

expect(start.id).toBeTruthy();
Expand All @@ -170,7 +170,7 @@ describe('MatDateRangeInput', () => {
it('should point the range input aria-labelledby to the form field label', () => {
const fixture = createComponent(StandardRangePicker);
fixture.detectChanges();
const labelId = fixture.nativeElement.querySelector('label').id;
const labelId = fixture.nativeElement.querySelector('label.mat-form-field-label').id;
const rangeInput = fixture.nativeElement.querySelector('.mat-date-range-input');

expect(labelId).toBeTruthy();
Expand Down
17 changes: 16 additions & 1 deletion src/material/datepicker/date-range-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
Inject,
OnChanges,
SimpleChanges,
inject,
InjectFlags,
} from '@angular/core';
import {MatFormFieldControl, MatFormField, MAT_FORM_FIELD} from '@angular/material/form-field';
import {ThemePalette, DateAdapter} from '@angular/material/core';
Expand All @@ -39,6 +41,7 @@ import {createMissingDateImplError} from './datepicker-errors';
import {DateFilterFn, dateInputsHaveChanged} from './datepicker-input-base';
import {MatDateRangePickerInput} from './date-range-picker';
import {DateRange, MatDateSelectionModel} from './date-selection-model';
import {MatDatepickerIntl} from './datepicker-intl';

let nextUniqueId = 0;

Expand Down Expand Up @@ -137,6 +140,8 @@ export class MatDateRangeInput<D>
}
private _required: boolean;

private readonly _intl = inject(MatDatepickerIntl, InjectFlags.Optional);

/** Function that can be used to filter out dates within the date range picker. */
@Input()
get dateFilter() {
Expand Down Expand Up @@ -380,7 +385,7 @@ export class MatDateRangeInput<D>
);
}

/** Gets the value for the `aria-labelledby` attribute of the inputs. */
/** Gets the value for the `aria-labelledby` attribute of the group. */
_getAriaLabelledby() {
const formField = this._formField;
return formField && formField._hasFloatingLabel() ? formField._labelId : null;
Expand All @@ -392,6 +397,16 @@ export class MatDateRangeInput<D>
this.stateChanges.next();
}

/** Gets the value for the aria label for the start date input. */
_getStartDateLabel(): string | null {
return this._intl ? this._intl.startDateLabel : null;
}

/** Gets the value for the aria label for the end date input. */
_getEndDateLabel(): string | null {
return this._intl ? this._intl.endDateLabel : null;
}

/** Re-runs the validators on the start/end inputs. */
private _revalidate() {
if (this._startInput) {
Expand Down
2 changes: 2 additions & 0 deletions tools/public_api_guard/material/datepicker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,10 @@ export class MatDateRangeInput<D> implements MatFormFieldControl<DateRange<D>>,
focused: boolean;
_getAriaLabelledby(): string | null;
getConnectedOverlayOrigin(): ElementRef;
_getEndDateLabel(): string | null;
_getInputMirrorValue(): string;
getOverlayLabelId(): string | null;
_getStartDateLabel(): string | null;
getStartValue(): D | null;
getThemePalette(): ThemePalette;
// (undocumented)
Expand Down