From 24348b24a94c5f9ca285642b751e6798b92eedd9 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 20 Jun 2023 05:50:25 +0000
Subject: [PATCH] fix: parsing wikilinks that have codeblock anchors, scroll to anchor
---
quartz/components/scripts/popover.inline.ts | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 24c6aec..655831d 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,41 +1,65 @@
-import { computePosition, inline, shift, autoPlacement } from "@floating-ui/dom"
+import { computePosition, flip, inline, shift } from "@floating-ui/dom"
document.addEventListener("nav", () => {
const links = [...document.getElementsByClassName("internal")] as HTMLLinkElement[]
const p = new DOMParser()
for (const link of links) {
link.addEventListener("mouseenter", async ({ clientX, clientY }) => {
- if (link.dataset.fetchedPopover === "true") return
- const url = link.href
- const contents = await fetch(`${url}`)
+ async function setPosition(popoverElement: HTMLElement) {
+ const { x, y } = await computePosition(link, popoverElement, {
+ middleware: [
+ inline({ x: clientX, y: clientY }),
+ shift(),
+ flip()
+ ]
+ })
+ Object.assign(popoverElement.style, {
+ left: `${x}px`,
+ top: `${y}px`,
+ })
+ }
+
+ if (link.dataset.fetchedPopover === "true") {
+ return setPosition(link.lastChild as HTMLElement)
+ }
+
+ 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(`${targetUrl}`)
.then((res) => res.text())
.catch((err) => {
console.error(err)
})
+
if (!contents) return
const html = p.parseFromString(contents, "text/html")
const elts = [...html.getElementsByClassName("popover-hint")]
if (elts.length === 0) return
-
const popoverElement = document.createElement("div")
popoverElement.classList.add("popover")
- elts.forEach(elt => popoverElement.appendChild(elt))
+ const popoverInner = document.createElement("div")
+ popoverInner.classList.add("popover-inner")
+ popoverElement.appendChild(popoverInner)
+ elts.forEach(elt => popoverInner.appendChild(elt))
- const { x, y } = await computePosition(link, popoverElement, {
- middleware: [inline({
- x: clientX,
- y: clientY
- }), shift(), autoPlacement()]
- })
-
- Object.assign(popoverElement.style, {
- left: `${x}px`,
- top: `${y}px`,
- })
-
+ setPosition(popoverElement)
link.appendChild(popoverElement)
link.dataset.fetchedPopover = "true"
+
+ 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