Skip to content

[General] Apply global color-scheme to reflect theme in use #2854

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
vnbaaij merged 1 commit into from
Oct 24, 2024
Merged

[General] Apply global color-scheme to reflect theme in use #2854

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
13 changes: 12 additions & 1 deletion src/Core/Components/DesignSystemProvider/FluentDesignTheme.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export function addThemeChangeEvent(dotNetHelper, id) {

if (element) {
element.addEventListener("onchange", (e) => {
UpdateBodyDataSetTheme(e.detail.newValue);
try {
// setTimeout: https://github.com/dotnet/aspnetcore/issues/26809
setTimeout(() => {
Expand All @@ -15,7 +16,8 @@ export function addThemeChangeEvent(dotNetHelper, id) {

try {
// This can fail when localStorage does not contain a valid JSON object
const theme = element.themeStorage.readLocalStorage()
const theme = element.themeStorage.readLocalStorage();
UpdateBodyDataSetTheme(theme.mode);
return theme == null ? theme : JSON.stringify(theme);
} catch (error) {
ClearLocalStorage(id);
Expand Down Expand Up @@ -46,3 +48,12 @@ export function ClearLocalStorage(id) {
element.themeStorage.clearLocalStorage();
}
}

function UpdateBodyDataSetTheme(theme) {
if (theme) {
document.body.dataset.theme = theme;
} else {
const isSystemDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
document.body.dataset.theme = isSystemDark ? 'dark' : 'light';
}
}
10 changes: 10 additions & 0 deletions src/Core/wwwroot/css/reboot.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ body, .body {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}

body[data-theme="light"],
body[data-theme="system-light"] {
color-scheme: light;
}

body[data-theme="dark"],
body[data-theme="system-dark"] {
color-scheme: dark;
}

hr {
margin: 1rem 0;
color: inherit;
Expand Down