Fixing double enter in channel switcher (#6208)

webapp/components/search_bar.jsx

@@ -36,6 +36,7 @@ export default class SearchBar extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
         this.searchMentions = this.searchMentions.bind(this);
         this.getFlagged = this.getFlagged.bind(this);
+        this.handleKeyDown = this.handleKeyDown.bind(this);
 
         const state = this.getSearchTermStateFromStores();
         state.focused = false;
@@ -107,6 +108,10 @@ export default class SearchBar extends React.Component {
         });
     }
 
+    handleKeyDown() {
+        // This is just to prevent a JS error
+    }
+
     handleChange(e) {
         var term = e.target.value;
         SearchStore.storeSearchTerm(term);
@@ -320,6 +325,7 @@ export default class SearchBar extends React.Component {
                         onFocus={this.handleUserFocus}
                         onBlur={this.handleUserBlur}
                         onChange={this.handleChange}
+                        onKeyDown={this.handleKeyDown}
                         listComponent={SearchSuggestionList}
                         providers={this.suggestionProviders}
                         type='search'

webapp/components/suggestion/suggestion_box.jsx

@@ -172,6 +172,7 @@ export default class SuggestionBox extends React.Component {
                 e.preventDefault();
             } else if (e.which === KeyCodes.ENTER || e.which === KeyCodes.TAB) {
                 GlobalActions.emitCompleteWordSuggestion(this.suggestionId);
+                this.props.onKeyDown(e);
                 e.preventDefault();
             } else if (e.which === KeyCodes.ESCAPE) {
                 GlobalActions.emitClearSuggestions(this.suggestionId);