filter out emoji and update emojimart

GetStream · Mar 26, 2020 · 333ed77 · 333ed77
1 parent 7de6db5
commit 333ed77
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "anchorme": "^1.1.2",
     "dayjs": "^1.8.23",
     "deep-equal": "^2.0.1",
-    "emoji-mart": "2.11.0",
+    "emoji-mart": "3.0.0",
     "emoji-regex": "^8.0.0",
     "i18next": "^19.3.3",
     "isomorphic-ws": "^4.0.1",

diff --git a/src/components/EditMessageForm.js b/src/components/EditMessageForm.js
@@ -10,6 +10,7 @@ import {
   FileUploadButton,
 } from 'react-file-utils';
 import { withTranslationContext } from '../context';
+import { filterEmoji } from '../utils';
 
 /**
  * @example ./docs/EditMessageForm.md
@@ -130,6 +131,7 @@ class EditMessageForm extends React.Component {
             onSelect={this.props.onSelectEmoji}
             color="#006CFF"
             showPreview={false}
+            emojisToShowFilter={filterEmoji}
           />
         </div>
       );
@@ -164,6 +166,7 @@ class EditMessageForm extends React.Component {
                   title={t('Pick your emoji')}
                   onSelect={this.props.onSelectEmoji}
                   color="#006CFF"
+                  emojisToShowFilter={filterEmoji}
                 />
               </div>
             )}

diff --git a/src/components/MessageInputFlat.js b/src/components/MessageInputFlat.js
@@ -9,6 +9,7 @@ import {
   FilePreviewer,
   FileUploadButton,
 } from 'react-file-utils';
+import { filterEmoji } from '../utils';
 
 import { Picker } from 'emoji-mart';
 
@@ -134,6 +135,7 @@ class MessageInputFlat extends PureComponent {
             onSelect={this.props.onSelectEmoji}
             color="#006CFF"
             showPreview={false}
+            emojisToShowFilter={filterEmoji}
           />
         </div>
       );

diff --git a/src/components/MessageInputLarge.js b/src/components/MessageInputLarge.js
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { ChatAutoComplete } from './ChatAutoComplete';
 import { withTranslationContext } from '../context';
-
+import { filterEmoji } from '../utils';
 import {
   ImageDropzone,
   ImagePreviewer,
@@ -131,6 +131,8 @@ class MessageInputLarge extends PureComponent {
             onSelect={this.props.onSelectEmoji}
             color="#006CFF"
             showPreview={false}
+            useButton={true}
+            emojisToShowFilter={filterEmoji}
           />
         </div>
       );

diff --git a/src/components/MessageInputSmall.js b/src/components/MessageInputSmall.js
@@ -11,6 +11,7 @@ import {
   FilePreviewer,
   FileUploadButton,
 } from 'react-file-utils';
+import { filterEmoji } from '../utils';
 
 /**
  * MessageInputSmall - compact design to be used for the MessageInput. It has all the features of MessageInput minus the typing indicator.
@@ -131,6 +132,7 @@ class MessageInputSmall extends PureComponent {
             onSelect={this.props.onSelectEmoji}
             color="#006CFF"
             showPreview={false}
+            emojisToShowFilter={filterEmoji}
           />
         </div>
       );

diff --git a/yarn.lock b/yarn.lock
@@ -3738,11 +3738,12 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-emoji-mart@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-2.11.0.tgz#fed7c44d3a642b5de08848e8833d65a656ea8414"
-  integrity sha512-ol1ABg0xfDwCeKVu0Mmr/iTRHUMvqlyLZJFRQy+e6aWV83/Y+TEbJpBbtk7NxaW3BLAOyJ8r0NWthRQwxTtT1A==
+emoji-mart@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.0.tgz#eca24a04881e27752a6921e09f65a86ce8539a50"
+  integrity sha512-r5DXyzOLJttdwRYfJmPq/XL3W5tiAE/VsRnS0Hqyn27SqPA/GOYwVUSx50px/dXdJyDSnvmoPbuJ/zzhwSaU4A==
   dependencies:
+    "@babel/runtime" "^7.0.0"
     prop-types "^15.6.0"
 
 "emoji-regex@>=6.0.0 <=6.1.1":