Skip to content

feat(theme-provider): theme provider changes #320 #342

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
airikej merged 1 commit into from
Mar 11, 2026
Merged

feat(theme-provider): theme provider changes #320 #342

Show file tree
Hide file tree
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
22 changes: 1 addition & 21 deletions tedi/providers/tedi.provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,20 @@
import {
EnvironmentProviders,
inject,
makeEnvironmentProviders,
provideAppInitializer,
} from "@angular/core";
import { TEDI_THEME_DEFAULT_TOKEN } from "../tokens/theme.token";
import {
AVAILABLE_THEMES,
Theme,
THEME_CLASS_PREFIX,
THEME_FALLBACK_VALUE,
} from "../services/theme/theme.service";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../tokens/translation.token";
import { Language } from "../services/translation/translation.service";
import { DOCUMENT } from "@angular/common";

export interface TediConfig {
theme?: Theme;
language?: Language;
}

function applyInitialTheme() {
return () => {
const document = inject(DOCUMENT);
const defaultTheme = inject(TEDI_THEME_DEFAULT_TOKEN);
const html = document.documentElement;

for (const t of AVAILABLE_THEMES) {
html.classList.remove(`${THEME_CLASS_PREFIX}${t}`);
}

html.classList.add(`${THEME_CLASS_PREFIX}${defaultTheme}`);
};
}

export function provideTedi(config: TediConfig = {}): EnvironmentProviders {
return makeEnvironmentProviders([
{
Expand All @@ -44,6 +25,5 @@ export function provideTedi(config: TediConfig = {}): EnvironmentProviders {
provide: TEDI_TRANSLATION_DEFAULT_TOKEN,
useValue: config.language ?? "et",
},
provideAppInitializer(applyInitialTheme()),
]);
}
}
21 changes: 14 additions & 7 deletions tedi/services/theme/theme.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { DOCUMENT } from "@angular/common";
import { TEDI_THEME_DEFAULT_TOKEN } from "../../tokens/theme.token";
import { cookieSignal } from "../../utils/cookies.util";

export type Theme = "default" | "dark" | "rit";
export const AVAILABLE_THEMES: Theme[] = ["default", "dark", "rit"];
export type TEDITheme = "default" | "dark";
export type Theme = TEDITheme | string;
export const THEME_CLASS_PREFIX = "tedi-theme--";
export const THEME_COOKIE_NAME = "tedi-theme";
export const THEME_FALLBACK_VALUE: Theme = "default";
Expand All @@ -14,17 +14,24 @@ export class ThemeService {
private readonly document = inject(DOCUMENT);
private readonly defaultTheme = inject(TEDI_THEME_DEFAULT_TOKEN);

readonly theme = cookieSignal<Theme>(THEME_COOKIE_NAME, this.defaultTheme);
readonly theme = cookieSignal<Theme>(
THEME_COOKIE_NAME,
this.defaultTheme
);

constructor() {
effect(() => {
const html = this.document.documentElement;
const nextTheme = this.theme();

for (const t of AVAILABLE_THEMES) {
html.classList.remove(`${THEME_CLASS_PREFIX}${t}`);
for (let i = html.classList.length - 1; i >= 0; i--) {
const className = html.classList.item(i);
if (className?.startsWith(THEME_CLASS_PREFIX)) {
html.classList.remove(className);
}
}

html.classList.add(`${THEME_CLASS_PREFIX}${this.theme()}`);
html.classList.add(`${THEME_CLASS_PREFIX}${nextTheme}`);
});
}
}
}