From 0813f127a30b376c5d5552a8cdb6e5cad5969c38 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 07 Jun 2023 03:58:26 +0000
Subject: [PATCH] fix darkmode script load
---
quartz/components/Darkmode.tsx | 3 +++
quartz/components/scripts/darkmode.inline.ts | 34 ++++++++++++++++------------------
quartz/styles/syntax.scss | 2 +-
quartz/plugins/emitters/contentPage.tsx | 4 ++--
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/quartz/components/Darkmode.tsx b/quartz/components/Darkmode.tsx
index 0161e0a..ae6788c 100644
--- a/quartz/components/Darkmode.tsx
+++ b/quartz/components/Darkmode.tsx
@@ -1,3 +1,6 @@
+// @ts-ignore: this is safe, we don't want to actually make darkmode.inline.ts a module as
+// modules are automatically deferred and we don't want that to happen for critical beforeDOMLoads
+// see: https://v8.dev/features/modules#defer
import darkmodeScript from "./scripts/darkmode.inline"
import styles from '../styles/darkmode.scss'
diff --git a/quartz/components/scripts/darkmode.inline.ts b/quartz/components/scripts/darkmode.inline.ts
index d2b6e06..f00a873 100644
--- a/quartz/components/scripts/darkmode.inline.ts
+++ b/quartz/components/scripts/darkmode.inline.ts
@@ -1,25 +1,23 @@
-export default "Darkmode"
+const userPref = window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark'
+const currentTheme = localStorage.getItem('theme') ?? userPref
+document.documentElement.setAttribute('saved-theme', currentTheme)
-const currentTheme = localStorage.getItem("theme")
-const theme =
- currentTheme ??
- (window.matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark")
-
-document.documentElement.setAttribute("saved-theme", theme)
-
-window.addEventListener("DOMContentLoaded", () => {
- const toggleSwitch = document.querySelector("#darkmode-toggle") as HTMLInputElement
- toggleSwitch.addEventListener("change", (e: any) => {
+window.addEventListener('DOMContentLoaded', () => {
+ const switchTheme = (e: any) => {
if (e.target.checked) {
- document.documentElement.setAttribute("saved-theme", "dark")
- localStorage.setItem("theme", "dark")
- } else {
- document.documentElement.setAttribute("saved-theme", "light")
- localStorage.setItem("theme", "light")
+ document.documentElement.setAttribute('saved-theme', 'dark')
+ localStorage.setItem('theme', 'dark')
}
- })
+ else {
+ document.documentElement.setAttribute('saved-theme', 'light')
+ localStorage.setItem('theme', 'light')
+ }
+ }
- if (theme === "dark") {
+ // Darkmode toggle
+ const toggleSwitch = document.querySelector('#darkmode-toggle') as HTMLInputElement
+ toggleSwitch.addEventListener('change', switchTheme, false)
+ if (currentTheme === 'dark') {
toggleSwitch.checked = true
}
})
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 9cca0af..61ddcfb 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -40,9 +40,9 @@
const pageResources: StaticResources = {
css: [baseDir + "/index.css", ...resources.css,],
js: [
- { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", type: 'module' },
+ { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady" },
...resources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' }
+ { src: baseDir + "/postscript.js", loadTime: "afterDOMReady" }
]
}
diff --git a/quartz/styles/syntax.scss b/quartz/styles/syntax.scss
index c53904a..623ee6f 100644
--- a/quartz/styles/syntax.scss
+++ b/quartz/styles/syntax.scss
@@ -14,7 +14,7 @@
}
// npx convert-sh-theme https://raw.githubusercontent.com/shikijs/shiki/main/packages/shiki/themes/github-dark.json
-:root[saved-theme="dark"] {
+[saved-theme="dark"] {
--shiki-color-text: #e1e4e8 !important;
--shiki-color-background: #24292e !important;
--shiki-token-constant: #79b8ff !important;
--
Gitblit v1.10.0