From 9d77edaf94d23f207552b3a650189810ba2252cd Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 20 Aug 2023 08:08:18 +0000
Subject: [PATCH] fix description not being used in folder and tag listings
---
quartz/components/pages/FolderContent.tsx | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index ea7ab5e..c1083ba 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -5,13 +5,14 @@
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 = canonicalizeServer(file.slug!)
+ const fileSlug = simplifySlug(file.slug!)
const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
const folderParts = folderSlug.split(path.posix.sep)
const fileParts = fileSlug.split(path.posix.sep)
@@ -24,8 +25,11 @@
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