From 0a3379a8530f365e2bd85e8ea20a1dfc8126c39c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 02 Feb 2024 18:10:25 +0000
Subject: [PATCH] fix(search): null checks and focus fixes
---
quartz/components/pages/TagContent.tsx | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index a495af5..ec30c5f 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -26,16 +26,20 @@
(tree as Root).children.length === 0
? fileData.description
: htmlToJsx(fileData.filePath!, tree)
-
+ const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
+ const classes = ["popover-hint", ...cssClasses].join(" ")
if (tag === "/") {
- const tags = [...new Set(allFiles.flatMap((data) => data.frontmatter?.tags ?? []))]
+ const tags = [
+ ...new Set(
+ allFiles.flatMap((data) => data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes),
+ ),
+ ].sort((a, b) => a.localeCompare(b))
const tagItemMap: Map<string, QuartzPluginData[]> = new Map()
for (const tag of tags) {
tagItemMap.set(tag, allPagesWithTag(tag))
}
-
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>
<p>{content}</p>
</article>
@@ -58,11 +62,13 @@
</a>
</h2>
{content && <p>{content}</p>}
- <p>
- {pluralize(pages.length, "item")} with this tag.{" "}
- {pages.length > numPages && `Showing first ${numPages}.`}
- </p>
- <PageList limit={numPages} {...listProps} />
+ <div class="page-listing">
+ <p>
+ {pluralize(pages.length, "item")} with this tag.{" "}
+ {pages.length > numPages && `Showing first ${numPages}.`}
+ </p>
+ <PageList limit={numPages} {...listProps} />
+ </div>
</div>
)
})}
@@ -77,11 +83,13 @@
}
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>{content}</article>
- <p>{pluralize(pages.length, "item")} with this tag.</p>
- <div>
- <PageList {...listProps} />
+ <div class="page-listing">
+ <p>{pluralize(pages.length, "item")} with this tag.</p>
+ <div>
+ <PageList {...listProps} />
+ </div>
</div>
</div>
)
--
Gitblit v1.10.0