From 6dd772bf00459fe5165140e4e756e2b3096686e8 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 22 Apr 2025 06:55:38 +0000
Subject: [PATCH] fix(popover): properly clear popover on racing fetch
---
quartz/plugins/transformers/ofm.ts | 84 ++++++++++-------------------------------
1 files changed, 21 insertions(+), 63 deletions(-)
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index a39a4db..5c2f4b2 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -16,9 +16,12 @@
import { splitAnchor } from "../../util/path"
import { JSResource, CSSResource } from "../../util/resources"
// @ts-ignore
-import calloutScript from "../../components/scripts/callout.inline.ts"
+import calloutScript from "../../components/scripts/callout.inline"
// @ts-ignore
-import checkboxScript from "../../components/scripts/checkbox.inline.ts"
+import checkboxScript from "../../components/scripts/checkbox.inline"
+// @ts-ignore
+import mermaidScript from "../../components/scripts/mermaid.inline"
+import mermaidStyle from "../../components/styles/mermaid.inline.scss"
import { FilePath, pathToRoot, slugTag, slugifyFilePath } from "../../util/path"
import { toHast } from "mdast-util-to-hast"
import { toHtml } from "hast-util-to-html"
@@ -188,8 +191,7 @@
const [rawFp, rawHeader, rawAlias]: (string | undefined)[] = capture
const [fp, anchor] = splitAnchor(`${rawFp ?? ""}${rawHeader ?? ""}`)
- const blockRef = Boolean(rawHeader?.match(/^#?\^/)) ? "^" : ""
- const displayAnchor = anchor ? `#${blockRef}${anchor.trim().replace(/^#+/, "")}` : ""
+ const displayAnchor = anchor ? `#${anchor.trim().replace(/^#+/, "")}` : ""
const displayAlias = rawAlias ?? rawHeader?.replace("#", "|") ?? ""
const embedDisplay = value.startsWith("!") ? "!" : ""
@@ -672,7 +674,6 @@
properties: {
className: ["expand-button"],
"aria-label": "Expand mermaid diagram",
- "aria-hidden": "true",
"data-view-component": true,
},
children: [
@@ -703,7 +704,7 @@
{
type: "element",
tagName: "div",
- properties: { id: "mermaid-container" },
+ properties: { id: "mermaid-container", role: "dialog" },
children: [
{
type: "element",
@@ -713,63 +714,6 @@
{
type: "element",
tagName: "div",
- properties: { className: ["mermaid-header"] },
- children: [
- {
- type: "element",
- tagName: "button",
- properties: {
- className: ["close-button"],
- "aria-label": "close button",
- },
- children: [
- {
- type: "element",
- tagName: "svg",
- properties: {
- "aria-hidden": "true",
- xmlns: "http://www.w3.org/2000/svg",
- width: 24,
- height: 24,
- viewBox: "0 0 24 24",
- fill: "none",
- stroke: "currentColor",
- "stroke-width": "2",
- "stroke-linecap": "round",
- "stroke-linejoin": "round",
- },
- children: [
- {
- type: "element",
- tagName: "line",
- properties: {
- x1: 18,
- y1: 6,
- x2: 6,
- y2: 18,
- },
- children: [],
- },
- {
- type: "element",
- tagName: "line",
- properties: {
- x1: 6,
- y1: 6,
- x2: 18,
- y2: 18,
- },
- children: [],
- },
- ],
- },
- ],
- },
- ],
- },
- {
- type: "element",
- tagName: "div",
properties: { className: ["mermaid-content"] },
children: [],
},
@@ -806,6 +750,20 @@
})
}
+ if (opts.mermaid) {
+ js.push({
+ script: mermaidScript,
+ loadTime: "afterDOMReady",
+ contentType: "inline",
+ moduleType: "module",
+ })
+
+ css.push({
+ content: mermaidStyle,
+ inline: true,
+ })
+ }
+
return { js, css }
},
}
--
Gitblit v1.10.0