From 9c8fec06d2b58e4e3bbe280ddc665a99fcc4878c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 09 Mar 2025 22:33:15 +0000
Subject: [PATCH] feat: support non-singleton search
---
quartz/components/scripts/spa.inline.ts | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index c2a44c9..77900a6 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,5 +1,6 @@
import micromorph from "micromorph"
import { FullSlug, RelativeURL, getFullSlug, normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
@@ -39,10 +40,27 @@
document.dispatchEvent(event)
}
+const cleanupFns: Set<(...args: any[]) => void> = new Set()
+window.addCleanup = (fn) => cleanupFns.add(fn)
+
+function startLoading() {
+ const loadingBar = document.createElement("div")
+ loadingBar.className = "navigation-progress"
+ loadingBar.style.width = "0"
+ if (!document.body.contains(loadingBar)) {
+ document.body.appendChild(loadingBar)
+ }
+
+ setTimeout(() => {
+ loadingBar.style.width = "80%"
+ }, 100)
+}
+
let p: DOMParser
async function navigate(url: URL, isBack: boolean = false) {
+ startLoading()
p = p || new DOMParser()
- const contents = await fetch(`${url}`)
+ const contents = await fetchCanonical(url)
.then((res) => {
const contentType = res.headers.get("content-type")
if (contentType?.startsWith("text/html")) {
@@ -57,6 +75,14 @@
if (!contents) return
+ // notify about to nav
+ const event: CustomEventMap["prenav"] = new CustomEvent("prenav", { detail: {} })
+ document.dispatchEvent(event)
+
+ // cleanup old
+ cleanupFns.forEach((fn) => fn())
+ cleanupFns.clear()
+
const html = p.parseFromString(contents, "text/html")
normalizeRelativeURLs(html, url)
@@ -86,7 +112,7 @@
}
}
- // now, patch head
+ // now, patch head, re-executing scripts
const elementsToRemove = document.head.querySelectorAll(":not([spa-preserve])")
elementsToRemove.forEach((el) => el.remove())
const elementsToAdd = html.head.querySelectorAll(":not([spa-preserve])")
@@ -97,6 +123,7 @@
if (!isBack) {
history.pushState({}, "", url)
}
+
notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
--
Gitblit v1.10.0