Fix space inconsistency inserting emoji #21749

getusha · 2023-06-27T21:18:37Z

Details

Fixed Issues

$ #21584
PROPOSAL: #21584 (comment)

Tests

Open any chat
Insert emoji using different methods, short code i.e :smile:, opening emoji picker
Verify that space is added after the emoji if the cursor is at the end of the text

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

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Screen.Recording.2023-06-28.at.3.32.16.PM.mov

Mobile Web - Chrome

space-android.mov

Mobile Web - Safari

space-ios-web.mov

Desktop

Screen.Recording.2023-06-28.at.1.44.32.PM.mov

iOS

Screen.Recording.2023-06-28.at.1.41.28.PM.mov

Android

android-native-space.mov

melvin-bot · 2023-06-28T10:50:13Z

@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-06-28T11:40:43Z

@getusha based on you video in web - last test - when you have a text after emoji - and insert during typing - i do not see space after it, can you please double check?

getusha · 2023-06-28T11:45:07Z

@narefyev91 i did that intentionally because i think we only need to add the space if there is no text after it. Can you confirm if we want the space without the above condition?

narefyev91 · 2023-06-28T11:53:39Z

@narefyev91 i did that intentionally because i think we only need to add the space if there is no text after it. Can you confirm if we want the space without the above condition?

i think we should - because when you choose an emoji in dropdown or while typing pressing enter - it will add space

getusha · 2023-06-28T12:01:19Z

i think we should - because when you choose an emoji in dropdown or while typing pressing enter - it will add space

thanks i will remove the condition.

getusha · 2023-06-28T12:49:39Z

@narefyev91 Done, i also updated the screen recording for the web.

narefyev91 · 2023-06-28T15:28:08Z

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 · 2023-06-28T15:29:08Z

src/pages/home/report/ReportActionItemMessageEdit.js

-            start: prevSelection.start + emoji.length,
-            end: prevSelection.start + emoji.length,
+            start: prevSelection.start + emoji.length + CONST.SPACE_LENGTH,
+            end: prevSelection.start + emoji.length + CONST.SPACE_LENGTH,


can you please add some description why do you change that - for future and easy reading for any other devs

Should we add it here? there are multiple places where space_length is added.

Maybe on the top of the current function (somewhere in description)

TBH I think we're good without the comment since we have other instances without comments and that hasn't been a problem yet.

* we will add CONST.SPACE_LENGTH which is equal to 1 to the selection state * this will make sure the cursor is on the right place after the emoji is inserted what do you think about this?

@getusha everything is fine - as @luacmartins mentioned we can skip it - thanks for flexibility

@narefyev91 ohh, i missed that thanks!

narefyev91

LGTM!
🎀 👀 🎀 C+ reviewed

luacmartins · 2023-06-28T16:12:56Z

Thanks for the quick turnaround everyone!

OSBotify · 2023-06-28T16:17:37Z

✋ 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-06-29T20:38:36Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.35-0 🚀

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

OSBotify · 2023-07-03T14:36:27Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

OSBotify · 2023-07-03T15:19:02Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

getusha added 8 commits June 27, 2023 23:48

fix space inconsistency inserting emoji

861c2c7

remove isSmallScreenWidth params

ff45b46

remove isSmallScreenWidth args

7a3cc95

remove unecessary tests

edcf927

add space on every platform on emoji insertion

8b0ea26

make sure to add emoji after insertion

6ed4d5a

add space if the emoji is at end selecting from picker

a5f2f2c

add space if the emoji is at end for editing message

a2b13f8

getusha marked this pull request as ready for review June 28, 2023 10:50

getusha requested a review from a team as a code owner June 28, 2023 10:50

melvin-bot bot requested review from narefyev91 and removed request for a team June 28, 2023 10:50

getusha mentioned this pull request Jun 28, 2023

[HOLD for payment 2023-07-10] [$1000] Web - Chat - Empty space is added after adding an emoji by typing in web platform #21584

Closed

6 tasks

getusha added 2 commits June 28, 2023 15:19

remove a condition to add a space after emoji insertion

45f02e0

modify tests to match the change

2a1caf9

narefyev91 reviewed Jun 28, 2023

View reviewed changes

narefyev91 approved these changes Jun 28, 2023

View reviewed changes

melvin-bot bot requested a review from luacmartins June 28, 2023 15:29

luacmartins approved these changes Jun 28, 2023

View reviewed changes

luacmartins merged commit ecfcd83 into Expensify:main Jun 28, 2023

OSBotify mentioned this pull request Jun 29, 2023

Deploy Checklist: New Expensify 2023-06-29 #21911

Closed

51 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix space inconsistency inserting emoji #21749

Fix space inconsistency inserting emoji #21749

getusha commented Jun 27, 2023 •

edited

Loading

melvin-bot bot commented Jun 28, 2023

narefyev91 commented Jun 28, 2023 •

edited

Loading

getusha commented Jun 28, 2023 •

edited

Loading

narefyev91 commented Jun 28, 2023

getusha commented Jun 28, 2023

getusha commented Jun 28, 2023

narefyev91 commented Jun 28, 2023

narefyev91 Jun 28, 2023

getusha Jun 28, 2023

narefyev91 Jun 28, 2023

luacmartins Jun 28, 2023

getusha Jun 28, 2023

narefyev91 Jun 28, 2023 •

edited

Loading

getusha Jun 28, 2023

narefyev91 left a comment

luacmartins commented Jun 28, 2023

OSBotify commented Jun 28, 2023

OSBotify commented Jun 29, 2023

OSBotify commented Jul 3, 2023

OSBotify commented Jul 3, 2023

Fix space inconsistency inserting emoji #21749

Fix space inconsistency inserting emoji #21749

Conversation

getusha commented Jun 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 28, 2023

narefyev91 commented Jun 28, 2023 • edited Loading

getusha commented Jun 28, 2023 • edited Loading

narefyev91 commented Jun 28, 2023

getusha commented Jun 28, 2023

getusha commented Jun 28, 2023

narefyev91 commented Jun 28, 2023

Reviewer Checklist

Screenshots/Videos

narefyev91 Jun 28, 2023

Choose a reason for hiding this comment

getusha Jun 28, 2023

Choose a reason for hiding this comment

narefyev91 Jun 28, 2023

Choose a reason for hiding this comment

luacmartins Jun 28, 2023

Choose a reason for hiding this comment

getusha Jun 28, 2023

Choose a reason for hiding this comment

narefyev91 Jun 28, 2023 • edited Loading

Choose a reason for hiding this comment

getusha Jun 28, 2023

Choose a reason for hiding this comment

narefyev91 left a comment

Choose a reason for hiding this comment

luacmartins commented Jun 28, 2023

OSBotify commented Jun 28, 2023

OSBotify commented Jun 29, 2023

OSBotify commented Jul 3, 2023

OSBotify commented Jul 3, 2023

getusha commented Jun 27, 2023 •

edited

Loading

narefyev91 commented Jun 28, 2023 •

edited

Loading

getusha commented Jun 28, 2023 •

edited

Loading

narefyev91 Jun 28, 2023 •

edited

Loading