summaryrefslogtreecommitdiffstats
path: root/webapp/components/emoji_picker/emoji_picker_container.jsx
diff options
context:
space:
mode:
authorbonespiked <dngreene@gmail.com>2017-03-24 09:09:51 -0400
committerJason Blais <jason@spinpunch.com>2017-03-24 09:09:51 -0400
commit28ad645153b206ba84ddc4935280eaed94bb0138 (patch)
treea5ddcc228b5cfdbd479078873a1bfede9f11cb1f /webapp/components/emoji_picker/emoji_picker_container.jsx
parentd0af931e6e57b78432d5527b6e7b0be36c538144 (diff)
downloadchat-28ad645153b206ba84ddc4935280eaed94bb0138.tar.gz
chat-28ad645153b206ba84ddc4935280eaed94bb0138.tar.bz2
chat-28ad645153b206ba84ddc4935280eaed94bb0138.zip
Ticket 4665 - Emoji Picker (#5157)
* #4665 Added EmojiPicker Work primarily by @broernr-de and @harrison on pre-release.mattermost.com * Final fixes to handle custom emojis from internal review and single merge error * ESLint fixes * CSS changes and other code to support emoji picker in reply window * Fix for file upload and emoji picker icon positions on post and comment. RHS emoji picker appearing see-through at this time. * Fix for two ESLint issues. * covered most of feedback: RHS emoji picker looks correct color-wise RHS emoji picker dynamically positions against height of thread size (post + reply messages) escape closes emoji window search box focused on open ESLint fixes against other files oversized emoji preview fixes * Adding in 'outside click' eventing to dismiss the emoji window * Changing some formatting to fix mismatch between my local eslant rules and jenkins. * adding alternative import method due to downstream testing errors * yet another attempt to retain functionality and pass tests - skipping import of browser store * fix for feedback items 5 and 7: * move search to float on top with stylistic changes * whitespace in the header (+1 squashed commit) Squashed commits: [6a26d32] changes that address items 1, 2, 6, 8, and 9 of latest feedback * Fix for attachment preview location on mobile * Fix for latest rounds of feedback * fixing eslint issue * making emojipicker sprite based, fixing alignments * Fix for emoji quality, fixing some behavior (hover background and cursor settings) undoing config changes * Preview feature for emojis * Adjustments to config file, and changing layout/design of attachment and emoji icon. * manual revert from master branch for config.json * reverting paperclip and fixing alignments. Additionally fixing inadvertent display of picker on mobile. * CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working * Made suggested changes by jwilander except for jQuery removal * Adding hover for both icons * removal of some usages of jQuery * Fix for two layout issues on IE11/Edge * UI improvements for emoji picker * Fix for many minor display issues * fix for additional appearance items * fix to two minor UI items * A little extra padding for IE11 * fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error * fixes some display issues on firefox * fix for uneven sides of emojis * fix for eslint issues that I didn't introduce * fix for missing bottom edge of RHS emojipicker. also fixing text overlapping icons on text area (including RHS) * Update "emoji selector" to "emoji picker" * changes for code review - removal of ..getDOMNode - use sprite imagery for emoji preview - remove lastBlurAt from state as it wasn't used * fixes for: - fake custom emoji preview in picker - RHS scrollbar on preview * fix for minor alignment of preview emoji
Diffstat (limited to 'webapp/components/emoji_picker/emoji_picker_container.jsx')
-rw-r--r--webapp/components/emoji_picker/emoji_picker_container.jsx46
1 files changed, 46 insertions, 0 deletions
diff --git a/webapp/components/emoji_picker/emoji_picker_container.jsx b/webapp/components/emoji_picker/emoji_picker_container.jsx
new file mode 100644
index 000000000..7cdc0e4b9
--- /dev/null
+++ b/webapp/components/emoji_picker/emoji_picker_container.jsx
@@ -0,0 +1,46 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import React from 'react';
+
+import EmojiStore from 'stores/emoji_store.jsx';
+
+import EmojiPicker from './emoji_picker.jsx';
+
+export default class EmojiPickerContainer extends React.Component {
+ static propTypes = {
+ onEmojiClick: React.PropTypes.func.isRequred
+ }
+
+ constructor(props) {
+ super(props);
+ this.handleEmojiChange = this.handleEmojiChange.bind(this);
+
+ this.state = {
+ customEmojis: EmojiStore.getCustomEmojiMap().values() ? EmojiStore.getCustomEmojiMap().values() : []
+ };
+ }
+
+ componentDidMount() {
+ EmojiStore.addChangeListener(this.handleEmojiChange);
+ }
+
+ componentWillUnount() {
+ EmojiStore.removeChangeListener(this.handleEmojiChange);
+ }
+
+ handleEmojiChange() {
+ this.setState({
+ customEmojis: EmojiStore.getCustomEmojiMap().values()
+ });
+ }
+
+ render() {
+ return (
+ <EmojiPicker
+ customEmojis={EmojiStore.getCustomEmojiMap().values()}
+ onEmojiClick={this.props.onEmojiClick}
+ />
+ );
+ }
+}