From 21c6bbf3026cf9c06f6458bdb6614099d9a91adc Mon Sep 17 00:00:00 2001
From: Aaron Pham <29749331+aarnphm@users.noreply.github.com>
Date: Wed, 14 Feb 2024 04:53:44 +0000
Subject: [PATCH] chore(types): add additional hint for LSP support (#864)
---
quartz/components/Breadcrumbs.tsx | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/quartz/components/Breadcrumbs.tsx b/quartz/components/Breadcrumbs.tsx
index 182d9d6..b1a924a 100644
--- a/quartz/components/Breadcrumbs.tsx
+++ b/quartz/components/Breadcrumbs.tsx
@@ -1,7 +1,8 @@
-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 { QuartzPluginData } from "../plugins/vfile"
+import { classNames } from "../util/lang"
type CrumbData = {
displayName: string
@@ -53,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 <></>
@@ -67,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)
}
}
}
@@ -87,7 +88,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") {
@@ -113,7 +114,7 @@
}
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>
@@ -124,5 +125,6 @@
)
}
Breadcrumbs.css = breadcrumbsStyle
+
return Breadcrumbs
}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0