Skip to content

docs: inject services with recommended API and use takeUntilDestroyed #31915

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
Oct 2, 2025
Merged

docs: inject services with recommended API and use takeUntilDestroyed #31915

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

import {
ChangeDetectionStrategy,
Component,
OnDestroy,
OnInit,
ViewEncapsulation,
inject,
} from '@angular/core';
import {ChangeDetectionStrategy, Component, ViewEncapsulation, inject} from '@angular/core';
import {StyleManager} from '../style-manager';
import {DocsSiteTheme, ThemeStorage} from './theme-storage/theme-storage';
import {MatIconButton} from '@angular/material/button';
import {MatIcon} from '@angular/material/icon';
import {MatMenu, MatMenuItem, MatMenuTrigger} from '@angular/material/menu';
import {MatTooltip} from '@angular/material/tooltip';
import {ActivatedRoute, ParamMap} from '@angular/router';
import {Subscription} from 'rxjs';
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
import {map} from 'rxjs/operators';
import {LiveAnnouncer} from '@angular/cdk/a11y';

Expand All @@ -33,13 +26,12 @@ import {LiveAnnouncer} from '@angular/cdk/a11y';
encapsulation: ViewEncapsulation.None,
imports: [MatIconButton, MatTooltip, MatMenu, MatMenuItem, MatMenuTrigger, MatIcon],
})
export class ThemePicker implements OnInit, OnDestroy {
styleManager = inject(StyleManager);
private _themeStorage = inject(ThemeStorage);
private _activatedRoute = inject(ActivatedRoute);
private _liveAnnouncer = inject(LiveAnnouncer);
export class ThemePicker {
readonly styleManager = inject(StyleManager);
private readonly _themeStorage = inject(ThemeStorage);
private readonly _activatedRoute = inject(ActivatedRoute);
private readonly _liveAnnouncer = inject(LiveAnnouncer);

private _queryParamSubscription = Subscription.EMPTY;
currentTheme: DocsSiteTheme | undefined;

// The below colors need to align with the themes defined in theme-picker.scss
Expand Down Expand Up @@ -72,6 +64,17 @@ export class ThemePicker implements OnInit, OnDestroy {
];

constructor() {
this._activatedRoute.queryParamMap
.pipe(
map((params: ParamMap) => params.get('theme')),
takeUntilDestroyed(),
)
.subscribe((themeName: string | null) => {
if (themeName) {
this.selectTheme(themeName);
}
});

const themeName = this._themeStorage.getStoredThemeName();
if (themeName) {
this.selectTheme(themeName);
Expand All @@ -84,20 +87,6 @@ export class ThemePicker implements OnInit, OnDestroy {
}
}

ngOnInit() {
this._queryParamSubscription = this._activatedRoute.queryParamMap
.pipe(map((params: ParamMap) => params.get('theme')))
.subscribe((themeName: string | null) => {
if (themeName) {
this.selectTheme(themeName);
}
});
}

ngOnDestroy() {
this._queryParamSubscription.unsubscribe();
}

selectTheme(themeName: string) {
const theme =
this.themes.find(currentTheme => currentTheme.name === themeName) ||
Expand Down
Loading