Skip to content

Avoid parsing html in editing composer when reloading page #18195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chiragsalian merged 2 commits into from
May 2, 2023
Merged

Avoid parsing html in editing composer when reloading page #18195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330bce5
avoid parsing html in editing composer when reloading page
eh2077 Apr 29, 2023
360627b
add comments for the change
eh2077 Apr 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/pages/home/report/ReportActionItemMessageEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {InteractionManager, Keyboard, View} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import Str from 'expensify-common/lib/str';
import reportActionPropTypes from './reportActionPropTypes';
import styles from '../../../styles/styles';
import Composer from '../../../components/Composer';
Expand Down Expand Up @@ -81,8 +82,15 @@ class ReportActionItemMessageEdit extends React.Component {
this.emojiButtonID = 'emojiButton';
this.messageEditInput = 'messageEditInput';

const parser = new ExpensiMark();
const draftMessage = parser.htmlToMarkdown(this.props.draftMessage).trim();
let draftMessage;
if (this.props.draftMessage === this.props.action.message[0].html) {

@mollfpr mollfpr Apr 30, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eh2077 Could you add a comment explaining why we doing this and what issue we trying to solve?

@eh2077 eh2077 Apr 30, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added comments

// We only convert the report action message to markdown if the draft message is unchanged.
const parser = new ExpensiMark();
draftMessage = parser.htmlToMarkdown(this.props.draftMessage).trim();
} else {
// We need to decode saved draft message because it's escaped before saving.
draftMessage = Str.htmlDecode(this.props.draftMessage);
}

this.state = {
draft: draftMessage,
Expand Down Expand Up @@ -147,7 +155,8 @@ class ReportActionItemMessageEdit extends React.Component {
// This component is rendered only when draft is set to a non-empty string. In order to prevent component
// unmount when user deletes content of textarea, we set previous message instead of empty string.
if (newDraft.trim().length > 0) {
this.debouncedSaveDraft(newDraft);
// We want to escape the draft message to differentiate the HTML from the report action and the HTML the user drafted.
this.debouncedSaveDraft(_.escape(newDraft));

@mollfpr mollfpr Apr 30, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also like to let you know that comment here will be helpful.

@eh2077 eh2077 Apr 30, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

} else {
this.debouncedSaveDraft(this.props.action.message[0].html);
}
Expand Down