From 06e3f8b93d5fbe96e7a05e4eb6be97b6a2d7ead0 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 17 Feb 2024 18:34:51 +0000
Subject: [PATCH] fix(style): introduce semiBoldWeight and various improvements to reduce CLS
---
quartz/components/scripts/popover.inline.ts | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 08668ae..d0346b0 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -7,6 +7,10 @@
{ 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()],
@@ -33,29 +37,47 @@
targetUrl.hash = ""
targetUrl.search = ""
- const contents = await fetch(`${targetUrl}`)
- .then((res) => res.text())
- .catch((err) => {
- console.error(err)
- })
+ const response = await fetch(`${targetUrl}`).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
+ if (!response) return
+ const contentType = response.headers.get("Content-Type")
+ const contentTypeCategory = contentType?.split("/")[0] ?? "text"
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))
+
+ popoverInner.dataset.contentType = contentTypeCategory
+
+ switch (contentTypeCategory) {
+ case "image":
+ const img = document.createElement("img")
+
+ response.blob().then((blob) => {
+ img.src = URL.createObjectURL(blob)
+ })
+ img.alt = targetUrl.pathname
+
+ popoverInner.appendChild(img)
+ 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
+
+ elts.forEach((elt) => popoverInner.appendChild(elt))
+ }
setPosition(popoverElement)
link.appendChild(popoverElement)
@@ -72,7 +94,7 @@
document.addEventListener("nav", () => {
const links = [...document.getElementsByClassName("internal")] as HTMLLinkElement[]
for (const link of links) {
- link.removeEventListener("mouseenter", mouseEnterHandler)
link.addEventListener("mouseenter", mouseEnterHandler)
+ window.addCleanup(() => link.removeEventListener("mouseenter", mouseEnterHandler))
}
})
--
Gitblit v1.10.0