From 5232d09af520e12bc421cf19ae5d231a7e36cd4d Mon Sep 17 00:00:00 2001
From: ArtfulAzeria <146041757+ArtfulAzeria@users.noreply.github.com>
Date: Fri, 29 Sep 2023 18:17:48 +0000
Subject: [PATCH] feat: Better and more responsive tag behavior (#515)
---
quartz/components/pages/TagContent.tsx | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index 05aaade..9907e3f 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -3,8 +3,10 @@
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { ServerSlug, canonicalizeServer, getAllSegmentPrefixes, joinSegments } from "../../path"
+import { FullSlug, getAllSegmentPrefixes, simplifySlug } from "../../util/path"
import { QuartzPluginData } from "../../plugins/vfile"
+import { Root } from "hast"
+import { pluralize } from "../../util/lang"
const numPages = 10
function TagContent(props: QuartzComponentProps) {
@@ -15,14 +17,18 @@
throw new Error(`Component "TagContent" tried to render a non-tag page: ${slug}`)
}
- const tag = canonicalizeServer(slug.slice("tags/".length) as ServerSlug)
+ const tag = simplifySlug(slug.slice("tags/".length) as FullSlug)
const allPagesWithTag = (tag: string) =>
allFiles.filter((file) =>
(file.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes).includes(tag),
)
- // @ts-ignore
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
+ const content =
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : // @ts-ignore
+ toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
+
if (tag === "") {
const tags = [...new Set(allFiles.flatMap((data) => data.frontmatter?.tags ?? []))]
const tagItemMap: Map<string, QuartzPluginData[]> = new Map()
@@ -32,7 +38,9 @@
return (
<div class="popover-hint">
- <article>{content}</article>
+ <article>
+ <p>{content}</p>
+ </article>
<p>Found {tags.length} total tags.</p>
<div>
{tags.map((tag) => {
@@ -41,15 +49,19 @@
...props,
allFiles: pages,
}
+
+ const contentPage = allFiles.filter((file) => file.slug === `tags/${tag}`)[0]
+ const content = contentPage?.description
return (
<div>
<h2>
- <a class="internal tag-link" href={`./${joinSegments("tags", tag)}`}>
+ <a class="internal tag-link" href={`./${tag}`}>
#{tag}
</a>
</h2>
+ {content && <p>{content}</p>}
<p>
- {pages.length} items with this tag.{" "}
+ {pluralize(pages.length, "item")} with this tag.{" "}
{pages.length > numPages && `Showing first ${numPages}.`}
</p>
<PageList limit={numPages} {...listProps} />
@@ -69,7 +81,7 @@
return (
<div class="popover-hint">
<article>{content}</article>
- <p>{pages.length} items with this tag.</p>
+ <p>{pluralize(pages.length, "item")} with this tag.</p>
<div>
<PageList {...listProps} />
</div>
--
Gitblit v1.10.0