Merge branch 'emoji-rendering-hotfix' into 'develop'

Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
merge-requests/155/head
Alex Gleason 4 years ago
commit f07de93ee3

@ -367,7 +367,9 @@ class StatusActionBar extends ImmutablePureComponent {
onMouseLeave={this.handleLikeButtonLeave} onMouseLeave={this.handleLikeButtonLeave}
ref={this.setRef} ref={this.setRef}
> >
<EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} /> { emojiSelectorVisible &&
<EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
}
<IconButton <IconButton
className='status__action-bar-button star-icon' className='status__action-bar-button star-icon'
animate animate

@ -311,7 +311,9 @@ class ActionBar extends React.PureComponent {
onMouseLeave={this.handleLikeButtonLeave} onMouseLeave={this.handleLikeButtonLeave}
ref={this.setRef} ref={this.setRef}
> >
<EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} /> { emojiSelectorVisible &&
<EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
}
<IconButton <IconButton
className='star-icon' className='star-icon'
animate animate

Loading…
Cancel
Save