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

Only render emoji selector in the dom when needed See merge request soapbox-pub/soapbox-fe!131
4 years ago · f07de93ee3
parent aadde55262 769a512445
commit f07de93ee3
2 changed files with 6 additions and 2 deletions
--- a/app/soapbox/components/status_action_bar.js
+++ b/app/soapbox/components/status_action_bar.js
@ -367,7 +367,9 @@ class StatusActionBar extends ImmutablePureComponent {
          onMouseLeave={this.handleLikeButtonLeave}
          ref={this.setRef}
        >
-          <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          { emojiSelectorVisible &&
+            <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          }
          <IconButton
            className='status__action-bar-button star-icon'
            animate
--- a/app/soapbox/features/status/components/action_bar.js
+++ b/app/soapbox/features/status/components/action_bar.js
@ -311,7 +311,9 @@ class ActionBar extends React.PureComponent {
          onMouseLeave={this.handleLikeButtonLeave}
          ref={this.setRef}
        >
-          <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          { emojiSelectorVisible &&
+            <EmojiSelector onReact={this.handleReactClick} visible={emojiSelectorVisible} />
+          }
          <IconButton
            className='star-icon'
            animate