mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 03:50:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1163 from matrix-org/luke/fix-rte-multi-line-up-down

Browse source 
Only allow history selection when on the first or last line
This commit is contained in:
Luke Barnard 2017-06-30 14:57:48 +01:00 committed by GitHub
commit 1cfc2773ea
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,12 +593,36 @@ export default class MessageComposerInput extends React.Component {
};
onVerticalArrow = (e, up) => {
e.preventDefault();
// Select history only if we are not currently auto-completing
if (this.autocomplete.state.completionList.length === 0) {
return this.selectHistory(up);
// Don't go back in history if we're in the middle of a multi-line message
const selection = this.state.editorState.getSelection();
const blockKey = selection.getStartKey();
const firstBlock = this.state.editorState.getCurrentContent().getFirstBlock();
const lastBlock = this.state.editorState.getCurrentContent().getLastBlock();
const selectionOffset = selection.getAnchorOffset();
let canMoveUp = false;
let canMoveDown = false;
if (blockKey === firstBlock.getKey()) {
const textBeforeCursor = firstBlock.getText().slice(0, selectionOffset);
canMoveUp = textBeforeCursor.indexOf('\n') === -1;
}
if (blockKey === lastBlock.getKey()) {
const textAfterCursor = lastBlock.getText().slice(selectionOffset);
canMoveDown = textAfterCursor.indexOf('\n') === -1;
}
if ((up && !canMoveUp) || (!up && !canMoveDown)) return;
const selected = this.selectHistory(up);
if (selected) {
// We're selecting history, so prevent the key event from doing anything else
e.preventDefault();
}
} else {
return this.moveAutocompleteSelection(up);
this.moveAutocompleteSelection(up);
}
};