From efddd798e83705b0e17e074fe344b2d491051ba2 Mon Sep 17 00:00:00 2001
From: Emile Bangma <github@emilebangma.com>
Date: Wed, 30 Jul 2025 16:43:36 +0000
Subject: [PATCH] revert(graph): roll back changes due to issues with Safari (#2067)
---
quartz/components/scripts/toc.inline.ts | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/quartz/components/scripts/toc.inline.ts b/quartz/components/scripts/toc.inline.ts
index 405a21f..4148fa2 100644
--- a/quartz/components/scripts/toc.inline.ts
+++ b/quartz/components/scripts/toc.inline.ts
@@ -1,35 +1,44 @@
-const bufferPx = 150
-const observer = new IntersectionObserver(entries => {
+const observer = new IntersectionObserver((entries) => {
for (const entry of entries) {
const slug = entry.target.id
- const tocEntryElement = document.querySelector(`a[data-for="${slug}"]`)
+ const tocEntryElements = document.querySelectorAll(`a[data-for="${slug}"]`)
const windowHeight = entry.rootBounds?.height
- if (windowHeight && tocEntryElement) {
+ if (windowHeight && tocEntryElements.length > 0) {
if (entry.boundingClientRect.y < windowHeight) {
- tocEntryElement.classList.add("in-view")
+ tocEntryElements.forEach((tocEntryElement) => tocEntryElement.classList.add("in-view"))
} else {
- tocEntryElement.classList.remove("in-view")
+ tocEntryElements.forEach((tocEntryElement) => tocEntryElement.classList.remove("in-view"))
}
}
}
})
-function toggleCollapsible(this: HTMLElement) {
+function toggleToc(this: HTMLElement) {
this.classList.toggle("collapsed")
- const content = this.nextElementSibling as HTMLElement
+ this.setAttribute(
+ "aria-expanded",
+ this.getAttribute("aria-expanded") === "true" ? "false" : "true",
+ )
+ const content = this.nextElementSibling as HTMLElement | undefined
+ if (!content) return
content.classList.toggle("collapsed")
- content.style.maxHeight = content.style.maxHeight === "0px" ? content.scrollHeight + "px" : "0px"
+}
+
+function setupToc() {
+ for (const toc of document.getElementsByClassName("toc")) {
+ const button = toc.querySelector(".toc-header")
+ const content = toc.querySelector(".toc-content")
+ if (!button || !content) return
+ button.addEventListener("click", toggleToc)
+ window.addCleanup(() => button.removeEventListener("click", toggleToc))
+ }
}
document.addEventListener("nav", () => {
- const toc = document.getElementById("toc")!
- const content = toc.nextElementSibling as HTMLElement
- content.style.maxHeight = content.scrollHeight + "px"
- toc.removeEventListener("click", toggleCollapsible)
- toc.addEventListener("click", toggleCollapsible)
+ setupToc()
// update toc entry highlighting
observer.disconnect()
const headers = document.querySelectorAll("h1[id], h2[id], h3[id], h4[id], h5[id], h6[id]")
- headers.forEach(header => observer.observe(header))
+ headers.forEach((header) => observer.observe(header))
})
--
Gitblit v1.10.0