From c490f873e3f286e97027d1dca7cbc1eebe1bd037 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 00:58:35 +0100
Subject: [PATCH] unbreak modifier+space (e.g. emoji insert on macOS)

---
 src/components/views/rooms/MessageComposerInput.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 0b79e8a61c..9d89aa6b6e 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -712,6 +712,10 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onSpace = (ev: KeyboardEvent, change: Change): Change => {
+        if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) {
+            return;
+        }
+
         // drop a point in history so the user can undo a word
         // XXX: this seems nasty but adding to history manually seems a no-go
         ev.preventDefault();