From efd46f84de2d8dcc630b96de5454027bfbbf5f6e Mon Sep 17 00:00:00 2001
From: Eiko Wagenknecht <git@eiko-wagenknecht.de>
Date: Mon, 19 Feb 2024 08:08:36 +0000
Subject: [PATCH] fix(frontmatter): delimiters parameter was not passed (#885)
---
quartz/components/pages/TagContent.tsx | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index 2a9dfca..19452ec 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -1,39 +1,49 @@
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { ServerSlug, canonicalizeServer, getAllSegmentPrefixes } from "../../path"
+import { FullSlug, getAllSegmentPrefixes, simplifySlug } from "../../util/path"
import { QuartzPluginData } from "../../plugins/vfile"
+import { Root } from "hast"
+import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n"
const numPages = 10
function TagContent(props: QuartzComponentProps) {
- const { tree, fileData, allFiles } = props
+ const { tree, fileData, allFiles, cfg } = props
const slug = fileData.slug
- if (!slug?.startsWith("tags/")) {
+ if (!(slug?.startsWith("tags/") || slug === "tags")) {
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" })
- if (tag === "") {
- const tags = [...new Set(allFiles.flatMap((data) => data.frontmatter?.tags ?? []))]
+ const content =
+ (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 ?? []).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">
- <article>{content}</article>
- <p>Found {tags.length} total tags.</p>
+ <div class={classes}>
+ <article>
+ <p>{content}</p>
+ </article>
+ <p>{i18n(cfg.locale).pages.tagContent.totalTags({ count: tags.length })}</p>
<div>
{tags.map((tag) => {
const pages = tagItemMap.get(tag)!
@@ -41,15 +51,28 @@
...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={`./tags/${tag}`}>
+ <a class="internal tag-link" href={`../tags/${tag}`}>
#{tag}
</a>
</h2>
- <p>{pages.length} items with this tag. {pages.length > numPages && `Showing first ${numPages}.`}</p>
- <PageList limit={numPages} {...listProps} />
+ {content && <p>{content}</p>}
+ <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>
)
})}
@@ -64,11 +87,13 @@
}
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>{content}</article>
- <p>{pages.length} items 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