Merge pull request #1431 from hmhealey/plt1149

PLT-1149 Fixed some console errors related to the search autocomplete

1 files changed, 7 insertions, 5 deletions

diff --git a/web/react/components/search_autocomplete.jsx b/web/react/components/search_autocomplete.jsx
index d245c6bac..04384203f 100644
--- a/web/react/components/search_autocomplete.jsx
+++ b/web/react/components/search_autocomplete.jsx
@@ -46,7 +46,7 @@ export default class SearchAutocomplete extends React.Component {
     componentDidUpdate(prevProps, prevState) {
         const content = $(ReactDOM.findDOMNode(this.refs.searchPopover)).find('.popover-content');
 
-        if (this.state.show) {
+        if (this.state.show && this.state.suggestions.length > 0) {
             if (!prevState.show) {
                 content.perfectScrollbar();
                 content.css('max-height', $(window).height() - 200);
@@ -143,10 +143,12 @@ export default class SearchAutocomplete extends React.Component {
     }
 
     getSelection() {
-        if (this.state.mode === 'channels') {
-            return this.state.suggestions[this.state.selection].name;
-        } else if (this.state.mode === 'users') {
-            return this.state.suggestions[this.state.selection].username;
+        if (this.state.suggestions.length > 0) {
+            if (this.state.mode === 'channels') {
+                return this.state.suggestions[this.state.selection].name;
+            } else if (this.state.mode === 'users') {
+                return this.state.suggestions[this.state.selection].username;
+            }
         }
 
         return '';