From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sat, 20 Jun 2020 11:30:40 +0000 (+0900)
Subject: [Glitch] Fix modifier key to keep the EmojiPicker on macOS
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=83bc9f68af130db3b5c41cab5f76443348a96601;p=mastodon.git

[Glitch] Fix modifier key to keep the EmojiPicker on macOS

Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---

diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js
index 14e5cb94a..d0d9714a8 100644
--- a/app/javascript/flavours/glitch/features/emoji_picker/index.js
+++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js
@@ -283,7 +283,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);