diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/dms/ActionsWrapper.web.tsx | 6 | ||||
-rw-r--r-- | src/components/dms/ConvoMenu.tsx | 50 | ||||
-rw-r--r-- | src/components/dms/MessageMenu.tsx | 7 |
3 files changed, 30 insertions, 33 deletions
diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx index f4c85ab94..5cb30d3da 100644 --- a/src/components/dms/ActionsWrapper.web.tsx +++ b/src/components/dms/ActionsWrapper.web.tsx @@ -57,9 +57,6 @@ export function ActionsWrapper({ message={message} control={menuControl} triggerOpacity={showActions || menuControl.isOpen ? 1 : 0} - onTriggerPress={onMouseEnter} - // @ts-expect-error web only - onMouseLeave={onMouseLeave} /> </View> )} @@ -75,9 +72,6 @@ export function ActionsWrapper({ message={message} control={menuControl} triggerOpacity={showActions || menuControl.isOpen ? 1 : 0} - onTriggerPress={onMouseEnter} - // @ts-expect-error web only - onMouseLeave={onMouseLeave} /> </View> )} diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index 263befd56..cac4eb4d9 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -1,5 +1,5 @@ import React, {useCallback} from 'react' -import {Keyboard, Pressable} from 'react-native' +import {Keyboard, Pressable, View} from 'react-native' import {AppBskyActorDefs} from '@atproto/api' import {ChatBskyConvoDefs} from '@atproto-labs/api' import {msg, Trans} from '@lingui/macro' @@ -32,17 +32,19 @@ let ConvoMenu = ({ profile, onUpdateConvo, control, - hideTrigger, currentScreen, showMarkAsRead, + hideTrigger, + triggerOpacity, }: { convo: ChatBskyConvoDefs.ConvoView profile: AppBskyActorDefs.ProfileViewBasic onUpdateConvo?: (convo: ChatBskyConvoDefs.ConvoView) => void control?: Menu.MenuControlProps - hideTrigger?: boolean currentScreen: 'list' | 'conversation' showMarkAsRead?: boolean + hideTrigger?: boolean + triggerOpacity?: number }): React.ReactNode => { const navigation = useNavigation<NavigationProp>() const {_} = useLingui() @@ -89,26 +91,28 @@ let ConvoMenu = ({ <> <Menu.Root control={control}> {!hideTrigger && ( - <Menu.Trigger label={_(msg`Chat settings`)}> - {({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, - (state.hovered || state.pressed) && t.atoms.bg_contrast_25, - // make sure pfp is in the middle - {marginLeft: -10}, - ]}> - <DotsHorizontal size="lg" style={t.atoms.text} /> - </Pressable> - )} - </Menu.Trigger> + <View style={{opacity: triggerOpacity}}> + <Menu.Trigger label={_(msg`Chat settings`)}> + {({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_full, + (state.hovered || state.pressed) && t.atoms.bg_contrast_25, + // make sure pfp is in the middle + {marginLeft: -10}, + ]}> + <DotsHorizontal size="md" style={t.atoms.text} /> + </Pressable> + )} + </Menu.Trigger> + </View> )} <Menu.Outer> <Menu.Group> diff --git a/src/components/dms/MessageMenu.tsx b/src/components/dms/MessageMenu.tsx index 3a5fa54d8..75807f818 100644 --- a/src/components/dms/MessageMenu.tsx +++ b/src/components/dms/MessageMenu.tsx @@ -5,6 +5,7 @@ import {ChatBskyConvoDefs} from '@atproto-labs/api' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' +import {isWeb} from 'platform/detection' import {useConvo} from 'state/messages/convo' import {ConvoStatus} from 'state/messages/convo/types' import {useSession} from 'state/session' @@ -21,12 +22,10 @@ import {Clipboard_Stroke2_Corner2_Rounded as ClipboardIcon} from '../icons/Clipb export let MessageMenu = ({ message, control, - hideTrigger, triggerOpacity, }: { hideTrigger?: boolean triggerOpacity?: number - onTriggerPress?: () => void message: ChatBskyConvoDefs.MessageView control: Menu.MenuControlProps }): React.ReactNode => { @@ -64,7 +63,7 @@ export let MessageMenu = ({ return ( <> <Menu.Root control={control}> - {!hideTrigger && ( + {isWeb && ( <View style={{opacity: triggerOpacity}}> <Menu.Trigger label={_(msg`Chat settings`)}> {({props, state}) => ( @@ -75,7 +74,7 @@ export let MessageMenu = ({ a.rounded_full, (state.hovered || state.pressed) && t.atoms.bg_contrast_25, ]}> - <DotsHorizontal size="sm" style={t.atoms.text} /> + <DotsHorizontal size="md" style={t.atoms.text} /> </Pressable> )} </Menu.Trigger> |