Skip to content

refactor(material/sidenav): Remove use of focusInitialElementWhenReady #28683

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
mmalerba merged 2 commits into from
Mar 18, 2024
Merged

refactor(material/sidenav): Remove use of focusInitialElementWhenReady #28683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b450c54
refactor(material/sidenav): Remove use of focusInitialElementWhenReady
mmalerba Mar 4, 2024
c897b44
fix(material/sidenav): fix view already destroyed error
mmalerba Mar 17, 2024
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
4 changes: 4 additions & 0 deletions src/material/autocomplete/autocomplete.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,6 +2546,10 @@ describe('MDC-based MatAutocomplete', () => {
fixture.detectChanges();
await new Promise(r => setTimeout(r));
fixture.detectChanges();
await new Promise(r => setTimeout(r));
fixture.detectChanges();
await new Promise(r => setTimeout(r));
fixture.detectChanges();
};

await flushPosition();
Expand Down
19 changes: 12 additions & 7 deletions src/material/sidenav/drawer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ export class MatDrawer implements AfterViewInit, AfterContentChecked, OnDestroy
*/
readonly _modeChanged = new Subject<void>();

private _injector = inject(Injector);

constructor(
private _elementRef: ElementRef<HTMLElement>,
private _focusTrapFactory: FocusTrapFactory,
Expand All @@ -331,12 +333,11 @@ export class MatDrawer implements AfterViewInit, AfterContentChecked, OnDestroy
@Optional() @Inject(DOCUMENT) private _doc: any,
@Optional() @Inject(MAT_DRAWER_CONTAINER) public _container?: MatDrawerContainer,
) {
this.openedChange.subscribe((opened: boolean) => {
this.openedChange.pipe(takeUntil(this._destroyed)).subscribe((opened: boolean) => {
if (opened) {
if (this._doc) {
this._elementFocusedBeforeDrawerWasOpened = this._doc.activeElement as HTMLElement;
}

this._takeFocus();
} else if (this._isFocusWithinDrawer()) {
this._restoreFocus(this._openedVia || 'program');
Expand Down Expand Up @@ -441,11 +442,15 @@ export class MatDrawer implements AfterViewInit, AfterContentChecked, OnDestroy
return;
case true:
case 'first-tabbable':
this._focusTrap.focusInitialElementWhenReady().then(hasMovedFocus => {
if (!hasMovedFocus && typeof this._elementRef.nativeElement.focus === 'function') {
element.focus();
}
});
afterNextRender(
() => {
const hasMovedFocus = this._focusTrap!.focusInitialElement();
if (!hasMovedFocus && typeof element.focus === 'function') {
element.focus();
}
},
{injector: this._injector},
);
break;
case 'first-heading':
this._focusByCssSelector('h1, h2, h3, h4, h5, h6, [role="heading"]');
Expand Down