fix: attempt to merge cached folder state between builds (closes #691)

quartz/components/Explorer.tsx

@@ -69,9 +69,8 @@ export default ((userOpts?: Partial<Options>) => {
     }
 
     // Get all folders of tree. Initialize with collapsed state
-    const folders = fileTree.getFolderPaths(opts.folderDefaultState === "collapsed")
-
     // Stringify to pass json tree as data attribute ([data-tree])
+    const folders = fileTree.getFolderPaths(opts.folderDefaultState === "collapsed")
     jsonTree = JSON.stringify(folders)
   }
 

quartz/components/scripts/explorer.inline.ts

@@ -1,132 +1,106 @@
 import { FolderState } from "../ExplorerNode"
 
-// Current state of folders
+type MaybeHTMLElement = HTMLElement | undefined
-let explorerState: FolderState[]
+let currentExplorerState: FolderState[]
-
 const observer = new IntersectionObserver((entries) => {
   // If last element is observed, remove gradient of "overflow" class so element is visible
-  const explorer = document.getElementById("explorer-ul")
+  const explorerUl = document.getElementById("explorer-ul")
+  if (!explorerUl) return
   for (const entry of entries) {
     if (entry.isIntersecting) {
-      explorer?.classList.add("no-background")
+      explorerUl.classList.add("no-background")
     } else {
-      explorer?.classList.remove("no-background")
+      explorerUl.classList.remove("no-background")
     }
   }
 })
 
 function toggleExplorer(this: HTMLElement) {
-  // Toggle collapsed state of entire explorer
   this.classList.toggle("collapsed")
-  const content = this.nextElementSibling as HTMLElement
+  const content = this.nextElementSibling as MaybeHTMLElement
+  if (!content) return
+
   content.classList.toggle("collapsed")
   content.style.maxHeight = content.style.maxHeight === "0px" ? content.scrollHeight + "px" : "0px"
 }
 
 function toggleFolder(evt: MouseEvent) {
   evt.stopPropagation()
+  const target = evt.target as MaybeHTMLElement
+  if (!target) return
 
-  // Element that was clicked
-  const target = evt.target as HTMLElement
-
-  // Check if target was svg icon or button
   const isSvg = target.nodeName === "svg"
-
+  const childFolderContainer = (
-  // corresponding <ul> element relative to clicked button/folder
+    isSvg
-  let childFolderContainer: HTMLElement
+      ? target.parentElement?.nextSibling
-
+      : target.parentElement?.parentElement?.nextElementSibling
-  // <li> element of folder (stores folder-path dataset)
+  ) as MaybeHTMLElement
-  let currentFolderParent: HTMLElement
+  const currentFolderParent = (
-
+    isSvg ? target.nextElementSibling : target.parentElement
-  // Get correct relative container and toggle collapsed class
+  ) as MaybeHTMLElement
-  if (isSvg) {
+  if (!(childFolderContainer && currentFolderParent)) return
-    childFolderContainer = target.parentElement?.nextSibling as HTMLElement
-    currentFolderParent = target.nextElementSibling as HTMLElement
 
   childFolderContainer.classList.toggle("open")
-  } else {
-    childFolderContainer = target.parentElement?.parentElement?.nextElementSibling as HTMLElement
-    currentFolderParent = target.parentElement as HTMLElement
-
-    childFolderContainer.classList.toggle("open")
-  }
-  if (!childFolderContainer) return
-
-  // Collapse folder container
   const isCollapsed = childFolderContainer.classList.contains("open")
   setFolderState(childFolderContainer, !isCollapsed)
-
+  const fullFolderPath = currentFolderParent.dataset.folderpath as string
-  // Save folder state to localStorage
+  toggleCollapsedByPath(currentExplorerState, fullFolderPath)
-  const clickFolderPath = currentFolderParent.dataset.folderpath as string
+  const stringifiedFileTree = JSON.stringify(currentExplorerState)
-
-  const fullFolderPath = clickFolderPath
-  toggleCollapsedByPath(explorerState, fullFolderPath)
-
-  const stringifiedFileTree = JSON.stringify(explorerState)
   localStorage.setItem("fileTree", stringifiedFileTree)
 }
 
 function setupExplorer() {
-  // Set click handler for collapsing entire explorer
   const explorer = document.getElementById("explorer")
+  if (!explorer) return
+
+  if (explorer.dataset.behavior === "collapse") {
+    for (const item of document.getElementsByClassName(
+      "folder-button",
+    ) as HTMLCollectionOf<HTMLElement>) {
+      item.removeEventListener("click", toggleFolder)
+      item.addEventListener("click", toggleFolder)
+    }
+  }
+
+  explorer.removeEventListener("click", toggleExplorer)
+  explorer.addEventListener("click", toggleExplorer)
+
+  // Set up click handlers for each folder (click handler on folder "icon")
+  for (const item of document.getElementsByClassName(
+    "folder-icon",
+  ) as HTMLCollectionOf<HTMLElement>) {
+    item.removeEventListener("click", toggleFolder)
+    item.addEventListener("click", toggleFolder)
+  }
 
   // Get folder state from local storage
   const storageTree = localStorage.getItem("fileTree")
-
-  // Convert to bool
   const useSavedFolderState = explorer?.dataset.savestate === "true"
-
+  const oldExplorerState: FolderState[] =
-  if (explorer) {
+    storageTree && useSavedFolderState ? JSON.parse(storageTree) : []
-    // Get config
+  const oldIndex = new Map(oldExplorerState.map((entry) => [entry.path, entry.collapsed]))
-    const collapseBehavior = explorer.dataset.behavior
+  const newExplorerState: FolderState[] = explorer.dataset.tree
-
+    ? JSON.parse(explorer.dataset.tree)
-    // Add click handlers for all folders (click handler on folder "label")
+    : []
-    if (collapseBehavior === "collapse") {
+  currentExplorerState = []
-      Array.prototype.forEach.call(
+  for (const { path, collapsed } of newExplorerState) {
-        document.getElementsByClassName("folder-button"),
+    currentExplorerState.push({ path, collapsed: oldIndex.get(path) ?? collapsed })
-        function (item) {
-          item.removeEventListener("click", toggleFolder)
-          item.addEventListener("click", toggleFolder)
-        },
-      )
   }
 
-    // Add click handler to main explorer
+  currentExplorerState.map((folderState) => {
-    explorer.removeEventListener("click", toggleExplorer)
+    const folderLi = document.querySelector(
-    explorer.addEventListener("click", toggleExplorer)
+      `[data-folderpath='${folderState.path}']`,
-  }
+    ) as MaybeHTMLElement
-
+    const folderUl = folderLi?.parentElement?.nextElementSibling as MaybeHTMLElement
-  // Set up click handlers for each folder (click handler on folder "icon")
+    if (folderUl) {
-  Array.prototype.forEach.call(document.getElementsByClassName("folder-icon"), function (item) {
+      setFolderState(folderUl, folderState.collapsed)
-    item.removeEventListener("click", toggleFolder)
-    item.addEventListener("click", toggleFolder)
-  })
-
-  if (storageTree && useSavedFolderState) {
-    // Get state from localStorage and set folder state
-    explorerState = JSON.parse(storageTree)
-    explorerState.map((folderUl) => {
-      // grab <li> element for matching folder path
-      const folderLi = document.querySelector(`[data-folderpath='${folderUl.path}']`) as HTMLElement
-
-      // Get corresponding content <ul> tag and set state
-      if (folderLi) {
-        const folderUL = folderLi.parentElement?.nextElementSibling
-        if (folderUL) {
-          setFolderState(folderUL as HTMLElement, folderUl.collapsed)
-        }
     }
   })
-  } else if (explorer?.dataset.tree) {
-    // If tree is not in localStorage or config is disabled, use tree passed from Explorer as dataset
-    explorerState = JSON.parse(explorer.dataset.tree)
-  }
 }
 
 window.addEventListener("resize", setupExplorer)
 document.addEventListener("nav", () => {
   setupExplorer()
-
   observer.disconnect()
 
   // select pseudo element at end of list
@@ -142,11 +116,7 @@ document.addEventListener("nav", () => {
  * @param collapsed if folder should be set to collapsed or not
  */
 function setFolderState(folderElement: HTMLElement, collapsed: boolean) {
-  if (collapsed) {
+  return collapsed ? folderElement.classList.remove("open") : folderElement.classList.add("open")
-    folderElement?.classList.remove("open")
-  } else {
-    folderElement?.classList.add("open")
-  }
 }
 
 /**

quartz/components/scripts/toc.inline.ts

@@ -16,7 +16,8 @@ const observer = new IntersectionObserver((entries) => {
 
 function toggleToc(this: HTMLElement) {
   this.classList.toggle("collapsed")
-  const content = this.nextElementSibling as HTMLElement
+  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"
 }
@@ -25,7 +26,8 @@ function setupToc() {
   const toc = document.getElementById("toc")
   if (toc) {
     const collapsed = toc.classList.contains("collapsed")
-    const content = toc.nextElementSibling as HTMLElement
+    const content = toc.nextElementSibling as HTMLElement | undefined
+    if (!content) return
     content.style.maxHeight = collapsed ? "0px" : content.scrollHeight + "px"
     toc.removeEventListener("click", toggleToc)
     toc.addEventListener("click", toggleToc)