From bb93ac1c83fd8d13593f7f9688de02eba60de913 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 21 Aug 2023 06:50:29 +0000
Subject: [PATCH] docs: fix links to networked thought
---
quartz/components/scripts/spa.inline.ts | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 1b44ade..6f9399e 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,5 +1,5 @@
import micromorph from "micromorph"
-import { CanonicalSlug, RelativeURL, getCanonicalSlug } from "../../util/path"
+import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
@@ -12,9 +12,6 @@
try {
const url = new URL(href)
if (window.location.origin === url.origin) {
- if (url.pathname === window.location.pathname) {
- return !url.hash
- }
return true
}
} catch (e) {}
@@ -31,7 +28,7 @@
return { url: new URL(href), scroll: "routerNoscroll" in a.dataset ? false : undefined }
}
-function notifyNav(url: CanonicalSlug) {
+function notifyNav(url: FullSlug) {
const event: CustomEventMap["nav"] = new CustomEvent("nav", { detail: { url } })
document.dispatchEvent(event)
}
@@ -46,10 +43,6 @@
})
if (!contents) return
- if (!isBack) {
- history.pushState({}, "", url)
- window.scrollTo({ top: 0 })
- }
const html = p.parseFromString(contents, "text/html")
let title = html.querySelector("title")?.textContent
@@ -65,15 +58,29 @@
announcer.dataset.persist = ""
html.body.appendChild(announcer)
+ // morph body
micromorph(document.body, html.body)
+ // scroll into place and add history
+ if (!isBack) {
+ if (url.hash) {
+ const el = document.getElementById(url.hash.substring(1))
+ el?.scrollIntoView()
+ } else {
+ window.scrollTo({ top: 0 })
+ }
+ }
+
// now, patch head
const elementsToRemove = document.head.querySelectorAll(":not([spa-preserve])")
elementsToRemove.forEach((el) => el.remove())
const elementsToAdd = html.head.querySelectorAll(":not([spa-preserve])")
elementsToAdd.forEach((el) => document.head.appendChild(el))
- notifyNav(getCanonicalSlug(window))
+ // delay setting the url until now
+ // at this point everything is loaded so changing the url should resolve to the correct addresses
+ history.pushState({}, "", url)
+ notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
@@ -92,8 +99,9 @@
}
})
- window.addEventListener("popstate", () => {
- if (window.location.hash) return
+ window.addEventListener("popstate", (event) => {
+ const { url } = getOpts(event) ?? {}
+ if (window.location.hash && window.location.pathname === url?.pathname) return
try {
navigate(new URL(window.location.toString()), true)
} catch (e) {
@@ -120,7 +128,7 @@
}
createRouter()
-notifyNav(getCanonicalSlug(window))
+notifyNav(getFullSlug(window))
if (!customElements.get("route-announcer")) {
const attrs = {
--
Gitblit v1.10.0