From 504b44716240bb3fb9a077a1acaa3dc1059e2c1e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 28 Dec 2023 00:44:14 +0000
Subject: [PATCH] fix: use slugs instead of title as basis for explorer (#652)
---
quartz/components/Explorer.tsx | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/quartz/components/Explorer.tsx b/quartz/components/Explorer.tsx
index 95eac43..e3ed9b1 100644
--- a/quartz/components/Explorer.tsx
+++ b/quartz/components/Explorer.tsx
@@ -12,6 +12,9 @@
folderClickBehavior: "collapse",
folderDefaultState: "collapsed",
useSavedState: true,
+ mapFn: (node) => {
+ return node
+ },
sortFn: (a, b) => {
// Sort order: folders first, then files. Sort folders and files alphabetically
if ((!a.file && !b.file) || (a.file && b.file)) {
@@ -22,6 +25,7 @@
sensitivity: "base",
})
}
+
if (a.file && !b.file) {
return 1
} else {
@@ -41,46 +45,34 @@
let jsonTree: string
function constructFileTree(allFiles: QuartzPluginData[]) {
- if (!fileTree) {
- // Construct tree from allFiles
- fileTree = new FileNode("")
- allFiles.forEach((file) => fileTree.add(file, 1))
+ if (fileTree) {
+ return
+ }
- /**
- * Keys of this object must match corresponding function name of `FileNode`,
- * while values must be the argument that will be passed to the function.
- *
- * e.g. entry for FileNode.sort: `sort: opts.sortFn` (value is sort function from options)
- */
- const functions = {
- map: opts.mapFn,
- sort: opts.sortFn,
- filter: opts.filterFn,
- }
+ // Construct tree from allFiles
+ fileTree = new FileNode("")
+ allFiles.forEach((file) => fileTree.add(file))
- // Execute all functions (sort, filter, map) that were provided (if none were provided, only default "sort" is applied)
- if (opts.order) {
- // Order is important, use loop with index instead of order.map()
- for (let i = 0; i < opts.order.length; i++) {
- const functionName = opts.order[i]
- if (functions[functionName]) {
- // for every entry in order, call matching function in FileNode and pass matching argument
- // e.g. i = 0; functionName = "filter"
- // converted to: (if opts.filterFn) => fileTree.filter(opts.filterFn)
-
- // @ts-ignore
- // typescript cant statically check these dynamic references, so manually make sure reference is valid and ignore warning
- fileTree[functionName].call(fileTree, functions[functionName])
- }
+ // Execute all functions (sort, filter, map) that were provided (if none were provided, only default "sort" is applied)
+ if (opts.order) {
+ // Order is important, use loop with index instead of order.map()
+ for (let i = 0; i < opts.order.length; i++) {
+ const functionName = opts.order[i]
+ if (functionName === "map") {
+ fileTree.map(opts.mapFn)
+ } else if (functionName === "sort") {
+ fileTree.sort(opts.sortFn)
+ } else if (functionName === "filter") {
+ fileTree.filter(opts.filterFn)
}
}
-
- // 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])
- jsonTree = JSON.stringify(folders)
}
+
+ // 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])
+ jsonTree = JSON.stringify(folders)
}
function Explorer({ allFiles, displayClass, fileData }: QuartzComponentProps) {
@@ -120,6 +112,7 @@
</div>
)
}
+
Explorer.css = explorerStyle
Explorer.afterDOMLoaded = script
return Explorer
--
Gitblit v1.10.0