]> cat aescling's git repositories - mastodon.git/commitdiff
Fix modifier key to keep the EmojiPicker on macOS (#14096)
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Sat, 20 Jun 2020 11:30:40 +0000 (20:30 +0900)
committerGitHub <noreply@github.com>
Sat, 20 Jun 2020 11:30:40 +0000 (13:30 +0200)
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js

index a6186010b4f7be9dbfcdd9791c59b02e4dfcf55f..360a7af6ab9fcaa5d7d4debfd604d72b192c7f50 100644 (file)
@@ -203,7 +203,7 @@ class EmojiPickerMenu extends React.PureComponent {
     if (!emoji.native) {
       emoji.native = emoji.colons;
     }
-    if (!event.ctrlKey) {
+    if (!(event.ctrlKey || event.metaKey)) {
       this.props.onClose();
     }
     this.props.onPick(emoji);