Skip to content

docs: use takeUntilDestroyed for cleanup instead of manual subscripti… #32027

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

docs: use takeUntilDestroyed for cleanup instead of manual subscripti… #32027

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
37 changes: 15 additions & 22 deletions docs/src/app/shared/navigation-focus/navigation-focus.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
* found in the LICENSE file at https://angular.dev/license
*/

import {Injectable, OnDestroy, inject} from '@angular/core';
import {Injectable, inject} from '@angular/core';
import {Event, NavigationEnd, Router} from '@angular/router';
import {filter, skip} from 'rxjs/operators';
import {Subscription} from 'rxjs';
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';

@Injectable({
providedIn: 'root',
})
export class NavigationFocusService implements OnDestroy {
export class NavigationFocusService {
private _router = inject(Router);
private _subscriptions = new Subscription();
private _navigationFocusRequests: HTMLElement[] = [];
private _skipLinkFocusRequests: HTMLElement[] = [];
private _skipLinkHref: string | null | undefined;
Expand All @@ -27,24 +26,18 @@ export class NavigationFocusService implements OnDestroy {
readonly softNavigations = this.navigationEndEvents.pipe(skip(1));

constructor() {
this._subscriptions.add(
this.softNavigations.subscribe(() => {
// focus if url does not have fragment
if (!this._router.url.split('#')[1]) {
setTimeout(() => {
if (this._navigationFocusRequests.length) {
this._navigationFocusRequests[this._navigationFocusRequests.length - 1].focus({
preventScroll: true,
});
}
}, 100);
}
}),
);
}

ngOnDestroy() {
this._subscriptions.unsubscribe();
this.softNavigations.pipe(takeUntilDestroyed()).subscribe(() => {
// focus if url does not have fragment
if (!this._router.url.split('#')[1]) {
setTimeout(() => {
if (this._navigationFocusRequests.length) {
this._navigationFocusRequests[this._navigationFocusRequests.length - 1].focus({
preventScroll: true,
});
}
}, 100);
}
});
}

requestFocusOnNavigation(el: HTMLElement) {
Expand Down
Loading