From 82bd08d14a45f9b1c3d48000543562fa0d51f13a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 03 Dec 2023 00:51:03 +0000
Subject: [PATCH] fix: transcludes and relative paths
---
quartz/components/renderPage.tsx | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index 5cb39d9..305f511 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
@@ -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,
@@ -62,17 +75,15 @@
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 page = getOrComputeFileIndex(componentData.allFiles).get(transcludeTarget)
if (!page) {
return
}
let blockRef = node.properties?.dataBlock as string | undefined
- if (blockRef?.startsWith("^")) {
+ if (blockRef?.startsWith("#^")) {
// block transclude
- blockRef = blockRef.slice(1)
+ blockRef = blockRef.slice("#^".length)
let blockNode = page.blocks?.[blockRef]
if (blockNode) {
if (blockNode.tagName === "li") {
@@ -84,7 +95,7 @@
}
node.children = [
- blockNode,
+ normalizeHastElement(blockNode, slug, transcludeTarget),
{
type: "element",
tagName: "a",
@@ -117,7 +128,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",
@@ -135,7 +148,9 @@
{ 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