diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-03-24 18:05:43 +0900 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-24 09:05:43 +0000 |
commit | 1167b391854957a5d58ed569c1dc2f80e9ccc599 (patch) | |
tree | 071e2e2217dee77fee5b310620aa946d4f68a69d /webapp/components/search_results.jsx | |
parent | 98baf1536eb1b47d8258e188e1c80393182c6525 (diff) | |
download | chat-1167b391854957a5d58ed569c1dc2f80e9ccc599.tar.gz chat-1167b391854957a5d58ed569c1dc2f80e9ccc599.tar.bz2 chat-1167b391854957a5d58ed569c1dc2f80e9ccc599.zip |
Fixed mobile search focus - keyboard collapse/focus (#5766)
Diffstat (limited to 'webapp/components/search_results.jsx')
-rw-r--r-- | webapp/components/search_results.jsx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/webapp/components/search_results.jsx b/webapp/components/search_results.jsx index ce72ec3b1..70f686f42 100644 --- a/webapp/components/search_results.jsx +++ b/webapp/components/search_results.jsx @@ -3,7 +3,6 @@ import SearchResultsHeader from './search_results_header.jsx'; import SearchResultsItem from './search_results_item.jsx'; -import SearchBox from './search_bar.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import SearchStore from 'stores/search_store.jsx'; @@ -168,11 +167,6 @@ export default class SearchResults extends React.Component { render() { var results = this.state.results; - var currentId = UserStore.getCurrentId(); - var searchForm = null; - if (currentId) { - searchForm = <SearchBox isFocus={Utils.isMobile()}/>; - } var noResults = (!results || !results.order || !results.order.length); const searchTerm = this.state.searchTerm; const profiles = this.state.profiles || {}; @@ -312,23 +306,20 @@ export default class SearchResults extends React.Component { } return ( - <div className='sidebar--right__content'> - <div className='search-bar__container sidebar--right__search-header'>{searchForm}</div> - <div className='sidebar-right__body'> - <SearchResultsHeader - isMentionSearch={this.props.isMentionSearch} - toggleSize={this.props.toggleSize} - shrink={this.props.shrink} - isFlaggedPosts={this.props.isFlaggedPosts} - isPinnedPosts={this.props.isPinnedPosts} - channelDisplayName={this.props.channelDisplayName} - /> - <div - id='search-items-container' - className='search-items-container' - > - {ctls} - </div> + <div className='sidebar-right__body'> + <SearchResultsHeader + isMentionSearch={this.props.isMentionSearch} + toggleSize={this.props.toggleSize} + shrink={this.props.shrink} + isFlaggedPosts={this.props.isFlaggedPosts} + isPinnedPosts={this.props.isPinnedPosts} + channelDisplayName={this.props.channelDisplayName} + /> + <div + id='search-items-container' + className='search-items-container' + > + {ctls} </div> </div> ); |