From 79f481f81e8b9d1d11535f91f5b8da5d19006d7e Mon Sep 17 00:00:00 2001
From: Aviral Dasgupta <me@aviraldg.com>
Date: Tue, 7 Mar 2017 04:39:38 +0530
Subject: [PATCH] rte: special return handling for some block types

---
 src/components/views/rooms/MessageComposerInput.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5d9496e78d..e3063babb1 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -513,9 +513,16 @@ export default class MessageComposerInput extends React.Component {
     };
 
     handleReturn = (ev) => {
-        if (ev.shiftKey) {
-            this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
-            return true;
+        const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
+        // If we're in any of these three types of blocks, shift enter should insert soft newlines
+        // And just enter should end the block
+        if(['blockquote', 'unordered-list-item', 'ordered-list-item'].includes(currentBlockType)) {
+            if(ev.shiftKey) {
+                this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
+                return true;
+            }
+
+            return false;
         }
 
         const contentState = this.state.editorState.getCurrentContent();