OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rte: special return handling for some block types

pull/21833/head
Aviral Dasgupta 2017-03-07 04:39:38 +05:30
parent f5b52fb488
commit 79f481f81e
No known key found for this signature in database
GPG Key ID: 5FD1E9F4FFD3DA80
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/rooms/MessageComposerInput.js
View File

@ -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();