From 4e2aea8a5a414b3bcfac0168bea4f6afd032e8f5 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 21:12:45 +0000
Subject: [PATCH] chore(deps): bump @napi-rs/simple-git from 0.1.17 to 0.1.19 (#1376)
---
quartz/components/Breadcrumbs.tsx | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/quartz/components/Breadcrumbs.tsx b/quartz/components/Breadcrumbs.tsx
index 3875f5e..9ccfb9a 100644
--- a/quartz/components/Breadcrumbs.tsx
+++ b/quartz/components/Breadcrumbs.tsx
@@ -1,6 +1,6 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
import breadcrumbsStyle from "./styles/breadcrumbs.scss"
-import { FullSlug, SimpleSlug, resolveRelative } from "../util/path"
+import { FullSlug, SimpleSlug, joinSegments, resolveRelative } from "../util/path"
import { QuartzPluginData } from "../plugins/vfile"
import { classNames } from "../util/lang"
@@ -54,7 +54,11 @@
// computed index of folder name to its associated file data
let folderIndex: Map<string, QuartzPluginData> | undefined
- function Breadcrumbs({ fileData, allFiles, displayClass }: QuartzComponentProps) {
+ const Breadcrumbs: QuartzComponent = ({
+ fileData,
+ allFiles,
+ displayClass,
+ }: QuartzComponentProps) => {
// Hide crumbs on root if enabled
if (options.hideOnRoot && fileData.slug === "index") {
return <></>
@@ -68,13 +72,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("/")
- // 2nd last to exclude the /index
- const folderName = folderParts?.at(-2)
- if (folderName) {
- folderIndex.set(folderName, file)
- }
+ const folderParts = file.slug?.split("/")
+ if (folderParts?.at(-1) === "index") {
+ folderIndex.set(folderParts.slice(0, -1).join("/"), file)
}
}
}
@@ -82,13 +82,17 @@
// 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(curPathSegment)
+ const currentFile = folderIndex?.get(slugParts.slice(0, i + 1).join("/"))
if (currentFile) {
const title = currentFile.frontmatter!.title
if (title !== "index") {
@@ -97,10 +101,15 @@
}
// Add current slug to full path
- currentPath += slugParts[i] + "/"
+ currentPath = joinSegments(currentPath, slugParts[i])
+ const includeTrailingSlash = !isTagPath || i < 1
// Format and add current crumb
- const crumb = formatCrumb(curPathSegment, fileData.slug!, currentPath as SimpleSlug)
+ const crumb = formatCrumb(
+ curPathSegment,
+ fileData.slug!,
+ (currentPath + (includeTrailingSlash ? "/" : "")) as SimpleSlug,
+ )
crumbs.push(crumb)
}
@@ -125,5 +134,6 @@
)
}
Breadcrumbs.css = breadcrumbsStyle
+
return Breadcrumbs
}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0