From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/components/pages/FolderContent.tsx | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 9221eac..765f846 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,18 +1,19 @@
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
import path from "path"
-import style from '../styles/listPage.scss'
+import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { canonicalizeServer } from "../../path"
+import { _stripSlashes, simplifySlug } from "../../util/path"
+import { Root } from "hast"
+import { pluralize } from "../../util/lang"
+import { htmlToJsx } from "../../util/jsx"
function FolderContent(props: QuartzComponentProps) {
const { tree, fileData, allFiles } = props
- const folderSlug = canonicalizeServer(fileData.slug!)
- const allPagesInFolder = allFiles.filter(file => {
- const fileSlug = file.slug ?? ""
- const prefixed = fileSlug.startsWith(folderSlug)
+ const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
+ const allPagesInFolder = allFiles.filter((file) => {
+ 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
@@ -21,18 +22,25 @@
const listProps = {
...props,
- allFiles: allPagesInFolder
+ allFiles: allPagesInFolder,
}
-
- // @ts-ignore
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
- return <div class="popover-hint">
- <article>{content}</article>
- <p>{allPagesInFolder.length} items under this folder.</p>
- <div>
- <PageList {...listProps} />
+
+ const content =
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : htmlToJsx(fileData.filePath!, tree)
+
+ return (
+ <div class="popover-hint">
+ <article>
+ <p>{content}</p>
+ </article>
+ <p>{pluralize(allPagesInFolder.length, "item")} under this folder.</p>
+ <div>
+ <PageList {...listProps} />
+ </div>
</div>
- </div>
+ )
}
FolderContent.css = style + PageList.css
--
Gitblit v1.10.0