From cf6ab9e9333b5f76cb9e06f6687f2b4f8fbe91bd Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 12 Nov 2023 22:27:53 +0000
Subject: [PATCH] feat: option to specify npx quartz sync message (closes #583)
---
quartz/components/scripts/spa.inline.ts | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 32c2bf2..0318ec3 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,5 +1,6 @@
import micromorph from "micromorph"
import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
+import { normalizeRelativeURLs } from "./popover.inline"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
@@ -12,17 +13,21 @@
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) {}
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
@@ -48,6 +53,8 @@
if (!contents) return
const html = p.parseFromString(contents, "text/html")
+ normalizeRelativeURLs(html, url)
+
let title = html.querySelector("title")?.textContent
if (title) {
document.title = title
@@ -67,7 +74,7 @@
// scroll into place and add history
if (!isBack) {
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 })
@@ -82,7 +89,9 @@
// 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)
+ if (!isBack) {
+ history.pushState({}, "", url)
+ }
notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
@@ -93,9 +102,16 @@
if (typeof window !== "undefined") {
window.addEventListener("click", async (event) => {
const { url } = getOpts(event) ?? {}
- if (!url) return
- if (url.pathname === window.location.pathname) return
+ // 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()
+ return
+ }
+
try {
navigate(url, false)
} catch (e) {
@@ -141,6 +157,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