diff options
Diffstat (limited to 'src/view/com/search')
-rw-r--r-- | src/view/com/search/HeaderWithInput.tsx | 19 | ||||
-rw-r--r-- | src/view/com/search/SearchResults.tsx | 16 |
2 files changed, 26 insertions, 9 deletions
diff --git a/src/view/com/search/HeaderWithInput.tsx b/src/view/com/search/HeaderWithInput.tsx index f825c578e..7a8676602 100644 --- a/src/view/com/search/HeaderWithInput.tsx +++ b/src/view/com/search/HeaderWithInput.tsx @@ -10,6 +10,7 @@ import {useTheme} from 'lib/ThemeContext' import {usePalette} from 'lib/hooks/usePalette' import {useStores} from 'state/index' import {useAnalytics} from 'lib/analytics/analytics' +import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {HITSLOP_10} from 'lib/constants' interface Props { @@ -37,6 +38,7 @@ export function HeaderWithInput({ const pal = usePalette('default') const {track} = useAnalytics() const textInput = React.useRef<TextInput>(null) + const {isMobile} = useWebMediaQueries() const onPressMenu = React.useCallback(() => { track('ViewHeader:MenuButtonClicked') @@ -49,8 +51,14 @@ export function HeaderWithInput({ }, [onPressCancelSearch, textInput]) return ( - <View style={[pal.view, pal.border, styles.header]}> - {showMenu ? ( + <View + style={[ + pal.view, + pal.border, + styles.header, + !isMobile && styles.headerDesktop, + ]}> + {showMenu && isMobile ? ( <TouchableOpacity testID="viewHeaderBackOrMenuBtn" onPress={onPressMenu} @@ -85,7 +93,7 @@ export function HeaderWithInput({ onBlur={() => setIsInputFocused(false)} onChangeText={onChangeQuery} onSubmitEditing={onSubmitQuery} - autoFocus={true} + autoFocus={isMobile} accessibilityRole="search" accessibilityLabel="Search" accessibilityHint="" @@ -127,6 +135,11 @@ const styles = StyleSheet.create({ paddingHorizontal: 12, paddingVertical: 4, }, + headerDesktop: { + borderWidth: 1, + borderTopWidth: 0, + paddingVertical: 10, + }, headerMenuBtn: { width: 30, height: 30, diff --git a/src/view/com/search/SearchResults.tsx b/src/view/com/search/SearchResults.tsx index 984277705..e74a8cfe4 100644 --- a/src/view/com/search/SearchResults.tsx +++ b/src/view/com/search/SearchResults.tsx @@ -13,13 +13,14 @@ import { } from 'view/com/util/LoadingPlaceholder' import {Text} from 'view/com/util/text/Text' import {usePalette} from 'lib/hooks/usePalette' +import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {s} from 'lib/styles' -import {isDesktopWeb} from 'platform/detection' const SECTIONS = ['Posts', 'Users'] export const SearchResults = observer(({model}: {model: SearchUIModel}) => { const pal = usePalette('default') + const {isMobile} = useWebMediaQueries() const renderTabBar = React.useCallback( (props: RenderTabBarFnProps) => { @@ -39,10 +40,16 @@ export const SearchResults = observer(({model}: {model: SearchUIModel}) => { return ( <Pager renderTabBar={renderTabBar} tabBarPosition="top" initialPage={0}> - <View style={[styles.results]}> + <View + style={{ + paddingTop: isMobile ? 42 : 50, + }}> <PostResults key="0" model={model} /> </View> - <View style={[styles.results]}> + <View + style={{ + paddingTop: isMobile ? 42 : 50, + }}> <Profiles key="1" model={model} /> </View> </Pager> @@ -128,7 +135,4 @@ const styles = StyleSheet.create({ paddingHorizontal: 14, paddingVertical: 16, }, - results: { - paddingTop: isDesktopWeb ? 50 : 42, - }, }) |