add animation to press and hold

This commit is contained in:
Hailey
2024-05-01 17:20:45 -07:00
parent 725520a0f2
commit bbff994618
3 changed files with 98 additions and 173 deletions
+65
View File
@@ -0,0 +1,65 @@
import React, {useCallback, useImperativeHandle} from 'react'
import {Pressable} from 'react-native'
import Animated, {
cancelAnimation,
runOnJS,
useAnimatedStyle,
useSharedValue,
withTiming,
} from 'react-native-reanimated'
const AnimatedPressable = Animated.createAnimatedComponent(Pressable)
export interface GrowWrapperRef {
reset: () => void
}
export const GrowWrapper = React.forwardRef(function GrowWrapper(
{
onOpenMenu,
children,
}: {
onOpenMenu: () => unknown
children: React.ReactNode
},
ref,
) {
useImperativeHandle(ref, () => ({
reset,
}))
const scale = useSharedValue(1)
const animationDidComplete = useSharedValue(false)
const animatedStyle = useAnimatedStyle(() => ({
transform: [{scale: scale.value}],
}))
const reset = useCallback(() => {
cancelAnimation(scale)
scale.value = withTiming(1, {duration: 200})
}, [scale])
const onTouchStart = React.useCallback(() => {
scale.value = withTiming(1.05, {duration: 750}, () => {
animationDidComplete.value = true
runOnJS(onOpenMenu)()
})
}, [scale, animationDidComplete, onOpenMenu])
const onTouchEnd = React.useCallback(() => {
if (!animationDidComplete.value) {
reset()
}
}, [animationDidComplete, reset])
return (
<AnimatedPressable
onPressIn={onTouchStart}
style={animatedStyle}
unstable_pressDelay={300}
onTouchEnd={onTouchEnd}>
{children}
</AnimatedPressable>
)
})
+16 -159
View File
@@ -1,173 +1,30 @@
import React from 'react'
import {Pressable} from 'react-native'
import {AppBskyActorDefs} from '@atproto/api'
import {View} from 'react-native'
import {ChatBskyConvoDefs} from '@atproto-labs/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useNavigation} from '@react-navigation/native'
import {NavigationProp} from '#/lib/routes/types'
import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'
import {
useMuteConvo,
useUnmuteConvo,
} from '#/state/queries/messages/mute-conversation'
import * as Toast from '#/view/com/util/Toast'
import {atoms as a, useTheme} from '#/alf'
import {ArrowBoxLeft_Stroke2_Corner0_Rounded as ArrowBoxLeft} from '#/components/icons/ArrowBoxLeft'
import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid'
import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
import {Mute_Stroke2_Corner0_Rounded as Mute} from '#/components/icons/Mute'
import {Person_Stroke2_Corner0_Rounded as Person} from '#/components/icons/Person'
import {PersonCheck_Stroke2_Corner0_Rounded as PersonCheck} from '#/components/icons/PersonCheck'
import {PersonX_Stroke2_Corner0_Rounded as PersonX} from '#/components/icons/PersonX'
import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
import * as Menu from '#/components/Menu'
import * as Prompt from '#/components/Prompt'
import {atoms as a} from '#/alf'
import * as Dialog from '#/components/Dialog'
let ConvoMenu = ({
convo,
profile,
onUpdateConvo,
export let MessageMenu = ({
message,
onClose,
control,
hideTrigger,
}: {
convo: ChatBskyConvoDefs.ConvoView
profile: AppBskyActorDefs.ProfileViewBasic
onUpdateConvo?: (convo: ChatBskyConvoDefs.ConvoView) => void
control?: Menu.MenuControlProps
hideTrigger?: boolean
message: ChatBskyConvoDefs.MessageView
onClose: () => void
control: Dialog.DialogControlProps
}): React.ReactNode => {
const navigation = useNavigation<NavigationProp>()
const {_} = useLingui()
const t = useTheme()
const leaveConvoControl = Prompt.usePromptControl()
const onNavigateToProfile = useCallback(() => {
navigation.navigate('Profile', {name: profile.did})
}, [navigation, profile.did])
const {mutate: muteConvo} = useMuteConvo(convo.id, {
onSuccess: data => {
onUpdateConvo?.(data.convo)
Toast.show(_(msg`Chat muted`))
},
onError: () => {
Toast.show(_(msg`Could not mute chat`))
},
})
const {mutate: unmuteConvo} = useUnmuteConvo(convo.id, {
onSuccess: data => {
onUpdateConvo?.(data.convo)
Toast.show(_(msg`Chat unmuted`))
},
onError: () => {
Toast.show(_(msg`Could not unmute chat`))
},
})
const {mutate: leaveConvo} = useLeaveConvo(convo.id, {
onSuccess: () => {
navigation.popToTop()
},
onError: () => {
Toast.show(_(msg`Could not leave chat`))
},
})
return (
<>
<Menu.Root control={control}>
{!hideTrigger && (
<Menu.Trigger label={_(msg`Chat settings`)}>
{({props, state}) => (
<Pressable
{...props}
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>
)}
<Menu.Outer>
<Menu.Group>
<Menu.Item
label={_(msg`Go to user's profile`)}
onPress={onNavigateToProfile}>
<Menu.ItemText>
<Trans>Go to profile</Trans>
</Menu.ItemText>
<Menu.ItemIcon icon={Person} />
</Menu.Item>
<Menu.Item
label={_(msg`Mute notifications`)}
onPress={() => (convo?.muted ? unmuteConvo() : muteConvo())}>
<Menu.ItemText>
{convo?.muted ? (
<Trans>Unmute notifications</Trans>
) : (
<Trans>Mute notifications</Trans>
)}
</Menu.ItemText>
<Menu.ItemIcon icon={convo?.muted ? Unmute : Mute} />
</Menu.Item>
</Menu.Group>
{/* TODO(samuel): implement these */}
<Menu.Group>
<Menu.Item
label={_(msg`Block account`)}
onPress={() => {}}
disabled>
<Menu.ItemText>
<Trans>Block account</Trans>
</Menu.ItemText>
<Menu.ItemIcon
icon={profile.viewer?.blocking ? PersonCheck : PersonX}
/>
</Menu.Item>
<Menu.Item
label={_(msg`Report account`)}
onPress={() => {}}
disabled>
<Menu.ItemText>
<Trans>Report account</Trans>
</Menu.ItemText>
<Menu.ItemIcon icon={Flag} />
</Menu.Item>
</Menu.Group>
<Menu.Group>
<Menu.Item
label={_(msg`Leave conversation`)}
onPress={leaveConvoControl.open}>
<Menu.ItemText>
<Trans>Leave conversation</Trans>
</Menu.ItemText>
<Menu.ItemIcon icon={ArrowBoxLeft} />
</Menu.Item>
</Menu.Group>
</Menu.Outer>
</Menu.Root>
<Dialog.Outer control={control} onClose={onClose}>
<Dialog.Handle />
<Prompt.Basic
control={leaveConvoControl}
title={_(msg`Leave conversation`)}
description={_(
msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for other participants.`,
)}
confirmButtonCta={_(msg`Leave`)}
confirmButtonColor="negative"
onConfirm={() => leaveConvo()}
/>
</>
<Dialog.ScrollableInner label="Menu TODO">
<View style={{height: a.gap_lg.gap}} />
</Dialog.ScrollableInner>
</Dialog.Outer>
)
}
ConvoMenu = React.memo(ConvoMenu)
export {ConvoMenu}
MessageMenu = React.memo(MessageMenu)
@@ -1,20 +1,19 @@
import React, {useCallback, useMemo} from 'react'
import {Pressable, StyleProp, TextStyle, View} from 'react-native'
import {StyleProp, TextStyle, View} from 'react-native'
import {ChatBskyConvoDefs} from '@atproto-labs/api'
import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useSession} from '#/state/session'
import {useHaptics} from 'lib/haptics'
import {isNative, isWeb} from 'platform/detection'
import {isNative} from 'platform/detection'
import {TimeElapsed} from '#/view/com/util/TimeElapsed'
import {atoms as a, useTheme} from '#/alf'
import {useDialogControl} from '#/components/Dialog'
import {GrowWrapper, GrowWrapperRef} from '#/components/dms/GrowWrapper'
import {MessageMenu} from '#/components/dms/MessageMenu'
import {Text} from '#/components/Typography'
function onPressPlaceholder() {
// Placeholder onPress function
}
export function MessageItem({
item,
next,
@@ -29,6 +28,9 @@ export function MessageItem({
const {currentAccount} = useSession()
const playHaptic = useHaptics()
const control = useDialogControl()
const itemRef = React.useRef<GrowWrapperRef>(null)
const isFromSelf = item.sender?.did === currentAccount?.did
const isNextFromSelf =
@@ -59,15 +61,11 @@ export function MessageItem({
if (isNative) {
playHaptic()
}
// Open menu
}, [playHaptic])
control.open()
}, [control, playHaptic])
return (
<Pressable
accessibilityRole="button"
onPress={isWeb ? onOpenMenu : onPressPlaceholder}
onLongPress={onOpenMenu}>
<GrowWrapper onOpenMenu={onOpenMenu} ref={itemRef}>
<View
style={[
a.py_sm,
@@ -100,7 +98,12 @@ export function MessageItem({
isLastInGroup={isLastInGroup}
style={isFromSelf ? a.text_right : a.text_left}
/>
</Pressable>
<MessageMenu
message={item}
onClose={() => itemRef.current?.reset()}
control={control}
/>
</GrowWrapper>
)
}