From b34d521293415944370fd0f5cf25cd71bcffb5b6 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 18 Apr 2025 02:45:17 +0000
Subject: [PATCH] feat: reader mode
---
quartz/components/scripts/popover.inline.ts | 64 ++++++++++++++------------------
1 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 56d2c96..d8f1e1a 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,7 +1,6 @@
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()
@@ -9,10 +8,7 @@
this: HTMLAnchorElement,
{ clientX, clientY }: { clientX: number; clientY: number },
) {
- clearActivePopover()
-
const link = this
- const id = randomIdNonSecure()
if (link.dataset.noPopover === "true") {
return
}
@@ -23,27 +19,38 @@
middleware: [inline({ x: clientX, y: clientY }), shift(), flip()],
})
Object.assign(popoverElement.style, {
- transform: `translate(${x}px, ${y}px)`,
+ transform: `translate(${x.toFixed()}px, ${y.toFixed()}px)`,
})
}
- const prevPopoverElement = document.getElementById(`popover-${id}`)
- const hasAlreadyBeenFetched = () => !!document.getElementById(`popover-${id}`)
+ function showPopover(popoverElement: HTMLElement) {
+ clearActivePopover()
+ popoverElement.classList.add("active-popover")
+ setPosition(popoverElement as HTMLElement)
- // dont refetch if there's already a popover
- if (hasAlreadyBeenFetched()) {
- setPosition(prevPopoverElement as HTMLElement)
- prevPopoverElement?.classList.add("active-popover")
- return
+ 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.pathname}`
+ 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)
@@ -59,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":
@@ -100,35 +107,20 @@
elts.forEach((elt) => popoverInner.appendChild(elt))
}
- setPosition(popoverElement)
- popoverElement.id = `popover-${id}`
- popoverElement.classList.add("active-popover")
document.body.appendChild(popoverElement)
-
- 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" })
- }
- }
+ showPopover(popoverElement)
}
function clearActivePopover() {
const allPopoverElements = document.querySelectorAll(".popover")
- if (allPopoverElements) {
- allPopoverElements.forEach((popoverElement) =>
- popoverElement.classList.remove("active-popover"),
- )
- }
+ allPopoverElements.forEach((popoverElement) => popoverElement.classList.remove("active-popover"))
}
document.addEventListener("nav", () => {
- const links = [...document.getElementsByClassName("internal")] as HTMLAnchorElement[]
+ const links = [...document.querySelectorAll("a.internal")] as HTMLAnchorElement[]
for (const link of links) {
- link.addEventListener("mouseleave", clearActivePopover)
link.addEventListener("mouseenter", mouseEnterHandler)
+ link.addEventListener("mouseleave", clearActivePopover)
window.addCleanup(() => {
link.removeEventListener("mouseenter", mouseEnterHandler)
link.removeEventListener("mouseleave", clearActivePopover)
--
Gitblit v1.10.0