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

Fix space inconsistency inserting emoji #21749

Merged
merged 10 commits into from
Jun 28, 2023
Merged

Fix space inconsistency inserting emoji #21749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
861c2c7
fix space inconsistency inserting emoji
getusha Jun 27, 2023
ff45b46
remove isSmallScreenWidth params
getusha Jun 27, 2023
7a3cc95
remove isSmallScreenWidth args
getusha Jun 27, 2023
edcf927
remove unecessary tests
getusha Jun 27, 2023
8b0ea26
add space on every platform on emoji insertion
getusha Jun 28, 2023
6ed4d5a
make sure to add emoji after insertion
getusha Jun 28, 2023
a5f2f2c
add space if the emoji is at end selecting from picker
getusha Jun 28, 2023
a2b13f8
add space if the emoji is at end for editing message
getusha Jun 28, 2023
45f02e0
remove a condition to add a space after emoji insertion
getusha Jun 28, 2023
2a1caf9
modify tests to match the change
getusha Jun 28, 2023
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
6 changes: 3 additions & 3 deletions src/libs/EmojiUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,10 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
* If we're on mobile, we also add a space after the emoji granted there's no text after it.
*
* @param {String} text
* @param {Boolean} isSmallScreenWidth
* @param {Number} preferredSkinTone
* @returns {Object}
*/
function replaceEmojis(text, isSmallScreenWidth = false, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE) {
function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE) {
let newText = text;
const emojis = [];
const emojiData = text.match(CONST.REGEX.EMOJI_NAME);
Expand All @@ -244,9 +243,10 @@ function replaceEmojis(text, isSmallScreenWidth = false, preferredSkinTone = CON

// If this is the last emoji in the message and it's the end of the message so far,
// add a space after it so the user can keep typing easily.
if (isSmallScreenWidth && i === emojiData.length - 1 && text.endsWith(emojiData[i])) {
if (i === emojiData.length - 1) {
emojiReplacement += ' ';
}

newText = newText.replace(emojiData[i], emojiReplacement);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,11 +662,11 @@ class ReportActionCompose extends React.Component {
* @param {String} emoji
*/
addEmojiToTextBox(emoji) {
this.updateComment(ComposerUtils.insertText(this.comment, this.state.selection, emoji));
this.updateComment(ComposerUtils.insertText(this.comment, this.state.selection, `${emoji} `));
this.setState((prevState) => ({
selection: {
start: prevState.selection.start + emoji.length,
end: prevState.selection.start + emoji.length,
start: prevState.selection.start + emoji.length + CONST.SPACE_LENGTH,
end: prevState.selection.start + emoji.length + CONST.SPACE_LENGTH,
},
}));
}
Expand Down Expand Up @@ -721,7 +721,7 @@ class ReportActionCompose extends React.Component {
* @param {Boolean} shouldDebounceSaveComment
*/
updateComment(comment, shouldDebounceSaveComment) {
const {text: newComment = '', emojis = []} = EmojiUtils.replaceEmojis(comment, this.props.isSmallScreenWidth, this.props.preferredSkinTone);
const {text: newComment = '', emojis = []} = EmojiUtils.replaceEmojis(comment, this.props.preferredSkinTone);

if (!_.isEmpty(emojis)) {
User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(emojis));
Expand Down
10 changes: 5 additions & 5 deletions src/pages/home/report/ReportActionItemMessageEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function ReportActionItemMessageEdit(props) {
*/
const updateDraft = useCallback(
(newDraftInput) => {
const {text: newDraft = '', emojis = []} = EmojiUtils.replaceEmojis(newDraftInput, isSmallScreenWidth, props.preferredSkinTone);
const {text: newDraft = '', emojis = []} = EmojiUtils.replaceEmojis(newDraftInput, props.preferredSkinTone);

if (!_.isEmpty(emojis)) {
User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(emojis));
Expand All @@ -171,7 +171,7 @@ function ReportActionItemMessageEdit(props) {
debouncedSaveDraft(props.action.message[0].html);
}
},
[props.action.message, debouncedSaveDraft, isSmallScreenWidth, props.preferredSkinTone],
[props.action.message, debouncedSaveDraft, props.preferredSkinTone],
);

/**
Expand Down Expand Up @@ -226,10 +226,10 @@ function ReportActionItemMessageEdit(props) {
*/
const addEmojiToTextBox = (emoji) => {
setSelection((prevSelection) => ({
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,
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

 * 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?

Copy link
Contributor

@narefyev91 narefyev91 Jun 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@narefyev91 ohh, i missed that thanks!

}));
updateDraft(ComposerUtils.insertText(draft, selection, emoji));
updateDraft(ComposerUtils.insertText(draft, selection, `${emoji} `));
};

/**
Expand Down
20 changes: 5 additions & 15 deletions tests/unit/EmojiTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,24 +101,14 @@ describe('EmojiTest', () => {
expect(EmojiUtils.containsOnlyEmojis('🅃🄴🅂🅃')).toBe(false);
});

it('replaces an emoji code with an emoji and a space on mobile', () => {
it('replaces an emoji code with an emoji and a space', () => {
const text = 'Hi :smile:';
expect(lodashGet(EmojiUtils.replaceEmojis(text, true), 'text')).toBe('Hi 😄 ');
expect(lodashGet(EmojiUtils.replaceEmojis(text), 'text')).toBe('Hi 😄 ');
});

it('will not add a space after the last emoji if there is text after it', () => {
const text = 'Hi :smile::wave:no space after last emoji';
expect(lodashGet(EmojiUtils.replaceEmojis(text), 'text')).toBe('Hi 😄👋no space after last emoji');
});

it('will not add a space after the last emoji when there is text after it on mobile', () => {
const text = 'Hi :smile::wave:no space after last emoji';
expect(lodashGet(EmojiUtils.replaceEmojis(text, true), 'text')).toBe('Hi 😄👋no space after last emoji');
});

it("will not add a space after the last emoji if we're not on mobile", () => {
const text = 'Hi :smile:';
expect(lodashGet(EmojiUtils.replaceEmojis(text), 'text')).toBe('Hi 😄');
it('will add a space after the last emoji if there is text after it', () => {
const text = 'Hi :smile::wave:space after last emoji';
expect(lodashGet(EmojiUtils.replaceEmojis(text), 'text')).toBe('Hi 😄👋 space after last emoji');
});

it('suggests emojis when typing emojis prefix after colon', () => {
Expand Down