From e47c29d2fd4eae06c511c914e2a5fcb057b44d7b Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 21:14:29 +0000
Subject: [PATCH] chore(deps): bump rehype-katex from 7.0.0 to 7.0.1 (#1356)
---
quartz/components/pages/FolderContent.tsx | 100 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 34 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 9221eac..dc216cd 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,39 +1,71 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
import path from "path"
-import style from '../styles/listPage.scss'
-import { PageList } from "../PageList"
-import { canonicalizeServer } from "../../path"
+import style from "../styles/listPage.scss"
+import { PageList, SortFn } from "../PageList"
+import { stripSlashes, simplifySlug } from "../../util/path"
+import { Root } from "hast"
+import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n"
-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 folderParts = folderSlug.split(path.posix.sep)
- const fileParts = fileSlug.split(path.posix.sep)
- const isDirectChild = fileParts.length === folderParts.length + 1
- return prefixed && isDirectChild
- })
-
- const listProps = {
- ...props,
- 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} />
- </div>
- </div>
+interface FolderContentOptions {
+ /**
+ * Whether to display number of folders
+ */
+ showFolderCount: boolean
+ sort?: SortFn
}
-FolderContent.css = style + PageList.css
-export default (() => FolderContent) satisfies QuartzComponentConstructor
+const defaultOptions: FolderContentOptions = {
+ showFolderCount: true,
+}
+
+export default ((opts?: Partial<FolderContentOptions>) => {
+ const options: FolderContentOptions = { ...defaultOptions, ...opts }
+
+ const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
+ const { tree, fileData, allFiles, cfg } = props
+ 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
+ return prefixed && isDirectChild
+ })
+ const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
+ const classes = ["popover-hint", ...cssClasses].join(" ")
+ const listProps = {
+ ...props,
+ sort: options.sort,
+ allFiles: allPagesInFolder,
+ }
+
+ const content =
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : htmlToJsx(fileData.filePath!, tree)
+
+ return (
+ <div class={classes}>
+ <article>{content}</article>
+ <div class="page-listing">
+ {options.showFolderCount && (
+ <p>
+ {i18n(cfg.locale).pages.folderContent.itemsUnderFolder({
+ count: allPagesInFolder.length,
+ })}
+ </p>
+ )}
+ <div>
+ <PageList {...listProps} />
+ </div>
+ </div>
+ </div>
+ )
+ }
+
+ FolderContent.css = style + PageList.css
+ return FolderContent
+}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0