Merge pull request #782 from bernhardoj/fix/autolink-doesnt-work-if-p…

…laced-before-img
Expensify · Aug 19, 2024 · e89eff9 · e89eff9
2 parents 18f8ace + 8a6a696
commit e89eff9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -2137,9 +2137,9 @@ describe('Image markdown conversion to html tag', () => {
     });
 
     test('Text containing image and autolink', () => {
-        const testString = 'An image of a banana: ![banana](https://example.com/banana.png) an autolink: example.com';
+        const testString = 'An autolink: example.com before an image of a banana: ![banana](https://example.com/banana.png), another autolink: example.com after the image';
         const resultString =
-            'An image of a banana: <img src="https://example.com/banana.png" alt="banana" /> an autolink: <a href="https://example.com" target="_blank" rel="noreferrer noopener">example.com</a>';
+            'An autolink: <a href="https://example.com" target="_blank" rel="noreferrer noopener">example.com</a> before an image of a banana: <img src="https://example.com/banana.png" alt="banana" />, another autolink: <a href="https://example.com" target="_blank" rel="noreferrer noopener">example.com</a> after the image';
         expect(parser.replace(testString)).toBe(resultString);
     });
 

diff --git a/lib/ExpensiMark.ts b/lib/ExpensiMark.ts
@@ -352,7 +352,7 @@ export default class ExpensiMark {
                 name: 'autolink',
 
                 process: (textToProcess, replacement) => {
-                    const regex = new RegExp(`(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${UrlPatterns.MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>|.+\\/>))`, 'gi');
+                    const regex = new RegExp(`(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${UrlPatterns.MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, 'gi');
                     return this.modifyTextForUrlLinks(regex, textToProcess, replacement as ReplacementFn);
                 },