zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Search - only enable queries once tab is active (#3471)

Browse source 
* only enable queries once tab is active

* remove hasBeenTrue hook

* make enabled optional
This commit is contained in:
Samuel Newman 2024-04-10 23:32:31 +01:00 • committed by GitHub
parent 310d865440
commit 9007810cdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 61 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/view/screens/Search/Search.tsx
View file

@ -195,9 +195,11 @@ type SearchResultSlice =
function SearchScreenPostResults({
query,
sort,
active,
}: {
query: string
sort?: 'top' | 'latest'
active: boolean
}) {
const {_} = useLingui()
const {currentAccount} = useSession()
@ -216,7 +218,7 @@ function SearchScreenPostResults({
fetchNextPage,
isFetchingNextPage,
hasNextPage,
} = useSearchPostsQuery({query: augmentedQuery, sort})
} = useSearchPostsQuery({query: augmentedQuery, sort, enabled: active})
const onPullToRefresh = React.useCallback(async () => {
setIsPTR(true)
@ -297,9 +299,19 @@ function SearchScreenPostResults({
)
}
function SearchScreenUserResults({query}: {query: string}) {
function SearchScreenUserResults({
query,
active,
}: {
query: string
active: boolean
}) {
const {_} = useLingui()
const {data: results, isFetched} = useActorSearch(query)
const {data: results, isFetched} = useActorSearch({
query,
enabled: active,
})
return isFetched && results ? (
<>
@ -335,6 +347,7 @@ export function SearchScreenInner({
const setDrawerSwipeDisabled = useSetDrawerSwipeDisabled()
const {hasSession} = useSession()
const {isDesktop} = useWebMediaQueries()
const [activeTab, setActiveTab] = React.useState(0)
const {_} = useLingui()
const isNewSearch = useGate('new_search')
@ -343,6 +356,7 @@ export function SearchScreenInner({
(index: number) => {
setMinimalShellMode(false)
setDrawerSwipeDisabled(index > 0)
setActiveTab(index)
},
[setDrawerSwipeDisabled, setMinimalShellMode],
)
@ -354,22 +368,38 @@ export function SearchScreenInner({
return [
{
title: _(msg`Top`),
component: <SearchScreenPostResults query={query} sort="top" />,
component: (
<SearchScreenPostResults
query={query}
sort="top"
active={activeTab === 0}
/>
),
},
{
title: _(msg`Latest`),
component: <SearchScreenPostResults query={query} sort="latest" />,
component: (
<SearchScreenPostResults
query={query}
sort="latest"
active={activeTab === 1}
/>
),
},
{
title: _(msg`People`),
component: <SearchScreenUserResults query={query} />,
component: (
<SearchScreenUserResults query={query} active={activeTab === 2} />
),
},
]
} else {
return [
{
title: _(msg`People`),
component: <SearchScreenUserResults query={query} />,
component: (
<SearchScreenUserResults query={query} active={activeTab === 0} />
),
},
]
}
@ -378,23 +408,29 @@ export function SearchScreenInner({
return [
{
title: _(msg`Posts`),
component: <SearchScreenPostResults query={query} />,
component: (
<SearchScreenPostResults query={query} active={activeTab === 0} />
),
},
{
title: _(msg`Users`),
component: <SearchScreenUserResults query={query} />,
component: (
<SearchScreenUserResults query={query} active={activeTab === 1} />
),
},
]
} else {
return [
{
title: _(msg`Users`),
component: <SearchScreenUserResults query={query} />,
component: (
<SearchScreenUserResults query={query} active={activeTab === 0} />
),
},
]
}
}
}, [hasSession, isNewSearch, _, query])
}, [hasSession, isNewSearch, _, query, activeTab])
if (hasSession) {
return query ? (