unbreak keyboard shortcuts & ctrl-backspace

This commit is contained in:
Matthew Hodgson 2018-05-26 02:11:20 +01:00
parent ab41212258
commit 6299e188a4

View file

@ -716,7 +716,7 @@ export default class MessageComposerInput extends React.Component {
if (ctrlCmdCommand) { if (ctrlCmdCommand) {
return this.handleKeyCommand(ctrlCmdCommand); return this.handleKeyCommand(ctrlCmdCommand);
} }
return false; return;
} }
switch (ev.keyCode) { switch (ev.keyCode) {
@ -739,6 +739,10 @@ export default class MessageComposerInput extends React.Component {
}; };
onBackspace = (ev: Event, change: Change): Change => { onBackspace = (ev: Event, change: Change): Change => {
if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
return;
}
if (this.state.isRichTextEnabled) { if (this.state.isRichTextEnabled) {
// let backspace exit lists // let backspace exit lists
const isList = this.hasBlock('list-item'); const isList = this.hasBlock('list-item');