Merge branch 'store-current-search-tab' into 'develop'
Keep selected search results tab See merge request soapbox-pub/soapbox-fe!657
This commit is contained in:
@ -16,21 +16,15 @@ export default class SearchResults extends ImmutablePureComponent {
|
||||
results: ImmutablePropTypes.map.isRequired,
|
||||
submitted: PropTypes.bool,
|
||||
expandSearch: PropTypes.func.isRequired,
|
||||
};
|
||||
|
||||
state = {
|
||||
selectedFilter: 'accounts',
|
||||
selectedFilter: PropTypes.string.isRequired,
|
||||
};
|
||||
|
||||
handleLoadMore = () => this.props.expandSearch(this.state.selectedFilter);
|
||||
|
||||
handleSelectFilter = newActiveFilter => {
|
||||
this.setState({ selectedFilter: newActiveFilter });
|
||||
};
|
||||
handleSelectFilter = newActiveFilter => this.props.selectFilter(newActiveFilter);
|
||||
|
||||
render() {
|
||||
const { results, submitted } = this.props;
|
||||
const { selectedFilter } = this.state;
|
||||
const { results, submitted, selectedFilter } = this.props;
|
||||
|
||||
if (submitted && results.isEmpty()) {
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user