From 1d2dc167f4397e230092cc867889a86734343cfc Mon Sep 17 00:00:00 2001
From: Thomas Hack <39602241+tha00@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:52:33 +0000
Subject: [PATCH] feat(folder): add intermediate folders pages (#1295)
---
quartz/components/pages/FolderContent.tsx | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index dc216cd..7a49d49 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -2,22 +2,25 @@
import path from "path"
import style from "../styles/listPage.scss"
-import { PageList, SortFn } from "../PageList"
-import { stripSlashes, simplifySlug } from "../../util/path"
+import { byDateAndAlphabetical, PageList, SortFn } from "../PageList"
+import { stripSlashes, simplifySlug, joinSegments, FullSlug } from "../../util/path"
import { Root } from "hast"
import { htmlToJsx } from "../../util/jsx"
import { i18n } from "../../i18n"
+import { QuartzPluginData } from "../../plugins/vfile"
interface FolderContentOptions {
/**
* Whether to display number of folders
*/
showFolderCount: boolean
+ showSubfolders: boolean
sort?: SortFn
}
const defaultOptions: FolderContentOptions = {
showFolderCount: true,
+ showSubfolders: true,
}
export default ((opts?: Partial<FolderContentOptions>) => {
@@ -26,14 +29,47 @@
const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
const { tree, fileData, allFiles, cfg } = props
const folderSlug = stripSlashes(simplifySlug(fileData.slug!))
- const allPagesInFolder = allFiles.filter((file) => {
+ const folderParts = folderSlug.split(path.posix.sep)
+
+ const allPagesInFolder: QuartzPluginData[] = []
+ const allPagesInSubfolders: Map<FullSlug, QuartzPluginData[]> = new Map()
+
+ allFiles.forEach((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
+
+ if (!prefixed) {
+ return
+ }
+
+ if (isDirectChild) {
+ allPagesInFolder.push(file)
+ } else if (options.showSubfolders) {
+ const subfolderSlug = joinSegments(
+ ...fileParts.slice(0, folderParts.length + 1),
+ ) as FullSlug
+ const pagesInFolder = allPagesInSubfolders.get(subfolderSlug) || []
+ allPagesInSubfolders.set(subfolderSlug, [...pagesInFolder, file])
+ }
})
+
+ allPagesInSubfolders.forEach((files, subfolderSlug) => {
+ const hasIndex = allPagesInFolder.some(
+ (file) => subfolderSlug === stripSlashes(simplifySlug(file.slug!)),
+ )
+ if (!hasIndex) {
+ const subfolderDates = files.sort(byDateAndAlphabetical(cfg))[0].dates
+ const subfolderTitle = subfolderSlug.split(path.posix.sep).at(-1)!
+ allPagesInFolder.push({
+ slug: subfolderSlug,
+ dates: subfolderDates,
+ frontmatter: { title: subfolderTitle, tags: ["folder"] },
+ })
+ }
+ })
+
const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
const classes = ["popover-hint", ...cssClasses].join(" ")
const listProps = {
--
Gitblit v1.10.0