Skip to content
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

Message html to text and last message (LHN) fixes #12968

Merged
merged 7 commits into from
Dec 2, 2022
Merged

Message html to text and last message (LHN) fixes #12968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9b4d01
Collapse multiple consecutive spaces into a single space
aldo-expensify Nov 23, 2022
9f790f6
Add global modifier
aldo-expensify Nov 23, 2022
34b543d
Merge branch 'main' of github.com:Expensify/App into aldo_lastMessage…
aldo-expensify Nov 24, 2022
e4d9327
Merge branch 'main' of github.com:Expensify/App into aldo_lastMessage…
aldo-expensify Nov 28, 2022
79e8dd7
Use only first line for LHN last message.
aldo-expensify Nov 30, 2022
a7741b9
Merge branch 'main' of github.com:Expensify/App into aldo_lastMessage…
aldo-expensify Nov 30, 2022
efbc91d
Update expensify-common version
aldo-expensify Nov 30, 2022
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
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
"dotenv": "^8.2.0",
"expensify-common": "git+https://github.com/Expensify/expensify-common.git#db2c245c1e6b39232092b1415b9235fadda2a529",
"expensify-common": "git+https://github.com/Expensify/expensify-common.git#6bd112f1e7ebbd6679042fa04060104b68beace2",
"fbjs": "^3.0.2",
"file-loader": "^6.0.0",
"html-entities": "^1.3.1",
Expand Down
1 change: 1 addition & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ const CONST = {
NON_NUMERIC: /\D/g,
EMOJI_NAME: /:[\w+-]+:/g,
EMOJI_SUGGESTIONS: /:[a-zA-Z]{1,20}(\s[a-zA-Z]{0,20})?$/,
AFTER_FIRST_LINE_BREAK: /\n.*/g,
},

PRONOUNS: {
Expand Down
4 changes: 3 additions & 1 deletion src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,9 @@ function canShowReportRecipientLocalTime(personalDetails, report) {
* @returns {String}
*/
function formatReportLastMessageText(lastMessageText) {
return String(lastMessageText).substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
return String(lastMessageText)
.replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '')
.substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
}

/**
Expand Down
13 changes: 4 additions & 9 deletions src/pages/home/report/ReportActionItemFragment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,15 @@ const ReportActionItemFragment = (props) => {
)
);
}
let {html, text} = props.fragment;
const {html, text} = props.fragment;

// If the only difference between fragment.text and fragment.html is <br /> tags
// we replace them with line breaks and render it as text, not as html.
// we render it as text, not as html.
// This is done to render emojis with line breaks between them as text.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm guessing that rendering something with <Text> instead of <RenderHTML> is more performant too.

const differByLineBreaksOnly = Str.replaceAll(props.fragment.html, '<br />', ' ') === props.fragment.text;
if (differByLineBreaksOnly) {
const textWithLineBreaks = Str.replaceAll(props.fragment.html, '<br />', '\n');
html = textWithLineBreaks;
text = textWithLineBreaks;
}
const differByLineBreaksOnly = Str.replaceAll(html, '<br />', '\n') === text;

// Only render HTML if we have html in the fragment
if (html !== text) {
if (!differByLineBreaksOnly) {
const editedTag = props.fragment.isEdited ? '<edited></edited>' : '';
const htmlContent = html + editedTag;
return (
Expand Down