From 23df17233da3f16db5166cf8a05b2089bd1f006a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 10 Mar 2025 18:39:08 +0000
Subject: [PATCH] fix(graph): make graph non-singleton, proper cleanup, fix radial
---
quartz/components/scripts/spa.inline.ts | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index fc5aa74..77900a6 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,9 +1,9 @@
import micromorph from "micromorph"
-import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
+import { FullSlug, RelativeURL, getFullSlug, normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
-
const NODE_TYPE_ELEMENT = 1
let announcer = document.createElement("route-announcer")
const isElement = (target: EventTarget | null): target is Element =>
@@ -18,8 +18,15 @@
return false
}
+const isSamePage = (url: URL): boolean => {
+ const sameOrigin = url.origin === window.location.origin
+ const samePath = url.pathname === window.location.pathname
+ return sameOrigin && samePath
+}
+
const getOpts = ({ target }: Event): { url: URL; scroll?: boolean } | undefined => {
if (!isElement(target)) return
+ if (target.attributes.getNamedItem("target")?.value === "_blank") return
const a = target.closest("a")
if (!a) return
if ("routerIgnore" in a.dataset) return
@@ -33,18 +40,52 @@
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}`)
- .then((res) => res.text())
+ const contents = await fetchCanonical(url)
+ .then((res) => {
+ const contentType = res.headers.get("content-type")
+ if (contentType?.startsWith("text/html")) {
+ return res.text()
+ } else {
+ window.location.assign(url)
+ }
+ })
.catch(() => {
window.location.assign(url)
})
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)
+
let title = html.querySelector("title")?.textContent
if (title) {
document.title = title
@@ -71,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])")
@@ -82,6 +123,7 @@
if (!isBack) {
history.pushState({}, "", url)
}
+
notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
@@ -92,8 +134,17 @@
if (typeof window !== "undefined") {
window.addEventListener("click", async (event) => {
const { url } = getOpts(event) ?? {}
+ // dont hijack behaviour, just let browser act normally
if (!url || event.ctrlKey || event.metaKey) return
event.preventDefault()
+
+ if (isSamePage(url) && url.hash) {
+ const el = document.getElementById(decodeURIComponent(url.hash.substring(1)))
+ el?.scrollIntoView()
+ history.pushState({}, "", url)
+ return
+ }
+
try {
navigate(url, false)
} catch (e) {
@@ -139,6 +190,7 @@
style:
"position: absolute; left: 0; top: 0; clip: rect(0 0 0 0); clip-path: inset(50%); overflow: hidden; white-space: nowrap; width: 1px; height: 1px",
}
+
customElements.define(
"route-announcer",
class RouteAnnouncer extends HTMLElement {
--
Gitblit v1.10.0