DRY code

Expensify · Jun 28, 2022 · de3301c · de3301c
1 parent a732f4b
commit de3301c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/components/HTMLEngineProvider/htmlEngineUtils.js b/src/components/HTMLEngineProvider/htmlEngineUtils.js
@@ -17,6 +17,16 @@ function computeEmbeddedMaxWidth(tagName, contentWidth) {
     return contentWidth;
 }
 
+/**
+ * Check if tagName is equal to any of our custom tags wrapping chat comments.
+ *
+ * @param {string} tagName
+ * @returns {Boolean}
+ */
+function isCommentTag(tagName) {
+    return tagName === 'email-comment' || tagName === 'comment';
+}
+
 /**
  * Check if there is an ancestor node with name 'comment'.
  * Finding node with name 'comment' flags that we are rendering a comment.
@@ -26,7 +36,7 @@ function computeEmbeddedMaxWidth(tagName, contentWidth) {
 function isInsideComment(tnode) {
     let currentNode = tnode;
     while (currentNode.parent) {
-        if (currentNode.domNode.name === 'comment' || currentNode.domNode.name === 'email-comment') {
+        if (isCommentTag(currentNode.domNode.name)) {
             return true;
         }
         currentNode = currentNode.parent;
@@ -37,4 +47,5 @@ function isInsideComment(tnode) {
 export {
     computeEmbeddedMaxWidth,
     isInsideComment,
+    isCommentTag,
 };
diff --git a/src/libs/SelectionScraper/index.js b/src/libs/SelectionScraper/index.js
@@ -4,6 +4,7 @@ import {parseDocument} from 'htmlparser2';
 import {Element} from 'domhandler';
 import _ from 'underscore';
 import Str from 'expensify-common/lib/str';
+import {isCommentTag} from '../../components/HTMLEngineProvider/htmlEngineUtils';
 
 const elementsWillBeSkipped = ['html', 'body'];
 const tagAttribute = 'data-testid';
@@ -103,7 +104,7 @@ const replaceNodes = (dom) => {
         }
 
         // Adding a new line after each comment here, because adding after each range is not working for chrome.
-        if (dom.attribs[tagAttribute] === 'comment' || dom.attribs[tagAttribute] === 'email-comment') {
+        if (isCommentTag(dom.attribs[tagAttribute])) {
             dom.children.push(new Element('br', {}));
         }
     }

diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
@@ -45,7 +45,7 @@ const propTypes = {
     loading: PropTypes.bool,
 
     /** The reportAction's source */
-    source: PropTypes.string,
+    source: PropTypes.oneOf(['Chronos', 'email', 'ios', 'android', 'web', 'email', '']),
 
     /** Should this fragment be contained in a single line? */
     isSingleLine: PropTypes.bool,
@@ -104,18 +104,13 @@ const ReportActionItemFragment = (props) => {
 
             // Only render HTML if we have html in the fragment
             if (html !== text) {
-                if (props.source === 'email') {
-                    // Messages from email replies usually have complex HTML structure and they don't rely in white-space: pre to preserve spacing,
-                    // instead, they normally use &nbsp;
-                    return (
-                        <RenderHTML
-                            html={`<email-comment>${html + (props.fragment.isEdited ? '<edited></edited>' : '')}</email-comment>`}
-                        />
-                    );
-                }
+                const editedTag = props.fragment.isEdited ? '<edited></edited>' : '';
+                const htmlContent = html + editedTag;
                 return (
                     <RenderHTML
-                        html={`<comment>${html + (props.fragment.isEdited ? '<edited></edited>' : '')}</comment>`}
+                        html={props.source === 'email'
+                            ? `<email-comment>${htmlContent}</email-comment>`
+                            : `<comment>${htmlContent}</comment>`}
                     />
                 );
             }