folder and tag descriptions, re-enable relative pathing

This commit is contained in:
Jacky Zhao 2023-07-04 18:02:59 -07:00
parent 7e3781c6d0
commit f8b2275b43
5 changed files with 12 additions and 6 deletions

View File

@ -23,9 +23,12 @@ function FolderContent(props: QuartzComponentProps) {
allFiles: allPagesInFolder
}
const desc = props.fileData.description
// @ts-ignore
const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
return <div class="popover-hint">
{desc && <p>{desc}</p>}
<article>{content}</article>
<p>{allPagesInFolder.length} items under this folder.</p>
<div>

View File

@ -17,9 +17,12 @@ function TagContent(props: QuartzComponentProps) {
allFiles: allPagesWithTag
}
const desc = props.fileData.description
// @ts-ignore
const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
return <div class="popover-hint">
{desc && <p>{desc}</p>}
<article>{content}</article>
<p>{allPagesWithTag.length} items with this tag.</p>
<div>

View File

@ -60,8 +60,7 @@ export function relativeToRoot(slug: string, fp: string): string {
}
export function relative(src: string, dest: string): string {
return "./" + path.relative(src, dest)
return path.relative(src, dest)
}
export const QUARTZ = "quartz"

View File

@ -31,7 +31,9 @@ export const Description: QuartzTransformerPlugin<Partial<Options> | undefined>
let sentenceIdx = 0
const len = opts.descriptionLength
while (finalDesc.length < len) {
finalDesc += sentences[sentenceIdx] + '.'
const sentence = sentences[sentenceIdx]
if (!sentence) break
finalDesc += sentence + '.'
sentenceIdx++
}

View File

@ -1,5 +1,5 @@
import { QuartzTransformerPlugin } from "../types"
import { clientSideSlug, relativeToRoot, slugify, trimPathSuffix } from "../../path"
import { clientSideSlug, relative, relativeToRoot, slugify, trimPathSuffix } from "../../path"
import path from "path"
import { visit } from 'unist-util-visit'
import isAbsoluteUrl from "is-absolute-url"
@ -31,8 +31,7 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options> | undefined> =
const transformLink = (target: string) => {
const targetSlug = slugify(decodeURI(target).trim())
if (opts.markdownLinkResolution === 'relative' && !path.isAbsolute(targetSlug)) {
// TODO
// return './' + relative(curSlug, targetSlug)
return './' + relative(curSlug, targetSlug)
} else {
return './' + relativeToRoot(curSlug, targetSlug)
}