From c851a68e15daedb8dbe572ce5927a8e61254d4c9 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Tue, 7 Apr 2020 20:31:45 +0300 Subject: feat: support \| symbol, fix html parsing --- src/lib/Markdown/Content.tsx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Markdown/Content.tsx b/src/lib/Markdown/Content.tsx index 30f2a8a..5895df9 100644 --- a/src/lib/Markdown/Content.tsx +++ b/src/lib/Markdown/Content.tsx @@ -28,6 +28,10 @@ const denotesSelfClosingHtml = (line: string): string[] | null => { return line.match(regex); } +const declaresNoLineBreak = (line: string): boolean => { + return line.match(/\\\|$/) !== null; +} + const Content: React.FC = ({ rawLines }) => { if (!rawLines.length) return null; @@ -46,7 +50,7 @@ const Content: React.FC = ({ rawLines }) => { } else if ((buffer = denotesOpenHtml(line))) { const tag = buffer; const closeIndex = rawLines.findIndex(line => denotesClosingHtml(line, tag)); - const htmlLines = rawLines.splice(0, closeIndex + 1).slice(0, closeIndex); + const htmlLines = rawLines.splice(0, closeIndex + 1); htmlLines.unshift(line); buffer =
; } else if ((buffer = denotesSelfClosingHtml(line)) !== null) { @@ -59,6 +63,14 @@ const Content: React.FC = ({ rawLines }) => { ); + } else if (declaresNoLineBreak(line)) { + const closeIndex = rawLines.findIndex(line => !declaresNoLineBreak(line)); + const lineBreakLines = rawLines.splice(0, closeIndex).map(line => line.slice(0, -2)); + lineBreakLines.unshift(line.slice(0, -2)); + lineBreakLines.push(rawLines.splice(0, 1)[0]); + buffer =

{lineBreakLines.map(lineBreakLine => )}

; + } else if (denotesClosingHtml(line, '')) { + buffer = null; } else { buffer =

} -- cgit v1.2.3