summaryrefslogtreecommitdiffstats
path: root/webapp/components/emoji_picker/emoji_picker.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-18 09:28:18 -0400
committerGitHub <noreply@github.com>2017-05-18 09:28:18 -0400
commit2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch)
treec97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/emoji_picker/emoji_picker.jsx
parent63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff)
downloadchat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip
Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json
Diffstat (limited to 'webapp/components/emoji_picker/emoji_picker.jsx')
-rw-r--r--webapp/components/emoji_picker/emoji_picker.jsx12
1 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/emoji_picker/emoji_picker.jsx b/webapp/components/emoji_picker/emoji_picker.jsx
index b4e67df29..e9cddce34 100644
--- a/webapp/components/emoji_picker/emoji_picker.jsx
+++ b/webapp/components/emoji_picker/emoji_picker.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
@@ -30,11 +32,11 @@ const CATEGORIES = [
class EmojiPicker extends React.Component {
static propTypes = {
- customEmojis: React.PropTypes.object,
- onEmojiClick: React.PropTypes.func.isRequired,
- pickerLocation: React.PropTypes.string.isRequired,
- emojiOffset: React.PropTypes.number,
- outsideClick: React.PropTypes.func
+ customEmojis: PropTypes.object,
+ onEmojiClick: PropTypes.func.isRequired,
+ pickerLocation: PropTypes.string.isRequired,
+ emojiOffset: PropTypes.number,
+ outsideClick: PropTypes.func
}
constructor(props) {