From ef72f1bf707dca363cdab84da91e2acfaef8f276 Mon Sep 17 00:00:00 2001
From: Ammar Alakkad <am.alakkad@gmail.com>
Date: Mon, 30 Dec 2024 16:03:57 +0000
Subject: [PATCH] Fix ObsidianFlavoredMarkdown source link (#1694)
---
quartz/components/pages/FolderContent.tsx | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 19 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 67cfa8d..593073b 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,41 +1,80 @@
-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 { byDateAndAlphabetical, PageList, SortFn } from "../PageList"
+import { stripSlashes, simplifySlug, joinSegments, FullSlug } from "../../util/path"
import { Root } from "hast"
-import { pluralize } from "../../util/lang"
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>) => {
const options: FolderContentOptions = { ...defaultOptions, ...opts }
- function FolderContent(props: QuartzComponentProps) {
- const { tree, fileData, allFiles } = props
- const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
- const allPagesInFolder = allFiles.filter((file) => {
- const fileSlug = _stripSlashes(simplifySlug(file.slug!))
+ const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
+ const { tree, fileData, allFiles, cfg } = props
+ const folderSlug = stripSlashes(simplifySlug(fileData.slug!))
+ 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 = cssClasses.join(" ")
const listProps = {
...props,
+ sort: options.sort,
allFiles: allPagesInFolder,
}
@@ -46,14 +85,18 @@
return (
<div class="popover-hint">
- <article>
- <p>{content}</p>
- </article>
- {options.showFolderCount && (
- <p>{pluralize(allPagesInFolder.length, "item")} under this folder.</p>
- )}
- <div>
- <PageList {...listProps} />
+ <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>
)
--
Gitblit v1.10.0