matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

allow user to break out of blockquote/etc by hitting enter twice

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-07-17 12:30:22 +01:00
parent 5b79e3bcd5
commit ff76b6a981
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -990,15 +990,29 @@ export default class MessageComposerInput extends React.Component {
return change.insertText('\n');
}
if (this.state.editorState.blocks.some(
block => ['code', 'block-quote', 'list-item'].includes(block.type)
)) {
const editorState = this.state.editorState;
let inBlock = false;
let inEmptyBlock = false;
for (const block of editorState.blocks) {
if (['code', 'block-quote', 'list-item'].includes(block.type)) {
inBlock = true;
if (block.text === '') {
inEmptyBlock = true;
}
break;
}
}
if (inEmptyBlock) {
// allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
return change.setBlocks(DEFAULT_NODE);
} else if (inBlock) {
// allow the user to terminate blocks by hitting return rather than sending a msg
return;
}
const editorState = this.state.editorState;
let contentText;
let contentHTML;