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 | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 67cfa8d..dc216cd 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,18 +1,19 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
import path from "path"
import style from "../styles/listPage.scss"
-import { PageList } from "../PageList"
-import { _stripSlashes, simplifySlug } from "../../util/path"
+import { PageList, SortFn } from "../PageList"
+import { stripSlashes, simplifySlug } from "../../util/path"
import { Root } from "hast"
-import { pluralize } from "../../util/lang"
import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n"
interface FolderContentOptions {
/**
* Whether to display number of folders
*/
showFolderCount: boolean
+ sort?: SortFn
}
const defaultOptions: FolderContentOptions = {
@@ -22,20 +23,22 @@
export default ((opts?: Partial<FolderContentOptions>) => {
const options: FolderContentOptions = { ...defaultOptions, ...opts }
- function FolderContent(props: QuartzComponentProps) {
- const { tree, fileData, allFiles } = props
- const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
+ 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 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,
}
@@ -45,15 +48,19 @@
: htmlToJsx(fileData.filePath!, tree)
return (
- <div class="popover-hint">
- <article>
- <p>{content}</p>
- </article>
- {options.showFolderCount && (
- <p>{pluralize(allPagesInFolder.length, "item")} under this folder.</p>
- )}
- <div>
- <PageList {...listProps} />
+ <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>
)
--
Gitblit v1.10.0