From 685c06ce2e7c559b4e2cc544e300c1262c739b1c Mon Sep 17 00:00:00 2001 From: K Gopal Krishna <30401343+kayg04@users.noreply.github.com> Date: Fri, 4 Apr 2025 23:06:29 +0530 Subject: [PATCH] fix(RecentNotes): Prevent folder pages from always appearing first (closes #1901) (#1904) * Fix(RecentNotes): Prevent folder pages from always appearing first Pass prioritizeFolders=false to byDateAndAlphabetical in RecentNotes to sort strictly by date/alphabetical order, fixing issue #1901. * refactor: split sorting functions for clarity - Split byDateAndAlphabetical into two separate functions\n- byDateAndAlphabetical: sorts strictly by date and alphabetically\n- byDateAndAlphabeticalFolderFirst: sorts with folders first\n- Updated RecentNotes to use date-only sorting * Fix(PageList): keep byDateAndAlphabeticalFolderFirst as the default sorting order for PageList --- quartz/components/PageList.tsx | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/quartz/components/PageList.tsx b/quartz/components/PageList.tsx index 2a5f0e0..7bf2382 100644 --- a/quartz/components/PageList.tsx +++ b/quartz/components/PageList.tsx @@ -7,6 +7,26 @@ import { GlobalConfiguration } from "../cfg" export type SortFn = (f1: QuartzPluginData, f2: QuartzPluginData) => number export function byDateAndAlphabetical(cfg: GlobalConfiguration): SortFn { + return (f1, f2) => { + // Sort by date/alphabetical + 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) + } +} + +export function byDateAndAlphabeticalFolderFirst(cfg: GlobalConfiguration): SortFn { return (f1, f2) => { // Sort folders first const f1IsFolder = isFolderPath(f1.slug ?? "") @@ -38,7 +58,7 @@ type Props = { } & QuartzComponentProps export const PageList: QuartzComponent = ({ cfg, fileData, allFiles, limit, sort }: Props) => { - const sorter = sort ?? byDateAndAlphabetical(cfg) + const sorter = sort ?? byDateAndAlphabeticalFolderFirst(cfg) let list = allFiles.sort(sorter) if (limit) { list = list.slice(0, limit)