fix: unwanted linebreaks added when translating html blockquote to markdown #22275

eh2077 · 2023-07-05T15:42:05Z

Fixed Issues

$ #20725
PROPOSAL: #20725 (comment)

Tests

Go to a chat and add comment

==== Case 1: simple quote ===
> one line quote a

> two line quote b
> two line quote b

> quote c with internal line break
> 
> quote c with internal line break

==== Case 2: quote surrounded by text ===
text a
> quote a

> quote b
text b

text c
> quote c
text c

==== Case 3: quote surrounded by inline element ===
_italic a_
> quote a

> quote b
*bold b*

_italic c_
> quote c
*bold c*

Open the comment in editing mode and verify that the initial draft is same as input.
Test copy and pasting
3a. On Web and Desktop, select the comment, copy the selection by Ctr/Cmd + C, paste it to composer and verify that it's same as input
3b. On mobile, long press comment, copy to clipboard, pasting in composer and verify that it's same as input
(Perform step 4-9 on Web only) Open w3schools, add following html and run

<!DOCTYPE html>
<html>
<body>

<p>==== Case 4A: quote surrounded by block element ===</p>

<pre>code fence a</pre>
<blockquote>
quote a
</blockquote>

<br />

<blockquote>
quote b
</blockquote>
<pre>code fence b</pre>

<br />

<pre>code fence c</pre>
<blockquote>
quote c
</blockquote>
<pre>code fence c</pre>

</body>
</html>

Select and copy html from right hand side of w3schools page and paste it to composer
Verify that the composer input is equal to following input

==== Case 4A: quote surrounded by block element ===
```
code fence a
```
> quote a

> quote b
```
code fence b
```

```
code fence c
```
> quote c
```
code fence c
```

case-4a-w3c.mov

Repeat Step 4 with following html

<!DOCTYPE html>
<html>
<body>

<p>==== Case 4B: quote surrounded by block element ===</p>

<h1>h1 a</h1>
<blockquote>
quote a
</blockquote>

<br />

<blockquote>
quote b
</blockquote>
<h1>h1 b</h1>

<br />

<h1>h1 c</h1>
<blockquote>
quote c
</blockquote>
<h1>h1 c</h1>

</body>
</html>

Repeat step 5
Verify that the composer input is equal to following input

==== Case 4B: quote surrounded by block element ===
# h1 a
> quote a

> quote b
# h1 b

# h1 c
> quote c
# h1 c

case-4b-w3c.mov

Verify that no errors appear in the JS console

Offline tests

QA

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

case-4a-w3c.mov

case-4b-w3c.mov

Mobile Web - Chrome

mobile-chrome.mp4

Mobile Web - Safari

mobile-safari.mp4

Desktop

desktop.mov

iOS

ios.mp4

Android

android.mp4

melvin-bot · 2023-07-05T15:42:11Z

@narefyev91 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

narefyev91 · 2023-07-06T08:22:51Z

@eh2077 can you please resolve merge conflicts?

…rkdown

eh2077 · 2023-07-06T08:41:43Z

@narefyev91 Updated!

narefyev91 · 2023-07-06T08:43:24Z

@eh2077 I think your changes were already includes in this merged PR - which happened right after yours Expensify/expensify-common@06a5ff5

eh2077 · 2023-07-06T08:47:07Z

@narefyev91 No, the hash for this PR is later than that one.

narefyev91 · 2023-07-06T09:27:19Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

android-web.mov

Mobile Web - Safari

ios-web.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

narefyev91

LGTM! Thank you for this great QA steps!
Small note - for some reasons pasting stop working on my IOS native devices - and issue happened on main branch as well
🎀 👀 🎀 C+ reviewed

iwiznia · 2023-07-06T15:24:39Z

This is just a library change, where's the actual PR?

eh2077 · 2023-07-06T15:31:17Z

@iwiznia The version hash is from this PR Expensify/expensify-common#554
We can find the related PR from the linked issue.

OSBotify · 2023-07-06T15:43:09Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-07-07T10:44:39Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.3.38-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-07-10T23:59:41Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.38-7 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

eh2077 requested a review from a team as a code owner July 5, 2023 15:42

melvin-bot bot requested review from narefyev91 and removed request for a team July 5, 2023 15:42

eh2077 force-pushed the 20725-fix-unwanted-linebreak-when-pasting-quote-message branch from 32978c5 to 509aad9 Compare July 6, 2023 08:27

fix: unwanted linebreaks added when translating html blockquote to ma…

af94a83

…rkdown

eh2077 force-pushed the 20725-fix-unwanted-linebreak-when-pasting-quote-message branch from 509aad9 to af94a83 Compare July 6, 2023 08:39

narefyev91 approved these changes Jul 6, 2023

View reviewed changes

melvin-bot bot requested a review from iwiznia July 6, 2023 09:40

iwiznia approved these changes Jul 6, 2023

View reviewed changes

iwiznia merged commit 7ceaf0e into Expensify:main Jul 6, 2023

OSBotify mentioned this pull request Jul 7, 2023

Deploy Checklist: New Expensify 2023-07-07 #22399

Closed

64 tasks

melvin-bot bot mentioned this pull request Jul 10, 2023

[HOLD for payment 2023-07-17] [$1000] Chat - A line break is resulted from pasting quote message #20725

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: unwanted linebreaks added when translating html blockquote to markdown #22275

fix: unwanted linebreaks added when translating html blockquote to markdown #22275

eh2077 commented Jul 5, 2023

melvin-bot bot commented Jul 5, 2023

narefyev91 commented Jul 6, 2023

eh2077 commented Jul 6, 2023

narefyev91 commented Jul 6, 2023

eh2077 commented Jul 6, 2023 •

edited

Loading

narefyev91 commented Jul 6, 2023

narefyev91 left a comment

iwiznia commented Jul 6, 2023

eh2077 commented Jul 6, 2023

OSBotify commented Jul 6, 2023

OSBotify commented Jul 7, 2023

OSBotify commented Jul 10, 2023

fix: unwanted linebreaks added when translating html blockquote to markdown #22275

fix: unwanted linebreaks added when translating html blockquote to markdown #22275

Conversation

eh2077 commented Jul 5, 2023

Fixed Issues

Tests

Offline tests

QA

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 5, 2023

narefyev91 commented Jul 6, 2023

eh2077 commented Jul 6, 2023

narefyev91 commented Jul 6, 2023

eh2077 commented Jul 6, 2023 • edited Loading

narefyev91 commented Jul 6, 2023

Reviewer Checklist

Screenshots/Videos

narefyev91 left a comment

Choose a reason for hiding this comment

iwiznia commented Jul 6, 2023

eh2077 commented Jul 6, 2023

OSBotify commented Jul 6, 2023

OSBotify commented Jul 7, 2023

OSBotify commented Jul 10, 2023

eh2077 commented Jul 6, 2023 •

edited

Loading