From aaa5c8e8e40be33aec74c1cf0073ac081cb918fc Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 24 Mar 2025 00:34:14 +0000
Subject: [PATCH] feat: conditional render component
---
quartz/components/PageList.tsx | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/quartz/components/PageList.tsx b/quartz/components/PageList.tsx
index 62b77b1..2a5f0e0 100644
--- a/quartz/components/PageList.tsx
+++ b/quartz/components/PageList.tsx
@@ -1,13 +1,20 @@
-import { FullSlug, resolveRelative } from "../util/path"
+import { FullSlug, isFolderPath, resolveRelative } from "../util/path"
import { QuartzPluginData } from "../plugins/vfile"
import { Date, getDate } from "./Date"
import { QuartzComponent, QuartzComponentProps } from "./types"
import { GlobalConfiguration } from "../cfg"
-export function byDateAndAlphabetical(
- cfg: GlobalConfiguration,
-): (f1: QuartzPluginData, f2: QuartzPluginData) => number {
+export type SortFn = (f1: QuartzPluginData, f2: QuartzPluginData) => number
+
+export function byDateAndAlphabetical(cfg: GlobalConfiguration): SortFn {
return (f1, f2) => {
+ // Sort folders first
+ const f1IsFolder = isFolderPath(f1.slug ?? "")
+ const f2IsFolder = isFolderPath(f2.slug ?? "")
+ if (f1IsFolder && !f2IsFolder) return -1
+ if (!f1IsFolder && f2IsFolder) return 1
+
+ // If both are folders or both are files, sort by date/alphabetical
if (f1.dates && f2.dates) {
// sort descending
return getDate(cfg, f2)!.getTime() - getDate(cfg, f1)!.getTime()
@@ -27,10 +34,12 @@
type Props = {
limit?: number
+ sort?: SortFn
} & QuartzComponentProps
-export const PageList: QuartzComponent = ({ cfg, fileData, allFiles, limit }: Props) => {
- let list = allFiles.sort(byDateAndAlphabetical(cfg))
+export const PageList: QuartzComponent = ({ cfg, fileData, allFiles, limit, sort }: Props) => {
+ const sorter = sort ?? byDateAndAlphabetical(cfg)
+ let list = allFiles.sort(sorter)
if (limit) {
list = list.slice(0, limit)
}
@@ -44,11 +53,9 @@
return (
<li class="section-li">
<div class="section">
- {page.dates && (
- <p class="meta">
- <Date date={getDate(cfg, page)!} locale={cfg.locale} />
- </p>
- )}
+ <p class="meta">
+ {page.dates && <Date date={getDate(cfg, page)!} locale={cfg.locale} />}
+ </p>
<div class="desc">
<h3>
<a href={resolveRelative(fileData.slug!, page.slug!)} class="internal">
@@ -63,7 +70,7 @@
class="internal tag-link"
href={resolveRelative(fileData.slug!, `tags/${tag}` as FullSlug)}
>
- #{tag}
+ {tag}
</a>
</li>
))}
--
Gitblit v1.10.0