Merge pull request #15034 from TMisiukiewicz/fix-copypasting-newline-…

…issues Fix issues with newlines when copypasting
Expensify · Feb 12, 2023 · 39d9b66 · 39d9b66
2 parents d42e443 + 1567fac
commit 39d9b66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js
@@ -273,7 +273,7 @@ class Composer extends React.Component {
             return;
         }
 
-        const plainText = event.clipboardData.getData('text/plain').replace(/\n\n/g, '\n');
+        const plainText = event.clipboardData.getData('text/plain');
 
         this.paste(Str.htmlDecode(plainText));
     }
@@ -302,9 +302,7 @@ class Composer extends React.Component {
         // the only stuff put into the clipboard is what the user selected.
         const selectedText = event.target.value.substring(this.state.selection.start, this.state.selection.end);
 
-        // The plaintext portion that is put into the clipboard needs to have the newlines duplicated. This is because
-        // the paste functionality is stripping all duplicate newlines to try and provide consistent behavior.
-        Clipboard.setHtml(selectedText, selectedText.replace(/\n/g, '\n\n'));
+        Clipboard.setHtml(selectedText, selectedText);
     }
 
     /**

diff --git a/src/components/CopySelectionHelper.js b/src/components/CopySelectionHelper.js
@@ -36,7 +36,9 @@ class CopySelectionHelper extends React.Component {
             Clipboard.setString(parser.htmlToMarkdown(selection));
             return;
         }
-        Clipboard.setHtml(selection, Str.htmlDecode(parser.htmlToText(selection)));
+
+        // Replace doubled newlines with the single ones because selection from SelectionScraper html contains doubled <br/> marks
+        Clipboard.setHtml(selection, Str.htmlDecode(parser.htmlToText(selection).replace(/\n\n/g, '\n')));
     }
 
     render() {

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -112,11 +112,7 @@ export default [
                     if (!Clipboard.canSetHtml()) {
                         Clipboard.setString(parser.htmlToMarkdown(content));
                     } else {
-                        // Thanks to how browsers work, when text is highlighted and CTRL+c is pressed, browsers end up doubling the amount of newlines. Since the code in this file is
-                        // triggered from a context menu and not CTRL+c, the newlines need to be doubled so that the content that goes into the clipboard is consistent with CTRL+c behavior.
-                        // The extra newlines are stripped when the contents are pasted into the compose input, but if the contents are pasted outside of the comment composer, it will
-                        // contain extra newlines and that's OK because it is consistent with CTRL+c behavior.
-                        const plainText = Str.htmlDecode(parser.htmlToText(content)).replace(/\n/g, '\n\n');
+                        const plainText = Str.htmlDecode(parser.htmlToText(content));
                         Clipboard.setHtml(content, plainText);
                     }
                 }