From e10de3febffd3e3b7eaa3aed611aea03153e6a82 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 22 Aug 2023 00:01:18 +0000
Subject: [PATCH] fix: server-handler crash from filename (closes #386)
---
quartz/components/scripts/spa.inline.ts | 98 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 774326e..6f9399e 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,36 +1,34 @@
import micromorph from "micromorph"
-import { CanonicalSlug, RelativeURL, getCanonicalSlug } from "../../path"
+import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
// 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 => (target as Node)?.nodeType === NODE_TYPE_ELEMENT
+let announcer = document.createElement("route-announcer")
+const isElement = (target: EventTarget | null): target is Element =>
+ (target as Node)?.nodeType === NODE_TYPE_ELEMENT
const isLocalUrl = (href: string) => {
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) { }
+ } catch (e) {}
return false
}
-const getOpts = ({ target }: Event): { url: URL, scroll?: boolean } | undefined => {
+const getOpts = ({ target }: Event): { url: URL; scroll?: boolean } | undefined => {
if (!isElement(target)) return
const a = target.closest("a")
if (!a) return
- if ('routerIgnore' in a.dataset) return
+ if ("routerIgnore" in a.dataset) return
const { href } = a
if (!isLocalUrl(href)) return
- return { url: new URL(href), scroll: 'routerNoscroll' in a.dataset ? false : undefined }
+ 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)
}
@@ -44,34 +42,45 @@
window.location.assign(url)
})
- if (!contents) return;
- if (!isBack) {
- history.pushState({}, "", url)
- window.scrollTo({ top: 0 })
- }
+ if (!contents) return
+
const html = p.parseFromString(contents, "text/html")
let title = html.querySelector("title")?.textContent
if (title) {
document.title = title
} else {
- const h1 = document.querySelector('h1')
+ const h1 = document.querySelector("h1")
title = h1?.innerText ?? h1?.textContent ?? url.pathname
}
if (announcer.textContent !== title) {
announcer.textContent = title
}
- announcer.dataset.persist = ''
+ announcer.dataset.persist = ""
html.body.appendChild(announcer)
+ // morph body
micromorph(document.body, html.body)
- // 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))
+ // 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 })
+ }
+ }
- notifyNav(getCanonicalSlug(window))
+ // 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))
+
+ // 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
}
@@ -90,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) {
@@ -101,7 +111,7 @@
})
}
- return new class Router {
+ return new (class Router {
go(pathname: RelativeURL) {
const url = new URL(pathname, window.location.toString())
return navigate(url, false)
@@ -114,26 +124,30 @@
forward() {
return window.history.forward()
}
- }
+ })()
}
createRouter()
-notifyNav(getCanonicalSlug(window))
+notifyNav(getFullSlug(window))
-if (!customElements.get('route-announcer')) {
+if (!customElements.get("route-announcer")) {
const attrs = {
- 'aria-live': 'assertive',
- 'aria-atomic': 'true',
- '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'
+ "aria-live": "assertive",
+ "aria-atomic": "true",
+ 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 {
- constructor() {
- super()
- }
- connectedCallback() {
- for (const [key, value] of Object.entries(attrs)) {
- this.setAttribute(key, value)
+ customElements.define(
+ "route-announcer",
+ class RouteAnnouncer extends HTMLElement {
+ constructor() {
+ super()
}
- }
- })
+ connectedCallback() {
+ for (const [key, value] of Object.entries(attrs)) {
+ this.setAttribute(key, value)
+ }
+ }
+ },
+ )
}
--
Gitblit v1.10.0