Prevent format emoji On Submitted text #40617

wildan-m · 2024-04-20T03:42:52Z

@eh2077

Details

Feature request: Prevent submitted emoji text from being formatted as italic, bold, or strikethrough.

Fixed Issues

$ #14676
PROPOSAL: #14676 (comment)

Tests

Go to any chat
Paste the following markdown.

Markdown 1

*bold 😄 bold*
_italic 😄 italic_
~strikethrough 😄 strikethrough~

Markdown 2

`text🟥`
 
*`bold🟥`*

_`italic🟥`_

~`strikethrough🟥`~

Ensure all of the emojis not affected by the formatting

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Kapture.2024-04-20.at.10.32.00.mp4

Android: mWeb Chrome

Kapture.2024-04-20.at.09.33.22.mp4

iOS: Native

Kapture.2024-04-20.at.10.18.04.mp4

iOS: mWeb Safari

Kapture.2024-04-20.at.09.23.19.mp4

MacOS: Chrome / Safari

Kapture.2024-04-20.at.09.15.52.mp4

MacOS: Desktop

Kapture.2024-04-20.at.10.23.58.mp4

…x-14676-prevent-format-emoji

…b.com/wildan-m/App into wildan/fix-14676-prevent-format-emoji

melvin-bot · 2024-04-20T03:42:57Z

@eh2077 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]

src/components/InlineCodeBlock/renderEmojis.tsx

dubielzyk-expensify · 2024-04-22T00:13:04Z

So I actually think we'd want to have the emoji's ignore the formatting in both preview and when it's sent. I believe our general philosophy when it comes to preview is that it should generally be one-to-one with what gets sent. And from the screenshot it looks like the emoji's are italic in the preview, but not when it's sent:

Keen on @Expensify/design input here as well

wildan-m · 2024-04-22T00:19:49Z

@dubielzyk-expensify unformat the emoji in preview is possible, but according to this. That might be handled separately because it's using a live markdown library maintained by an agency. @eh2077 is that correct?

dubielzyk-expensify · 2024-04-22T01:04:36Z

I see, if that's the case, then I'm fine with it. Thanks for clarifying 😄

…x-14676-prevent-format-emoji

shawnborton · 2024-04-22T13:08:12Z

Should we be preventing the formatting in the compose box as well? For example, here it looks like the emoji has strikethrough style applied to it:

I know it is removed once submitted, but I think it makes sense to match the compose box with what is shown when the message is posted.

eh2077 · 2024-04-22T13:29:12Z

#40617 (comment)

@dubielzyk-expensify unformat the emoji in preview is possible, but according to this. That might be handled separately because it's using a live markdown library maintained by an agency. @eh2077 is that correct?

@shawnborton Yes, we should fix composer as well and it'll be fixed in the other repo react-native-live-markdown which is a project supported by SWM team. We'll ask them to fix it in the main GH issue once this PR is merged.

Does this sound good to you?

shawnborton · 2024-04-22T13:50:48Z

Cool, that works for me - thanks for explaining!

eh2077 · 2024-04-24T05:34:34Z

@wildan-m Friendly bump! In case you missed this #40617 (comment)

…x-14676-prevent-format-emoji

src/styles/utils/emojiDefaultStyles/index.ts

src/components/InlineCodeBlock/WrappedText.tsx

src/components/InlineCodeBlock/index.tsx

wildan-m · 2024-04-25T06:03:43Z

@dubielzyk-expensify @shawnborton What is the expected hover behavior for emojis inside InlineCodeBlock? Should we display a tooltip?

shawnborton · 2024-04-25T11:55:33Z

Hmm I don't feel too strongly about that. Is it possible to continue supporting the tooltip when it's wrapped in a code block? Otherwise I think it's totally fine if we don't have one there.

dubielzyk-expensify · 2024-04-26T01:38:51Z

Yeah, I'm okay with not having one. Don't feel very strongly either though

src/components/InlineCodeBlock/getCurrentData.tsx

eh2077 · 2024-04-29T04:29:48Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…x-14676-prevent-format-emoji

eh2077 · 2024-04-29T08:08:42Z

Looks good and tested well.

@wildan-m Please help to mark comments as resolved.

stitesExpensify

Looks awesome! So glad this is finally fixed!

OSBotify · 2024-04-30T20:04:26Z

✋ 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 · 2024-05-01T03:01:46Z

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 1.4.69-0 🚀

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

OSBotify · 2024-05-02T13:05:21Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.69-2 🚀

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

wildan-m added 11 commits April 8, 2024 11:45

Prevent emoji from being formatted

9d7ead0

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

567b1de

…x-14676-prevent-format-emoji

Add dInlineFlex

aaff72e

comment emoji style in useMarkdownStyle

