From d98a3a088a76e5965a8fbf51a812e169abe1dde8 Mon Sep 17 00:00:00 2001
From: Emile Bangma <ewjbangma@hotmail.com>
Date: Tue, 22 Oct 2024 20:38:16 +0000
Subject: [PATCH] Merge pull request #1543 from saberzero1/draft-publish-string
---
quartz/components/scripts/darkmode.inline.ts | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/quartz/components/scripts/darkmode.inline.ts b/quartz/components/scripts/darkmode.inline.ts
index 86735e3..038ae0f 100644
--- a/quartz/components/scripts/darkmode.inline.ts
+++ b/quartz/components/scripts/darkmode.inline.ts
@@ -10,28 +10,28 @@
}
document.addEventListener("nav", () => {
- const switchTheme = (e: any) => {
- const newTheme = e.target.checked ? "dark" : "light"
+ const switchTheme = (e: Event) => {
+ const newTheme =
+ document.documentElement.getAttribute("saved-theme") === "dark" ? "light" : "dark"
+ document.documentElement.setAttribute("saved-theme", newTheme)
+ localStorage.setItem("theme", newTheme)
+ emitThemeChangeEvent(newTheme)
+ }
+
+ const themeChange = (e: MediaQueryListEvent) => {
+ const newTheme = e.matches ? "dark" : "light"
document.documentElement.setAttribute("saved-theme", newTheme)
localStorage.setItem("theme", newTheme)
emitThemeChangeEvent(newTheme)
}
// Darkmode toggle
- const toggleSwitch = document.querySelector("#darkmode-toggle") as HTMLInputElement
- toggleSwitch.removeEventListener("change", switchTheme)
- toggleSwitch.addEventListener("change", switchTheme)
- if (currentTheme === "dark") {
- toggleSwitch.checked = true
- }
+ const themeButton = document.querySelector("#darkmode") as HTMLButtonElement
+ themeButton.addEventListener("click", switchTheme)
+ window.addCleanup(() => themeButton.removeEventListener("click", switchTheme))
// Listen for changes in prefers-color-scheme
const colorSchemeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)")
- colorSchemeMediaQuery.addEventListener("change", (e) => {
- const newTheme = e.matches ? "dark" : "light"
- document.documentElement.setAttribute("saved-theme", newTheme)
- localStorage.setItem("theme", newTheme)
- toggleSwitch.checked = e.matches
- emitThemeChangeEvent(newTheme)
- })
+ colorSchemeMediaQuery.addEventListener("change", themeChange)
+ window.addCleanup(() => colorSchemeMediaQuery.removeEventListener("change", themeChange))
})
--
Gitblit v1.10.0