Merge pull request #1579 from hmhealey/plt1298

PLT-1298 Converted Command and @Mention autocomplete to new suggestion components

1 files changed, 5 insertions, 3 deletions

diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 0ea5c451a..77c9e39b9 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -5,9 +5,10 @@ import * as client from '../utils/client.jsx';
 import * as AsyncClient from '../utils/async_client.jsx';
 import SearchStore from '../stores/search_store.jsx';
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import SuggestionBox from '../components/suggestion_box.jsx';
-import SearchChannelProvider from '../components/search_channel_provider.jsx';
-import SearchUserProvider from '../components/search_user_provider.jsx';
+import SuggestionBox from './suggestion/suggestion_box.jsx';
+import SearchChannelProvider from './suggestion/search_channel_provider.jsx';
+import SearchSuggestionList from './suggestion/search_suggestion_list.jsx';
+import SearchUserProvider from './suggestion/search_user_provider.jsx';
 import * as utils from '../utils/utils.jsx';
 import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
@@ -164,6 +165,7 @@ export default class SearchBar extends React.Component {
                         onFocus={this.handleUserFocus}
                         onBlur={this.handleUserBlur}
                         onUserInput={this.handleUserInput}
+                        listComponent={SearchSuggestionList}
                         providers={this.suggestionProviders}
                     />
                     {isSearching}