From 9c8fec06d2b58e4e3bbe280ddc665a99fcc4878c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 09 Mar 2025 22:33:15 +0000
Subject: [PATCH] feat: support non-singleton search
---
quartz/components/scripts/popover.inline.ts | 154 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 55 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 655831d..b01af0e 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,65 +1,109 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
+import { normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
-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 }) => {
- 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`,
- })
+const p = new DOMParser()
+async function mouseEnterHandler(
+ this: HTMLAnchorElement,
+ { clientX, clientY }: { clientX: number; clientY: number },
+) {
+ const link = this
+ if (link.dataset.noPopover === "true") {
+ return
+ }
+
+ 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`,
+ })
+ }
+
+ const hasAlreadyBeenFetched = () =>
+ [...link.children].some((child) => child.classList.contains("popover"))
+
+ // dont refetch if there's already a popover
+ if (hasAlreadyBeenFetched()) {
+ 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 = decodeURIComponent(targetUrl.hash)
+ targetUrl.hash = ""
+ targetUrl.search = ""
+
+ const response = await fetchCanonical(targetUrl).catch((err) => {
+ console.error(err)
+ })
+
+ // bailout if another popover exists
+ if (hasAlreadyBeenFetched()) {
+ return
+ }
+
+ if (!response) return
+ const [contentType] = response.headers.get("Content-Type")!.split(";")
+ const [contentTypeCategory, typeInfo] = contentType.split("/")
+
+ const popoverElement = document.createElement("div")
+ popoverElement.classList.add("popover")
+ const popoverInner = document.createElement("div")
+ popoverInner.classList.add("popover-inner")
+ popoverElement.appendChild(popoverInner)
+
+ popoverInner.dataset.contentType = contentType ?? undefined
+
+ switch (contentTypeCategory) {
+ case "image":
+ const img = document.createElement("img")
+ img.src = targetUrl.toString()
+ img.alt = targetUrl.pathname
+
+ 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
}
-
- 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
+ break
+ default:
+ const contents = await response.text()
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")
- const popoverInner = document.createElement("div")
- popoverInner.classList.add("popover-inner")
- popoverElement.appendChild(popoverInner)
- elts.forEach(elt => popoverInner.appendChild(elt))
+ elts.forEach((elt) => popoverInner.appendChild(elt))
+ }
- 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' })
- }
- })
+ setPosition(popoverElement)
+ link.appendChild(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" })
+ }
+ }
+}
+
+document.addEventListener("nav", () => {
+ const links = [...document.getElementsByClassName("internal")] as HTMLAnchorElement[]
+ for (const link of links) {
+ link.addEventListener("mouseenter", mouseEnterHandler)
+ window.addCleanup(() => link.removeEventListener("mouseenter", mouseEnterHandler))
}
})
--
Gitblit v1.10.0