diff options
| author | Samuel Newman <mozzius@protonmail.com> | 2024-05-05 00:39:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-05 00:39:52 +0100 |
| commit | 9b7818d358eff34276006bc242120778cb0189a1 (patch) | |
| tree | 8ed349087e18b63d4b2c99a7c8816e0a933d6223 /src | |
| parent | 4862bc2ba85a91d885b4bd116f25b6533ab568d0 (diff) | |
| download | voidsky-9b7818d358eff34276006bc242120778cb0189a1.tar.zst | |
[🐴] Dismiss keyboard before opening convo menu (#3862)
* Dismiss keyboard before opening convo menu * call `props.onPress()` instead
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/dms/ConvoMenu.tsx | 7 | ||||
| -rw-r--r-- | src/screens/Messages/Conversation/MessagesList.tsx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index 90ffedae3..16306bb57 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -1,5 +1,5 @@ import React, {useCallback} from 'react' -import {Pressable} from 'react-native' +import {Keyboard, Pressable} from 'react-native' import {AppBskyActorDefs} from '@atproto/api' import {ChatBskyConvoDefs} from '@atproto-labs/api' import {msg, Trans} from '@lingui/macro' @@ -88,6 +88,11 @@ let ConvoMenu = ({ {({props, state}) => ( <Pressable {...props} + onPress={() => { + Keyboard.dismiss() + // eslint-disable-next-line react/prop-types -- eslint is confused by the name `props` + props.onPress() + }} style={[ a.p_sm, a.rounded_sm, diff --git a/src/screens/Messages/Conversation/MessagesList.tsx b/src/screens/Messages/Conversation/MessagesList.tsx index 73743b5f7..b96dbd95b 100644 --- a/src/screens/Messages/Conversation/MessagesList.tsx +++ b/src/screens/Messages/Conversation/MessagesList.tsx @@ -213,7 +213,7 @@ export function MessagesList() { contentContainerStyle={a.flex_1}> {/* This view keeps the scroll bar and content within the CenterView on web, otherwise the entire window would scroll */} {/* @ts-expect-error web only */} - <View style={[{flex: 1}, isWeb && {'overflow-y': 'scroll'}]}> + <View style={[a.flex_1, isWeb && {'overflow-y': 'scroll'}]}> {/* Custom scroll provider so that we can use the `onScroll` event in our custom List implementation */} <ScrollProvider onScroll={onScroll} onMomentumEnd={onMomentumEnd}> <List |