diff options
| author | Paul Frazee <pfrazee@gmail.com> | 2023-12-28 13:43:01 -0800 |
|---|---|---|
| committer | Paul Frazee <pfrazee@gmail.com> | 2023-12-28 13:43:01 -0800 |
| commit | 23c9c8977b73ae86f0099012ec372a4bccc9741f (patch) | |
| tree | 3ce4f877fa4681157b08fc82b0ece807b84a8361 /src/view/screens | |
| parent | c9704f447d9c81dd9f5b3429c2f0a38ef9bc3480 (diff) | |
| parent | 6e7098e456abde1387b3b427195d7268e07f83a3 (diff) | |
| download | voidsky-23c9c8977b73ae86f0099012ec372a4bccc9741f.tar.zst | |
Merge branch 'main' of github.com:bluesky-social/social-app into main
Diffstat (limited to 'src/view/screens')
| -rw-r--r-- | src/view/screens/Feeds.tsx | 2 | ||||
| -rw-r--r-- | src/view/screens/Search/Search.tsx | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx index 20cdf815a..dbdb6d9ca 100644 --- a/src/view/screens/Feeds.tsx +++ b/src/view/screens/Feeds.tsx @@ -494,6 +494,8 @@ export function FeedsScreen(_props: Props) { // @ts-ignore our .web version only -prf desktopFixedHeight scrollIndicatorInsets={{right: 1}} + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag" /> {hasSession && ( diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 965ad2b7e..df3c38267 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -162,6 +162,8 @@ function SearchScreenSuggestedFollows() { // @ts-ignore web only -prf desktopFixedHeight contentContainerStyle={{paddingBottom: 1200}} + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag" /> ) : ( <CenteredView sideBorders style={[pal.border, s.hContentRegion]}> @@ -578,7 +580,8 @@ export function SearchScreen( onPress={onPressClearQuery} accessibilityRole="button" accessibilityLabel={_(msg`Clear search query`)} - accessibilityHint=""> + accessibilityHint="" + hitSlop={HITSLOP_10}> <FontAwesomeIcon icon="xmark" size={16} @@ -590,7 +593,10 @@ export function SearchScreen( {query || inputIsFocused ? ( <View style={styles.headerCancelBtn}> - <Pressable onPress={onPressCancelSearch} accessibilityRole="button"> + <Pressable + onPress={onPressCancelSearch} + accessibilityRole="button" + hitSlop={HITSLOP_10}> <Text style={[pal.text]}> <Trans>Cancel</Trans> </Text> @@ -604,7 +610,11 @@ export function SearchScreen( {isFetching ? ( <Loader /> ) : ( - <ScrollView style={{height: '100%'}} dataSet={{stableGutters: '1'}}> + <ScrollView + style={{height: '100%'}} + dataSet={{stableGutters: '1'}} + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag"> {searchResults.length ? ( searchResults.map((item, i) => ( <SearchResultCard |