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

Refactor shared code between onUpArrow and onDownArrow

Browse source
This commit is contained in:
Luke Barnard 2017-06-28 15:20:16 +01:00
parent 1523d304f2
commit bcb67bb273
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -556,36 +556,34 @@ export default class MessageComposerInput extends React.Component {
this.autocomplete.hide(); this.autocomplete.hide();
return true; return true;
}
selectHistory = async (completion, delta) => {
if (completion == null) {
const newContent = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'html' : 'markdown');
if (!newContent) return false;
let editorState = EditorState.push(
this.state.editorState,
newContent,
'insert-characters',
);
this.setState({editorState});
return true;
}
return await this.setDisplayedCompletion(completion);
}; };
onUpArrow = async (e) => { onUpArrow = async (e) => {
const completion = this.autocomplete.onUpArrow();
if (completion == null && !(this.historyManager.currentIndex === -1 && this.state.editorState.getCurrentContent().hasText())) {
const newContent = this.historyManager.getItem(-1, this.state.isRichtextEnabled ? 'html' : 'markdown');
if (!newContent) return false;
const editorState = EditorState.push(this.state.editorState,
newContent,
'insert-characters');
this.setState({editorState});
return true;
}
e.preventDefault(); e.preventDefault();
return await this.setDisplayedCompletion(completion); const completion = this.autocomplete.onUpArrow();
return this.selectHistory(completion, -1);
}; };
onDownArrow = async (e) => { onDownArrow = async (e) => {
const completion = this.autocomplete.onDownArrow();
if (completion == null && !(this.historyManager.currentIndex === -1 && this.state.editorState.getCurrentContent().hasText())) {
const newContent = this.historyManager.getItem(+1, this.state.isRichtextEnabled ? 'html' : 'markdown');
if (!newContent) return false;
const editorState = EditorState.push(this.state.editorState,
newContent,
'insert-characters');
this.setState({editorState});
return true;
}
e.preventDefault(); e.preventDefault();
return await this.setDisplayedCompletion(completion); const completion = this.autocomplete.onDownArrow();
return this.selectHistory(completion, -1);
}; };
// tab and shift-tab are mapped to down and up arrow respectively // tab and shift-tab are mapped to down and up arrow respectively