From bcb67bb273c9b1860b15c0355c2cb26d20714f97 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 28 Jun 2017 15:20:16 +0100 Subject: [PATCH] Refactor shared code between `onUpArrow` and `onDownArrow` --- .../views/rooms/MessageComposerInput.js | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 7603a45e4c..90ac905553 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -556,36 +556,34 @@ export default class MessageComposerInput extends React.Component { this.autocomplete.hide(); 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) => { - 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(); - return await this.setDisplayedCompletion(completion); + const completion = this.autocomplete.onUpArrow(); + return this.selectHistory(completion, -1); }; 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(); - 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