From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/components/scripts/spa.inline.ts | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index da34700..774326e 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,4 +1,5 @@
import micromorph from "micromorph"
+import { CanonicalSlug, RelativeURL, getCanonicalSlug } from "../../path"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
@@ -29,8 +30,8 @@
return { url: new URL(href), scroll: 'routerNoscroll' in a.dataset ? false : undefined }
}
-function notifyNav(slug: string) {
- const event = new CustomEvent("spa_nav", { detail: { slug } })
+function notifyNav(url: CanonicalSlug) {
+ const event: CustomEventMap["nav"] = new CustomEvent("nav", { detail: { url } })
document.dispatchEvent(event)
}
@@ -42,6 +43,7 @@
.catch(() => {
window.location.assign(url)
})
+
if (!contents) return;
if (!isBack) {
history.pushState({}, "", url)
@@ -69,10 +71,12 @@
const elementsToAdd = html.head.querySelectorAll(':not([spa-preserve])')
elementsToAdd.forEach(el => document.head.appendChild(el))
- notifyNav(document.body.dataset.slug!)
+ notifyNav(getCanonicalSlug(window))
delete announcer.dataset.persist
}
+window.spaNavigate = navigate
+
function createRouter() {
if (typeof window !== "undefined") {
window.addEventListener("click", async (event) => {
@@ -96,8 +100,9 @@
return
})
}
+
return new class Router {
- go(pathname: string) {
+ go(pathname: RelativeURL) {
const url = new URL(pathname, window.location.toString())
return navigate(url, false)
}
@@ -113,6 +118,7 @@
}
createRouter()
+notifyNav(getCanonicalSlug(window))
if (!customElements.get('route-announcer')) {
const attrs = {
--
Gitblit v1.10.0