Allow emoji as link text #749
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This PR only covers link. Do we also want to update it for email? (left: link, right: email) |
6 tasks
|
@bernhardoj, yeah I think the behavior should be consistent across links and emails |
|
@rayane-djouah updated |
rayane-djouah
suggested changes
Jul 11, 2024
__tests__/ExpensiMark-HTML-test.js
Outdated
| @@ -304,12 +304,12 @@ test('Test markdown replacement for emojis with emails', () => { | |||
| '[😄 [email protected] ]([email protected]) '; | |||
| const result = | |||
| 'Do not replace the emoji with link ' + | |||
There was a problem hiding this comment.
Suggested change
| 'Do not replace the emoji with link ' + | |
| 'Replace the emoji with link ' + |
And the same above
| @@ -1200,7 +1200,7 @@ test('Test for link with no content', () => { | |||
|
|
|||
| test('Test for link with emoji', () => { | |||
| const testString = '[😀](www.link.com)'; | |||
There was a problem hiding this comment.
Suggested change
| const testString = '[😀](www.link.com)'; | |
| const testString = | |
| 'Replace the emoji with email link ' + | |
| '[😀](www.link.com)'; |
There was a problem hiding this comment.
Added as comment
| @@ -1200,7 +1200,7 @@ test('Test for link with no content', () => { | |||
|
|
|||
| test('Test for link with emoji', () => { | |||
| const testString = '[😀](www.link.com)'; | |||
| const resultString = '[<emoji>😀</emoji>](<a href="https://www.link.com" target="_blank" rel="noreferrer noopener">www.link.com</a>)'; | |||
| const resultString = '<a href="https://www.link.com" target="_blank" rel="noreferrer noopener"><emoji>😀</emoji></a>'; | |||
There was a problem hiding this comment.
Suggested change
| const resultString = '<a href="https://www.link.com" target="_blank" rel="noreferrer noopener"><emoji>😀</emoji></a>'; | |
| const resultString = | |
| 'Replace the emoji with email link ' + | |
| '<a href="https://www.link.com" target="_blank" rel="noreferrer noopener"><emoji>😀</emoji></a>'; |
| @@ -173,7 +173,7 @@ export default class ExpensiMark { | |||
| return this.modifyTextForEmailLinks(regex, textToProcess, replacement as ReplacementFn, shouldKeepRawInput); | |||
| }, | |||
| replacement: (_extras, match, g1, g2) => { | |||
| if (g1.match(Constants.CONST.REG_EXP.EMOJIS) || !g1.trim()) { | |||
There was a problem hiding this comment.
I think we can remove CONST.REG_EXP.EMOJIS from constants file as it is not used anymore
|
cc @francoisl |
francoisl
approved these changes
Jul 11, 2024
|
🚀Published to npm in v2.0.43 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed Issues
$ Expensify/App#44835
Tests
What unit/integration tests cover your change? What autoQA tests cover your change?
Updated unit test.
What tests did you perform that validates your changed worked?
a. Send a link with emoji as text (
[😄 link](google.com)) to any userb. Verify
😄 linkis rendered as a linkWeb
Desktop
iOS mWeb
iOS
Android mWeb
Android
QA
Same as Test step above