Merge pull request #693 from dragnoir/fix-40571

Fix: multi level blockquote HTML to Markdown
Expensify · May 29, 2024 · 6cfc572 · 6cfc572
2 parents b805fed + 32e14db
commit 6cfc572
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/__tests__/ExpensiMark-Markdown-test.js b/__tests__/ExpensiMark-Markdown-test.js
@@ -497,6 +497,18 @@ test('map div with quotes', () => {
     expect(parser.htmlToMarkdown(testString)).toBe(resultString);
 });
 
+test('double quotes in same line', () => {
+    const testString = '<blockquote><blockquote>line 1</blockquote></blockquote>';
+    const resultString = '>> line 1';
+    expect(parser.htmlToMarkdown(testString)).toBe(resultString);
+});
+
+test('triple quotes in same line', () => {
+    const testString = '<blockquote><blockquote><blockquote>line 1</blockquote></blockquote></blockquote>';
+    const resultString = '>>> line 1';
+    expect(parser.htmlToMarkdown(testString)).toBe(resultString);
+});
+
 test('map table to newline', () => {
     const testString = '<tbody><tr>line 1</tr><tr>line 2</tr></tbody>';
     const resultString = 'line 1\nline 2';

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -425,8 +425,32 @@ export default class ExpensiMark {
                         .trim()
                         .split('\n');
 
-                    const prependGreaterSign = (m) => `> ${m}`;
-                    resultString = _.map(resultString, prependGreaterSign).join('\n');
+                    // Wrap each string in the array with <blockquote> and </blockquote>
+                    // Define a named function to wrap each line with blockquote
+                    function wrapWithBlockquote(line) {
+                        return `<blockquote>${line}</blockquote>`;
+                    }
+
+                    // Use _.map with the named function
+                    resultString = _.map(resultString, wrapWithBlockquote);
+
+                    function processString(m) {
+                        // Recursive function to replace nested <blockquote> with ">"
+                        function replaceBlockquotes(text) {
+                            let modifiedText = text;
+                            let depth;
+                            do {
+                                depth = (modifiedText.match(/<blockquote>/gi) || []).length;
+                                modifiedText = modifiedText.replace(/<blockquote>/gi, '');
+                                modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
+                            } while (/<blockquote>/i.test(modifiedText));
+                            return `${'>'.repeat(depth)} ${modifiedText}`;
+                        }
+                        return replaceBlockquotes(m);
+                    }
+
+                    resultString = _.map(resultString, processString).join('\n');
+
                     // We want to keep <blockquote> tag here and let method replaceBlockElementWithNewLine to handle the line break later
                     return `<blockquote>${resultString}</blockquote>`;
                 },