Skip to content
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

fix(transloco-locale): complete subject when root injector is destroyed #834

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(transloco-locale): complete subject when root injector is destroyed #834

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: 20 additions & 17 deletions libs/transloco-locale/src/lib/transloco-locale.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { inject, Injectable, OnDestroy } from '@angular/core';
import { DestroyRef, inject, Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
import { BehaviorSubject, Subscription } from 'rxjs';
import { BehaviorSubject } from 'rxjs';
import { distinctUntilChanged, filter, map } from 'rxjs/operators';

import { isLocaleFormat, toDate } from './helpers';
Expand All @@ -27,7 +27,7 @@ import {
@Injectable({
providedIn: 'root',
})
export class TranslocoLocaleService implements OnDestroy {
export class TranslocoLocaleService {
private translocoService = inject(TranslocoService);
private langLocaleMapping = inject(TRANSLOCO_LOCALE_LANG_MAPPING);
private defaultLocale = inject(TRANSLOCO_LOCALE_DEFAULT_LOCALE);
Expand All @@ -39,16 +39,26 @@ export class TranslocoLocaleService implements OnDestroy {

private _locale =
this.defaultLocale || this.toLocale(this.translocoService.getActiveLang());
private locale: BehaviorSubject<Locale> = new BehaviorSubject(this._locale);
private subscription: Subscription | null = this.translocoService.langChanges$
.pipe(
map((lang) => this.toLocale(lang)),
filter(Boolean),
)
.subscribe((locale: Locale) => this.setLocale(locale));
private locale = new BehaviorSubject<Locale>(this._locale);

localeChanges$ = this.locale.asObservable().pipe(distinctUntilChanged());

constructor() {
inject(DestroyRef).onDestroy(() => {
// Complete subjects to release observers if users forget to unsubscribe manually.
// This is important in server-side rendering.
this.locale.complete();
});

this.translocoService.langChanges$
.pipe(
map((lang) => this.toLocale(lang)),
filter(Boolean),
)
// Note: No need to unsubscribe because `lang` is completed by the `TranslocoService`.
.subscribe((locale: Locale) => this.setLocale(locale));
}

getLocale() {
return this._locale;
}
Expand Down Expand Up @@ -143,13 +153,6 @@ export class TranslocoLocaleService implements OnDestroy {
return this.localeCurrencyMapping[locale] || this.defaultCurrency;
}

ngOnDestroy() {
this.subscription?.unsubscribe();
// Caretaker note: it's important to clean up references to subscriptions since they save the `next`
// callback within its `destination` property, preventing classes from being GC'd.
this.subscription = null;
}

private toLocale(val: string | Locale): Locale {
if (this.langLocaleMapping[val]) {
return this.langLocaleMapping[val];
Expand Down