From eed4472aeecdcb0f2b233df69884f03bd45fc293 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 23 Aug 2023 19:18:50 +0000
Subject: [PATCH] fix: use proper full base for links.ts
---
quartz/components/scripts/spa.inline.ts | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index e0a8373..bd22608 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)
}
@@ -66,9 +63,8 @@
// scroll into place and add history
if (!isBack) {
- history.pushState({}, "", url)
if (url.hash) {
- const el = document.getElementById(url.hash.substring(1))
+ const el = document.getElementById(decodeURIComponent(url.hash.substring(1)))
el?.scrollIntoView()
} else {
window.scrollTo({ top: 0 })
@@ -81,7 +77,12 @@
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
+ if (!isBack) {
+ history.pushState({}, "", url)
+ }
+ notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
@@ -129,7 +130,7 @@
}
createRouter()
-notifyNav(getCanonicalSlug(window))
+notifyNav(getFullSlug(window))
if (!customElements.get("route-announcer")) {
const attrs = {
--
Gitblit v1.10.0