From e0ebee5aa9b3646de722f139f1d8d15591df538e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 02 Jul 2023 20:08:29 +0000
Subject: [PATCH] various polish
---
quartz/components/scripts/popover.inline.ts | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index f7cd998..b388995 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,5 +1,24 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
+// from micromorph/src/utils.ts
+// https://github.com/natemoo-re/micromorph/blob/main/src/utils.ts#L5
+export function normalizeRelativeURLs(
+ el: Element | Document,
+ base: string | URL
+) {
+ const update = (el: Element, attr: string, base: string | URL) => {
+ el.setAttribute(attr, new URL(el.getAttribute(attr)!, base).pathname)
+ }
+
+ el.querySelectorAll('[href^="./"], [href^="../"]').forEach((item) =>
+ update(item, 'href', base)
+ )
+
+ el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
+ update(item, 'src', base)
+ )
+}
+
document.addEventListener("nav", () => {
const links = [...document.getElementsByClassName("internal")] as HTMLLinkElement[]
const p = new DOMParser()
@@ -7,10 +26,11 @@
link.addEventListener("mouseenter", async ({ clientX, clientY }) => {
async function setPosition(popoverElement: HTMLElement) {
const { x, y } = await computePosition(link, popoverElement, {
- middleware: [inline({
- x: clientX,
- y: clientY
- }), shift(), flip()]
+ middleware: [
+ inline({ x: clientX, y: clientY }),
+ shift(),
+ flip()
+ ]
})
Object.assign(popoverElement.style, {
left: `${x}px`,
@@ -22,11 +42,17 @@
return setPosition(link.lastChild as HTMLElement)
}
- const url = link.href
- const anchor = new URL(url).hash
- if (anchor.startsWith("#")) return
+ const thisUrl = new URL(document.location.href)
+ thisUrl.hash = ""
+ thisUrl.search = ""
+ const targetUrl = new URL(link.href)
+ const hash = targetUrl.hash
+ targetUrl.hash = ""
+ targetUrl.search = ""
+ // prevent hover of the same page
+ if (thisUrl.toString() === targetUrl.toString()) return
- const contents = await fetch(`${url}`)
+ const contents = await fetch(`${targetUrl}`)
.then((res) => res.text())
.catch((err) => {
console.error(err)
@@ -34,12 +60,12 @@
if (!contents) return
const html = p.parseFromString(contents, "text/html")
+ normalizeRelativeURLs(html, targetUrl)
const elts = [...html.getElementsByClassName("popover-hint")]
if (elts.length === 0) return
const popoverElement = document.createElement("div")
popoverElement.classList.add("popover")
- // TODO: scroll this element if we specify a header/anchor to jump to
const popoverInner = document.createElement("div")
popoverInner.classList.add("popover-inner")
popoverElement.appendChild(popoverInner)
@@ -48,6 +74,14 @@
setPosition(popoverElement)
link.appendChild(popoverElement)
link.dataset.fetchedPopover = "true"
+
+ if (hash !== "") {
+ const heading = popoverInner.querySelector(hash) as HTMLElement | null
+ if (heading) {
+ // leave ~12px of buffer when scrolling to a heading
+ popoverInner.scroll({ top: heading.offsetTop - 12, behavior: 'instant' })
+ }
+ }
})
}
})
--
Gitblit v1.10.0