From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 24 Jan 2024 01:08:56 +0000
Subject: [PATCH] fix: make search result card block
---
quartz/components/pages/TagContent.tsx | 99 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 19 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index a490b8d..890755b 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -1,33 +1,94 @@
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 style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { ServerSlug, canonicalizeServer } from "../../path"
+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"
+const numPages = 10
function TagContent(props: QuartzComponentProps) {
const { tree, fileData, allFiles } = props
const slug = fileData.slug
- if (slug?.startsWith("tags/")) {
- const tag = canonicalizeServer(slug.slice("tags/".length) as ServerSlug)
- const allPagesWithTag = allFiles.filter(file => (file.frontmatter?.tags ?? []).includes(tag))
- const listProps = {
- ...props,
- allFiles: allPagesWithTag
+ if (!(slug?.startsWith("tags/") || slug === "tags")) {
+ throw new Error(`Component "TagContent" tried to render a non-tag page: ${slug}`)
+ }
+
+ const tag = simplifySlug(slug.slice("tags/".length) as FullSlug)
+ const allPagesWithTag = (tag: string) =>
+ allFiles.filter((file) =>
+ (file.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes).includes(tag),
+ )
+
+ const content =
+ (tree as Root).children.length === 0
+ ? fileData.description
+ : htmlToJsx(fileData.filePath!, tree)
+
+ 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))
}
- // @ts-ignore
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
- return <div class="popover-hint">
- <article>{content}</article>
- <p>{allPagesWithTag.length} items with this tag.</p>
- <div>
- <PageList {...listProps} />
+ return (
+ <div class="popover-hint">
+ <article>
+ <p>{content}</p>
+ </article>
+ <p>Found {tags.length} total tags.</p>
+ <div>
+ {tags.map((tag) => {
+ const pages = tagItemMap.get(tag)!
+ const listProps = {
+ ...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}`}>
+ #{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>
+ )
+ })}
+ </div>
</div>
- </div>
+ )
} else {
- throw new Error(`Component "TagContent" tried to render a non-tag page: ${slug}`)
+ const pages = allPagesWithTag(tag)
+ const listProps = {
+ ...props,
+ allFiles: pages,
+ }
+
+ return (
+ <div class="popover-hint">
+ <article>{content}</article>
+ <p>{pluralize(pages.length, "item")} with this tag.</p>
+ <div>
+ <PageList {...listProps} />
+ </div>
+ </div>
+ )
}
}
--
Gitblit v1.10.0