From e9b60c728595e84b935d8af59a7efcac52ef5ab1 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 10 Apr 2025 23:46:30 +0000
Subject: [PATCH] fix(popover): popover id calculation + scroll consistency
---
quartz/components/scripts/popover.inline.ts | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index b01af0e..04ffd58 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,8 +1,10 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
import { normalizeRelativeURLs } from "../../util/path"
import { fetchCanonical } from "./util"
+import { randomIdNonSecure } from "../../util/random"
const p = new DOMParser()
+
async function mouseEnterHandler(
this: HTMLAnchorElement,
{ clientX, clientY }: { clientX: number; clientY: number },
@@ -14,29 +16,41 @@
async function setPosition(popoverElement: HTMLElement) {
const { x, y } = await computePosition(link, popoverElement, {
+ strategy: "fixed",
middleware: [inline({ x: clientX, y: clientY }), shift(), flip()],
})
Object.assign(popoverElement.style, {
- left: `${x}px`,
- top: `${y}px`,
+ transform: `translate(${x.toFixed()}px, ${y.toFixed()}px)`,
})
}
- const hasAlreadyBeenFetched = () =>
- [...link.children].some((child) => child.classList.contains("popover"))
+ function showPopover(popoverElement: HTMLElement) {
+ popoverElement.classList.add("active-popover")
+ setPosition(popoverElement as HTMLElement)
- // dont refetch if there's already a popover
- if (hasAlreadyBeenFetched()) {
- return setPosition(link.lastChild as HTMLElement)
+ if (hash !== "") {
+ const targetAnchor = `#popover-internal-${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" })
+ }
+ }
}
- const thisUrl = new URL(document.location.href)
- thisUrl.hash = ""
- thisUrl.search = ""
const targetUrl = new URL(link.href)
const hash = decodeURIComponent(targetUrl.hash)
targetUrl.hash = ""
targetUrl.search = ""
+ const popoverId = `popover-${link.dataset.slug ?? randomIdNonSecure()}`
+ const prevPopoverElement = document.getElementById(popoverId)
+ const hasAlreadyBeenFetched = () => !!document.getElementById(popoverId)
+
+ // dont refetch if there's already a popover
+ if (hasAlreadyBeenFetched()) {
+ showPopover(prevPopoverElement as HTMLElement)
+ return
+ }
const response = await fetchCanonical(targetUrl).catch((err) => {
console.error(err)
@@ -52,12 +66,12 @@
const [contentTypeCategory, typeInfo] = contentType.split("/")
const popoverElement = document.createElement("div")
+ popoverElement.id = popoverId
popoverElement.classList.add("popover")
const popoverInner = document.createElement("div")
popoverInner.classList.add("popover-inner")
- popoverElement.appendChild(popoverInner)
-
popoverInner.dataset.contentType = contentType ?? undefined
+ popoverElement.appendChild(popoverInner)
switch (contentTypeCategory) {
case "image":
@@ -82,28 +96,34 @@
const contents = await response.text()
const html = p.parseFromString(contents, "text/html")
normalizeRelativeURLs(html, targetUrl)
+ // prepend all IDs inside popovers to prevent duplicates
+ html.querySelectorAll("[id]").forEach((el) => {
+ const targetID = `popover-internal-${el.id}`
+ el.id = targetID
+ })
const elts = [...html.getElementsByClassName("popover-hint")]
if (elts.length === 0) return
elts.forEach((elt) => popoverInner.appendChild(elt))
}
- setPosition(popoverElement)
- link.appendChild(popoverElement)
+ document.body.appendChild(popoverElement)
+ showPopover(popoverElement)
+}
- 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" })
- }
- }
+function clearActivePopover() {
+ const allPopoverElements = document.querySelectorAll(".popover")
+ allPopoverElements.forEach((popoverElement) => popoverElement.classList.remove("active-popover"))
}
document.addEventListener("nav", () => {
const links = [...document.getElementsByClassName("internal")] as HTMLAnchorElement[]
for (const link of links) {
+ link.addEventListener("mouseleave", clearActivePopover)
link.addEventListener("mouseenter", mouseEnterHandler)
- window.addCleanup(() => link.removeEventListener("mouseenter", mouseEnterHandler))
+ window.addCleanup(() => {
+ link.removeEventListener("mouseenter", mouseEnterHandler)
+ link.removeEventListener("mouseleave", clearActivePopover)
+ })
}
})
--
Gitblit v1.10.0