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

Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
timeline-tab-hover-styles
Alex Gleason 2020-08-05 21:04:41 +00:00
commit f07de93ee3
2 zmienionych plików z 6 dodań i 2 usunięć

Wyświetl plik

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

Wyświetl plik

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