From 4e74d11b1aee8c0affa0b13ba7b174d175ca3244 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 24 Mar 2025 00:24:43 +0000
Subject: [PATCH] fix: cleanup a href link construction, global shared trie, breadcrumbs use trie
---
quartz/components/Breadcrumbs.tsx | 90 +++++++++++----------------------------------
1 files changed, 22 insertions(+), 68 deletions(-)
diff --git a/quartz/components/Breadcrumbs.tsx b/quartz/components/Breadcrumbs.tsx
index d0faeab..5144a31 100644
--- a/quartz/components/Breadcrumbs.tsx
+++ b/quartz/components/Breadcrumbs.tsx
@@ -1,8 +1,8 @@
import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
import breadcrumbsStyle from "./styles/breadcrumbs.scss"
-import { FullSlug, SimpleSlug, joinSegments, resolveRelative } from "../util/path"
-import { QuartzPluginData } from "../plugins/vfile"
+import { FullSlug, SimpleSlug, resolveRelative, simplifySlug } from "../util/path"
import { classNames } from "../util/lang"
+import { trieFromAllFiles } from "../util/ctx"
type CrumbData = {
displayName: string
@@ -23,10 +23,6 @@
*/
resolveFrontmatterTitle: boolean
/**
- * Whether to display breadcrumbs on root `index.md`
- */
- hideOnRoot: boolean
- /**
* Whether to display the current page in the breadcrumbs.
*/
showCurrentPage: boolean
@@ -36,7 +32,6 @@
spacerSymbol: "❯",
rootName: "Home",
resolveFrontmatterTitle: true,
- hideOnRoot: true,
showCurrentPage: true,
}
@@ -48,78 +43,37 @@
}
export default ((opts?: Partial<BreadcrumbOptions>) => {
- // Merge options with defaults
const options: BreadcrumbOptions = { ...defaultOptions, ...opts }
-
- // computed index of folder name to its associated file data
- let folderIndex: Map<string, QuartzPluginData> | undefined
-
const Breadcrumbs: QuartzComponent = ({
fileData,
allFiles,
displayClass,
+ ctx,
}: QuartzComponentProps) => {
- // Hide crumbs on root if enabled
- if (options.hideOnRoot && fileData.slug === "index") {
- return <></>
+ const trie = (ctx.trie ??= trieFromAllFiles(allFiles))
+ const slugParts = fileData.slug!.split("/")
+ const pathNodes = trie.ancestryChain(slugParts)
+
+ if (!pathNodes) {
+ return null
}
- // Format entry for root element
- const firstEntry = formatCrumb(options.rootName, fileData.slug!, "/" as SimpleSlug)
- const crumbs: CrumbData[] = [firstEntry]
-
- if (!folderIndex && options.resolveFrontmatterTitle) {
- folderIndex = new Map()
- // construct the index for the first time
- for (const file of allFiles) {
- const folderParts = file.slug?.split("/")
- if (folderParts?.at(-1) === "index") {
- folderIndex.set(folderParts.slice(0, -1).join("/"), file)
- }
- }
- }
-
- // Split slug into hierarchy/parts
- const slugParts = fileData.slug?.split("/")
- if (slugParts) {
- // is tag breadcrumb?
- const isTagPath = slugParts[0] === "tags"
-
- // full path until current part
- let currentPath = ""
-
- for (let i = 0; i < slugParts.length - 1; i++) {
- let curPathSegment = slugParts[i]
-
- // Try to resolve frontmatter folder title
- const currentFile = folderIndex?.get(slugParts.slice(0, i + 1).join("/"))
- if (currentFile) {
- const title = currentFile.frontmatter!.title
- if (title !== "index") {
- curPathSegment = title
- }
- }
-
- // Add current slug to full path
- currentPath = joinSegments(currentPath, slugParts[i])
- const includeTrailingSlash = !isTagPath || i < slugParts.length - 1
-
- // Format and add current crumb
- const crumb = formatCrumb(
- curPathSegment,
- fileData.slug!,
- (currentPath + (includeTrailingSlash ? "/" : "")) as SimpleSlug,
- )
- crumbs.push(crumb)
+ const crumbs: CrumbData[] = pathNodes.map((node, idx) => {
+ const crumb = formatCrumb(node.displayName, fileData.slug!, simplifySlug(node.slug))
+ if (idx === 0) {
+ crumb.displayName = options.rootName
}
- // Add current file to crumb (can directly use frontmatter title)
- if (options.showCurrentPage && slugParts.at(-1) !== "index") {
- crumbs.push({
- displayName: fileData.frontmatter!.title,
- path: "",
- })
+ // For last node (current page), set empty path
+ if (idx === pathNodes.length - 1) {
+ crumb.path = ""
}
+
+ return crumb
+ })
+
+ if (!options.showCurrentPage) {
+ crumbs.pop()
}
return (
--
Gitblit v1.10.0