From eb6cc6ff8e3e9de9cf86e10b013d7785aa63aba5 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Sep 2025 20:11:44 +0000
Subject: [PATCH] chore(deps): bump the production-dependencies group with 9 updates (#2134)
---
quartz/components/scripts/popover.inline.ts | 125 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 37 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 4d51e2a..989af7e 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,82 +1,133 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
import { normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
const p = new DOMParser()
+let activeAnchor: HTMLAnchorElement | null = null
+
async function mouseEnterHandler(
- this: HTMLLinkElement,
+ this: HTMLAnchorElement,
{ clientX, clientY }: { clientX: number; clientY: number },
) {
- const link = this
+ const link = (activeAnchor = this)
if (link.dataset.noPopover === "true") {
return
}
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) {
+ clearActivePopover()
+ 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 = targetUrl.hash
+ const hash = decodeURIComponent(targetUrl.hash)
targetUrl.hash = ""
targetUrl.search = ""
+ const popoverId = `popover-${link.pathname}`
+ const prevPopoverElement = document.getElementById(popoverId)
- const contents = await fetch(`${targetUrl}`)
- .then((res) => res.text())
- .catch((err) => {
- console.error(err)
- })
-
- // bailout if another popover exists
- if (hasAlreadyBeenFetched()) {
+ // dont refetch if there's already a popover
+ if (!!document.getElementById(popoverId)) {
+ showPopover(prevPopoverElement as HTMLElement)
return
}
- 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 response = await fetchCanonical(targetUrl).catch((err) => {
+ console.error(err)
+ })
+
+ if (!response) return
+ const [contentType] = response.headers.get("Content-Type")!.split(";")
+ 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")
+ popoverInner.dataset.contentType = contentType ?? undefined
popoverElement.appendChild(popoverInner)
- elts.forEach((elt) => popoverInner.appendChild(elt))
- setPosition(popoverElement)
- link.appendChild(popoverElement)
+ switch (contentTypeCategory) {
+ case "image":
+ const img = document.createElement("img")
+ img.src = targetUrl.toString()
+ img.alt = targetUrl.pathname
- 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" })
- }
+ popoverInner.appendChild(img)
+ break
+ case "application":
+ switch (typeInfo) {
+ case "pdf":
+ const pdf = document.createElement("iframe")
+ pdf.src = targetUrl.toString()
+ popoverInner.appendChild(pdf)
+ break
+ default:
+ break
+ }
+ break
+ default:
+ 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))
}
+
+ if (!!document.getElementById(popoverId)) {
+ return
+ }
+
+ document.body.appendChild(popoverElement)
+ if (activeAnchor !== this) {
+ return
+ }
+
+ showPopover(popoverElement)
+}
+
+function clearActivePopover() {
+ activeAnchor = null
+ const allPopoverElements = document.querySelectorAll(".popover")
+ allPopoverElements.forEach((popoverElement) => popoverElement.classList.remove("active-popover"))
}
document.addEventListener("nav", () => {
- const links = [...document.getElementsByClassName("internal")] as HTMLLinkElement[]
+ const links = [...document.querySelectorAll("a.internal")] as HTMLAnchorElement[]
for (const link of links) {
- link.removeEventListener("mouseenter", mouseEnterHandler)
link.addEventListener("mouseenter", mouseEnterHandler)
+ link.addEventListener("mouseleave", clearActivePopover)
+ window.addCleanup(() => {
+ link.removeEventListener("mouseenter", mouseEnterHandler)
+ link.removeEventListener("mouseleave", clearActivePopover)
+ })
}
})
--
Gitblit v1.10.0