From fe0ebbeec1d8422ab1812cadf06550da97ad0573 Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Sun, 26 Mar 2023 21:56:49 -0400 Subject: [PATCH] fix: Make search screen able to change type, listing type, and sort when there is no query (#966) --- src/shared/components/search.tsx | 34 +++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx index b96e1c5..e36c9ad 100644 --- a/src/shared/components/search.tsx +++ b/src/shared/components/search.tsx @@ -236,14 +236,20 @@ export class Search extends Component { this.setupCreatorFilter(); } - static getDerivedStateFromProps(props: any): SearchProps { + static getDerivedStateFromProps( + props: any, + prevState: SearchState + ): SearchProps { return { q: Search.getSearchQueryFromProps(props.match.params.q), - type_: Search.getSearchTypeFromProps(props.match.params.type), - sort: Search.getSortTypeFromProps(props.match.params.sort), - listingType: Search.getListingTypeFromProps( - props.match.params.listing_type - ), + type_: + prevState.type_ ?? + Search.getSearchTypeFromProps(props.match.params.type), + sort: + prevState.sort ?? Search.getSortTypeFromProps(props.match.params.sort), + listingType: + prevState.listingType ?? + Search.getListingTypeFromProps(props.match.params.listing_type), communityId: Search.getCommunityIdFromProps( props.match.params.community_id ), @@ -878,21 +884,27 @@ export class Search extends Component { } handleSortChange(val: SortType) { - this.updateUrl({ sort: val, page: 1 }); + const updateObj = { sort: val, page: 1 }; + this.setState(updateObj); + this.updateUrl(updateObj); } handleTypeChange(i: Search, event: any) { - i.updateUrl({ + const updateObj = { type_: SearchType[event.target.value], page: 1, - }); + }; + i.setState(updateObj); + i.updateUrl(updateObj); } handleListingTypeChange(val: ListingType) { - this.updateUrl({ + const updateObj = { listingType: val, page: 1, - }); + }; + this.setState(updateObj); + this.updateUrl(updateObj); } handleCommunityFilterChange(communityId: number) { -- 2.44.1