diff --git a/web/src/labs/marked/index.ts b/web/src/labs/marked/index.ts index 436b99361e222..0d3d083ad5a25 100644 --- a/web/src/labs/marked/index.ts +++ b/web/src/labs/marked/index.ts @@ -47,7 +47,7 @@ export const marked = (markdownStr: string, blockParsers = blockElementParserLis const matchedLength = matchedStr.length; const prefixStr = markdownStr.slice(0, matchedIndex); const suffixStr = markdownStr.slice(matchedIndex + matchedLength); - return prefixStr + matchedInlineParser.renderer(matchedStr) + marked(suffixStr, [], inlineParsers); + return marked(prefixStr, [], inlineParsers) + matchedInlineParser.renderer(matchedStr) + marked(suffixStr, [], inlineParsers); } } diff --git a/web/src/labs/marked/parser/Bold.ts b/web/src/labs/marked/parser/Bold.ts index 041640f216dc6..578a6ed48411e 100644 --- a/web/src/labs/marked/parser/Bold.ts +++ b/web/src/labs/marked/parser/Bold.ts @@ -1,4 +1,3 @@ -import { escape } from "lodash"; import { marked } from ".."; import Link from "./Link"; @@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => { return rawStr; } - const parsedContent = marked(escape(matchResult[1]), [], [Link]); + const parsedContent = marked(matchResult[1], [], [Link]); return `${parsedContent}`; }; diff --git a/web/src/labs/marked/parser/BoldEmphasis.ts b/web/src/labs/marked/parser/BoldEmphasis.ts index f434da5849166..0fdf37ebbbe46 100644 --- a/web/src/labs/marked/parser/BoldEmphasis.ts +++ b/web/src/labs/marked/parser/BoldEmphasis.ts @@ -1,4 +1,3 @@ -import { escape } from "lodash"; import { marked } from ".."; import Link from "./Link"; @@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => { return rawStr; } - const parsedContent = marked(escape(matchResult[1]), [], [Link]); + const parsedContent = marked(matchResult[1], [], [Link]); return `${parsedContent}`; }; diff --git a/web/src/labs/marked/parser/Emphasis.ts b/web/src/labs/marked/parser/Emphasis.ts index 7dd12df1ac12e..e339bf3a112c1 100644 --- a/web/src/labs/marked/parser/Emphasis.ts +++ b/web/src/labs/marked/parser/Emphasis.ts @@ -1,4 +1,3 @@ -import { escape } from "lodash"; import { marked } from ".."; import Link from "./Link"; @@ -15,7 +14,7 @@ const renderer = (rawStr: string): string => { return rawStr; } - const parsedContent = marked(escape(matchResult[1]), [], [Link]); + const parsedContent = marked(matchResult[1], [], [Link]); return `${parsedContent}`; }; diff --git a/web/src/labs/marked/parser/Link.ts b/web/src/labs/marked/parser/Link.ts index 6bfc0f8a5cdce..7b9ac4fc72cee 100644 --- a/web/src/labs/marked/parser/Link.ts +++ b/web/src/labs/marked/parser/Link.ts @@ -17,7 +17,7 @@ const renderer = (rawStr: string): string => { if (!matchResult) { return rawStr; } - const parsedContent = marked(escape(matchResult[1]), [], [InlineCode, BoldEmphasis, Emphasis, Bold]); + const parsedContent = marked(matchResult[1], [], [InlineCode, BoldEmphasis, Emphasis, Bold]); return `${parsedContent}`; }; diff --git a/web/src/labs/marked/parser/Strikethrough.ts b/web/src/labs/marked/parser/Strikethrough.ts index b58c9222220e8..7dc189766a500 100644 --- a/web/src/labs/marked/parser/Strikethrough.ts +++ b/web/src/labs/marked/parser/Strikethrough.ts @@ -1,4 +1,4 @@ -import { marked } from ".."; +import { escape } from "lodash"; export const STRIKETHROUGH_REG = /~~(.+?)~~/; @@ -13,8 +13,7 @@ const renderer = (rawStr: string): string => { return rawStr; } - const parsedContent = marked(matchResult[1], [], []); - return `${parsedContent}`; + return `${escape(matchResult[1])}`; }; export default {