stream-chat-react-native-core 9.0.0-beta.9 → 9.0.0

package/src/components/Attachment/FileAttachment.tsx

@@ -7,6 +7,7 @@ import { openUrlSafely } from './utils/openUrlSafely';
 
 import { FileIconProps } from '../../components/Attachment/FileIcon';
 
+import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import {
   MessageContextValue,
   useMessageContext,
@@ -21,7 +22,7 @@ export type FileAttachmentPropsWithContext = Pick<
   MessageContextValue,
   'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
 > &
-  Pick<MessagesContextValue, 'additionalPressableProps' | 'FilePreview'> & {
+  Pick<MessagesContextValue, 'additionalPressableProps'> & {
     /** The attachment to render */
     attachment: Attachment;
     attachmentIconSize?: FileIconProps['size'];
@@ -41,13 +42,13 @@ const FileAttachmentWithContext = (props: FileAttachmentPropsWithContext) => {
     additionalPressableProps,
     attachment,
     attachmentIconSize,
-    FilePreview,
     onLongPress,
     onPress,
     onPressIn,
     preventPress,
     styles: stylesProp = styles,
   } = props;
+  const { FilePreview } = useComponentsContext();
 
   const defaultOnPress = () => openUrlSafely(attachment.asset_url);
 
@@ -99,17 +100,13 @@ export type FileAttachmentProps = Partial<Omit<FileAttachmentPropsWithContext, '
   Pick<FileAttachmentPropsWithContext, 'attachment'>;
 
 export const FileAttachment = (props: FileAttachmentProps) => {
-  const { FilePreview: PropFilePreview } = props;
   const { onLongPress, onPress, onPressIn, preventPress } = useMessageContext();
-  const { additionalPressableProps, FilePreview: ContextFilePreview } = useMessagesContext();
-
-  const FilePreview = PropFilePreview || ContextFilePreview;
+  const { additionalPressableProps } = useMessagesContext();
 
   return (
     <FileAttachmentWithContext
       {...{
         additionalPressableProps,
-        FilePreview,
         onLongPress,
         onPress,
         onPressIn,

package/src/components/Attachment/FileAttachmentGroup.tsx

@@ -1,30 +1,24 @@
 import React from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
-import { Attachment as AttachmentDefault } from './Attachment';
-
+import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import {
   MessageContextValue,
   useMessageContext,
 } from '../../contexts/messageContext/MessageContext';
-
-import {
-  MessagesContextValue,
-  useMessagesContext,
-} from '../../contexts/messagesContext/MessagesContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { primitives } from '../../theme';
 
-export type FileAttachmentGroupPropsWithContext = Pick<MessageContextValue, 'files' | 'message'> &
-  Pick<MessagesContextValue, 'Attachment'> & {
-    styles?: Partial<{
-      attachmentContainer: StyleProp<ViewStyle>;
-      container: StyleProp<ViewStyle>;
-    }>;
-  };
+export type FileAttachmentGroupPropsWithContext = Pick<MessageContextValue, 'files' | 'message'> & {
+  styles?: Partial<{
+    attachmentContainer: StyleProp<ViewStyle>;
+    container: StyleProp<ViewStyle>;
+  }>;
+};
 
 const FileAttachmentGroupWithContext = (props: FileAttachmentGroupPropsWithContext) => {
-  const { Attachment, files, message, styles: stylesProp = {} } = props;
+  const { files, message, styles: stylesProp = {} } = props;
+  const { Attachment } = useComponentsContext();
 
   const {
     theme: {
@@ -75,8 +69,6 @@ export const FileAttachmentGroup = (props: FileAttachmentGroupProps) => {
 
   const { files: contextFiles, message } = useMessageContext();
 
-  const { Attachment = AttachmentDefault, AudioAttachment } = useMessagesContext();
-
   const files = propFiles || contextFiles;
 
   if (!files.length) {
@@ -86,8 +78,6 @@ export const FileAttachmentGroup = (props: FileAttachmentGroupProps) => {
   return (
     <MemoizedFileAttachmentGroup
       {...{
-        Attachment,
-        AudioAttachment,
         files,
         message,
       }}

package/src/components/Attachment/FileIcon.tsx

@@ -2,16 +2,16 @@ import React from 'react';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import { Audio } from '../../icons/Audio';
-import { Code } from '../../icons/Code';
-import { DOC } from '../../icons/DOC';
-import { OtherFileIcon } from '../../icons/OtherFileIcon';
-import { PDF } from '../../icons/PDF';
-import { Presentation } from '../../icons/Presentation';
-import { SpreadSheet } from '../../icons/SpreadSheet';
+import { Audio } from '../../icons/filetype-audio-xl';
+import { Code } from '../../icons/filetype-code-xl';
+import { ZIP } from '../../icons/filetype-compression-xl';
+import { OtherFileIcon } from '../../icons/filetype-other-xl';
+import { PDF } from '../../icons/filetype-pdf-xl';
+import { Presentation } from '../../icons/filetype-presentation-xl';
+import { SpreadSheet } from '../../icons/filetype-spreadsheet-xl';
+import { DOC } from '../../icons/filetype-text-xl';
+import { Video } from '../../icons/filetype-video-xl';
 import type { IconProps } from '../../icons/utils/base';
-import { Video } from '../../icons/Video';
-import { ZIP } from '../../icons/ZIP';
 
 // https://www.iana.org/assignments/media-types/media-types.xhtml#audio
 const audioFileTypes = [

package/src/components/Attachment/FilePreview.tsx

@@ -3,16 +3,13 @@ import { StyleProp, StyleSheet, Text, TextStyle, View, ViewStyle } from 'react-n
 
 import type { Attachment } from 'stream-chat';
 
-import { FileIcon as FileIconDefault, FileIconProps } from '../../components/Attachment/FileIcon';
-import {
-  MessagesContextValue,
-  useMessagesContext,
-} from '../../contexts/messagesContext/MessagesContext';
+import type { FileIconProps } from '../../components/Attachment/FileIcon';
+import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { primitives } from '../../theme';
 import { getDurationLabelFromDuration, getFileSizeDisplayText } from '../../utils/utils';
 
-export type FilePreviewProps = Partial<Pick<MessagesContextValue, 'FileAttachmentIcon'>> & {
+export type FilePreviewProps = {
   /** The attachment to render */
   attachment: Attachment;
   attachmentIconSize?: FileIconProps['size'];
@@ -30,14 +27,12 @@ export type FilePreviewProps = Partial<Pick<MessagesContextValue, 'FileAttachmen
 export const FilePreview = (props: FilePreviewProps) => {
   const {
     attachment,
-    FileAttachmentIcon: PropFileAttachmentIcon,
     attachmentIconSize,
     styles: stylesProp = {},
     titleNumberOfLines = 2,
     indicator,
   } = props;
-  const { FileAttachmentIcon: ContextFileAttachmentIcon } = useMessagesContext();
-  const FileAttachmentIcon = PropFileAttachmentIcon || ContextFileAttachmentIcon || FileIconDefault;
+  const { FileAttachmentIcon } = useComponentsContext();
 
   const styles = useStyles();
 

package/src/components/Attachment/Gallery.tsx

@@ -16,6 +16,7 @@ import { openUrlSafely } from './utils/openUrlSafely';
 
 import { useTranslationContext } from '../../contexts';
 import { useChatConfigContext } from '../../contexts/chatConfigContext/ChatConfigContext';
+import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import {
   ImageGalleryContextValue,
   useImageGalleryContext,
@@ -54,14 +55,7 @@ export type GalleryPropsWithContext = Pick<ImageGalleryContextValue, 'imageGalle
     | 'message'
     | 'messageContentOrder'
   > &
-  Pick<
-    MessagesContextValue,
-    | 'additionalPressableProps'
-    | 'VideoThumbnail'
-    | 'ImageLoadingIndicator'
-    | 'ImageLoadingFailedIndicator'
-    | 'myMessageTheme'
-  > &
+  Pick<MessagesContextValue, 'additionalPressableProps' | 'myMessageTheme'> &
   Pick<OverlayContextValue, 'setOverlay'> & {
     channelId: string | undefined;
     messageHasOnlyOneMedia: boolean;
@@ -72,8 +66,6 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
     additionalPressableProps,
     alignment,
     imageGalleryStateStore,
-    ImageLoadingFailedIndicator,
-    ImageLoadingIndicator,
     images,
     message,
     onLongPress,
@@ -82,10 +74,8 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
     preventPress,
     setOverlay,
     videos,
-    VideoThumbnail,
     messageHasOnlyOneMedia = false,
   } = props;
-
   const { resizableCDNHosts } = useChatConfigContext();
   const {
     theme: {
@@ -103,9 +93,7 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
       },
     },
   } = useTheme();
-
   const styles = useStyles();
-
   const sizeConfig = {
     gridHeight,
     gridWidth,
@@ -114,12 +102,10 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
     minHeight,
     minWidth,
   };
-
   const imagesAndVideos = [...(images || []), ...(videos || [])];
   const imagesAndVideosValue = `${images?.length}${videos?.length}${images
     ?.map((i) => `${i.image_url}${i.thumb_url}`)
     .join('')}${videos?.map((i) => `${i.image_url}${i.thumb_url}`).join('')}`;
-
   const { height, invertedDirections, thumbnailGrid, width } = useMemo(
     () =>
       buildGallery({
@@ -130,12 +116,10 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [imagesAndVideosValue],
   );
-
   if (!imagesAndVideos?.length) {
     return null;
   }
   const numOfColumns = thumbnailGrid.length;
-
   return (
     <View
       style={[
@@ -180,19 +164,15 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
                 width,
                 messageHasOnlyOneMedia,
               });
-
               if (!message) {
                 return null;
               }
-
               return (
                 <GalleryThumbnail
                   additionalPressableProps={additionalPressableProps}
                   borderRadius={borderRadius}
                   colIndex={colIndex}
                   imageGalleryStateStore={imageGalleryStateStore}
-                  ImageLoadingFailedIndicator={ImageLoadingFailedIndicator}
-                  ImageLoadingIndicator={ImageLoadingIndicator}
                   imagesAndVideos={imagesAndVideos}
                   invertedDirections={invertedDirections || false}
                   key={rowIndex}
@@ -206,7 +186,6 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
                   rowIndex={rowIndex}
                   setOverlay={setOverlay}
                   thumbnail={thumbnail}
-                  VideoThumbnail={VideoThumbnail}
                 />
               );
             })}
@@ -216,7 +195,6 @@ const GalleryWithContext = (props: GalleryPropsWithContext) => {
     </View>
   );
 };
-
 type GalleryThumbnailProps = {
   borderRadius: GalleryImageBorderRadius;
   colIndex: number;
@@ -227,24 +205,15 @@ type GalleryThumbnailProps = {
   numOfRows: number;
   rowIndex: number;
   thumbnail: Thumbnail;
-} & Pick<
-  MessagesContextValue,
-  | 'additionalPressableProps'
-  | 'VideoThumbnail'
-  | 'ImageLoadingIndicator'
-  | 'ImageLoadingFailedIndicator'
-> &
+} & Pick<MessagesContextValue, 'additionalPressableProps'> &
   Pick<ImageGalleryContextValue, 'imageGalleryStateStore'> &
   Pick<MessageContextValue, 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'> &
   Pick<OverlayContextValue, 'setOverlay'>;
-
 const GalleryThumbnail = ({
   additionalPressableProps,
   borderRadius,
   colIndex,
   imageGalleryStateStore,
-  ImageLoadingFailedIndicator,
-  ImageLoadingIndicator,
   imagesAndVideos,
   invertedDirections,
   message,
@@ -257,8 +226,8 @@ const GalleryThumbnail = ({
   rowIndex,
   setOverlay,
   thumbnail,
-  VideoThumbnail,
 }: GalleryThumbnailProps) => {
+  const { VideoThumbnail } = useComponentsContext();
   const {
     theme: {
       messageItemView: {
@@ -269,7 +238,6 @@ const GalleryThumbnail = ({
   } = useTheme();
   const { t } = useTranslationContext();
   const styles = useStyles();
-
   const openImageViewer = () => {
     if (!message) {
       return;
@@ -280,7 +248,6 @@ const GalleryThumbnail = ({
     });
     setOverlay('gallery');
   };
-
   const defaultOnPress = () => {
     // If the url is defined then only try to open the file.
     if (thumbnail.url) {
@@ -293,7 +260,6 @@ const GalleryThumbnail = ({
       }
     }
   };
-
   return (
     <Pressable
       disabled={preventPress}
@@ -327,14 +293,7 @@ const GalleryThumbnail = ({
           });
         }
       }}
-      style={({ pressed }) => [
-        styles.imageContainer,
-        {
-          opacity: pressed ? 0.8 : 1,
-          flex: thumbnail.flex,
-        },
-        imageContainer,
-      ]}
+      style={[styles.imageContainer, { flex: thumbnail.flex }, imageContainer]}
       testID={`gallery-${invertedDirections ? 'row' : 'column'}-${colIndex}-item-${rowIndex}`}
       {...additionalPressableProps}
     >
@@ -346,15 +305,13 @@ const GalleryThumbnail = ({
       ) : (
         <GalleryImageThumbnail
           borderRadius={imageBorderRadius ?? borderRadius}
-          ImageLoadingFailedIndicator={ImageLoadingFailedIndicator}
-          ImageLoadingIndicator={ImageLoadingIndicator}
           thumbnail={thumbnail}
         />
       )}
       {colIndex === numOfColumns - 1 && rowIndex === numOfRows - 1 && imagesAndVideos.length > 4 ? (
         <View
           style={[
-            StyleSheet.absoluteFillObject,
+            StyleSheet.absoluteFill,
             styles.moreImagesContainer,
             { backgroundColor: semantics.backgroundCoreOverlayDark },
             borderRadius,
@@ -369,16 +326,11 @@ const GalleryThumbnail = ({
     </Pressable>
   );
 };
-
 const GalleryImageThumbnail = ({
   borderRadius,
-  ImageLoadingFailedIndicator,
-  ImageLoadingIndicator,
   thumbnail,
-}: Pick<
-  GalleryThumbnailProps,
-  'ImageLoadingFailedIndicator' | 'ImageLoadingIndicator' | 'thumbnail' | 'borderRadius'
->) => {
+}: Pick<GalleryThumbnailProps, 'thumbnail' | 'borderRadius'>) => {
+  const { ImageLoadingFailedIndicator, ImageLoadingIndicator } = useComponentsContext();
   const {
     isLoadingImage,
     isLoadingImageError,
@@ -386,33 +338,27 @@ const GalleryImageThumbnail = ({
     setLoadingImage,
     setLoadingImageError,
   } = useLoadingImage();
-
   const {
     theme: {
       messageItemView: { gallery },
     },
   } = useTheme();
-
   const styles = useStyles();
-
   const onLoadStart = useStableCallback(() => {
     setLoadingImageError(false);
     setLoadingImage(true);
   });
-
   const onLoad = useStableCallback(() => {
     setTimeout(() => {
       setLoadingImage(false);
       setLoadingImageError(false);
     }, 0);
   });
-
   const onError = useStableCallback(({ nativeEvent: { error } }: ImageErrorEvent) => {
     console.warn(error);
     setLoadingImage(false);
     setLoadingImageError(true);
   });
-
   return (
     <View style={[styles.image, borderRadius]}>
       {isLoadingImageError ? (
@@ -433,7 +379,6 @@ const GalleryImageThumbnail = ({
     </View>
   );
 };
-
 const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWithContext) => {
   const {
     alignment: prevAlignment,
@@ -449,19 +394,16 @@ const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWit
     myMessageTheme: nextMyMessageTheme,
     videos: nextVideos,
   } = nextProps;
-
   const alignmentEqual = prevAlignment === nextAlignment;
   if (!alignmentEqual) {
     return false;
   }
-
   const messageEqual =
     prevMessage?.id === nextMessage?.id &&
     `${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
   if (!messageEqual) {
     return false;
   }
-
   const imagesEqual =
     prevImages.length === nextImages.length &&
     prevImages.every(
@@ -472,7 +414,6 @@ const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWit
   if (!imagesEqual) {
     return false;
   }
-
   const videosEqual =
     prevVideos.length === nextVideos.length &&
     prevVideos.every(
@@ -483,20 +424,15 @@ const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWit
   if (!videosEqual) {
     return false;
   }
-
   const messageThemeEqual =
     JSON.stringify(prevMyMessageTheme) === JSON.stringify(nextMyMessageTheme);
   if (!messageThemeEqual) {
     return false;
   }
-
   return true;
 };
-
 const MemoizedGallery = React.memo(GalleryWithContext, areEqual) as typeof GalleryWithContext;
-
 export type GalleryProps = Partial<GalleryPropsWithContext>;
-
 /**
  * UI component for card in attachments.
  */
@@ -504,8 +440,6 @@ export const Gallery = (props: GalleryProps) => {
   const {
     alignment: propAlignment,
     additionalPressableProps: propAdditionalPressableProps,
-    ImageLoadingFailedIndicator: PropImageLoadingFailedIndicator,
-    ImageLoadingIndicator: PropImageLoadingIndicator,
     images: propImages,
     message: propMessage,
     myMessageTheme: propMyMessageTheme,
@@ -515,10 +449,8 @@ export const Gallery = (props: GalleryProps) => {
     preventPress: propPreventPress,
     setOverlay: propSetOverlay,
     videos: propVideos,
-    VideoThumbnail: PropVideoThumbnail,
     messageContentOrder: propMessageContentOrder,
   } = props;
-
   const { imageGalleryStateStore } = useImageGalleryContext();
   const {
     alignment: contextAlignment,
@@ -533,13 +465,9 @@ export const Gallery = (props: GalleryProps) => {
   } = useMessageContext();
   const {
     additionalPressableProps: contextAdditionalPressableProps,
-    ImageLoadingFailedIndicator: ContextImageLoadingFailedIndicator,
-    ImageLoadingIndicator: ContextImageLoadingIndicator,
     myMessageTheme: contextMyMessageTheme,
-    VideoThumbnail: ContextVideoThumnbnail,
   } = useMessagesContext();
   const { setOverlay: contextSetOverlay } = useOverlayContext();
-
   const images = propImages ?? contextImages ?? [];
   const videos = propVideos ?? contextVideos ?? [];
   const imagesAndVideos = [...images, ...videos];
@@ -548,7 +476,6 @@ export const Gallery = (props: GalleryProps) => {
   if (!images.length && !videos.length) {
     return null;
   }
-
   const additionalPressableProps = propAdditionalPressableProps || contextAdditionalPressableProps;
   const onLongPress = propOnLongPress || contextOnLongPress;
   const onPressIn = propOnPressIn || contextOnPressIn;
@@ -556,18 +483,12 @@ export const Gallery = (props: GalleryProps) => {
   const preventPress =
     typeof propPreventPress === 'boolean' ? propPreventPress : contextPreventPress;
   const setOverlay = propSetOverlay || contextSetOverlay;
-  const VideoThumbnail = PropVideoThumbnail || ContextVideoThumnbnail;
-  const ImageLoadingFailedIndicator =
-    PropImageLoadingFailedIndicator || ContextImageLoadingFailedIndicator;
-  const ImageLoadingIndicator = PropImageLoadingIndicator || ContextImageLoadingIndicator;
   const myMessageTheme = propMyMessageTheme || contextMyMessageTheme;
   const messageContentOrder = propMessageContentOrder || contextMessageContentOrder;
-
   const messageHasOnlyOneMedia =
     messageContentOrder?.length === 1 &&
     messageContentOrder?.includes('gallery') &&
     imagesAndVideos.length === 1;
-
   return (
     <MemoizedGallery
       {...{
@@ -575,8 +496,6 @@ export const Gallery = (props: GalleryProps) => {
         alignment,
         channelId: message?.cid,
         imageGalleryStateStore,
-        ImageLoadingFailedIndicator,
-        ImageLoadingIndicator,
         images,
         message,
         myMessageTheme,
@@ -586,14 +505,12 @@ export const Gallery = (props: GalleryProps) => {
         preventPress,
         setOverlay,
         videos,
-        VideoThumbnail,
         messageHasOnlyOneMedia,
         messageContentOrder,
       }}
     />
   );
 };
-
 const useStyles = () => {
   const {
     theme: { semantics },
@@ -624,7 +541,11 @@ const useStyles = () => {
         overflow: 'hidden',
       },
       imageLoadingErrorIndicatorStyle: {
-        ...StyleSheet.absoluteFillObject,
+        bottom: 0,
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0,
         alignItems: 'center',
         justifyContent: 'center',
       },
@@ -640,7 +561,11 @@ const useStyles = () => {
         position: 'absolute',
       },
       imageReloadContainerStyle: {
-        ...StyleSheet.absoluteFillObject,
+        bottom: 0,
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0,
         alignItems: 'center',
         justifyContent: 'center',
       },
@@ -655,16 +580,23 @@ const useStyles = () => {
         fontWeight: primitives.typographyFontWeightSemiBold,
       },
       imageLoadingErrorContainer: {
-        ...StyleSheet.absoluteFillObject,
+        bottom: 0,
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0,
         alignItems: 'center',
         justifyContent: 'center',
       },
       imageLoadingErrorWrapper: {
-        ...StyleSheet.absoluteFillObject,
+        bottom: 0,
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0,
         overflow: 'hidden',
       },
     });
   }, [semantics, isMyMessage]);
 };
-
 Gallery.displayName = 'Gallery{messageItemView{gallery}}';

package/src/components/Attachment/GalleryImage.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
 import { Image, ImageProps, StyleSheet } from 'react-native';
 
-import { ChatContextValue, useChatContext } from '../../contexts/chatContext/ChatContext';
+import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 
 import { getUrlWithoutParams, isLocalUrl, makeImageCompatibleUrl } from '../../utils/utils';
 
-export type GalleryImageWithContextProps = GalleryImageProps &
-  Pick<ChatContextValue, 'ImageComponent'>;
+export type GalleryImageWithContextProps = GalleryImageProps & {
+  ImageComponent?: React.ComponentType<ImageProps>;
+};
 
 export const GalleryImageWithContext = (props: GalleryImageWithContextProps) => {
   const { ImageComponent = Image, uri, style, ...rest } = props;
@@ -48,7 +49,7 @@ export type GalleryImageProps = Omit<ImageProps, 'height' | 'source'> & {
 };
 
 export const GalleryImage = (props: GalleryImageProps) => {
-  const { ImageComponent } = useChatContext();
+  const { ImageComponent } = useComponentsContext();
 
   return <MemoizedGalleryImage ImageComponent={ImageComponent} {...props} />;
 };