Merge pull request #1222 from matrix-org/luke/fix-rte-allow-split-code-block

Add code-block to the list of blocks where hitting return will split-…
This commit is contained in:
Luke Barnard 2017-07-14 09:48:47 +01:00 committed by GitHub
commit 1db2431c9f

View file

@ -598,10 +598,13 @@ export default class MessageComposerInput extends React.Component {
}
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
// XXX: Empirically enter does not end these blocks
if(['blockquote', 'unordered-list-item', 'ordered-list-item'].includes(currentBlockType)) {
if(
['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item']
.includes(currentBlockType)
) {
// By returning false, we allow the default draft-js key binding to occur,
// which in this case invokes "split-block". This creates a new block of the
// same type, allowing the user to delete it with backspace.
return false;
}