PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1258 from matrix-org/luke/feature-rte-enter-to-toggle-empty-block

Browse source 
Interpret a `split-block` as format toggle for an empty block
This commit is contained in:
David Baker 2017-07-28 15:33:45 +01:00 committed by GitHub
commit 8fd0ced215
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -502,12 +502,18 @@ export default class MessageComposerInput extends React.Component {
// These are block types, not handled by RichUtils by default. // These are block types, not handled by RichUtils by default.
const blockCommands = ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item']; const blockCommands = ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item'];
const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState); const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
const shouldToggleBlockFormat = (
command === 'backspace' ||
command === 'split-block'
) && currentBlockType !== 'unstyled';
if (blockCommands.includes(command)) { if (blockCommands.includes(command)) {
newState = RichUtils.toggleBlockType(this.state.editorState, command); newState = RichUtils.toggleBlockType(this.state.editorState, command);
} else if (command === 'strike') { } else if (command === 'strike') {
// this is the only inline style not handled by Draft by default // this is the only inline style not handled by Draft by default
newState = RichUtils.toggleInlineStyle(this.state.editorState, 'STRIKETHROUGH'); newState = RichUtils.toggleInlineStyle(this.state.editorState, 'STRIKETHROUGH');
} else if (command === 'backspace' && currentBlockType !== 'unstyled') { } else if (shouldToggleBlockFormat) {
const currentStartOffset = this.state.editorState.getSelection().getStartOffset(); const currentStartOffset = this.state.editorState.getSelection().getStartOffset();
if (currentStartOffset === 0) { if (currentStartOffset === 0) {
// Toggle current block type (setting it to 'unstyled') // Toggle current block type (setting it to 'unstyled')