stream-chat-react-native-core 6.6.8-beta.3 → 7.0.0-rc.2

package/src/components/Attachment/FileAttachmentGroup.tsx

@@ -17,12 +17,10 @@ import {
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { isSoundPackageAvailable } from '../../native';
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 
-export type FileAttachmentGroupPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageContextValue<StreamChatGenerics>, 'files'> &
-  Pick<MessagesContextValue<StreamChatGenerics>, 'Attachment' | 'AudioAttachment'> & {
+export type FileAttachmentGroupPropsWithContext = Pick<MessageContextValue, 'files'> &
+  Pick<MessagesContextValue, 'Attachment' | 'AudioAttachment'> & {
     /**
      * The unique id for the message with file attachments
      */
@@ -33,19 +31,13 @@ export type FileAttachmentGroupPropsWithContext<
     }>;
   };
 
-type FilesToDisplayType<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Attachment<StreamChatGenerics> & {
+type FilesToDisplayType = Attachment & {
   duration: number;
   paused: boolean;
   progress: number;
 };
 
-const FileAttachmentGroupWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
-) => {
+const FileAttachmentGroupWithContext = (props: FileAttachmentGroupPropsWithContext) => {
   const { Attachment, AudioAttachment, files, messageId, styles: stylesProp = {} } = props;
   const [filesToDisplay, setFilesToDisplay] = useState<FilesToDisplayType[]>([]);
 
@@ -108,7 +100,7 @@ const FileAttachmentGroupWithContext = <
     <View style={[styles.container, container, stylesProp.container]}>
       {filesToDisplay.map((file, index) => (
         <View
-          key={`${messageId}-${index}`}
+          key={`file-by-attachment-group-${messageId}-${index}`}
           style={[
             { paddingBottom: index !== files.length - 1 ? 4 : 0 },
             stylesProp.attachmentContainer,
@@ -144,9 +136,9 @@ const FileAttachmentGroupWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
-  nextProps: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: FileAttachmentGroupPropsWithContext,
+  nextProps: FileAttachmentGroupPropsWithContext,
 ) => {
   const { files: prevFiles } = prevProps;
   const { files: nextFiles } = nextProps;
@@ -159,22 +151,17 @@ const MemoizedFileAttachmentGroup = React.memo(
   areEqual,
 ) as typeof FileAttachmentGroupWithContext;
 
-export type FileAttachmentGroupProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Omit<FileAttachmentGroupPropsWithContext<StreamChatGenerics>, 'messageId'>> &
-  Pick<FileAttachmentGroupPropsWithContext<StreamChatGenerics>, 'messageId'>;
+export type FileAttachmentGroupProps = Partial<
+  Omit<FileAttachmentGroupPropsWithContext, 'messageId'>
+> &
+  Pick<FileAttachmentGroupPropsWithContext, 'messageId'>;
 
-export const FileAttachmentGroup = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentGroupProps<StreamChatGenerics>,
-) => {
+export const FileAttachmentGroup = (props: FileAttachmentGroupProps) => {
   const { files: propFiles, messageId } = props;
 
-  const { files: contextFiles } = useMessageContext<StreamChatGenerics>();
+  const { files: contextFiles } = useMessageContext();
 
-  const { Attachment = AttachmentDefault, AudioAttachment } =
-    useMessagesContext<StreamChatGenerics>();
+  const { Attachment = AttachmentDefault, AudioAttachment } = useMessagesContext();
 
   const files = propFiles || contextFiles;
 

package/src/components/Attachment/Gallery.tsx

@@ -33,14 +33,15 @@ import {
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useLoadingImage } from '../../hooks/useLoadingImage';
 import { isVideoPlayerAvailable } from '../../native';
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 import { getUrlWithoutParams } from '../../utils/utils';
 
-export type GalleryPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
+export type GalleryPropsWithContext = Pick<
+  ImageGalleryContextValue,
+  'setSelectedMessage' | 'setMessages'
+> &
   Pick<
-    MessageContextValue<StreamChatGenerics>,
+    MessageContextValue,
     | 'alignment'
     | 'groupStyles'
     | 'images'
@@ -52,7 +53,7 @@ export type GalleryPropsWithContext<
     | 'threadList'
   > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'additionalPressableProps'
     | 'legacyImageViewerSwipeBehaviour'
     | 'VideoThumbnail'
@@ -75,14 +76,10 @@ export type GalleryPropsWithContext<
      *
      * TODO: Fix circular dependencies of imports
      */
-    message?: MessageType<StreamChatGenerics>;
+    message?: MessageType;
   };
 
-const GalleryWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GalleryPropsWithContext<StreamChatGenerics>,
-) => {
+const GalleryWithContext = (props: GalleryPropsWithContext) => {
   const {
     additionalPressableProps,
     alignment,
@@ -234,9 +231,7 @@ const GalleryWithContext = <
   );
 };
 
-type GalleryThumbnailProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+type GalleryThumbnailProps = {
   borderRadius: {
     borderBottomLeftRadius: number;
     borderBottomRightRadius: number;
@@ -244,31 +239,26 @@ type GalleryThumbnailProps<
     borderTopRightRadius: number;
   };
   colIndex: number;
-  imagesAndVideos: Attachment<StreamChatGenerics>[];
+  imagesAndVideos: Attachment[];
   invertedDirections: boolean;
-  message: MessageType<StreamChatGenerics>;
+  message: MessageType;
   numOfColumns: number;
   numOfRows: number;
   rowIndex: number;
   thumbnail: Thumbnail;
 } & Pick<
-  MessagesContextValue<StreamChatGenerics>,
+  MessagesContextValue,
   | 'additionalPressableProps'
   | 'legacyImageViewerSwipeBehaviour'
   | 'VideoThumbnail'
   | 'ImageLoadingIndicator'
   | 'ImageLoadingFailedIndicator'
 > &
-  Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
-  Pick<
-    MessageContextValue<StreamChatGenerics>,
-    'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
-  > &
+  Pick<ImageGalleryContextValue, 'setSelectedMessage' | 'setMessages'> &
+  Pick<MessageContextValue, 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'> &
   Pick<OverlayContextValue, 'setOverlay'>;
 
-const GalleryThumbnail = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+const GalleryThumbnail = ({
   additionalPressableProps,
   borderRadius,
   colIndex,
@@ -290,7 +280,7 @@ const GalleryThumbnail = <
   setSelectedMessage,
   thumbnail,
   VideoThumbnail,
-}: GalleryThumbnailProps<StreamChatGenerics>) => {
+}: GalleryThumbnailProps) => {
   const {
     theme: {
       colors: { overlay },
@@ -419,15 +409,13 @@ const GalleryThumbnail = <
   );
 };
 
-const GalleryImageThumbnail = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+const GalleryImageThumbnail = ({
   borderRadius,
   ImageLoadingFailedIndicator,
   ImageLoadingIndicator,
   thumbnail,
 }: Pick<
-  GalleryThumbnailProps<StreamChatGenerics>,
+  GalleryThumbnailProps,
   'ImageLoadingFailedIndicator' | 'ImageLoadingIndicator' | 'thumbnail' | 'borderRadius'
 >) => {
   const {
@@ -494,10 +482,7 @@ const GalleryImageThumbnail = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: GalleryPropsWithContext<StreamChatGenerics>,
-  nextProps: GalleryPropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWithContext) => {
   const {
     groupStyles: prevGroupStyles,
     hasThreadReplies: prevHasThreadReplies,
@@ -566,18 +551,12 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
 const MemoizedGallery = React.memo(GalleryWithContext, areEqual) as typeof GalleryWithContext;
 
-export type GalleryProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<GalleryPropsWithContext<StreamChatGenerics>>;
+export type GalleryProps = Partial<GalleryPropsWithContext>;
 
 /**
  * UI component for card in attachments.
  */
-export const Gallery = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GalleryProps<StreamChatGenerics>,
-) => {
+export const Gallery = (props: GalleryProps) => {
   const {
     additionalPressableProps: propAdditionalPressableProps,
     alignment: propAlignment,
@@ -599,8 +578,7 @@ export const Gallery = <
     VideoThumbnail: PropVideoThumbnail,
   } = props;
 
-  const { setMessages, setSelectedMessage: contextSetSelectedMessage } =
-    useImageGalleryContext<StreamChatGenerics>();
+  const { setMessages, setSelectedMessage: contextSetSelectedMessage } = useImageGalleryContext();
   const {
     alignment: contextAlignment,
     groupStyles: contextGroupStyles,
@@ -612,7 +590,7 @@ export const Gallery = <
     preventPress: contextPreventPress,
     threadList: contextThreadList,
     videos: contextVideos,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
   const {
     additionalPressableProps: contextAdditionalPressableProps,
     ImageLoadingFailedIndicator: ContextImageLoadingFailedIndicator,
@@ -620,7 +598,7 @@ export const Gallery = <
     legacyImageViewerSwipeBehaviour,
     myMessageTheme: contextMyMessageTheme,
     VideoThumbnail: ContextVideoThumnbnail,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
   const { setOverlay: contextSetOverlay } = useOverlayContext();
 
   const images = propImages || contextImages;

package/src/components/Attachment/GalleryImage.tsx

@@ -3,12 +3,10 @@ import { Image, ImageProps } from 'react-native';
 
 import { ChatContextValue, useChatContext } from '../../contexts/chatContext/ChatContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { getUrlWithoutParams, isLocalUrl, makeImageCompatibleUrl } from '../../utils/utils';
 
-export type GalleryImageWithContextProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = GalleryImageProps & Pick<ChatContextValue<StreamChatGenerics>, 'ImageComponent'>;
+export type GalleryImageWithContextProps = GalleryImageProps &
+  Pick<ChatContextValue, 'ImageComponent'>;
 
 export const GalleryImageWithContext = (props: GalleryImageWithContextProps) => {
   const { ImageComponent = Image, uri, ...rest } = props;
@@ -47,12 +45,8 @@ export type GalleryImageProps = Omit<ImageProps, 'height' | 'source'> & {
   uri: string;
 };
 
-export const GalleryImage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GalleryImageProps,
-) => {
-  const { ImageComponent } = useChatContext<StreamChatGenerics>();
+export const GalleryImage = (props: GalleryImageProps) => {
+  const { ImageComponent } = useChatContext();
 
   return <MemoizedGalleryImage ImageComponent={ImageComponent} {...props} />;
 };

package/src/components/Attachment/Giphy.tsx

@@ -24,7 +24,7 @@ import {
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useLoadingImage } from '../../hooks/useLoadingImage';
 import { GiphyIcon, GiphyLightning } from '../../icons';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { makeImageCompatibleUrl } from '../../utils/utils';
 
 const styles = StyleSheet.create({
@@ -134,11 +134,12 @@ const styles = StyleSheet.create({
   },
 });
 
-export type GiphyPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
+export type GiphyPropsWithContext = Pick<
+  ImageGalleryContextValue,
+  'setSelectedMessage' | 'setMessages'
+> &
   Pick<
-    MessageContextValue<StreamChatGenerics>,
+    MessageContextValue,
     | 'handleAction'
     | 'isMyMessage'
     | 'message'
@@ -147,22 +148,18 @@ export type GiphyPropsWithContext<
     | 'onPressIn'
     | 'preventPress'
   > &
-  Pick<ChatContextValue<StreamChatGenerics>, 'ImageComponent'> &
+  Pick<ChatContextValue, 'ImageComponent'> &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'giphyVersion'
     | 'additionalPressableProps'
     | 'ImageLoadingIndicator'
     | 'ImageLoadingFailedIndicator'
   > & {
-    attachment: Attachment<StreamChatGenerics>;
+    attachment: Attachment;
   } & Pick<OverlayContextValue, 'setOverlay'>;
 
-const GiphyWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GiphyPropsWithContext<StreamChatGenerics>,
-) => {
+const GiphyWithContext = (props: GiphyPropsWithContext) => {
   const {
     additionalPressableProps,
     attachment,
@@ -389,10 +386,7 @@ const GiphyWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: GiphyPropsWithContext<StreamChatGenerics>,
-  nextProps: GiphyPropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: GiphyPropsWithContext, nextProps: GiphyPropsWithContext) => {
   const {
     attachment: { actions: prevActions, image_url: prevImageUrl, thumb_url: prevThumbUrl },
     giphyVersion: prevGiphyVersion,
@@ -448,31 +442,25 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
 const MemoizedGiphy = React.memo(GiphyWithContext, areEqual) as typeof GiphyWithContext;
 
-export type GiphyProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<GiphyPropsWithContext<StreamChatGenerics>> & {
-  attachment: Attachment<StreamChatGenerics>;
+export type GiphyProps = Partial<GiphyPropsWithContext> & {
+  attachment: Attachment;
 };
 
 /**
  * UI component for card in attachments.
  */
-export const Giphy = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GiphyProps<StreamChatGenerics>,
-) => {
+export const Giphy = (props: GiphyProps) => {
   const { handleAction, isMyMessage, message, onLongPress, onPress, onPressIn, preventPress } =
-    useMessageContext<StreamChatGenerics>();
-  const { ImageComponent } = useChatContext<StreamChatGenerics>();
-  const { additionalPressableProps, giphyVersion } = useMessagesContext<StreamChatGenerics>();
-  const { setMessages, setSelectedMessage } = useImageGalleryContext<StreamChatGenerics>();
+    useMessageContext();
+  const { ImageComponent } = useChatContext();
+  const { additionalPressableProps, giphyVersion } = useMessagesContext();
+  const { setMessages, setSelectedMessage } = useImageGalleryContext();
   const { setOverlay } = useOverlayContext();
 
   const {
     ImageLoadingFailedIndicator: ContextImageLoadingFailedIndicator,
     ImageLoadingIndicator: ContextImageLoadingIndicator,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
   const ImageLoadingFailedIndicator =
     ContextImageLoadingFailedIndicator || props.ImageLoadingFailedIndicator;
   const ImageLoadingIndicator = ContextImageLoadingIndicator || props.ImageLoadingIndicator;

package/src/components/Attachment/utils/buildGallery/buildGallery.ts

@@ -12,7 +12,6 @@ import {
   chatConfigContextDefaultvalue,
   ChatConfigContextValue,
 } from '../../../../contexts/chatConfigContext/ChatConfigContext';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
 
 /**
  * Builds and returns a gallery of optimized images to be rendered on UI.
@@ -30,14 +29,12 @@ import type { DefaultStreamChatGenerics } from '../../../../types/types';
  *
  * @return {GallerySizeAndThumbnailGrid}
  */
-export function buildGallery<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildGallery({
   images,
   resizableCDNHosts = chatConfigContextDefaultvalue.resizableCDNHosts,
   sizeConfig,
 }: Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
-  images: Attachment<StreamChatGenerics>[];
+  images: Attachment[];
   sizeConfig: GallerySizeConfig;
 }): GallerySizeAndThumbnailGrid {
   if (images.length === 1) {

package/src/components/Attachment/utils/buildGallery/buildGalleryOfSingleImage.ts

@@ -5,7 +5,7 @@ import { buildThumbnail } from './buildThumbnail';
 import type { GallerySizeAndThumbnailGrid, GallerySizeConfig } from './types';
 
 import { ChatConfigContextValue } from '../../../../contexts/chatConfigContext/ChatConfigContext';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
+
 import { getAspectRatio } from '../getAspectRatio';
 
 /**
@@ -20,9 +20,13 @@ function clamp(number: number, min: number, max: number) {
   return Math.min(Math.max(number, min), max);
 }
 
-function getContainerSize<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({ image, sizeConfig }: { image: Attachment<StreamChatGenerics>; sizeConfig: GallerySizeConfig }) {
+function getContainerSize({
+  image,
+  sizeConfig,
+}: {
+  image: Attachment;
+  sizeConfig: GallerySizeConfig;
+}) {
   const { original_height: height, original_width: width } = image;
   const { gridHeight, gridWidth, maxHeight, maxWidth, minHeight, minWidth } = sizeConfig;
 
@@ -64,14 +68,12 @@ function getContainerSize<
   };
 }
 
-export function buildGalleryOfSingleImage<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildGalleryOfSingleImage({
   image,
   resizableCDNHosts,
   sizeConfig,
 }: Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
-  image: Attachment<StreamChatGenerics>;
+  image: Attachment;
   sizeConfig: GallerySizeConfig;
 }): GallerySizeAndThumbnailGrid {
   const container = getContainerSize({

package/src/components/Attachment/utils/buildGallery/buildGalleryOfThreeImages.ts

@@ -5,7 +5,7 @@ import { buildThumbnailGrid } from './buildThumbnailGrid';
 import type { GallerySizeAndThumbnailGrid, GallerySizeConfig } from './types';
 
 import { ChatConfigContextValue } from '../../../../contexts/chatConfigContext/ChatConfigContext';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
+
 import { getAspectRatio } from '../getAspectRatio';
 
 /** function to move item to the front of the array */
@@ -20,14 +20,12 @@ function moveToFront<T>(array: T[], item: T): T[] {
   return newArray;
 }
 
-export function buildGalleryOfThreeImages<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildGalleryOfThreeImages({
   images,
   resizableCDNHosts,
   sizeConfig,
 }: Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
-  images: Attachment<StreamChatGenerics>[];
+  images: Attachment[];
   sizeConfig: GallerySizeConfig;
 }): GallerySizeAndThumbnailGrid {
   // Find the most ladscape and most portrait image.
@@ -57,9 +55,9 @@ export function buildGalleryOfThreeImages<
         landscapeImageAspectRatio: 1,
         portraitImageAspectRatio: 1,
       } as {
-        landscapeImage: Attachment<StreamChatGenerics>;
+        landscapeImage: Attachment;
         landscapeImageAspectRatio: number;
-        portraitImage: Attachment<StreamChatGenerics>;
+        portraitImage: Attachment;
         portraitImageAspectRatio: number;
       },
     );

package/src/components/Attachment/utils/buildGallery/buildGalleryOfTwoImages.ts

@@ -5,17 +5,15 @@ import { buildThumbnailGrid } from './buildThumbnailGrid';
 import type { GallerySizeAndThumbnailGrid, GallerySizeConfig } from './types';
 
 import { ChatConfigContextValue } from '../../../../contexts/chatConfigContext/ChatConfigContext';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
+
 import { getAspectRatio } from '../getAspectRatio';
 
-export function buildGalleryOfTwoImages<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildGalleryOfTwoImages({
   images,
   resizableCDNHosts,
   sizeConfig,
 }: Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
-  images: Attachment<StreamChatGenerics>[];
+  images: Attachment[];
   sizeConfig: GallerySizeConfig;
 }): GallerySizeAndThumbnailGrid {
   const aspectRatio1 = getAspectRatio(images[0]);

package/src/components/Attachment/utils/buildGallery/buildThumbnail.ts

@@ -5,29 +5,24 @@ import type { Attachment } from 'stream-chat';
 import type { Thumbnail } from './types';
 
 import { ChatConfigContextValue } from '../../../../contexts/chatConfigContext/ChatConfigContext';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
 
 import { getResizedImageUrl } from '../../../../utils/getResizedImageUrl';
 import { getUrlOfImageAttachment } from '../../../../utils/getUrlOfImageAttachment';
 
-export type BuildThumbnailProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
+export type BuildThumbnailProps = Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
   height: number;
-  image: Attachment<StreamChatGenerics>;
+  image: Attachment;
   width: number;
   resizeMode?: ImageResizeMode;
 };
 
-export function buildThumbnail<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildThumbnail({
   height,
   image,
   resizableCDNHosts,
   resizeMode,
   width,
-}: BuildThumbnailProps<StreamChatGenerics>): Thumbnail {
+}: BuildThumbnailProps): Thumbnail {
   const { original_height: originalImageHeight, original_width: originalImageWidth } = image;
 
   // Only resize if the original image is larger than the thumbnail container size.

package/src/components/Attachment/utils/buildGallery/buildThumbnailGrid.ts

@@ -5,8 +5,6 @@ import type { GallerySizeAndThumbnailGrid, GallerySizeConfig, ThumbnailGrid } fr
 
 import { ChatConfigContextValue } from '../../../../contexts/chatConfigContext/ChatConfigContext';
 
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
-
 /**
  * Builds a grid of thumbnail images from image attachments.
  * This function take a object parameter with following properties:
@@ -135,9 +133,7 @@ import type { DefaultStreamChatGenerics } from '../../../../types/types';
  *
  * @return {GallerySizeAndThumbnailGrid}
  */
-export function buildThumbnailGrid<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export function buildThumbnailGrid({
   grid,
   images,
   invertedDirections = false,
@@ -145,7 +141,7 @@ export function buildThumbnailGrid<
   sizeConfig,
 }: Pick<ChatConfigContextValue, 'resizableCDNHosts'> & {
   grid: number[][];
-  images: Attachment<StreamChatGenerics>[];
+  images: Attachment[];
   invertedDirections: boolean;
   sizeConfig: GallerySizeConfig;
 }): GallerySizeAndThumbnailGrid {

package/src/components/Attachment/utils/getAspectRatio.ts

@@ -1,6 +1,6 @@
 import type { Attachment } from 'stream-chat';
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../../types/types';
+import { FileTypes } from '../../../types/types';
 
 /**
  * Returns the aspect ratio of an image attachment.
@@ -8,9 +8,7 @@ import { DefaultStreamChatGenerics, FileTypes } from '../../../types/types';
  * @param image Image attachment.
  * @returns {number}
  */
-export function getAspectRatio<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(attachment: Attachment<StreamChatGenerics>) {
+export function getAspectRatio(attachment: Attachment) {
   if (!(attachment.type === FileTypes.Image || attachment.type === FileTypes.Video)) {
     throw new Error(
       'getAspectRatio() can only be called on an image attachment or video thumbnail',