Merge pull request #429 from greybutton/try-fix-emoji

try fix emoji
hexlet-codebattle · Jan 19, 2019 · c8477af · c8477af
2 parents 4ea1b8a + 6eb7dc2
commit c8477af
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/services/app/assets/js/widgets/components/InputWithEmoji.jsx b/services/app/assets/js/widgets/components/InputWithEmoji.jsx
@@ -10,13 +10,19 @@ class InputWithEmoji extends PureComponent {
     }
   };
 
+  getEmoji = (emoji) => {
+    const codes = emoji.unified.split('-').map(c => `0x${c}`);
+    return String.fromCodePoint(...codes);
+  }
+
   addEmoji = (emoji, closeEmoji) => {
     const { value, handleChange } = this.props;
     const input = this.inputRef.current;
     const cursorPosition = input.selectionStart;
     const start = value.substring(0, input.selectionStart);
     const end = value.substring(input.selectionEnd);
-    const updatedValue = `${start}${emoji.native}${end}`;
+    const emojiPic = this.getEmoji(emoji);
+    const updatedValue = `${start}${emojiPic}${end}`;
 
     handleChange(updatedValue);
     closeEmoji();