From 39eebca3cfa8adf504d08d54e6fc05912641b40f Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 09 Aug 2024 01:28:13 +0000
Subject: [PATCH] chore: ts fixes
---
quartz/components/ContentMeta.tsx | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/quartz/components/ContentMeta.tsx b/quartz/components/ContentMeta.tsx
index 254c5d4..5dfec14 100644
--- a/quartz/components/ContentMeta.tsx
+++ b/quartz/components/ContentMeta.tsx
@@ -1,16 +1,22 @@
import { formatDate, getDate } from "./Date"
import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
import readingTime from "reading-time"
+import { classNames } from "../util/lang"
+import { i18n } from "../i18n"
+import { JSX } from "preact"
+import style from "./styles/contentMeta.scss"
interface ContentMetaOptions {
/**
* Whether to display reading time
*/
showReadingTime: boolean
+ showComma: boolean
}
const defaultOptions: ContentMetaOptions = {
showReadingTime: true,
+ showComma: true,
}
export default ((opts?: Partial<ContentMetaOptions>) => {
@@ -21,29 +27,34 @@
const text = fileData.text
if (text) {
- const segments: string[] = []
+ const segments: (string | JSX.Element)[] = []
if (fileData.dates) {
- segments.push(formatDate(getDate(cfg, fileData)!))
+ segments.push(formatDate(getDate(cfg, fileData)!, cfg.locale))
}
// Display reading time if enabled
if (options.showReadingTime) {
- const { text: timeTaken, words: _words } = readingTime(text)
- segments.push(timeTaken)
+ const { minutes, words: _words } = readingTime(text)
+ const displayedTime = i18n(cfg.locale).components.contentMeta.readingTime({
+ minutes: Math.ceil(minutes),
+ })
+ segments.push(displayedTime)
}
- return <p class={`content-meta ${displayClass ?? ""}`}>{segments.join(", ")}</p>
+ const segmentsElements = segments.map((segment) => <span>{segment}</span>)
+
+ return (
+ <p show-comma={options.showComma} class={classNames(displayClass, "content-meta")}>
+ {segmentsElements}
+ </p>
+ )
} else {
return null
}
}
- ContentMetadata.css = `
- .content-meta {
- margin-top: 0;
- color: var(--gray);
- }
- `
+ ContentMetadata.css = style
+
return ContentMetadata
}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0