From 8bfee04c8c6948a88114d53769d4bb89b8ec7bf5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 17 Jun 2023 23:05:46 +0000
Subject: [PATCH] popovers
---
quartz/plugins/emitters/contentPage.tsx | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index b7059f8..4728920 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,18 +1,20 @@
-import { StaticResources } from "../../resources"
-import { EmitCallback, QuartzEmitterPlugin } from "../types"
-import { ProcessedContent } from "../vfile"
+import { JSResourceToScriptElement, StaticResources } from "../../resources"
+import { QuartzEmitterPlugin } from "../types"
import { render } from "preact-render-to-string"
-import { GlobalConfiguration } from "../../cfg"
import { QuartzComponent } from "../../components/types"
import { resolveToRoot } from "../../path"
-import Header from "../../components/Header"
+import HeaderConstructor from "../../components/Header"
import { QuartzComponentProps } from "../../components/types"
-import Body from "../../components/Body"
+import BodyConstructor from "../../components/Body"
interface Options {
head: QuartzComponent
header: QuartzComponent[],
- body: QuartzComponent[]
+ beforeBody: QuartzComponent[],
+ content: QuartzComponent,
+ left: QuartzComponent[],
+ right: QuartzComponent[],
+ footer: QuartzComponent[],
}
export const ContentPage: QuartzEmitterPlugin<Options> = (opts) => {
@@ -20,23 +22,26 @@
throw new Error("ContentPage must be initialized with options specifiying the components to use")
}
+ const { head: Head, header, beforeBody, left, right, footer } = opts
+ const Header = HeaderConstructor()
+ const Body = BodyConstructor()
+
return {
name: "ContentPage",
getQuartzComponents() {
- return [opts.head, Header, ...opts.header, ...opts.body]
+ return [opts.head, Header, Body, ...opts.header, ...opts.beforeBody, opts.content, ...opts.left, ...opts.right, ...opts.footer]
},
- async emit(cfg: GlobalConfiguration, content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
+ async emit(_contentDir, cfg, content, resources, emit): Promise<string[]> {
const fps: string[] = []
- const { head: Head, header, body } = opts
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" },
+ { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", contentType: "external" },
...resources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' }
+ { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", moduleType: 'module', contentType: "external" }
]
}
@@ -48,19 +53,32 @@
tree
}
+ const Content = opts.content
const doc = <html>
<Head {...componentData} />
- <body>
+ <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}>
- {body.map(BodyComponent => <BodyComponent {...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>
+
</div>
</body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} {...resource} />)}
+ {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
</html>
const fp = file.data.slug + ".html"
--
Gitblit v1.10.0