From de6f469011e15f82ddffa8aad75f628d1ca612da Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 01:54:12 +0000
Subject: [PATCH] chore(deps-dev): bump @types/node from 20.11.25 to 20.11.29 (#1010)
---
quartz/components/pages/TagContent.tsx | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index 890755b..9e04359 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -1,15 +1,15 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
import { FullSlug, getAllSegmentPrefixes, simplifySlug } from "../../util/path"
import { QuartzPluginData } from "../../plugins/vfile"
import { Root } from "hast"
-import { pluralize } from "../../util/lang"
import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n"
const numPages = 10
-function TagContent(props: QuartzComponentProps) {
- const { tree, fileData, allFiles } = props
+const TagContent: QuartzComponent = (props: QuartzComponentProps) => {
+ const { tree, fileData, allFiles, cfg } = props
const slug = fileData.slug
if (!(slug?.startsWith("tags/") || slug === "tags")) {
@@ -26,7 +26,8 @@
(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(
@@ -37,13 +38,12 @@
for (const tag of tags) {
tagItemMap.set(tag, allPagesWithTag(tag))
}
-
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>
<p>{content}</p>
</article>
- <p>Found {tags.length} total tags.</p>
+ <p>{i18n(cfg.locale).pages.tagContent.totalTags({ count: tags.length })}</p>
<div>
{tags.map((tag) => {
const pages = tagItemMap.get(tag)!
@@ -52,21 +52,36 @@
allFiles: pages,
}
- const contentPage = allFiles.filter((file) => file.slug === `tags/${tag}`)[0]
- const content = contentPage?.description
+ const contentPage = allFiles.filter((file) => file.slug === `tags/${tag}`).at(0)
+
+ const root = contentPage?.htmlAst
+ const content =
+ !root || root?.children.length === 0
+ ? contentPage?.description
+ : htmlToJsx(contentPage.filePath!, root)
+
return (
<div>
<h2>
<a class="internal tag-link" href={`../tags/${tag}`}>
- #{tag}
+ {tag}
</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>
+ {i18n(cfg.locale).pages.tagContent.itemsUnderTag({ count: pages.length })}
+ {pages.length > numPages && (
+ <>
+ {" "}
+ <span>
+ {i18n(cfg.locale).pages.tagContent.showingFirst({ count: numPages })}
+ </span>
+ </>
+ )}
+ </p>
+ <PageList limit={numPages} {...listProps} />
+ </div>
</div>
)
})}
@@ -81,11 +96,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>{i18n(cfg.locale).pages.tagContent.itemsUnderTag({ count: pages.length })}</p>
+ <div>
+ <PageList {...listProps} />
+ </div>
</div>
</div>
)
--
Gitblit v1.10.0