fix darkmode script load

This commit is contained in:
Jacky Zhao 2023-06-06 20:58:26 -07:00
parent 22332f4205
commit 8191d5e1ef
4 changed files with 22 additions and 21 deletions

View File

@ -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 darkmodeScript from "./scripts/darkmode.inline"
import styles from '../styles/darkmode.scss' import styles from '../styles/darkmode.scss'

View File

@ -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") window.addEventListener('DOMContentLoaded', () => {
const theme = const switchTheme = (e: any) => {
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) => {
if (e.target.checked) { if (e.target.checked) {
document.documentElement.setAttribute("saved-theme", "dark") document.documentElement.setAttribute('saved-theme', 'dark')
localStorage.setItem("theme", "dark") localStorage.setItem('theme', 'dark')
} else { }
document.documentElement.setAttribute("saved-theme", "light") else {
localStorage.setItem("theme", "light") 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 toggleSwitch.checked = true
} }
}) })

View File

@ -40,9 +40,9 @@ export class ContentPage extends QuartzEmitterPlugin {
const pageResources: StaticResources = { const pageResources: StaticResources = {
css: [baseDir + "/index.css", ...resources.css,], css: [baseDir + "/index.css", ...resources.css,],
js: [ js: [
{ src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", type: 'module' }, { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady" },
...resources.js, ...resources.js,
{ src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' } { src: baseDir + "/postscript.js", loadTime: "afterDOMReady" }
] ]
} }

View File

@ -14,7 +14,7 @@
} }
// npx convert-sh-theme https://raw.githubusercontent.com/shikijs/shiki/main/packages/shiki/themes/github-dark.json // 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-text: #e1e4e8 !important;
--shiki-color-background: #24292e !important; --shiki-color-background: #24292e !important;
--shiki-token-constant: #79b8ff !important; --shiki-token-constant: #79b8ff !important;