From 2831da1ddaf03ea077de3a24e16745f24a142d05 Mon Sep 17 00:00:00 2001 From: Eric Han Date: Wed, 29 Mar 2023 23:19:52 +0800 Subject: [PATCH 1/2] fix padding on edited quote message --- src/libs/actions/Report.js | 4 ++-- src/pages/home/report/ReportActionItemMessageEdit.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index bfa44088bd3c..aed2de653236 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -828,7 +828,7 @@ const handleUserDeletedLinks = (newCommentText, originalHtml) => { return newCommentText; } const htmlWithAutoLinks = parser.replace(newCommentText); - const markdownWithAutoLinks = parser.htmlToMarkdown(htmlWithAutoLinks); + const markdownWithAutoLinks = parser.htmlToMarkdown(htmlWithAutoLinks).trim(); const markdownOriginalComment = parser.htmlToMarkdown(originalHtml); const removedLinks = getRemovedMarkdownLinks(markdownOriginalComment, newCommentText); return removeLinks(markdownWithAutoLinks, removedLinks); @@ -858,7 +858,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) { let parsedOriginalCommentHTML = originalCommentHTML; if (markdownForNewComment.length < CONST.MAX_MARKUP_LENGTH) { htmlForNewComment = parser.replace(markdownForNewComment, autolinkFilter); - parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML), autolinkFilter); + parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML).trim(), autolinkFilter); } // Delete the comment if it's empty diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index eb84a6837236..9f3c29a113e6 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -83,7 +83,7 @@ class ReportActionItemMessageEdit extends React.Component { this.messageEditInput = 'messageEditInput'; const parser = new ExpensiMark(); - const draftMessage = parser.htmlToMarkdown(this.props.draftMessage); + const draftMessage = parser.htmlToMarkdown(this.props.draftMessage).trim(); this.state = { draft: draftMessage, From 8d5329fb9b3fa3aeade48572cb55b64044bdf280 Mon Sep 17 00:00:00 2001 From: Eric Han <117511920+eh2077@users.noreply.github.com> Date: Wed, 29 Mar 2023 23:57:19 +0800 Subject: [PATCH 2/2] Apply suggestions from code review always trim htmlToMarkdown output for consistency Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index aed2de653236..ff896d561c64 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -829,7 +829,7 @@ const handleUserDeletedLinks = (newCommentText, originalHtml) => { } const htmlWithAutoLinks = parser.replace(newCommentText); const markdownWithAutoLinks = parser.htmlToMarkdown(htmlWithAutoLinks).trim(); - const markdownOriginalComment = parser.htmlToMarkdown(originalHtml); + const markdownOriginalComment = parser.htmlToMarkdown(originalHtml).trim(); const removedLinks = getRemovedMarkdownLinks(markdownOriginalComment, newCommentText); return removeLinks(markdownWithAutoLinks, removedLinks); };