From ba9f243728cab171f86b40b9d50db485af272a39 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 01 Jul 2023 07:03:01 +0000
Subject: [PATCH] tag and folder pages

---
 quartz/components/scripts/popover.inline.ts |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 5cbe170..655831d 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -7,10 +7,11 @@
     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()]
+          middleware: [
+            inline({ x: clientX, y: clientY }),
+            shift(),
+            flip()
+          ]
         })
         Object.assign(popoverElement.style, {
           left: `${x}px`,
@@ -22,11 +23,17 @@
         return setPosition(link.lastChild as HTMLElement)
       }
 
-      const url = link.href
-      const anchor = new URL(url).hash
-      if (anchor.startsWith("#")) return
+      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(`${url}`)
+      const contents = await fetch(`${targetUrl}`)
         .then((res) => res.text())
         .catch((err) => {
           console.error(err)
@@ -47,6 +54,12 @@
       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' })
+      }
     })
   }
 })

--
Gitblit v1.10.0