Skip to content

Commit 738975f

Browse files
committed
feat: add touch responder as well
1 parent e2fd4a0 commit 738975f

File tree

4 files changed

+208
-115
lines changed

4 files changed

+208
-115
lines changed

package/src/components/Message/Message.tsx

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
253253
const [showMessageReactions, setShowMessageReactions] = useState(true);
254254
const [isBounceDialogOpen, setIsBounceDialogOpen] = useState(false);
255255
const [isEditedMessageOpen, setIsEditedMessageOpen] = useState(false);
256-
const [selectedReaction, setSelectedReaction] = useState<string | undefined>(undefined);
256+
// const [selectedReaction, setSelectedReaction] = useState<string | undefined>(undefined);
257257

258258
const {
259259
channel,
@@ -344,19 +344,9 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
344344
await dismissKeyboard();
345345
try {
346346
const layout = await measureInWindow(messageWrapperRef.current);
347-
const rLayout =
348-
layout.h > 300
349-
? {
350-
...layout,
351-
h: 300,
352-
y: layout.y + layout.h - 300,
353-
originalH: layout.h,
354-
originalY: layout.y,
355-
}
356-
: { ...layout, originalH: layout.h, originalY: layout.y };
357347
setShowMessageReactions(showMessageReactions);
358-
openOverlay(message.id, { bottomH, state: { isMyMessage, rect: rLayout }, topH });
359-
setSelectedReaction(selectedReaction);
348+
openOverlay(message.id, { bottomH, state: { isMyMessage, rect: layout }, topH });
349+
// setSelectedReaction(selectedReaction);
360350
} catch (e) {
361351
console.error(e);
362352
}
@@ -782,7 +772,7 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
782772
}
783773
: null,
784774
otherAttachments: attachments.other,
785-
preventPress,
775+
preventPress: active ? true : preventPress,
786776
reactions,
787777
readBy,
788778
setIsEditedMessageOpen,
@@ -843,7 +833,7 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
843833
{active && state?.rect ? (
844834
<View
845835
style={{
846-
height: state.rect.originalH,
836+
height: state.rect.h,
847837
width: state.rect.w,
848838
}}
849839
/>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ const areEqual = (
386386
nextProps: MessageContentPropsWithContext,
387387
) => {
388388
const {
389+
preventPress: prevPreventPress,
389390
goToMessage: prevGoToMessage,
390391
groupStyles: prevGroupStyles,
391392
isAttachmentEqual,
@@ -397,6 +398,7 @@ const areEqual = (
397398
t: prevT,
398399
} = prevProps;
399400
const {
401+
preventPress: nextPreventPress,
400402
goToMessage: nextGoToMessage,
401403
groupStyles: nextGroupStyles,
402404
isEditedMessageOpen: nextIsEditedMessageOpen,
@@ -407,6 +409,10 @@ const areEqual = (
407409
t: nextT,
408410
} = nextProps;
409411

412+
if (prevPreventPress !== nextPreventPress) {
413+
return false;
414+
}
415+
410416
const goToMessageChangedAndMatters =
411417
nextMessage.quoted_message_id && prevGoToMessage !== nextGoToMessage;
412418
if (goToMessageChangedAndMatters) {

package/src/components/Message/hooks/useCreateMessageContext.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export const useCreateMessageContext = ({
113113
showAvatar,
114114
showMessageStatus,
115115
threadList,
116+
preventPress,
116117
],
117118
);
118119

0 commit comments

Comments
 (0)