6cb3e5b

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

4b496f1

…x-14676-prevent-format-emoji

Add textDecorationLine none to hide striketrough in android

521bf2d

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

287cb7e

…x-14676-prevent-format-emoji

Merge branch 'wildan/fix-14676-prevent-format-emoji' of https://githu…

06e0038

…b.com/wildan-m/App into wildan/fix-14676-prevent-format-emoji

Move renderEmojisAsTextComponents to a new file

dcccca4

Fix lint and prettier

4fe6841

render emojis as EmojiWithTooltip instead of Text to keep emoji tooltip

6b0d2d6

wildan-m requested review from a team as code owners April 20, 2024 03:42

melvin-bot bot requested review from eh2077 and removed request for a team April 20, 2024 03:42

wildan-m mentioned this pull request Apr 20, 2024

[$500] Do not allow emojis to be formatted (ie italics) #14676

Closed

3 tasks

eh2077 reviewed Apr 20, 2024

View reviewed changes

src/components/InlineCodeBlock/renderEmojis.tsx Outdated Show resolved Hide resolved

wildan-m added 3 commits April 22, 2024 16:53

Override EmojiWithTooltip textStyles with code textStyles

f55d6a0

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

bcafecd

…x-14676-prevent-format-emoji

Fix Type

f59918e

wildan-m added 2 commits April 24, 2024 15:56

create platform specific emojiDefaultStyles

dd86bd9

change emojiDefault to emojiDefaultStyles

1807fa2

wildan-m added 8 commits April 24, 2024 22:47

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

f396366

…x-14676-prevent-format-emoji

remove unnecessary code

e74c233

run prettier

e0d25a2

fix lint error

e06746a

fix containsEmoji function

be66270

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

2c0be52

…x-14676-prevent-format-emoji

refactor, add comment

5448e1a

fix lint

46c1230

eh2077 reviewed Apr 25, 2024

View reviewed changes

src/styles/utils/emojiDefaultStyles/index.ts Show resolved Hide resolved

src/components/InlineCodeBlock/WrappedText.tsx Show resolved Hide resolved

src/components/InlineCodeBlock/index.tsx Show resolved Hide resolved

eh2077 reviewed Apr 29, 2024

View reviewed changes

src/components/InlineCodeBlock/getCurrentData.tsx Outdated Show resolved Hide resolved

wildan-m added 3 commits April 29, 2024 12:57

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

68c4e7d

…x-14676-prevent-format-emoji

move getCurrentData to native specific file

4e651a8

Add comment to getCurrentData

2fb2a49

eh2077 approved these changes Apr 29, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify April 29, 2024 08:09

stitesExpensify approved these changes Apr 30, 2024

View reviewed changes

stitesExpensify merged commit b195e21 into Expensify:main Apr 30, 2024
16 of 17 checks passed

github-actions bot mentioned this pull request May 1, 2024

Deploy Checklist: New Expensify 2024-05-01 #41376

Closed

59 tasks

This was referenced May 1, 2024

Revert "Prevent format emoji On Submitted text" #41437

Closed

[HOLD for #318] [$250] iOS - Single emoji is not enlarged on iOS #41390

Closed

bernhardoj mentioned this pull request May 16, 2024

mWeb - Chat - In offline, emojis are not striked out when deleted with markdown #42212

Closed

6 tasks

bernhardoj mentioned this pull request Dec 27, 2024

[$250] Chat - Double strike through is applied for emojis #54618

Closed

8 tasks

Prevent format emoji On Submitted text #40617

Prevent format emoji On Submitted text #40617

Uh oh!

Conversation

wildan-m commented Apr 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 20, 2024

Uh oh!

Uh oh!

dubielzyk-expensify commented Apr 22, 2024

Uh oh!

wildan-m commented Apr 22, 2024

Uh oh!

dubielzyk-expensify commented Apr 22, 2024

Uh oh!

shawnborton commented Apr 22, 2024

Uh oh!

eh2077 commented Apr 22, 2024

Uh oh!

shawnborton commented Apr 22, 2024

Uh oh!

eh2077 commented Apr 24, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wildan-m commented Apr 25, 2024

Uh oh!

shawnborton commented Apr 25, 2024

Uh oh!

dubielzyk-expensify commented Apr 26, 2024

Uh oh!

Uh oh!

eh2077 commented Apr 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 commented Apr 29, 2024

Uh oh!

stitesExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 30, 2024

Uh oh!

OSBotify commented May 1, 2024

Uh oh!

OSBotify commented May 2, 2024

Uh oh!

Uh oh!

wildan-m commented Apr 20, 2024 •

edited

Loading

eh2077 commented Apr 29, 2024 •

edited

Loading