Mobile Web (#427)
* WIP * WIP * Fix header offset on web * Remove debug * Fix web mobile feed and FAB layout * Fix modals on mobile web * Remove dead code * Remove ios config that shouldnt be committed now * Move bottom bar into its own folder * Fix web drawer navigation and state behaviors * Remove dark mode toggle from web drawer for now * Fix search on mobile web * Fix the logged out splash screen on mobile web * Fixes to detox simulator --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
2fed6c4021
commit
f6769b283f
30 changed files with 4343 additions and 319 deletions
|
@ -15,12 +15,15 @@ import {
|
|||
import {useStores} from 'state/index'
|
||||
import {s} from 'lib/styles'
|
||||
import {usePalette} from 'lib/hooks/usePalette'
|
||||
import * as Mobile from './SearchMobile'
|
||||
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
|
||||
|
||||
type Props = NativeStackScreenProps<SearchTabNavigatorParams, 'Search'>
|
||||
export const SearchScreen = withAuthRequired(
|
||||
observer(({route}: Props) => {
|
||||
observer(({navigation, route}: Props) => {
|
||||
const pal = usePalette('default')
|
||||
const store = useStores()
|
||||
const params = route.params || {}
|
||||
const foafs = React.useMemo<FoafsModel>(
|
||||
() => new FoafsModel(store),
|
||||
[store],
|
||||
|
@ -30,13 +33,13 @@ export const SearchScreen = withAuthRequired(
|
|||
[store],
|
||||
)
|
||||
const searchUIModel = React.useMemo<SearchUIModel | undefined>(
|
||||
() => (route.params.q ? new SearchUIModel(store) : undefined),
|
||||
[route.params.q, store],
|
||||
() => (params.q ? new SearchUIModel(store) : undefined),
|
||||
[params.q, store],
|
||||
)
|
||||
|
||||
React.useEffect(() => {
|
||||
if (route.params.q && searchUIModel) {
|
||||
searchUIModel.fetch(route.params.q)
|
||||
if (params.q && searchUIModel) {
|
||||
searchUIModel.fetch(params.q)
|
||||
}
|
||||
if (!foafs.hasData) {
|
||||
foafs.fetch()
|
||||
|
@ -44,12 +47,18 @@ export const SearchScreen = withAuthRequired(
|
|||
if (!suggestedActors.hasLoaded) {
|
||||
suggestedActors.loadMore(true)
|
||||
}
|
||||
}, [foafs, suggestedActors, searchUIModel, route.params.q])
|
||||
}, [foafs, suggestedActors, searchUIModel, params.q])
|
||||
|
||||
if (searchUIModel) {
|
||||
return <SearchResults model={searchUIModel} />
|
||||
}
|
||||
|
||||
const {isDesktop} = useWebMediaQueries()
|
||||
|
||||
if (!isDesktop) {
|
||||
return <Mobile.SearchScreen navigation={navigation} route={route} />
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
testID="searchScrollView"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue