Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-13 19:51:37 +01:00
Code Issues Projects Releases Wiki Activity

[PM-7809] Fix memory leak in AngularThemingService for Safari extension (#9434)

Browse Source 
* [PM-7809] Fix memory leak in AngularThemingService for Safari

* Use getSystemThemeFromWindow in createSystemThemeFromWindow
This commit is contained in:
Daniel García 2024-06-28 21:58:15 +02:00 committed by GitHub
parent 4e3fb99b9f
commit 3c7663a965
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/browser/src/popup/services/services.module.ts
View File

@ -1,6 +1,6 @@
import { APP_INITIALIZER, NgModule, NgZone } from "@angular/core";
import { Router } from "@angular/router";
import { Subject, merge } from "rxjs";
import { Subject, merge, of } from "rxjs";
import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards";
import { AngularThemingService } from "@bitwarden/angular/platform/services/theming/angular-theming.service";
@ -485,14 +485,15 @@ const safeProviders: SafeProvider[] = [
provide: SYSTEM_THEME_OBSERVABLE,
useFactory: (platformUtilsService: PlatformUtilsService) => {
// Safari doesn't properly handle the (prefers-color-scheme) media query in the popup window, it always returns light.
// In Safari, we have to use the background page instead, which comes with limitations like not dynamically changing the extension theme when the system theme is changed.
let windowContext = window;
// This means we have to use the background page instead, which comes with limitations like not dynamically
// changing the extension theme when the system theme is changed. We also have issues with memory leaks when
// holding the reference to the background page.
const backgroundWindow = BrowserApi.getBackgroundPage();
if (platformUtilsService.isSafari() && backgroundWindow) {
windowContext = backgroundWindow;
return of(AngularThemingService.getSystemThemeFromWindow(backgroundWindow));
} else {
return AngularThemingService.createSystemThemeFromWindow(window);
}
return AngularThemingService.createSystemThemeFromWindow(windowContext);
},
deps: [PlatformUtilsService],
}),

17
libs/angular/src/platform/services/theming/angular-theming.service.ts
View File

@ -18,11 +18,7 @@ export class AngularThemingService implements AbstractThemingService {
static createSystemThemeFromWindow(window: Window): Observable<ThemeType> {
return merge(
// This observable should always emit at least once, so go and get the current system theme designation
of(
window.matchMedia("(prefers-color-scheme: dark)").matches
? ThemeType.Dark
: ThemeType.Light,
),
of(AngularThemingService.getSystemThemeFromWindow(window)),
// Start listening to changes
fromEvent<MediaQueryListEvent>(
window.matchMedia("(prefers-color-scheme: dark)"),
@ -31,6 +27,17 @@ export class AngularThemingService implements AbstractThemingService {
);
}
/**
* Gets the currently active system theme based on the given window.
* @param window The window to query for the current theme.
* @returns The active system theme.
*/
static getSystemThemeFromWindow(window: Window): ThemeType {
return window.matchMedia("(prefers-color-scheme: dark)").matches
? ThemeType.Dark
: ThemeType.Light;
}
readonly theme$ = this.themeStateService.selectedTheme$.pipe(
switchMap((configuredTheme) => {
if (configuredTheme === ThemeType.System) {