From e10de3febffd3e3b7eaa3aed611aea03153e6a82 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 22 Aug 2023 00:01:18 +0000
Subject: [PATCH] fix: server-handler crash from filename (closes #386)
---
quartz/components/pages/FolderContent.tsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 66a1adb..6c5fd7d 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -5,14 +5,15 @@
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { canonicalizeServer } from "../../path"
+import { _stripSlashes, simplifySlug } from "../../util/path"
+import { Root } from "hast"
function FolderContent(props: QuartzComponentProps) {
const { tree, fileData, allFiles } = props
- const folderSlug = canonicalizeServer(fileData.slug!)
+ const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
const allPagesInFolder = allFiles.filter((file) => {
- const fileSlug = file.slug ?? ""
- const prefixed = fileSlug.startsWith(folderSlug)
+ const fileSlug = _stripSlashes(simplifySlug(file.slug!))
+ const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
const folderParts = folderSlug.split(path.posix.sep)
const fileParts = fileSlug.split(path.posix.sep)
const isDirectChild = fileParts.length === folderParts.length + 1
@@ -24,8 +25,12 @@
allFiles: allPagesInFolder,
}
- // @ts-ignore
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
+ const content =
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : // @ts-ignore
+ toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
+
return (
<div class="popover-hint">
<article>{content}</article>
--
Gitblit v1.10.0