imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow enter to remove current block if its empty useful for lists

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-07-17 13:29:40 +01:00
parent 8d4cead105
commit 688776bc10
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/components/views/rooms/MessageComposerInput.js
View file

@ -992,24 +992,25 @@ export default class MessageComposerInput extends React.Component {
const editorState = this.state.editorState; const editorState = this.state.editorState;
let inBlock = false; const lastBlock = editorState.blocks.last();
let inEmptyBlock = false; if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) {
const text = lastBlock.text;
for (const block of editorState.blocks) { if (text === '') {
if (['code', 'block-quote', 'list-item'].includes(block.type)) { // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
inBlock = true; return change
if (block.text === '') { .setBlocks(DEFAULT_NODE)
inEmptyBlock = true; .unwrapBlock('bulleted-list')
} .unwrapBlock('numbered-list');
break;
} }
}
if (inEmptyBlock) { // TODO strip trailing lines from blockquotes/list entries
// allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock` // the below code seemingly works but doesn't account for edge cases like return with caret not at end
return change.setBlocks(DEFAULT_NODE); /* const trailingNewlines = text.match(/\n*$/);
} else if (inBlock) { if (trailingNewlines && trailingNewlines[0]) {
// allow the user to terminate blocks by hitting return rather than sending a msg remove trailing newlines at the end of this block before making a new one
return change.deleteBackward(trailingNewlines[0].length);
}*/
return; return;
} }