From 1f9a396fa53b5da3fd8f6e9e6ea6669d13a92d00 Mon Sep 17 00:00:00 2001
From: Aviral Dasgupta <me@aviraldg.com>
Date: Wed, 3 Aug 2016 17:51:40 +0530
Subject: [PATCH] fix: autocomplete to use tab instead of return

---
 src/components/views/rooms/MessageComposer.js      |  8 --------
 src/components/views/rooms/MessageComposerInput.js | 13 ++++---------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 282f7f013fb..edd8ed7b9a9 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -36,7 +36,6 @@ export default class MessageComposer extends React.Component {
         this.onInputContentChanged = this.onInputContentChanged.bind(this);
         this.onUpArrow = this.onUpArrow.bind(this);
         this.onDownArrow = this.onDownArrow.bind(this);
-        this.onTab = this.onTab.bind(this);
         this._tryComplete = this._tryComplete.bind(this);
         this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
 
@@ -143,12 +142,6 @@ export default class MessageComposer extends React.Component {
         return this.refs.autocomplete.onDownArrow();
     }
 
-    onTab() {
-        // FIXME Autocomplete doesn't have an onTab - what is this supposed to do?
-        // return this.refs.autocomplete.onTab();
-        return false;
-    }
-
     _tryComplete(): boolean {
         if (this.refs.autocomplete) {
             return this.refs.autocomplete.onConfirm();
@@ -223,7 +216,6 @@ export default class MessageComposer extends React.Component {
                     tryComplete={this._tryComplete}
                     onUpArrow={this.onUpArrow}
                     onDownArrow={this.onDownArrow}
-                    onTab={this.onTab}
                     tabComplete={this.props.tabComplete} // used for old messagecomposerinput/tabcomplete
                     onContentChanged={this.onInputContentChanged} />,
                 uploadButton,
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 46abc20ed69..690da28c013 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -422,12 +422,6 @@ export default class MessageComposerInput extends React.Component {
         if (ev.shiftKey) {
             return false;
         }
-        
-        if(this.props.tryComplete) {
-            if(this.props.tryComplete()) {
-                return true;
-            }
-        }
 
         const contentState = this.state.editorState.getCurrentContent();
         if (!contentState.hasText()) {
@@ -519,8 +513,8 @@ export default class MessageComposerInput extends React.Component {
     }
 
     onTab(e) {
-        if (this.props.onTab) {
-            if (this.props.onTab()) {
+        if (this.props.tryComplete) {
+            if (this.props.tryComplete()) {
                 e.preventDefault();
             }
         }
@@ -585,5 +579,6 @@ MessageComposerInput.propTypes = {
 
     onDownArrow: React.PropTypes.func,
 
-    onTab: React.PropTypes.func
+    // attempts to confirm currently selected completion, returns whether actually confirmed
+    tryComplete: React.PropTypes.func,
 };