Skip to content

Commit 47ac4c7

Browse files
committed
feat(@app/web): ✨ render markdown preview with @m2d/react-markdown and add mermaid controls
1 parent 470ba24 commit 47ac4c7

8 files changed

Lines changed: 341 additions & 167 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@m2d/core": patch
3+
---
4+
5+
Include `CheckBox` and `FootnoteReferenceRun` in `InlineDocxNodes` type union to resolve assignment error during inline children processing

‎apps/web/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@m2d/md2docx": "workspace:*",
13+
"@m2d/react-markdown": "workspace:*",
1314
"@m2d/remark-docx": "workspace:*",
1415
"@m2d/remark-docx-node": "workspace:*",
1516
"@mayank1513/fork-me": "^2.1.3",
@@ -28,6 +29,7 @@
2829
"fumadocs-mdx": "15.4.9",
2930
"fumadocs-ui": "16.17.7",
3031
"hast-util-to-html": "9.0.5",
32+
"hast-util-to-jsx-runtime": "^2.3.6",
3133
"katex": "^0.19.0",
3234
"lowlight": "3.3.0",
3335
"lowlight-mermaid": "0.0.0",

‎apps/web/src/app/global.css‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,54 @@
126126
--sh-comment: #a19595;
127127
}
128128

129+
/* Lowlight Highlight.js Syntax Highlighting - Light */
130+
.hljs-keyword,
131+
.hljs-selector-tag,
132+
.hljs-subst {
133+
color: #d946ef;
134+
font-weight: 600;
135+
}
136+
.hljs-string,
137+
.hljs-title,
138+
.hljs-section,
139+
.hljs-attribute,
140+
.hljs-literal,
141+
.hljs-template-tag,
142+
.hljs-template-variable,
143+
.hljs-type {
144+
color: #16a34a;
145+
}
146+
.hljs-comment,
147+
.hljs-quote,
148+
.hljs-deletion {
149+
color: #6b7280;
150+
font-style: italic;
151+
}
152+
.hljs-number,
153+
.hljs-regexp,
154+
.hljs-link {
155+
color: #d97706;
156+
}
157+
.hljs-variable,
158+
.hljs-name,
159+
.hljs-selector-id,
160+
.hljs-selector-class {
161+
color: #2563eb;
162+
}
163+
.hljs-built_in,
164+
.hljs-title.class_,
165+
.hljs-class .hljs-title {
166+
color: #ca8a04;
167+
}
168+
.hljs-attr,
169+
.hljs-property {
170+
color: #0284c7;
171+
}
172+
.hljs-operator,
173+
.hljs-punctuation {
174+
color: #6b7280;
175+
}
176+
129177
.dark {
130178
--background: #09090b;
131179
--foreground: #fafafa;
@@ -167,6 +215,54 @@
167215
--sh-jsxliterals: #c084fc;
168216
}
169217

