Skip to content

Commit 69a0119

Browse files
lordelogoslordelogos
committed
feat: sanitized md output, added option to remove data-id attributes
1 parent 365795f commit 69a0119

File tree

6 files changed

+390
-36
lines changed

6 files changed

+390
-36
lines changed

‎__tests__/parseMarkdownToReactEmailJSX.test.ts‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,22 @@ describe("Markdown to React Mail JSX Parser", () => {
1111
styles.h1
1212
)}">Hello, World!</h1>`;
1313

14-
const rendered = parseMarkdownToReactEmailJSX(markdown);
14+
const rendered = parseMarkdownToReactEmailJSX({
15+
markdown,
16+
});
17+
expect(rendered).toBe(expected);
18+
});
19+
20+
it("converts header one with data attributes correctly", () => {
21+
const markdown = "# Hello, World!";
22+
const expected = `<h1 data-id="react-email-heading" style="${parseCssInJsToInlineCss(
23+
styles.h1
24+
)}">Hello, World!</h1>`;
25+
26+
const rendered = parseMarkdownToReactEmailJSX({
27+
markdown,
28+
withDataAttr: true,
29+
});
1530
expect(rendered).toBe(expected);
1631
});
1732

@@ -21,7 +36,7 @@ describe("Markdown to React Mail JSX Parser", () => {
2136
styles.image
2237
)}" alt="alt text" src="image.jpg" />`;
2338

24-
const rendered = parseMarkdownToReactEmailJSX(markdown);
39+
const rendered = parseMarkdownToReactEmailJSX({ markdown });
2540
expect(rendered).toBe(expected);
2641
});
2742

@@ -31,7 +46,7 @@ describe("Markdown to React Mail JSX Parser", () => {
3146
styles.link
3247
)}">Codeskills</a>`;
3348

34-
const rendered = parseMarkdownToReactEmailJSX(markdown);
49+
const rendered = parseMarkdownToReactEmailJSX({ markdown });
3550
expect(rendered).toBe(expected);
3651
});
3752

@@ -43,7 +58,7 @@ describe("Markdown to React Mail JSX Parser", () => {
4358
console.log("Hello, World!");
4459
\`}</p></pre>`;
4560

46-
const rendered = parseMarkdownToReactEmailJSX(markdown);
61+
const rendered = parseMarkdownToReactEmailJSX({ markdown });
4762
expect(rendered).toBe(expected);
4863
});
4964

@@ -57,8 +72,11 @@ console.log("Hello, World!");
5772
const expected =
5873
'<table style=""><thead style=""><tr style="color:red"><th style="" align="center">Header 1</th><th style="" align="center">Header 2</th></tr></thead><tbody style=""><tr style="color:red"><td style="" align="center">Cell 1</td><td style="" align="center">Cell 2</td></tr><tr style="color:red"><td style="" align="center">Cell 3</td><td style="" align="center">Cell 4</td></tr></tbody></table>';
5974

60-
const rendered = parseMarkdownToReactEmailJSX(markdown, {
61-
tr: { color: "red" },
75+
const rendered = parseMarkdownToReactEmailJSX({
76+
markdown,
77+
customStyles: {
78+
tr: { color: "red" },
79+
},
6280
});
6381
expect(rendered).toBe(expected);
6482
});
@@ -69,7 +87,7 @@ console.log("Hello, World!");
6987
styles.strikethrough
7088
)}">This is a paragraph.</del>`;
7189

72-
const rendered = parseMarkdownToReactEmailJSX(markdown);
90+
const rendered = parseMarkdownToReactEmailJSX({ markdown });
7391
expect(rendered).toBe(expected);
7492
});
7593
});

‎__tests__/reactEmailMarkdown.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe("ReactEmailMarkdown component renders correctly", () => {
88
<ReactEmailMarkdown markdown={`# Hello, World!`} />
99
);
1010
expect(actualOutput).toMatchInlineSnapshot(
11-
`"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><div><h1 style="font-weight:500;padding-top:20;font-size:2.5rem">Hello, World!</h1></div>"`
11+
`"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><div><h1 style="font-weight:500;padding-top:20;font-size:2.5rem" data-id="react-email-heading">Hello, World!</h1></div>"`
1212
);
1313
});
1414
});

