From d61fb266c7f6b534236340d5359d0cbe14f55834 Mon Sep 17 00:00:00 2001
From: Emile Bangma <github@emilebangma.com>
Date: Sat, 05 Apr 2025 17:31:17 +0000
Subject: [PATCH] fix(popover): automatically position anchored links properly (#1897)
---
quartz/plugins/transformers/ofm.ts | 3 +--
quartz/components/scripts/popover.inline.ts | 10 +++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 7337793..7d8aec3 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -82,8 +82,11 @@
const contents = await response.text()
const html = p.parseFromString(contents, "text/html")
normalizeRelativeURLs(html, targetUrl)
- // strip all IDs from elements to prevent duplicates
- html.querySelectorAll("[id]").forEach((el) => el.removeAttribute("id"))
+ // prepend all IDs inside popovers to prevent duplicates
+ html.querySelectorAll("[id]").forEach((el) => {
+ const targetID = `popover-${el.id}`
+ el.id = targetID
+ })
const elts = [...html.getElementsByClassName("popover-hint")]
if (elts.length === 0) return
@@ -94,7 +97,8 @@
link.appendChild(popoverElement)
if (hash !== "") {
- const heading = popoverInner.querySelector(hash) as HTMLElement | null
+ const targetAnchor = hash.startsWith("#popover") ? hash : `#popover-${hash.slice(1)}`
+ const heading = popoverInner.querySelector(targetAnchor) as HTMLElement | null
if (heading) {
// leave ~12px of buffer when scrolling to a heading
popoverInner.scroll({ top: heading.offsetTop - 12, behavior: "instant" })
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index 1f4873d..5c2f4b2 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -191,8 +191,7 @@
const [rawFp, rawHeader, rawAlias]: (string | undefined)[] = capture
const [fp, anchor] = splitAnchor(`${rawFp ?? ""}${rawHeader ?? ""}`)
- const blockRef = Boolean(rawHeader?.match(/^#?\^/)) ? "^" : ""
- const displayAnchor = anchor ? `#${blockRef}${anchor.trim().replace(/^#+/, "")}` : ""
+ const displayAnchor = anchor ? `#${anchor.trim().replace(/^#+/, "")}` : ""
const displayAlias = rawAlias ?? rawHeader?.replace("#", "|") ?? ""
const embedDisplay = value.startsWith("!") ? "!" : ""
--
Gitblit v1.10.0