Merge branch 'master' into glitch-soc/merge-upstream

2020-06-01 18:21:43 +02:00
parent 1f94f4009e 51ff679b9d
commit 89de02f7aa
6 changed files with 39 additions and 15 deletions
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -199,12 +199,13 @@ class EmojiPickerMenu extends React.PureComponent {
    };
  }

-  handleClick = emoji => {
+  handleClick = (emoji, event) => {
    if (!emoji.native) {
      emoji.native = emoji.colons;
    }
-
-    this.props.onClose();
+    if (!event.ctrlKey) {
+      this.props.onClose();
+    }
    this.props.onPick(emoji);
  }