From 998198cffb9bbcc8a75cd07310c06fabff6750bd Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:27:16 +0000
Subject: [PATCH] chore(deps): bump esbuild-sass-plugin from 2.16.0 to 2.16.1 (#778)
---
quartz/components/Explorer.tsx | 71 ++++++++++++++++-------------------
1 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/quartz/components/Explorer.tsx b/quartz/components/Explorer.tsx
index 79d8781..f701734 100644
--- a/quartz/components/Explorer.tsx
+++ b/quartz/components/Explorer.tsx
@@ -5,13 +5,17 @@
import script from "./scripts/explorer.inline"
import { ExplorerNode, FileNode, Options } from "./ExplorerNode"
import { QuartzPluginData } from "../plugins/vfile"
+import { classNames } from "../util/lang"
+import { i18n } from "../i18n"
// Options interface defined in `ExplorerNode` to avoid circular dependency
const defaultOptions = {
- title: "Explorer",
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 +26,7 @@
sensitivity: "base",
})
}
+
if (a.file && !b.file) {
return 1
} else {
@@ -41,52 +46,39 @@
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
+ // Stringify to pass json tree as data attribute ([data-tree])
+ const folders = fileTree.getFolderPaths(opts.folderDefaultState === "collapsed")
+ jsonTree = JSON.stringify(folders)
}
- function Explorer({ allFiles, displayClass, fileData }: QuartzComponentProps) {
+ function Explorer({ cfg, allFiles, displayClass, fileData }: QuartzComponentProps) {
constructFileTree(allFiles)
return (
- <div class={`explorer ${displayClass}`}>
+ <div class={classNames(displayClass, "explorer")}>
<button
type="button"
id="explorer"
@@ -95,7 +87,7 @@
data-savestate={opts.useSavedState}
data-tree={jsonTree}
>
- <h1>{opts.title}</h1>
+ <h1>{opts.title ?? i18n(cfg.locale).components.explorer.title}</h1>
<svg
xmlns="http://www.w3.org/2000/svg"
width="14"
@@ -120,6 +112,7 @@
</div>
)
}
+
Explorer.css = explorerStyle
Explorer.afterDOMLoaded = script
return Explorer
--
Gitblit v1.10.0