From ec00a40aefca73596ab76e3ebe3a8e1129b43688 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 18:27:17 +0000
Subject: [PATCH] chore(deps): bump the production-dependencies group with 4 updates (#2289)
---
quartz/components/pages/FolderContent.tsx | 157 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 122 insertions(+), 35 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 9221eac..afd4f5d 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,39 +1,126 @@
-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 { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
-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 { Root } from "hast"
+import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n"
+import { QuartzPluginData } from "../../plugins/vfile"
+import { ComponentChildren } from "preact"
+import { concatenateResources } from "../../util/resources"
+import { trieFromAllFiles } from "../../util/ctx"
-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
+ showSubfolders: boolean
+ sort?: SortFn
}
-FolderContent.css = style + PageList.css
-export default (() => FolderContent) satisfies QuartzComponentConstructor
+const defaultOptions: FolderContentOptions = {
+ showFolderCount: true,
+ showSubfolders: true,
+}
+
+export default ((opts?: Partial<FolderContentOptions>) => {
+ const options: FolderContentOptions = { ...defaultOptions, ...opts }
+
+ const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
+ const { tree, fileData, allFiles, cfg } = props
+
+ const trie = (props.ctx.trie ??= trieFromAllFiles(allFiles))
+ const folder = trie.findNode(fileData.slug!.split("/"))
+ if (!folder) {
+ return null
+ }
+
+ const allPagesInFolder: QuartzPluginData[] =
+ folder.children
+ .map((node) => {
+ // regular file, proceed
+ if (node.data) {
+ return node.data
+ }
+
+ if (node.isFolder && options.showSubfolders) {
+ // folders that dont have data need synthetic files
+ const getMostRecentDates = (): QuartzPluginData["dates"] => {
+ let maybeDates: QuartzPluginData["dates"] | undefined = undefined
+ for (const child of node.children) {
+ if (child.data?.dates) {
+ // compare all dates and assign to maybeDates if its more recent or its not set
+ if (!maybeDates) {
+ maybeDates = { ...child.data.dates }
+ } else {
+ if (child.data.dates.created > maybeDates.created) {
+ maybeDates.created = child.data.dates.created
+ }
+
+ if (child.data.dates.modified > maybeDates.modified) {
+ maybeDates.modified = child.data.dates.modified
+ }
+
+ if (child.data.dates.published > maybeDates.published) {
+ maybeDates.published = child.data.dates.published
+ }
+ }
+ }
+ }
+ return (
+ maybeDates ?? {
+ created: new Date(),
+ modified: new Date(),
+ published: new Date(),
+ }
+ )
+ }
+
+ return {
+ slug: node.slug,
+ dates: getMostRecentDates(),
+ frontmatter: {
+ title: node.displayName,
+ tags: [],
+ },
+ }
+ }
+ })
+ .filter((page) => page !== undefined) ?? []
+ const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
+ const classes = cssClasses.join(" ")
+ const listProps = {
+ ...props,
+ sort: options.sort,
+ allFiles: allPagesInFolder,
+ }
+
+ const content = (
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : htmlToJsx(fileData.filePath!, tree)
+ ) as ComponentChildren
+
+ return (
+ <div class="popover-hint">
+ <article class={classes}>{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 = concatenateResources(style, PageList.css)
+ return FolderContent
+}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0