Skip to content
Snippets Groups Projects
Commit 1d2616b7 authored by Sorin Davidoi's avatar Sorin Davidoi Committed by Eugen Rochko
Browse files

fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221)

parent d4b097a8
No related branches found
No related tags found
No related merge requests found
......@@ -136,7 +136,7 @@ export default class ComposeForm extends ImmutablePureComponent {
handleEmojiPick = (data) => {
const position = this.autosuggestTextarea.textarea.selectionStart;
const emojiChar = String.fromCodePoint(parseInt(data.unicode, 16));
const emojiChar = data.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join('');
this._restoreCaret = position + emojiChar.length + 1;
this.props.onPickEmoji(position, data);
}
......
......@@ -118,7 +118,7 @@ const insertSuggestion = (state, position, token, completion) => {
};
const insertEmoji = (state, position, emojiData) => {
const emoji = String.fromCodePoint(parseInt(emojiData.unicode, 16));
const emoji = emojiData.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join('');
return state.withMutations(map => {
map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment