From cbae88fc4e9b98764cfccca2e85f265c4b894573 Mon Sep 17 00:00:00 2001
From: Adam Brangenberg <adambrangenberg@proton.me>
Date: Mon, 31 Jul 2023 04:08:32 +0000
Subject: [PATCH] Removing redundant properties (#356)
---
quartz/components/pages/FolderContent.tsx | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 9221eac..ea7ab5e 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,18 +1,18 @@
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
+import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
import path from "path"
-import style from '../styles/listPage.scss'
+import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
import { canonicalizeServer } from "../../path"
function FolderContent(props: QuartzComponentProps) {
const { tree, fileData, allFiles } = props
const folderSlug = canonicalizeServer(fileData.slug!)
- const allPagesInFolder = allFiles.filter(file => {
- const fileSlug = file.slug ?? ""
- const prefixed = fileSlug.startsWith(folderSlug)
+ const allPagesInFolder = allFiles.filter((file) => {
+ const fileSlug = canonicalizeServer(file.slug!)
+ const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
const folderParts = folderSlug.split(path.posix.sep)
const fileParts = fileSlug.split(path.posix.sep)
const isDirectChild = fileParts.length === folderParts.length + 1
@@ -21,18 +21,20 @@
const listProps = {
...props,
- allFiles: allPagesInFolder
+ allFiles: allPagesInFolder,
}
-
+
// @ts-ignore
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
- return <div class="popover-hint">
- <article>{content}</article>
- <p>{allPagesInFolder.length} items under this folder.</p>
- <div>
- <PageList {...listProps} />
+ const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
+ return (
+ <div class="popover-hint">
+ <article>{content}</article>
+ <p>{allPagesInFolder.length} items under this folder.</p>
+ <div>
+ <PageList {...listProps} />
+ </div>
</div>
- </div>
+ )
}
FolderContent.css = style + PageList.css
--
Gitblit v1.10.0