Skip to content

Commit df1adbd

Browse files
committed
fix: only move on reply click
1 parent eae51f3 commit df1adbd

2 files changed

Lines changed: 36 additions & 14 deletions

File tree

package/src/components/Message/Message.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,21 +381,12 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
381381
}
382382
};
383383

384-
const onPressQuotedMessage = (quotedMessage: LocalMessage) => {
385-
if (!goToMessage) {
386-
return;
387-
}
388-
389-
goToMessage(quotedMessage.id);
390-
};
391-
392384
const errorOrFailed = message.type === 'error' || message.status === MessageStatusTypes.FAILED;
393385

394386
const onPress = (error = errorOrFailed) => {
395387
if (dismissKeyboardOnMessageTouch) {
396388
dismissKeyboard();
397389
}
398-
const quotedMessage = message.quoted_message;
399390
if (error) {
400391
/**
401392
* If its a Blocked message, we don't do anything as per specs.
@@ -411,8 +402,6 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
411402
return;
412403
}
413404
showMessageOverlay();
414-
} else if (quotedMessage) {
415-
onPressQuotedMessage(quotedMessage);
416405
}
417406
};
418407

package/src/components/Message/MessageItemView/MessageContent.tsx

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
121121
FileAttachmentGroup,
122122
Gallery,
123123
groupStyles,
124+
goToMessage,
124125
isMessageAIGenerated,
125126
isMyMessage,
126127
isVeryLastMessage,
@@ -221,7 +222,6 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
221222

222223
const { setNativeScrollability } = useMessageListItemContext();
223224
const hasContentSideViews = !!(MessageContentLeadingView || MessageContentTrailingView);
224-
225225
const contentBody = (
226226
<>
227227
<View
@@ -240,12 +240,45 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
240240
case 'quoted_reply':
241241
return (
242242
message.quoted_message && (
243-
<View
243+
<Pressable
244+
disabled={!goToMessage}
244245
key={`quoted_reply_${messageContentOrderIndex}`}
246+
onLongPress={(event) => {
247+
if (onLongPress) {
248+
onLongPress({
249+
emitter: 'messageContent',
250+
event,
251+
});
252+
}
253+
}}
254+
onPress={(event) => {
255+
if (!message.quoted_message || !goToMessage) {
256+
return;
257+
}
258+
259+
if (onPress) {
260+
onPress({
261+
defaultHandler: () => goToMessage(message.quoted_message!.id),
262+
emitter: 'messageContent',
263+
event,
264+
});
265+
return;
266+
}
267+
268+
goToMessage(message.quoted_message.id);
269+
}}
270+
onPressIn={(event) => {
271+
if (onPressIn) {
272+
onPressIn({
273+
emitter: 'messageContent',
274+
event,
275+
});
276+
}
277+
}}
245278
style={[styles.replyContainer, replyContainer]}
246279
>
247280
<Reply mode='reply' styles={replyStyles} />
248-
</View>
281+
</Pressable>
249282
)
250283
);
251284
case 'attachments':

0 commit comments

Comments
 (0)