From ab5efac75fb0f20afe74bef33a2cf7e9ba0ba40f Mon Sep 17 00:00:00 2001
From: bfahrenfort <59982409+bfahrenfort@users.noreply.github.com>
Date: Sun, 01 Oct 2023 16:47:22 +0000
Subject: [PATCH] Fix: RSS title escaping (#521)
---
quartz/components/ExplorerNode.tsx | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/quartz/components/ExplorerNode.tsx b/quartz/components/ExplorerNode.tsx
index e1c8b8e..e5ceb0b 100644
--- a/quartz/components/ExplorerNode.tsx
+++ b/quartz/components/ExplorerNode.tsx
@@ -2,6 +2,8 @@
import { QuartzPluginData } from "../plugins/vfile"
import { resolveRelative } from "../util/path"
+type OrderEntries = "sort" | "filter" | "map"
+
export interface Options {
title: string
folderDefaultState: "collapsed" | "open"
@@ -10,6 +12,7 @@
sortFn: (a: FileNode, b: FileNode) => number
filterFn?: (node: FileNode) => boolean
mapFn?: (node: FileNode) => void
+ order?: OrderEntries[]
}
type DataWrapper = {
@@ -26,19 +29,28 @@
export class FileNode {
children: FileNode[]
name: string
+ displayName: string
file: QuartzPluginData | null
depth: number
constructor(name: string, file?: QuartzPluginData, depth?: number) {
this.children = []
this.name = name
+ this.displayName = name
this.file = file ? structuredClone(file) : null
this.depth = depth ?? 0
}
private insert(file: DataWrapper) {
if (file.path.length === 1) {
- this.children.push(new FileNode(file.file.frontmatter!.title, file.file, this.depth + 1))
+ if (file.path[0] !== "index.md") {
+ this.children.push(new FileNode(file.file.frontmatter!.title, file.file, this.depth + 1))
+ } else {
+ const title = file.file.frontmatter?.title
+ if (title && title !== "index" && file.path[0] === "index.md") {
+ this.displayName = title
+ }
+ }
} else {
const next = file.path[0]
file.path = file.path.splice(1)
@@ -73,23 +85,13 @@
* @param filterFn function to filter tree with
*/
filter(filterFn: (node: FileNode) => boolean) {
- const filteredNodes: FileNode[] = []
-
- const traverse = (node: FileNode) => {
- if (filterFn(node)) {
- filteredNodes.push(node)
- }
- node.children.forEach(traverse)
- }
-
- traverse(this)
-
- this.children = filteredNodes
+ this.children = this.children.filter(filterFn)
+ this.children.forEach((child) => child.filter(filterFn))
}
/**
* Filter FileNode tree. Behaves similar to `Array.prototype.map()`, but modifies tree in place
- * @param mapFn function to filter tree with
+ * @param mapFn function to use for mapping over tree
*/
map(mapFn: (node: FileNode) => void) {
mapFn(this)
@@ -152,12 +154,12 @@
}
return (
- <div>
+ <li>
{node.file ? (
// Single file node
<li key={node.file.slug}>
<a href={resolveRelative(fileData.slug!, node.file.slug!)} data-for={node.file.slug}>
- {node.file.frontmatter?.title}
+ {node.displayName}
</a>
</li>
) : (
@@ -181,17 +183,17 @@
<polyline points="6 9 12 15 18 9"></polyline>
</svg>
{/* render <a> tag if folderBehavior is "link", otherwise render <button> with collapse click event */}
- <li key={node.name} data-folderpath={folderPath}>
+ <div key={node.name} data-folderpath={folderPath}>
{folderBehavior === "link" ? (
<a href={`${folderPath}`} data-for={node.name} class="folder-title">
- {node.name}
+ {node.displayName}
</a>
) : (
<button class="folder-button">
- <h3 class="folder-title">{node.name}</h3>
+ <p class="folder-title">{node.displayName}</p>
</button>
)}
- </li>
+ </div>
</div>
)}
{/* Recursively render children of folder */}
@@ -217,6 +219,6 @@
</div>
</div>
)}
- </div>
+ </li>
)
}
--
Gitblit v1.10.0