From fd5c8d17d3b3cd0a13b0a21a2b78d85010e02e12 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 20 Jun 2023 03:37:45 +0000
Subject: [PATCH] basic search implementation
---
quartz/plugins/emitters/contentPage.tsx | 131 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 56a2a15..03bc0ff 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,62 +1,97 @@
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
-import { resolveToRoot } from "../../path"
-import { StaticResources } from "../../resources"
-import { EmitCallback, QuartzEmitterPlugin } from "../types"
-import { ProcessedContent } from "../vfile"
-import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
+import { JSResourceToScriptElement, StaticResources } from "../../resources"
+import { QuartzEmitterPlugin } from "../types"
import { render } from "preact-render-to-string"
-import { ComponentType } from "preact"
-import { HeadProps } from "../../components/Head"
+import { QuartzComponent } from "../../components/types"
+import { resolveToRoot, trimPathSuffix } from "../../path"
+import HeaderConstructor from "../../components/Header"
+import { QuartzComponentProps } from "../../components/types"
+import BodyConstructor from "../../components/Body"
interface Options {
- Head: ComponentType<HeadProps>
+ head: QuartzComponent
+ header: QuartzComponent[],
+ beforeBody: QuartzComponent[],
+ content: QuartzComponent,
+ left: QuartzComponent[],
+ right: QuartzComponent[],
+ footer: QuartzComponent[],
}
-export class ContentPage extends QuartzEmitterPlugin {
- name = "ContentPage"
- opts: Options
-
- constructor(opts: Options) {
- super()
- this.opts = opts
+export const ContentPage: QuartzEmitterPlugin<Options> = (opts) => {
+ if (!opts) {
+ throw new Error("ContentPage must be initialized with options specifiying the components to use")
}
- async emit(content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
- const fps: string[] = []
- for (const [tree, file] of content) {
+ const { head: Head, header, beforeBody, left, right, footer } = opts
+ const Header = HeaderConstructor()
+ const Body = BodyConstructor()
- // @ts-ignore (preact makes it angry)
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
+ return {
+ name: "ContentPage",
+ getQuartzComponents() {
+ return [opts.head, Header, Body, ...opts.header, ...opts.beforeBody, opts.content, ...opts.left, ...opts.right, ...opts.footer]
+ },
+ async emit(_contentDir, cfg, content, resources, emit): Promise<string[]> {
+ const fps: string[] = []
+ const allFiles = content.map(c => c[1].data)
+ for (const [tree, file] of content) {
+ const baseDir = resolveToRoot(file.data.slug!)
+ const pageResources: StaticResources = {
+ css: [baseDir + "/index.css", ...resources.css],
+ js: [
+ { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", contentType: "external" },
+ ...resources.js,
+ { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", moduleType: 'module', contentType: "external" }
+ ]
+ }
- const { Head } = this.opts
- const doc = <html>
- <Head
- title={file.data.frontmatter?.title ?? "Untitled"}
- description={file.data.description ?? "No description provided"}
- slug={file.data.slug!}
- externalResources={resources} />
- <body>
- <div id="quartz-root">
- <header>
- <h1>{file.data.frontmatter?.title}</h1>
- </header>
- <article>
- {content}
- </article>
- </div>
- </body>
- {resources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} src={resource.src} />)}
- </html>
+ const componentData: QuartzComponentProps = {
+ fileData: file.data,
+ externalResources: pageResources,
+ cfg,
+ children: [],
+ tree,
+ allFiles
+ }
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
- slug: file.data.slug!,
- ext: ".html",
- })
+ const Content = opts.content
+ const doc = <html>
+ <Head {...componentData} />
+ <body data-slug={file.data.slug ?? ""}>
+ <div id="quartz-root" class="page">
+ <Header {...componentData} >
+ {header.map(HeaderComponent => <HeaderComponent {...componentData} />)}
+ </Header>
+ <div class="popover-hint">
+ {beforeBody.map(BodyComponent => <BodyComponent {...componentData} />)}
+ </div>
+ <Body {...componentData}>
+ <div class="left">
+ {left.map(BodyComponent => <BodyComponent {...componentData} />)}
+ </div>
+ <div class="center popover-hint">
+ <Content {...componentData} />
+ </div>
+ <div class="right">
+ {right.map(BodyComponent => <BodyComponent {...componentData} />)}
+ </div>
+ </Body>
- fps.push(fp)
+ </div>
+ </body>
+ {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
+ </html>
+
+ const fp = file.data.slug + ".html"
+ await emit({
+ content: "<!DOCTYPE html>\n" + render(doc),
+ slug: file.data.slug!,
+ ext: ".html",
+ })
+
+ fps.push(fp)
+ }
+ return fps
}
- return fps
}
}
--
Gitblit v1.10.0