From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/components/renderPage.tsx | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index 5cb39d9..b3fe06b 100644
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -3,9 +3,10 @@
import HeaderConstructor from "./Header"
import BodyConstructor from "./Body"
import { JSResourceToScriptElement, StaticResources } from "../util/resources"
-import { FullSlug, RelativeURL, joinSegments } from "../util/path"
+import { FullSlug, RelativeURL, joinSegments, normalizeHastElement } from "../util/path"
import { visit } from "unist-util-visit"
import { Root, Element, ElementContent } from "hast"
+import { QuartzPluginData } from "../plugins/vfile"
interface RenderComponents {
head: QuartzComponent
@@ -22,7 +23,7 @@
staticResources: StaticResources,
): StaticResources {
const contentIndexPath = joinSegments(baseDir, "static/contentIndex.json")
- const contentIndexScript = `const fetchData = fetch(\`${contentIndexPath}\`).then(data => data.json())`
+ const contentIndexScript = `const fetchData = fetch("${contentIndexPath}").then(data => data.json())`
return {
css: [joinSegments(baseDir, "index.css"), ...staticResources.css],
@@ -49,6 +50,18 @@
}
}
+let pageIndex: Map<FullSlug, QuartzPluginData> | undefined = undefined
+function getOrComputeFileIndex(allFiles: QuartzPluginData[]): Map<FullSlug, QuartzPluginData> {
+ if (!pageIndex) {
+ pageIndex = new Map()
+ for (const file of allFiles) {
+ pageIndex.set(file.slug!, file)
+ }
+ }
+
+ return pageIndex
+}
+
export function renderPage(
slug: FullSlug,
componentData: QuartzComponentProps,
@@ -61,30 +74,29 @@
const classNames = (node.properties?.className ?? []) as string[]
if (classNames.includes("transclude")) {
const inner = node.children[0] as Element
- const transcludeTarget = inner.properties?.["data-slug"] as FullSlug
-
- // TODO: avoid this expensive find operation and construct an index ahead of time
- const page = componentData.allFiles.find((f) => f.slug === transcludeTarget)
+ const transcludeTarget = inner.properties["data-slug"] as FullSlug
+ const page = getOrComputeFileIndex(componentData.allFiles).get(transcludeTarget)
if (!page) {
return
}
- let blockRef = node.properties?.dataBlock as string | undefined
- if (blockRef?.startsWith("^")) {
+ let blockRef = node.properties.dataBlock as string | undefined
+ if (blockRef?.startsWith("#^")) {
// block transclude
- blockRef = blockRef.slice(1)
+ blockRef = blockRef.slice("#^".length)
let blockNode = page.blocks?.[blockRef]
if (blockNode) {
if (blockNode.tagName === "li") {
blockNode = {
type: "element",
tagName: "ul",
+ properties: {},
children: [blockNode],
}
}
node.children = [
- blockNode,
+ normalizeHastElement(blockNode, slug, transcludeTarget),
{
type: "element",
tagName: "a",
@@ -117,7 +129,9 @@
}
node.children = [
- ...(page.htmlAst.children.slice(startIdx, endIdx) as ElementContent[]),
+ ...(page.htmlAst.children.slice(startIdx, endIdx) as ElementContent[]).map((child) =>
+ normalizeHastElement(child as Element, slug, transcludeTarget),
+ ),
{
type: "element",
tagName: "a",
@@ -131,11 +145,14 @@
{
type: "element",
tagName: "h1",
+ properties: {},
children: [
{ type: "text", value: page.frontmatter?.title ?? `Transclude of ${page.slug}` },
],
},
- ...(page.htmlAst.children as ElementContent[]),
+ ...(page.htmlAst.children as ElementContent[]).map((child) =>
+ normalizeHastElement(child as Element, slug, transcludeTarget),
+ ),
{
type: "element",
tagName: "a",
--
Gitblit v1.10.0