Use updated regex from joypixels/emojione#507

Author: alexmunda

draft-js-emoji-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draft-js-emoji-bump",
-  "version": "2.2.0",
+  "version": "2.2.16",
   "description": "Emoji Plugin for DraftJS",
   "author": {
     "name": "Nik Graf",

draft-js-emoji-plugin/src/components/Emoji/index.js

@@ -16,7 +16,7 @@ const Emoji = ({ theme = {}, cacheBustParam, imagePath, imageType, className, de
     );
   } else {
     // short name to image url code steal from emojione source code
-    const codepointsForImage = emojione.emojioneList[shortName].fname;
+    const codepointsForImage = emojione.emojioneList[shortName].uc_base;
     const backgroundImage = `url(${imagePath}${codepointsForImage}.${imageType}${cacheBustParam})`;
     const combinedClassName = unionClassNames(theme.emoji, className);
 

draft-js-emoji-plugin/src/components/EmojiSelect/Popover/Entry/index.js

@@ -66,7 +66,7 @@ export default class Entry extends Component {
       emojiDisplay = convertShortNameToUnicode(unicode);
     } else {
       // short name to image url code steal from emojione source code
-      const codePointsForImage = emojione.emojioneList[emoji].fname;
+      const codePointsForImage = emojione.emojioneList[emoji].uc_base;
       const fullImagePath = `${imagePath}${codePointsForImage}.${imageType}${cacheBustParam}`;
       emojiDisplay = (
         <img

draft-js-emoji-plugin/src/components/EmojiSuggestions/Entry/index.js

@@ -45,7 +45,7 @@ export default class Entry extends Component {
       emojiDisplay = convertShortNameToUnicode(unicode);
     } else {
       // short name to image url code steal from emojione source code
-      const codePointsForImage = emojione.emojioneList[this.props.emoji].fname;
+      const codePointsForImage = emojione.emojioneList[this.props.emoji].uc_base;
       const fullImagePath = `${imagePath}${codePointsForImage}.${imageType}${cacheBustParam}`;
       emojiDisplay = (
         <img

draft-js-emoji-plugin/src/emojiStrategy.js

@@ -1,7 +1,5 @@
 import findWithRegex from 'find-with-regex';
-import emojione from 'emojione';
-
-const unicodeRegex = emojione.regUnicode;
+import unicodeRegex from './utils/emojiUnicodeRegex';
 
 export default (contentBlock: Object, callback: Function) => {
   findWithRegex(unicodeRegex, contentBlock, callback);

draft-js-emoji-plugin/src/modifiers/attachImmutableEntitiesToEmojis.js

@@ -1,8 +1,6 @@
 import { EditorState, Modifier, SelectionState } from 'draft-js';
 import findWithRegex from 'find-with-regex';
-import emojione from 'emojione';
-
-const unicodeRegex = emojione.regUnicode;
+import unicodeRegex from '../utils/emojiUnicodeRegex';
 
 /*
  * Attaches Immutable DraftJS Entities to the Emoji text.

draft-js-emoji-plugin/src/utils/emojiList.js

@@ -1,12 +1,14 @@
 import emojione from 'emojione';
 
+emojione.greedyMatch = true;
+
 const newEmojiListWithOutPriorityList = (priorityList) => {
   const list = {};
   for (const key in emojione.emojioneList) { // eslint-disable-line no-restricted-syntax
     if (priorityList.hasOwnProperty(key)) { // eslint-disable-line no-prototype-builtins
       continue; // eslint-disable-line no-continue
     }
-    list[key] = emojione.emojioneList[key].uc;
+    list[key] = emojione.emojioneList[key].uc_output;
   }
 
   return { ...priorityList, ...list };