From 444e05ee21687473c17c19e1d52d7da39694971c Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 01 Feb 2024 02:35:29 +0000
Subject: [PATCH] chore(deps-dev): bump @types/hast from 3.0.3 to 3.0.4 (#780)
---
quartz/components/scripts/popover.inline.ts | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index f7cd998..4d51e2a 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,53 +1,82 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
+import { normalizeRelativeURLs } from "../../util/path"
+
+const p = new DOMParser()
+async function mouseEnterHandler(
+ this: HTMLLinkElement,
+ { 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 = targetUrl.hash
+ targetUrl.hash = ""
+ targetUrl.search = ""
+
+ const contents = await fetch(`${targetUrl}`)
+ .then((res) => res.text())
+ .catch((err) => {
+ console.error(err)
+ })
+
+ // bailout if another popover exists
+ if (hasAlreadyBeenFetched()) {
+ 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 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))
+
+ 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 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`,
- })
- }
-
- if (link.dataset.fetchedPopover === "true") {
- return setPosition(link.lastChild as HTMLElement)
- }
-
- const url = link.href
- const anchor = new URL(url).hash
- if (anchor.startsWith("#")) return
-
- const contents = await fetch(`${url}`)
- .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")
- // TODO: scroll this element if we specify a header/anchor to jump to
- const popoverInner = document.createElement("div")
- popoverInner.classList.add("popover-inner")
- popoverElement.appendChild(popoverInner)
- elts.forEach(elt => popoverInner.appendChild(elt))
-
- setPosition(popoverElement)
- link.appendChild(popoverElement)
- link.dataset.fetchedPopover = "true"
- })
+ link.removeEventListener("mouseenter", mouseEnterHandler)
+ link.addEventListener("mouseenter", mouseEnterHandler)
}
})
--
Gitblit v1.10.0