Skip to content

fix(material/datepicker): prevent calendar from stealing away focus #31128

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 1 commit into from
May 15, 2025
Merged

fix(material/datepicker): prevent calendar from stealing away focus #31128

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
12 changes: 9 additions & 3 deletions src/material/datepicker/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
EventEmitter,
Input,
OnChanges,
Expand Down Expand Up @@ -41,6 +42,7 @@ import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-select
import {MatIconButton, MatButton} from '../button';
import {_IdGenerator, CdkMonitorFocus} from '@angular/cdk/a11y';
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
import {_getFocusedElementPierceShadowDom} from '@angular/cdk/platform';

/**
* Possible views for the calendar.
Expand Down Expand Up @@ -241,6 +243,7 @@ export class MatCalendar<D> implements AfterContentInit, AfterViewChecked, OnDes
private _dateAdapter = inject<DateAdapter<D>>(DateAdapter, {optional: true})!;
private _dateFormats = inject<MatDateFormats>(MAT_DATE_FORMATS, {optional: true});
private _changeDetectorRef = inject(ChangeDetectorRef);
private _elementRef = inject<ElementRef<HTMLElement>>(ElementRef);

/** An input indicating the type of the header component, if set. */
@Input() headerComponent: ComponentType<any>;
Expand Down Expand Up @@ -457,9 +460,12 @@ export class MatCalendar<D> implements AfterContentInit, AfterViewChecked, OnDes
const view = this._getCurrentViewComponent();

if (view) {
// Schedule focus to be moved to the active date since re-rendering
// can blur the active cell. See #29265.
this._moveFocusOnNextTick = true;
// Schedule focus to be moved to the active date since re-rendering can blur the active
// cell (see #29265), however don't do so if focus is outside of the calendar, because it
// can steal away the user's attention (see #30635).
if (this._elementRef.nativeElement.contains(_getFocusedElementPierceShadowDom())) {
this._moveFocusOnNextTick = true;
}

// We need to `detectChanges` manually here, because the `minDate`, `maxDate` etc. are
// passed down to the view via data bindings which won't be up-to-date when we call `_init`.
Expand Down
Loading