From 998198cffb9bbcc8a75cd07310c06fabff6750bd Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:27:16 +0000
Subject: [PATCH] chore(deps): bump esbuild-sass-plugin from 2.16.0 to 2.16.1 (#778)
---
quartz/components/Breadcrumbs.tsx | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/quartz/components/Breadcrumbs.tsx b/quartz/components/Breadcrumbs.tsx
index 175f6f3..eab8a34 100644
--- a/quartz/components/Breadcrumbs.tsx
+++ b/quartz/components/Breadcrumbs.tsx
@@ -2,6 +2,7 @@
import breadcrumbsStyle from "./styles/breadcrumbs.scss"
import { FullSlug, SimpleSlug, resolveRelative } from "../util/path"
import { QuartzPluginData } from "../plugins/vfile"
+import { classNames } from "../util/lang"
type CrumbData = {
displayName: string
@@ -18,15 +19,15 @@
*/
rootName: string
/**
- * wether to look up frontmatter title for folders (could cause performance problems with big vaults)
+ * Whether to look up frontmatter title for folders (could cause performance problems with big vaults)
*/
resolveFrontmatterTitle: boolean
/**
- * Wether to display breadcrumbs on root `index.md`
+ * Whether to display breadcrumbs on root `index.md`
*/
hideOnRoot: boolean
/**
- * Wether to display the current page in the breadcrumbs.
+ * Whether to display the current page in the breadcrumbs.
*/
showCurrentPage: boolean
}
@@ -67,13 +68,9 @@
folderIndex = new Map()
// construct the index for the first time
for (const file of allFiles) {
- if (file.slug?.endsWith("index")) {
- const folderParts = file.slug?.split("/")
- if (folderParts) {
- // 2nd last to exclude the /index
- const folderName = folderParts[folderParts?.length - 2]
- folderIndex.set(folderName, file)
- }
+ const folderParts = file.slug?.split("/")
+ if (folderParts?.at(-1) === "index") {
+ folderIndex.set(folderParts.slice(0, -1).join("/"), file)
}
}
}
@@ -87,7 +84,7 @@
let curPathSegment = slugParts[i]
// Try to resolve frontmatter folder title
- const currentFile = folderIndex?.get(curPathSegment)
+ const currentFile = folderIndex?.get(slugParts.slice(0, i + 1).join("/"))
if (currentFile) {
const title = currentFile.frontmatter!.title
if (title !== "index") {
@@ -104,15 +101,16 @@
}
// Add current file to crumb (can directly use frontmatter title)
- if (options.showCurrentPage && slugParts.at(-1) === "") {
+ if (options.showCurrentPage && slugParts.at(-1) !== "index") {
crumbs.push({
displayName: fileData.frontmatter!.title,
path: "",
})
}
}
+
return (
- <nav class={`breadcrumb-container ${displayClass ?? ""}`} aria-label="breadcrumbs">
+ <nav class={classNames(displayClass, "breadcrumb-container")} aria-label="breadcrumbs">
{crumbs.map((crumb, index) => (
<div class="breadcrumb-element">
<a href={crumb.path}>{crumb.displayName}</a>
--
Gitblit v1.10.0