Merge branch 'Expensify:main' into fix-#21753

Expensify · Nov 18, 2023 · d5d7fcd · d5d7fcd
2 parents 1d6b926 + 7c72af4
commit d5d7fcd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -27,6 +27,12 @@ test('Test heading markdown replacement', () => {
 
     testString = '# Heading should have only one new line after it.\n\n';
     expect(parser.replace(testString)).toBe('<h1>Heading should have only one new line after it.</h1><br />');
+
+    testString = '# hello test.com';
+    expect(parser.replace(testString)).toBe('<h1>hello <a href=\"https://test.com\" target=\"_blank\" rel=\"noreferrer noopener\">test.com</a></h1>');
+
+    testString = '# hello [email protected]';
+    expect(parser.replace(testString)).toBe('<h1>hello <a href=\"mailto:[email protected]\">[email protected]</a></h1>');
 });
 
 // Sections starting with > are successfully wrapped with <blockquote></blockquote>

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -145,7 +145,7 @@ export default class ExpensiMark {
 
                 process: (textToProcess, replacement) => {
                     const regex = new RegExp(
-                        `(?![^<]*>|[^<>]*<\\/)([_*~]*?)${MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`,
+                        `(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`,
                         'gi',
                     );
                     return this.modifyTextForUrlLinks(regex, textToProcess, replacement);
@@ -189,7 +189,7 @@ export default class ExpensiMark {
             {
                 name: 'autoEmail',
                 regex: new RegExp(
-                    `([^\\w'#%+-]|^)${CONST.REG_EXP.MARKDOWN_EMAIL}(?!((?:(?!<a).)+)?<\\/a>|[^<>]*<\\/(?!em))`,
+                    `([^\\w'#%+-]|^)${CONST.REG_EXP.MARKDOWN_EMAIL}(?!((?:(?!<a).)+)?<\\/a>|[^<>]*<\\/(?!em|h1))`,
                     'gim',
                 ),
                 replacement: '$1<a href="mailto:$2">$2</a>',