‎package.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "md-to-react-email",
3-
"version": "2.0.2",
3+
"version": "3.0.0",
44
"description": "A simple Markdown parser for React-email written in typescript.",
55
"keywords": [
66
"markdown",
@@ -43,7 +43,10 @@
4343
"typescript": "5.1.3"
4444
},
4545
"peerDependencies": {
46-
"react": "18.2.0",
47-
"react-email": "1.9.3"
46+
"react": "18.x",
47+
"react-email": ">1.9.3"
48+
},
49+
"dependencies": {
50+
"isomorphic-dompurify": "1.7.0"
4851
}
4952
}

‎src/components/reactEmailMarkdown.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as React from "react";
22
import { StylesType } from "../types";
33
import { parseMarkdownToReactEmailJSX } from "../utils";
4+
import { sanitize } from "isomorphic-dompurify";
45

56
interface ReactEmailMarkdownProps {
67
markdown: string;
@@ -13,15 +14,16 @@ export const ReactEmailMarkdown: React.FC<ReactEmailMarkdownProps> = ({
1314
markdownCustomStyles,
1415
markdownContainerStyles,
1516
}) => {
16-
const parsedMarkdown = parseMarkdownToReactEmailJSX(
17+
const parsedMarkdown = parseMarkdownToReactEmailJSX({
1718
markdown,
18-
markdownCustomStyles
19-
);
19+
customStyles: markdownCustomStyles,
20+
withDataAttr: true,
21+
});
2022

2123
return (
2224
<div
2325
style={markdownContainerStyles}
24-
dangerouslySetInnerHTML={{ __html: parsedMarkdown }}
26+
dangerouslySetInnerHTML={{ __html: sanitize(parsedMarkdown) }}
2527
/>
2628
);
2729
};

‎src/utils.ts‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,37 +188,56 @@ export function parseMarkdownToReactEmail(
188188
return reactMailTemplate;
189189
}
190190

191-
export function parseMarkdownToReactEmailJSX(
192-
markdown: string,
193-
customStyles?: StylesType
194-
): string {
191+
interface ParseMarkdownToReactEmailJSXProps {
192+
markdown: string;
193+
customStyles?: StylesType;
194+
withDataAttr?: boolean;
195+
}
196+
197+
export function parseMarkdownToReactEmailJSX({
198+
markdown,
199+
customStyles,
200+
withDataAttr = false,
201+
}: ParseMarkdownToReactEmailJSXProps): string {
195202
const finalStyles = { ...styles, ...customStyles };
196203
let reactMailTemplate = "";
197204

198205
// Handle headings (e.g., # Heading)
199206
reactMailTemplate = markdown.replace(
200207
patterns.h1,
201-
`<h1 style="${parseCssInJsToInlineCss(finalStyles.h1)}">$1</h1>`
208+
`<h1${
209+
withDataAttr ? ' data-id="react-email-heading"' : ""
210+
} style="${parseCssInJsToInlineCss(finalStyles.h1)}">$1</h1>`
202211
);
203212
reactMailTemplate = reactMailTemplate.replace(
204213
patterns.h2,
205-
`<h2 style="${parseCssInJsToInlineCss(finalStyles.h2)}">$1</h2>`
214+
`<h2${
215+
withDataAttr ? ' data-id="react-email-heading"' : ""
216+
} style="${parseCssInJsToInlineCss(finalStyles.h2)}">$1</h2>`
206217
);
207218
reactMailTemplate = reactMailTemplate.replace(
208219
patterns.h3,
209-
`<h3 style="${parseCssInJsToInlineCss(finalStyles.h3)}">$1</h3>`
220+
`<h3${
221+
withDataAttr ? ' data-id="react-email-heading"' : ""
222+
} style="${parseCssInJsToInlineCss(finalStyles.h3)}">$1</h3>`
210223
);
211224
reactMailTemplate = reactMailTemplate.replace(
212225
patterns.h4,
213-
`<h4 style="${parseCssInJsToInlineCss(finalStyles.h4)}">$1</h4>`
226+
`<h4${
227+
withDataAttr ? ' data-id="react-email-heading"' : ""
228+
} style="${parseCssInJsToInlineCss(finalStyles.h4)}">$1</h4>`
214229
);
215230
reactMailTemplate = reactMailTemplate.replace(
216231
patterns.h5,
217-
`<h5 style="${parseCssInJsToInlineCss(finalStyles.h5)}">$1</h5>`
232+
`<h5${
233+
withDataAttr ? ' data-id="react-email-heading"' : ""
234+
} style="${parseCssInJsToInlineCss(finalStyles.h5)}">$1</h5>`
218235
);
219236
reactMailTemplate = reactMailTemplate.replace(
220237
patterns.h6,
221-
`<h6 style="${parseCssInJsToInlineCss(finalStyles.h6)}">$1</h6>`
238+
`<h6${
239+
withDataAttr ? ' data-id="react-email-heading"' : ""
240+
} style="${parseCssInJsToInlineCss(finalStyles.h6)}">$1</h6>`
222241
);
223242

224243
// Handle Tables from GFM
@@ -291,13 +310,17 @@ export function parseMarkdownToReactEmailJSX(
291310
// Handle bold text (e.g., **bold**)
292311
reactMailTemplate = reactMailTemplate.replace(
293312
patterns.bold,
294-
`<p style="${parseCssInJsToInlineCss(finalStyles.bold)}">$1</p>`
313+
`<p${
314+
withDataAttr ? ' data-id="react-email-text"' : ""
315+
} style="${parseCssInJsToInlineCss(finalStyles.bold)}">$1</p>`
295316
);
296317

297318
// Handle italic text (e.g., *italic*)
298319
reactMailTemplate = reactMailTemplate.replace(
299320
patterns.italic,
300-
`<p style="${parseCssInJsToInlineCss(finalStyles.italic)}">$1</p>`
321+
`<p${
322+
withDataAttr ? ' data-id="react-email-text"' : ""
323+
} style="${parseCssInJsToInlineCss(finalStyles.italic)}">$1</p>`
301324
);
302325

303326
// Handle lists (unordered and ordered)
@@ -321,29 +344,35 @@ export function parseMarkdownToReactEmailJSX(
321344
// Handle links (e.g., [link text](url))
322345
reactMailTemplate = reactMailTemplate.replace(
323346
patterns.link,
324-
`<a target="_blank" href="$2" style="${parseCssInJsToInlineCss(
347+
`<a${
348+
withDataAttr ? ' data-id="react-email-link"' : ""
349+
} target="_blank" href="$2" style="${parseCssInJsToInlineCss(
325350
finalStyles.link
326351
)}">$1</a>`
327352
);
328353

329354
// Handle code blocks (e.g., ```code```)
330355
reactMailTemplate = reactMailTemplate.replace(
331356
patterns.codeBlocks,
332-
`<pre style="${parseCssInJsToInlineCss(
333-
finalStyles.codeBlock
334-
)}"><p>${`{\`$1\`}`}</p></pre>`
357+
`<pre style="${parseCssInJsToInlineCss(finalStyles.codeBlock)}"><p${
358+
withDataAttr ? ' data-id="react-email-text"' : ""
359+
}>${`{\`$1\`}`}</p></pre>`
335360
);
336361

337362
// Handle inline code (e.g., `code`)
338363
reactMailTemplate = reactMailTemplate.replace(
339364
patterns.codeInline,
340-
`<p style="${parseCssInJsToInlineCss(finalStyles.codeInline)}">$1</p>`
365+
`<p${
366+
withDataAttr ? ' data-id="react-email-text"' : ""
367+
} style="${parseCssInJsToInlineCss(finalStyles.codeInline)}">$1</p>`
341368
);
342369

343370
// Handle block quotes
344371
reactMailTemplate = reactMailTemplate.replace(
345372
/^>\s+(.+)$/gm,
346-
`<p style="${parseCssInJsToInlineCss(finalStyles.blockQuote)}">$1</p>`
373+
`<p${
374+
withDataAttr ? ' data-id="react-email-text"' : ""
375+
} style="${parseCssInJsToInlineCss(finalStyles.blockQuote)}">$1</p>`
347376
);
348377

349378
// Handle line breaks (e.g., <br />)
@@ -355,7 +384,9 @@ export function parseMarkdownToReactEmailJSX(
355384
// Handle horizontal rules (e.g., ---)
356385
reactMailTemplate = reactMailTemplate.replace(
357386
patterns.hr,
358-
`<hr style="${parseCssInJsToInlineCss(finalStyles.hr)}" />`
387+
`<hr${
388+
withDataAttr ? ' data-id="react-email-hr"' : ""
389+
} style="${parseCssInJsToInlineCss(finalStyles.hr)}" />`
359390
);
360391

361392
return reactMailTemplate;

0 commit comments

Comments
 (0)