From 5ec61468d5e787b3c8ae32a2b4ef1595cf0bc3ee Mon Sep 17 00:00:00 2001
From: Emile Bangma <ewjbangma@hotmail.com>
Date: Sun, 31 Mar 2024 16:44:50 +0000
Subject: [PATCH] fix(wikilinks): proper escaping of pipe character in wikilinks inside tables (#1040)
---
quartz/components/pages/FolderContent.tsx | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 02938e3..a13f135 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,13 +1,12 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
import path from "path"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
-import { _stripSlashes, simplifySlug } from "../../util/path"
+import { stripSlashes, simplifySlug } from "../../util/path"
import { Root } from "hast"
-import { pluralize } from "../../util/lang"
import { htmlToJsx } from "../../util/jsx"
-import { i18n } from "../../i18n/i18next"
+import { i18n } from "../../i18n"
interface FolderContentOptions {
/**
@@ -23,11 +22,11 @@
export default ((opts?: Partial<FolderContentOptions>) => {
const options: FolderContentOptions = { ...defaultOptions, ...opts }
- function FolderContent(props: QuartzComponentProps) {
+ const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
const { tree, fileData, allFiles, cfg } = props
- const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
+ const folderSlug = stripSlashes(simplifySlug(fileData.slug!))
const allPagesInFolder = allFiles.filter((file) => {
- const fileSlug = _stripSlashes(simplifySlug(file.slug!))
+ const fileSlug = stripSlashes(simplifySlug(file.slug!))
const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
const folderParts = folderSlug.split(path.posix.sep)
const fileParts = fileSlug.split(path.posix.sep)
@@ -48,14 +47,13 @@
return (
<div class={classes}>
- <article>
- <p>{content}</p>
- </article>
+ <article>{content}</article>
<div class="page-listing">
{options.showFolderCount && (
<p>
- {pluralize(allPagesInFolder.length, i18n(cfg.locale, "common.item"))}{" "}
- {i18n(cfg.locale, "folderContent.underThisFolder")}.
+ {i18n(cfg.locale).pages.folderContent.itemsUnderFolder({
+ count: allPagesInFolder.length,
+ })}
</p>
)}
<div>
--
Gitblit v1.10.0