Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-06-14 09:52:58 +00:00
commit 15e4255db6

View file

@ -244,14 +244,12 @@ export default class MessageComposerInput extends React.Component {
let editorState = null;
if (contentState) {
editorState = EditorState.moveFocusToEnd(
EditorState.createWithContent(contentState, compositeDecorator)
);
editorState = EditorState.createWithContent(contentState, compositeDecorator);
} else {
editorState = EditorState.createEmpty(compositeDecorator);
}
return editorState;
return EditorState.moveFocusToEnd(editorState);
}
componentDidMount() {