Merge pull request #394 from parasharrajat/html-md

Fixed lin-break <br> HTML parsing
Expensify · Jul 15, 2021 · cf78cdc · cf78cdc
2 parents 77b43a2 + 80f6e55
commit cf78cdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/__tests__/ExpensiMark-Markdown-test.js b/__tests__/ExpensiMark-Markdown-test.js
@@ -59,8 +59,8 @@ test('Test HTML string with seperate closing tags (<br><br/>) to markdown ', ()
 });
 
 test('Test HTML string with attributes', () => {
-    const testString = '<em style="color:red;">This is</em> a <button disabled>test</button>. None of <strong data-link=\'bad\'>these strings</strong>.';
-    const resultString = '_This is_ a test. None of *these strings*.';
+    const testString = '<em style="color:red;">This is</em><br style="border-color:red;"> a <button disabled>test</button>. None of <strong data-link=\'bad\'>these strings</strong>.';
+    const resultString = '_This is_\n a test. None of *these strings*.';
 
     expect(parser.htmlToMarkdown(testString)).toBe(resultString);
 });
diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -174,7 +174,9 @@ export default class ExpensiMark {
 
                 // Replaces open and closing <br><br/> tags with a single <br/>
                 pre: inputString => inputString.replace('<br></br>', '<br/>').replace('<br><br/>', '<br/>'),
-                regex: /<br\s*[/]?>\n?/gi,
+
+                // Include the immediately followed newline as `<br>\n` should be equal to one \n.
+                regex: /<br(?:"[^"]*"|'[^']*'|[^'">])*>(?![^<]*(<\/pre>|<\/code>))\n?/gi,
                 replacement: '\n'
             },
             {