Fix strikethrough link is not parsed correctly on link with URL that …

…contains tilde
Expensify · Sep 26, 2023 · 8e79ca9 · 8e79ca9
1 parent 8bcd790
commit 8e79ca9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -1366,3 +1366,11 @@ test('Test strikethrough with multiple tilde characters', () => {
     testString = '~~~~';
     expect(parser.replace(testString)).toBe('~~~~');
 });
+
+test('Test strikethrough with link with URL that contains tilde', () => {
+    let testString = '~[Example Link](https://example.com/?example=~ex)~';
+    expect(parser.replace(testString)).toBe('<del><a href="https://example.com/?example=~ex" target="_blank" rel="noreferrer noopener">Example Link</a></del>');
+
+    testString = '~[Example Link](https://example.com/?~example=~~~ex~)~';
+    expect(parser.replace(testString)).toBe('<del><a href="https://example.com/?~example=~~~ex~" target="_blank" rel="noreferrer noopener">Example Link</a></del>');
+});
diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -210,7 +210,7 @@ export default class ExpensiMark {
             },
             {
                 name: 'strikethrough',
-                regex: /\B~((?=\S)(([^\s~]|\s(?!~))+?))~\B(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
+                regex: /\B~((?![\s~])[\s\S]*?[^\s~])~\B(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
                 replacement: (match, g1) => (this.containsNonPairTag(g1) ? match : `<del>${g1}</del>`),
             },
             {