218+
/* Lowlight Highlight.js Syntax Highlighting - Dark */
219+
.dark .hljs-keyword,
220+
.dark .hljs-selector-tag,
221+
.dark .hljs-subst {
222+
color: #f472b6;
223+
font-weight: 600;
224+
}
225+
.dark .hljs-string,
226+
.dark .hljs-title,
227+
.dark .hljs-section,
228+
.dark .hljs-attribute,
229+
.dark .hljs-literal,
230+
.dark .hljs-template-tag,
231+
.dark .hljs-template-variable,
232+
.dark .hljs-type {
233+
color: #4ade80;
234+
}
235+
.dark .hljs-comment,
236+
.dark .hljs-quote,
237+
.dark .hljs-deletion {
238+
color: #9ca3af;
239+
font-style: italic;
240+
}
241+
.dark .hljs-number,
242+
.dark .hljs-regexp,
243+
.dark .hljs-link {
244+
color: #fbbf24;
245+
}
246+
.dark .hljs-variable,
247+
.dark .hljs-name,
248+
.dark .hljs-selector-id,
249+
.dark .hljs-selector-class {
250+
color: #60a5fa;
251+
}
252+
.dark .hljs-built_in,
253+
.dark .hljs-title.class_,
254+
.dark .hljs-class .dark .hljs-title {
255+
color: #fef08a;
256+
}
257+
.dark .hljs-attr,
258+
.dark .hljs-property {
259+
color: #38bdf8;
260+
}
261+
.dark .hljs-operator,
262+
.dark .hljs-punctuation {
263+
color: #9ca3af;
264+
}
265+
170266
* {
171267
@apply border-border;
172268
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { toJsxRuntime } from "hast-util-to-jsx-runtime";
2+
import { common, createLowlight } from "lowlight";
3+
import { mermaidGrammar } from "lowlight-mermaid";
4+
import type { ReactNode } from "react";
5+
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
6+
7+
export const lowlight = createLowlight(common);
8+
lowlight.register("mermaid", mermaidGrammar);
9+
10+
/**
11+
* Highlights source code using lowlight with built-in Mermaid diagram grammar support,
12+
* returning native React elements without any dangerouslySetInnerHTML.
13+
*/
14+
export const highlightCode = (
15+
code: string,
16+
language = "typescript",
17+
): ReactNode => {
18+
if (!code) return null;
19+
try {
20+
const lang = lowlight.registered(language) ? language : "typescript";
21+
const tree = lowlight.highlight(lang, code.trim());
22+
return toJsxRuntime(tree, { Fragment, jsx, jsxs });
23+
} catch {
24+
try {
25+
const tree = lowlight.highlightAuto(code.trim());
26+
return toJsxRuntime(tree, { Fragment, jsx, jsxs });
27+
} catch {
28+
return code;
29+
}
30+
}
31+
};

‎apps/web/src/components/docx-demo/mermaid-viewer.tsx‎

Lines changed: 126 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
"use client";
22

3-
import { AlertCircle, GitBranch, Loader2 } from "lucide-react";
3+
import {
4+
AlertCircle,
5+
Check,
6+
Code2,
7+
Copy,
8+
Eye,
9+
GitBranch,
10+
Loader2,
11+
} from "lucide-react";
412
import mermaid from "mermaid";
5-
import { useEffect, useId, useState } from "react";
13+
import { useEffect, useId, useRef, useState } from "react";
14+
import { highlightCode } from "./highlight";
615

716
interface MermaidViewerProps {
817
chart: string;
@@ -12,9 +21,14 @@ export const MermaidViewer = ({ chart }: MermaidViewerProps) => {
1221
const [svg, setSvg] = useState<string>("");
1322
const [error, setError] = useState<string | null>(null);
1423
const [loading, setLoading] = useState(true);
24+
const [view, setView] = useState<"diagram" | "code">("diagram");
25+
const [copied, setCopied] = useState(false);
26+
const containerRef = useRef<HTMLDivElement>(null);
1527
const rawId = useId();
1628
const id = `mmd_${rawId.replace(/[^a-zA-Z0-9]/g, "_")}`;
1729

30+
const trimmedChart = chart.trim();
31+
1832
useEffect(() => {
1933
let active = true;
2034
setLoading(true);
@@ -29,7 +43,7 @@ export const MermaidViewer = ({ chart }: MermaidViewerProps) => {
2943
fontFamily: "inherit",
3044
});
3145

32-
const { svg: renderedSvg } = await mermaid.render(id, chart.trim());
46+
const { svg: renderedSvg } = await mermaid.render(id, trimmedChart);
3347
if (active) {
3448
setSvg(renderedSvg);
3549
setLoading(false);
@@ -49,45 +63,136 @@ export const MermaidViewer = ({ chart }: MermaidViewerProps) => {
4963
return () => {
5064
active = false;
5165
};
52-
}, [chart, id]);
66+
}, [trimmedChart, id]);
67+
68+
// Safely inject SVG into DOM element without dangerouslySetInnerHTML
69+
useEffect(() => {
70+
if (
71+
view === "diagram" &&
72+
!loading &&
73+
!error &&
74+
containerRef.current &&
75+
svg
76+
) {
77+
containerRef.current.replaceChildren();
78+
try {
79+
const parser = new DOMParser();
80+
const doc = parser.parseFromString(svg, "image/svg+xml");
81+
const svgEl = doc.documentElement;
82+
if (svgEl) {
83+
containerRef.current.appendChild(svgEl);
84+
}
85+
} catch {
86+
// Fallback if parsing fails
87+
}
88+
}
89+
}, [svg, view, loading, error]);
90+
91+
const handleCopy = async () => {
92+
try {
93+
await navigator.clipboard.writeText(trimmedChart);
94+
setCopied(true);
95+
setTimeout(() => setCopied(false), 2000);
96+
} catch {
97+
// ignore
98+
}
99+
};
53100

54101
if (error) {
55102
return (
56-
<div className="my-4 p-4 rounded-xl border border-destructive/30 bg-destructive/5 text-destructive text-xs">
103+
<div className="my-4 p-4 rounded-xl border border-destructive/30 bg-destructive/5 text-destructive text-xs not-prose">
57104
<div className="flex items-center gap-1.5 font-bold mb-2">
58105
<AlertCircle className="w-4 h-4 shrink-0" />
59106
<span>Mermaid Diagram Syntax Error:</span>
60107
</div>
61108
<pre className="font-mono text-[11px] p-2 rounded bg-background/50 border border-destructive/20 overflow-x-auto text-foreground">
62-
{chart.trim()}
109+
{trimmedChart}
63110
</pre>
64111
</div>
65112
);
66113
}
67114

68115
return (
69-
<div className="my-5 p-4 rounded-xl border border-border/70 bg-card/60 backdrop-blur-sm shadow-xs flex flex-col items-center not-prose">
70-
<div className="w-full flex items-center justify-between pb-2 mb-2 border-b border-border/40 text-[11px] text-muted-foreground font-mono">
116+
<div className="my-5 rounded-xl border border-border bg-card/60 backdrop-blur-sm shadow-xs overflow-hidden not-prose">
117+
{/* GitHub-style Header Controls */}
118+
<div className="w-full flex items-center justify-between px-3 py-2 bg-muted/40 border-b border-border/60 text-xs">
71119
<div className="flex items-center gap-1.5 text-primary font-semibold">
72120
<GitBranch className="w-3.5 h-3.5" />
73-
<span>Interactive Mermaid Vector</span>
121+
<span className="text-[11px] font-mono">Mermaid Diagram</span>
122+
</div>
123+
124+
<div className="flex items-center gap-1.5">
125+
{/* View Mode Toggle: Diagram vs Code */}
126+
<div className="inline-flex rounded-lg border border-border bg-background p-0.5 text-xs">
127+
<button
128+
type="button"
129+
onClick={() => setView("diagram")}
130+
className={`flex items-center gap-1 px-2 py-0.5 rounded-md text-[11px] font-medium transition-colors cursor-pointer ${
131+
view === "diagram"
132+
? "bg-muted text-foreground shadow-xs font-semibold"
133+
: "text-muted-foreground hover:text-foreground"
134+
}`}
135+
title="View rendered diagram"
136+
>
137+
<Eye className="w-3 h-3" />
138+
<span>Diagram</span>
139+
</button>
140+
<button
141+
type="button"
142+
onClick={() => setView("code")}
143+
className={`flex items-center gap-1 px-2 py-0.5 rounded-md text-[11px] font-medium transition-colors cursor-pointer ${
144+
view === "code"
145+
? "bg-muted text-foreground shadow-xs font-semibold"
146+
: "text-muted-foreground hover:text-foreground"
147+
}`}
148+
title="View Mermaid source code"
149+
>
150+
<Code2 className="w-3 h-3" />
151+
<span>Code</span>
152+
</button>
153+
</div>
154+
155+
{/* Copy Source Button */}
156+
<button
157+
type="button"
158+
onClick={handleCopy}
159+
className="flex items-center gap-1 px-2 py-1 rounded-md text-[11px] text-muted-foreground hover:text-foreground hover:bg-muted transition-colors cursor-pointer"
160+
title="Copy Mermaid code"
161+
>
162+
{copied ? (
163+
<>
164+
<Check className="w-3 h-3 text-emerald-500" />
165+
<span className="text-emerald-500">Copied</span>
166+
</>
167+
) : (
168+
<>
169+
<Copy className="w-3 h-3" />
170+
<span>Copy</span>
171+
</>
172+
)}
173+
</button>
74174
</div>
75-
<span className="text-[10px] px-1.5 py-0.5 rounded bg-primary/10 text-primary uppercase font-bold">
76-
Rendered Diagram
77-
</span>
78175
</div>
79176

80-
{loading ? (
81-
<div className="py-8 flex items-center gap-2 text-xs text-muted-foreground">
82-
<Loader2 className="w-4 h-4 animate-spin text-primary" />
83-
<span>Rendering diagram...</span>
177+
{/* Content Area */}
178+
{view === "diagram" ? (
179+
<div className="p-4 flex flex-col items-center justify-center min-h-[140px]">
180+
{loading ? (
181+
<div className="py-8 flex items-center gap-2 text-xs text-muted-foreground">
182+
<Loader2 className="w-4 h-4 animate-spin text-primary" />
183+
<span>Rendering diagram...</span>
184+
</div>
185+
) : (
186+
<div
187+
ref={containerRef}
188+
className="w-full flex justify-center overflow-x-auto py-2 [&_svg]:max-w-full [&_svg]:h-auto"
189+
/>
190+
)}
84191
</div>
85192
) : (
86-
<div
87-
className="w-full flex justify-center overflow-x-auto py-2 [&_svg]:max-w-full [&_svg]:h-auto"
88-
// biome-ignore lint/security/noDangerouslySetInnerHtml: mermaid svg
89-
dangerouslySetInnerHTML={{ __html: svg }}
90-
/>
193+
<pre className="p-4 font-mono text-xs overflow-x-auto leading-relaxed bg-muted/20 text-foreground">
194+
<code>{highlightCode(trimmedChart, "mermaid")}</code>
195+
</pre>
91196
)}
92197
</div>
93198
);

0 commit comments

Comments
 (0)