Merge branch 'master' of github.com:GetStream/stream-chat-react-native into vishal/input-and-messagelist-fix

Author: vishalnarkhede

src/components/Attachment/Attachment.tsx

@@ -10,7 +10,6 @@ import {
   useMessagesContext,
 } from '../../contexts/messagesContext/MessagesContext';
 
-import type { GestureResponderEvent } from 'react-native';
 import type { Attachment as AttachmentType } from 'stream-chat';
 
 import type {
@@ -47,18 +46,6 @@ export type AttachmentPropsWithContext<
    * The attachment to render
    */
   attachment: AttachmentType<At>;
-  /**
-   * onPress override for all attachments
-   */
-  onPressIn?: MessagesContextValue<
-    At,
-    Ch,
-    Co,
-    Ev,
-    Me,
-    Re,
-    Us
-  >['onPressInMessage'];
 };
 
 const AttachmentWithContext = <
@@ -79,27 +66,26 @@ const AttachmentWithContext = <
     FileAttachment,
     Gallery,
     Giphy,
-    onPressIn,
     UrlPreview,
   } = props;
 
   const hasAttachmentActions = !!attachment.actions?.length;
 
   if (attachment.type === 'giphy' || attachment.type === 'imgur') {
-    return <Giphy attachment={attachment} onPressIn={onPressIn} />;
+    return <Giphy attachment={attachment} />;
   }
 
   if (
     (attachment.title_link || attachment.og_scrape_url) &&
     (attachment.image_url || attachment.thumb_url)
   ) {
-    return <UrlPreview onPressIn={onPressIn} {...attachment} />;
+    return <UrlPreview {...attachment} />;
   }
 
   if (attachment.type === 'image') {
     return (
       <>
-        <Gallery images={[attachment]} onPressIn={onPressIn} />
+        <Gallery images={[attachment]} />
         {hasAttachmentActions && (
           <AttachmentActions
             key={`key-actions-${attachment.id}`}
@@ -121,22 +107,22 @@ const AttachmentWithContext = <
   ) {
     return (
       // TODO: Put in video component
-      <Card onPressIn={onPressIn} {...attachment} />
+      <Card {...attachment} />
     );
   }
 
   if (hasAttachmentActions) {
     return (
       <>
-        <Card onPressIn={onPressIn} {...attachment} />
+        <Card {...attachment} />
         <AttachmentActions
           key={`key-actions-${attachment.id}`}
           {...attachment}
         />
       </>
     );
   } else {
-    return <Card onPressIn={onPressIn} {...attachment} />;
+    return <Card {...attachment} />;
   }
 };
 
@@ -187,15 +173,7 @@ export type AttachmentProps<
     | 'UrlPreview'
   >
 > &
-  Pick<AttachmentPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>, 'attachment'> & {
-    /**
-     * onPress override for all attachments
-     */
-    onPressIn?: (
-      event: GestureResponderEvent,
-      defaultOnPress?: () => void,
-    ) => void;
-  };
+  Pick<AttachmentPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>, 'attachment'>;
 
 /**
  * Attachment - The message attachment
@@ -218,7 +196,6 @@ export const Attachment = <
     FileAttachment: PropFileAttachment,
     Gallery: PropGallery,
     Giphy: PropGiphy,
-    onPressIn: propOnPressIn,
     UrlPreview: PropUrlPreview,
   } = props;
 
@@ -228,7 +205,6 @@ export const Attachment = <
     FileAttachment: ContextFileAttachment,
     Gallery: ContextGallery,
     Giphy: ContextGiphy,
-    onPressInMessage,
     UrlPreview: ContextUrlPreview,
   } = useMessagesContext<At, Ch, Co, Ev, Me, Re, Us>();
 
@@ -245,7 +221,6 @@ export const Attachment = <
     PropFileAttachment || ContextFileAttachment || FileAttachmentDefault;
   const Gallery = PropGallery || ContextGallery || GalleryDefault;
   const Giphy = PropGiphy || ContextGiphy || GiphyDefault;
-  const onPressIn = propOnPressIn || onPressInMessage;
   const UrlPreview = PropUrlPreview || ContextUrlPreview || CardDefault;
 
   return (
@@ -257,7 +232,6 @@ export const Attachment = <
         FileAttachment,
         Gallery,
         Giphy,
-        onPressIn,
         UrlPreview,
       }}
     />

src/components/Attachment/Card.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import {
-  GestureResponderEvent,
   Image,
   ImageStyle,
   Linking,
@@ -98,15 +97,14 @@ export type CardPropsWithContext<
   Re extends UnknownType = DefaultReactionType,
   Us extends UnknownType = DefaultUserType
 > = Attachment<At> &
-  Pick<MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'onLongPress'> &
+  Pick<
+    MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>,
+    'onLongPress' | 'onPress' | 'onPressIn'
+  > &
   Pick<
     MessagesContextValue<At, Ch, Co, Ev, Me, Re, Us>,
     'additionalTouchableProps' | 'CardCover' | 'CardFooter' | 'CardHeader'
   > & {
-    onPressIn?: (
-      event: GestureResponderEvent,
-      defaultOnPress?: () => void,
-    ) => void;
     styles?: Partial<{
       authorName: StyleProp<TextStyle>;
       authorNameContainer: StyleProp<ViewStyle>;
@@ -141,6 +139,7 @@ const CardWithContext = <
     image_url,
     og_scrape_url,
     onLongPress,
+    onPress,
     onPressIn,
     styles: stylesProp = {},
     text,
@@ -173,15 +172,25 @@ const CardWithContext = <
 
   return (
     <TouchableOpacity
-      onLongPress={onLongPress}
-      onPress={() => {
-        if (!onPressIn) {
-          defaultOnPress();
-        }
+      onLongPress={(event) => {
+        onLongPress({
+          emitter: 'card',
+          event,
+        });
+      }}
+      onPress={(event) => {
+        onPress({
+          defaultHandler: defaultOnPress,
+          emitter: 'card',
+          event,
+        });
       }}
       onPressIn={(event) => {
         if (onPressIn) {
-          onPressIn(event, defaultOnPress);
+          onPressIn({
+            emitter: 'card',
+            event,
+          });
         }
       }}
       style={[styles.container, container, stylesProp.container]}
@@ -300,17 +309,15 @@ export type CardProps<
   Us extends UnknownType = DefaultUserType
 > = Attachment<At> &
   Partial<
-    Pick<MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'onLongPress'> &
+    Pick<
+      MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>,
+      'onLongPress' | 'onPress' | 'onPressIn'
+    > &
       Pick<
         MessagesContextValue<At, Ch, Co, Ev, Me, Re, Us>,
         'additionalTouchableProps' | 'CardCover' | 'CardFooter' | 'CardHeader'
       >
-  > & {
-    onPressIn?: (
-      event: GestureResponderEvent,
-      defaultOnPress?: () => void,
-    ) => void;
-  };
+  >;
 
 /**
  * UI component for card in attachments.
@@ -326,13 +333,20 @@ export const Card = <
 >(
   props: CardProps<At, Ch, Co, Ev, Me, Re, Us>,
 ) => {
-  const { onLongPress } = useMessageContext<At, Ch, Co, Ev, Me, Re, Us>();
+  const { onLongPress, onPress, onPressIn } = useMessageContext<
+    At,
+    Ch,
+    Co,
+    Ev,
+    Me,
+    Re,
+    Us
+  >();
   const {
     additionalTouchableProps,
     CardCover,
     CardFooter,
     CardHeader,
-    onPressInMessage: onPressIn,
   } = useMessagesContext<At, Ch, Co, Ev, Me, Re, Us>();
 
   return (
@@ -343,6 +357,7 @@ export const Card = <
         CardFooter,
         CardHeader,
         onLongPress,
+        onPress,
         onPressIn,
       }}
       {...props}

src/components/Attachment/FileAttachment.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import {
-  GestureResponderEvent,
   Linking,
   StyleProp,
   StyleSheet,
@@ -65,18 +64,17 @@ export type FileAttachmentPropsWithContext<
   Me extends UnknownType = DefaultMessageType,
   Re extends UnknownType = DefaultReactionType,
   Us extends UnknownType = DefaultUserType
-> = Pick<MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'onLongPress'> &
+> = Pick<
+  MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>,
+  'onLongPress' | 'onPress' | 'onPressIn'
+> &
   Pick<
     MessagesContextValue<At, Ch, Co, Ev, Me, Re, Us>,
     'additionalTouchableProps' | 'AttachmentActions' | 'FileAttachmentIcon'
   > & {
     /** The attachment to render */
     attachment: Attachment<At>;
     attachmentSize?: number;
-    onPressIn?: (
-      event: GestureResponderEvent,
-      defaultOnPress?: () => void,
-    ) => void;
     styles?: Partial<{
       container: StyleProp<ViewStyle>;
       details: StyleProp<ViewStyle>;
@@ -103,6 +101,7 @@ const FileAttachmentWithContext = <
     AttachmentActions,
     FileAttachmentIcon,
     onLongPress,
+    onPress,
     onPressIn,
     styles: stylesProp = {},
   } = props;
@@ -120,15 +119,28 @@ const FileAttachmentWithContext = <
 
   return (
     <TouchableOpacity
-      onLongPress={onLongPress}
-      onPress={() => {
+      onLongPress={(event) => {
+        onLongPress({
+          emitter: 'fileAttachment',
+          event,
+        });
+      }}
+      onPress={(event) => {
         if (!onPressIn) {
-          defaultOnPress();
+          onPress({
+            defaultHandler: defaultOnPress,
+            emitter: 'fileAttachment',
+            event,
+          });
         }
       }}
       onPressIn={(event) => {
         if (onPressIn) {
-          onPressIn(event, defaultOnPress);
+          onPressIn({
+            defaultHandler: defaultOnPress,
+            emitter: 'fileAttachment',
+            event,
+          });
         }
       }}
       testID='file-attachment'
@@ -181,12 +193,7 @@ export type FileAttachmentProps<
   Pick<
     FileAttachmentPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
     'attachment'
-  > & {
-    onPressIn?: (
-      event: GestureResponderEvent,
-      defaultOnPress?: () => void,
-    ) => void;
-  };
+  >;
 
 export const FileAttachment = <
   At extends DefaultAttachmentType = DefaultAttachmentType,
@@ -199,12 +206,19 @@ export const FileAttachment = <
 >(
   props: FileAttachmentProps<At, Ch, Co, Ev, Me, Re, Us>,
 ) => {
-  const { onLongPress } = useMessageContext<At, Ch, Co, Ev, Me, Re, Us>();
+  const { onLongPress, onPress, onPressIn } = useMessageContext<
+    At,
+    Ch,
+    Co,
+    Ev,
+    Me,
+    Re,
+    Us
+  >();
   const {
     additionalTouchableProps,
     AttachmentActions = AttachmentActionsDefault,
     FileAttachmentIcon = FileIconDefault,
-    onPressInMessage: onPressIn,
   } = useMessagesContext<At, Ch, Co, Ev, Me, Re, Us>();
 
   return (
@@ -214,6 +228,7 @@ export const FileAttachment = <
         AttachmentActions,
         FileAttachmentIcon,
         onLongPress,
+        onPress,
         onPressIn,
       }}
       {...props}