From 39eebca3cfa8adf504d08d54e6fc05912641b40f Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 09 Aug 2024 01:28:13 +0000
Subject: [PATCH] chore: ts fixes
---
quartz/components/PageList.tsx | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/quartz/components/PageList.tsx b/quartz/components/PageList.tsx
index d7aca08..8dc19b7 100644
--- a/quartz/components/PageList.tsx
+++ b/quartz/components/PageList.tsx
@@ -1,31 +1,38 @@
import { FullSlug, resolveRelative } from "../util/path"
import { QuartzPluginData } from "../plugins/vfile"
-import { Date } from "./Date"
-import { QuartzComponentProps } from "./types"
+import { Date, getDate } from "./Date"
+import { QuartzComponent, QuartzComponentProps } from "./types"
+import { GlobalConfiguration } from "../cfg"
-function byDateAndAlphabetical(f1: QuartzPluginData, f2: QuartzPluginData): number {
- if (f1.dates && f2.dates) {
- // sort descending by last modified
- return f2.dates.modified.getTime() - f1.dates.modified.getTime()
- } else if (f1.dates && !f2.dates) {
- // prioritize files with dates
- return -1
- } else if (!f1.dates && f2.dates) {
- return 1
+export type SortFn = (f1: QuartzPluginData, f2: QuartzPluginData) => number
+
+export function byDateAndAlphabetical(cfg: GlobalConfiguration): SortFn {
+ return (f1, f2) => {
+ if (f1.dates && f2.dates) {
+ // sort descending
+ return getDate(cfg, f2)!.getTime() - getDate(cfg, f1)!.getTime()
+ } else if (f1.dates && !f2.dates) {
+ // prioritize files with dates
+ return -1
+ } else if (!f1.dates && f2.dates) {
+ return 1
+ }
+
+ // otherwise, sort lexographically by title
+ const f1Title = f1.frontmatter?.title.toLowerCase() ?? ""
+ const f2Title = f2.frontmatter?.title.toLowerCase() ?? ""
+ return f1Title.localeCompare(f2Title)
}
-
- // otherwise, sort lexographically by title
- const f1Title = f1.frontmatter?.title.toLowerCase() ?? ""
- const f2Title = f2.frontmatter?.title.toLowerCase() ?? ""
- return f1Title.localeCompare(f2Title)
}
type Props = {
limit?: number
+ sort?: SortFn
} & QuartzComponentProps
-export function PageList({ fileData, allFiles, limit }: Props) {
- let list = allFiles.sort(byDateAndAlphabetical)
+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)
}
@@ -41,7 +48,7 @@
<div class="section">
{page.dates && (
<p class="meta">
- <Date date={page.dates.modified} />
+ <Date date={getDate(cfg, page)!} locale={cfg.locale} />
</p>
)}
<div class="desc">
@@ -58,7 +65,7 @@
class="internal tag-link"
href={resolveRelative(fileData.slug!, `tags/${tag}` as FullSlug)}
>
- #{tag}
+ {tag}
</a>
</li>
))}
--
Gitblit v1.10.0