Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception

Fix exception when opening dev tools
matrix-org · Jun 14, 2018 · bb99950 · bb99950
2 parents 038b43a + b81e12e
commit bb99950
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
@@ -244,12 +244,14 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState = null;
         if (contentState) {
-            editorState = EditorState.createWithContent(contentState, compositeDecorator);
+            editorState = EditorState.moveFocusToEnd(
+                EditorState.createWithContent(contentState, compositeDecorator)
+            );
         } else {
             editorState = EditorState.createEmpty(compositeDecorator);
         }
 
-        return EditorState.moveFocusToEnd(editorState);
+        return editorState;
     }
 
     componentDidMount() {