diff --git a/app/soapbox/components/emoji_selector.js b/app/soapbox/components/emoji_selector.js index 73db189a3..f41f23f41 100644 --- a/app/soapbox/components/emoji_selector.js +++ b/app/soapbox/components/emoji_selector.js @@ -102,7 +102,7 @@ class EmojiSelector extends ImmutablePureComponent { className='emoji-react-selector-container' >
diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js index b3bc4786c..5844ac41f 100644 --- a/app/soapbox/components/status_action_bar.js +++ b/app/soapbox/components/status_action_bar.js @@ -9,6 +9,7 @@ import { connect } from 'react-redux'; import { Link, withRouter } from 'react-router-dom'; import { simpleEmojiReact } from 'soapbox/actions/emoji_reacts'; +import EmojiSelector from 'soapbox/components/emoji_selector'; import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container'; import { isUserTouching } from 'soapbox/is_mobile'; import { isStaff, isAdmin } from 'soapbox/utils/accounts'; @@ -541,7 +542,8 @@ class StatusActionBar extends ImmutablePureComponent { } render() { - const { status, intl, allowedEmoji, features, me } = this.props; + const { status, intl, allowedEmoji, emojiSelectorFocused, handleEmojiSelectorUnfocus, features, me } = this.props; + const { emojiSelectorVisible } = this.state; const publicStatus = ['public', 'unlisted'].includes(status.get('visibility')); @@ -660,16 +662,16 @@ class StatusActionBar extends ImmutablePureComponent {
- {/* */} + />