Merge pull request #558 from eh2077/22492-fix-allow-to-add-link-with-…

…code-block-inside-alias-text fix: allow to add link with code block inside alias text part
Expensify · Jul 19, 2023 · fea1a75 · fea1a75
2 parents d7e4249 + e6fd696
commit fea1a75
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -1122,4 +1122,13 @@ test('Test here mention with @here@here', () => {
     const testString = '@here@here';
     const resultString = '<mention-here>@here</mention-here><mention-here>@here</mention-here>';
     expect(parser.replace(testString)).toBe(resultString);
-});
+});
+
+test('Test link with code fence inside the alias text part', () => {
+    const testString = '[```code```](google.com) '
+        + '[test ```code``` test](google.com)';
+
+    const resultString = '[<pre>code</pre>](<a href="https://google.com" target="_blank" rel="noreferrer noopener">google.com</a>) '
+        + '[test <pre>code</pre> test](<a href="https://google.com" target="_blank" rel="noreferrer noopener">google.com</a>)';
+    expect(parser.replace(testString)).toBe(resultString);
+});
diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -457,7 +457,7 @@ export default class ExpensiMark {
             }
             replacedText = replacedText.concat(textToCheck.substr(startIndex, (match.index - startIndex)));
 
-            if (abort) {
+            if (abort || match[1].includes('<pre>')) {
                 replacedText = replacedText.concat(textToCheck.substr(match.index, (match[0].length)));
             } else {
                 const urlRegex = new RegExp(`^${LOOSE_URL_REGEX}$|^${URL_REGEX}$`, 'i');