From 26778b8c30d2618f85236f2e8a78327476e95ca2 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Sat, 20 Jun 2020 20:30:40 +0900 Subject: [PATCH] [Glitch] Fix modifier key to keep the EmojiPicker on macOS Port c0b52ac871283c54efebb7d96c0103b4de6550ed to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/features/emoji_picker/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js index 14e5cb94a7..d0d9714a8b 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);