stream-chat-react-native-core 4.0.0-beta.3 → 4.0.0-beta.7

package/src/contexts/channelsStateContext/useChannelState.ts

@@ -6,28 +6,13 @@ import { useChannelsStateContext } from './ChannelsStateContext';
 
 import type { ChannelsStateContextValue, ChannelState, Keys } from './ChannelsStateContext';
 
-import type {
-  DefaultAttachmentType,
-  DefaultChannelType,
-  DefaultCommandType,
-  DefaultEventType,
-  DefaultMessageType,
-  DefaultReactionType,
-  DefaultUserType,
-  UnknownType,
-} from '../../types/types';
+import type { DefaultStreamChatGenerics } from '../../types/types';
 
 type StateManagerParams<
   Key extends Keys,
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = Omit<
-  ChannelsStateContextValue<At, Ch, Co, Ev, Me, Re, Us>,
+  ChannelsStateContextValue<StreamChatGenerics>,
   'increaseSubscriberCount' | 'decreaseSubscriberCount'
 > & {
   cid: string;
@@ -41,13 +26,7 @@ type StateManagerParams<
 */
 function useStateManager<
   Key extends Keys,
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
   {
     cid,
@@ -55,17 +34,17 @@ function useStateManager<
     setState,
     state,
   }: Omit<
-    StateManagerParams<Key, At, Ch, Co, Ev, Me, Re, Us>,
+    StateManagerParams<Key, StreamChatGenerics>,
     'increaseSubscriberCount' | 'decreaseSubscriberCount'
   >,
-  initialValue?: ChannelState<At, Ch, Co, Ev, Me, Re, Us>[Key],
+  initialValue?: ChannelState<StreamChatGenerics>[Key],
 ) {
   const memoizedInitialValue = useMemo(() => initialValue, []);
   const value =
-    state[cid]?.[key] || (memoizedInitialValue as ChannelState<At, Ch, Co, Ev, Me, Re, Us>[Key]);
+    state[cid]?.[key] || (memoizedInitialValue as ChannelState<StreamChatGenerics>[Key]);
 
   const setValue = useCallback(
-    (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>[Key]) => setState({ cid, key, value }),
+    (value: ChannelState<StreamChatGenerics>[Key]) => setState({ cid, key, value }),
     [cid, key],
   );
 
@@ -73,45 +52,33 @@ function useStateManager<
 }
 
 export type UseChannelStateValue<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = {
-  members: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['members'];
-  messages: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['messages'];
-  read: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['read'];
-  setMembers: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['members']) => void;
-  setMessages: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['messages']) => void;
-  setRead: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['read']) => void;
-  setThreadMessages: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['threadMessages']) => void;
-  setTyping: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['typing']) => void;
-  setWatcherCount: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['watcherCount']) => void;
-  setWatchers: (value: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['watchers']) => void;
-  threadMessages: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['threadMessages'];
-  typing: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['typing'];
-  watcherCount: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['watcherCount'];
-  watchers: ChannelState<At, Ch, Co, Ev, Me, Re, Us>['watchers'];
+  members: ChannelState<StreamChatGenerics>['members'];
+  messages: ChannelState<StreamChatGenerics>['messages'];
+  read: ChannelState<StreamChatGenerics>['read'];
+  setMembers: (value: ChannelState<StreamChatGenerics>['members']) => void;
+  setMessages: (value: ChannelState<StreamChatGenerics>['messages']) => void;
+  setRead: (value: ChannelState<StreamChatGenerics>['read']) => void;
+  setThreadMessages: (value: ChannelState<StreamChatGenerics>['threadMessages']) => void;
+  setTyping: (value: ChannelState<StreamChatGenerics>['typing']) => void;
+  setWatcherCount: (value: ChannelState<StreamChatGenerics>['watcherCount']) => void;
+  setWatchers: (value: ChannelState<StreamChatGenerics>['watchers']) => void;
+  threadMessages: ChannelState<StreamChatGenerics>['threadMessages'];
+  typing: ChannelState<StreamChatGenerics>['typing'];
+  watcherCount: ChannelState<StreamChatGenerics>['watcherCount'];
+  watchers: ChannelState<StreamChatGenerics>['watchers'];
 };
 
 export function useChannelState<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
-  channel: ChannelType<At, Ch, Co, Ev, Me, Re, Us> | undefined,
+  channel: ChannelType<StreamChatGenerics> | undefined,
   threadId?: string,
-): UseChannelStateValue<At, Ch, Co, Ev, Me, Re, Us> {
+): UseChannelStateValue<StreamChatGenerics> {
   const cid = channel?.id || 'id'; // in case channel is not initialized, use generic id string for indexing
   const { decreaseSubscriberCount, increaseSubscriberCount, setState, state } =
-    useChannelsStateContext<At, Ch, Co, Ev, Me, Re, Us>();
+    useChannelsStateContext<StreamChatGenerics>();
 
   // Keeps track of how many Channel components are subscribed to this Channel state (Channel vs Thread concurrency)
   useEffect(() => {

package/src/contexts/chatContext/ChatContext.tsx

@@ -2,26 +2,11 @@ import React, { PropsWithChildren, useContext } from 'react';
 
 import type { Channel, Mute, StreamChat } from 'stream-chat';
 
-import type {
-  DefaultAttachmentType,
-  DefaultChannelType,
-  DefaultCommandType,
-  DefaultEventType,
-  DefaultMessageType,
-  DefaultReactionType,
-  DefaultUserType,
-  UnknownType,
-} from '../../types/types';
+import type { DefaultStreamChatGenerics, UnknownType } from '../../types/types';
 import { getDisplayName } from '../utils/getDisplayName';
 
 export type ChatContextValue<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = {
   /**
    * The StreamChat client object
@@ -39,16 +24,16 @@ export type ChatContextValue<
    *
    * @overrideType StreamChat
    * */
-  client: StreamChat<At, Ch, Co, Ev, Me, Re, Us>;
+  client: StreamChat<StreamChatGenerics>;
   connectionRecovering: boolean;
   isOnline: boolean;
-  mutedUsers: Mute<Us>[];
+  mutedUsers: Mute<StreamChatGenerics>[];
   /**
    * @param newChannel Channel to set as active.
    *
    * @overrideType Function
    */
-  setActiveChannel: (newChannel?: Channel<At, Ch, Co, Ev, Me, Re, Us>) => void;
+  setActiveChannel: (newChannel?: Channel<StreamChatGenerics>) => void;
   /**
    * Instance of channel object from stream-chat package.
    *
@@ -66,24 +51,18 @@ export type ChatContextValue<
    *
    * @overrideType Channel
    */
-  channel?: Channel<At, Ch, Co, Ev, Me, Re, Us>;
+  channel?: Channel<StreamChatGenerics>;
 };
 
 export const ChatContext = React.createContext({} as ChatContextValue);
 
 export const ChatProvider = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
   children,
   value,
 }: PropsWithChildren<{
-  value: ChatContextValue<At, Ch, Co, Ev, Me, Re, Us>;
+  value: ChatContextValue<StreamChatGenerics>;
 }>) => (
   <ChatContext.Provider value={value as unknown as ChatContextValue}>
     {children}
@@ -91,14 +70,8 @@ export const ChatProvider = <
 );
 
 export const useChatContext = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
->() => useContext(ChatContext) as unknown as ChatContextValue<At, Ch, Co, Ev, Me, Re, Us>;
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>() => useContext(ChatContext) as unknown as ChatContextValue<StreamChatGenerics>;
 
 /**
  * Typescript currently does not support partial inference so if ChatContext
@@ -107,20 +80,12 @@ export const useChatContext = <
  */
 export const withChatContext = <
   P extends UnknownType,
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
   Component: React.ComponentType<P>,
-): React.FC<Omit<P, keyof ChatContextValue<At, Ch, Co, Ev, Me, Re, Us>>> => {
-  const WithChatContextComponent = (
-    props: Omit<P, keyof ChatContextValue<At, Ch, Co, Ev, Me, Re, Us>>,
-  ) => {
-    const chatContext = useChatContext<At, Ch, Co, Ev, Me, Re, Us>();
+): React.FC<Omit<P, keyof ChatContextValue<StreamChatGenerics>>> => {
+  const WithChatContextComponent = (props: Omit<P, keyof ChatContextValue<StreamChatGenerics>>) => {
+    const chatContext = useChatContext<StreamChatGenerics>();
 
     return <Component {...(props as P)} {...chatContext} />;
   };

package/src/contexts/imageGalleryContext/ImageGalleryContext.tsx

@@ -1,30 +1,15 @@
 import React, { PropsWithChildren, useContext, useState } from 'react';
 
 import type { MessageType } from '../../components/MessageList/hooks/useMessageList';
-import type {
-  DefaultAttachmentType,
-  DefaultChannelType,
-  DefaultCommandType,
-  DefaultEventType,
-  DefaultMessageType,
-  DefaultReactionType,
-  DefaultUserType,
-  UnknownType,
-} from '../../types/types';
+import type { DefaultStreamChatGenerics, UnknownType } from '../../types/types';
 import { getDisplayName } from '../utils/getDisplayName';
 
 export type ImageGalleryContextValue<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = {
-  images: MessageType<At, Ch, Co, Ev, Me, Re, Us>[];
+  images: MessageType<StreamChatGenerics>[];
   setImage: React.Dispatch<React.SetStateAction<{ messageId?: string; url?: string } | undefined>>;
-  setImages: React.Dispatch<React.SetStateAction<MessageType<At, Ch, Co, Ev, Me, Re, Us>[]>>;
+  setImages: React.Dispatch<React.SetStateAction<MessageType<StreamChatGenerics>[]>>;
   image?: { messageId?: string; url?: string };
 };
 
@@ -33,17 +18,11 @@ export const ImageGalleryContext = React.createContext<ImageGalleryContextValue>
 );
 
 export const ImageGalleryProvider = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
   children,
 }: PropsWithChildren<UnknownType>) => {
-  const [images, setImages] = useState<MessageType<At, Ch, Co, Ev, Me, Re, Us>[]>([]);
+  const [images, setImages] = useState<MessageType<StreamChatGenerics>[]>([]);
   const [image, setImage] = useState<{ messageId?: string; url?: string }>();
 
   const imageGalleryContext = {
@@ -63,40 +42,19 @@ export const ImageGalleryProvider = <
 };
 
 export const useImageGalleryContext = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
->() =>
-  useContext(ImageGalleryContext) as unknown as ImageGalleryContextValue<
-    At,
-    Ch,
-    Co,
-    Ev,
-    Me,
-    Re,
-    Us
-  >;
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>() => useContext(ImageGalleryContext) as unknown as ImageGalleryContextValue<StreamChatGenerics>;
 
 export const withImageGalleryContext = <
   P extends UnknownType,
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
   Component: React.ComponentType<P>,
-): React.FC<Omit<P, keyof ImageGalleryContextValue<At, Ch, Co, Ev, Me, Re, Us>>> => {
+): React.FC<Omit<P, keyof ImageGalleryContextValue<StreamChatGenerics>>> => {
   const WithImageGalleryContextComponent = (
-    props: Omit<P, keyof ImageGalleryContextValue<At, Ch, Co, Ev, Me, Re, Us>>,
+    props: Omit<P, keyof ImageGalleryContextValue<StreamChatGenerics>>,
   ) => {
-    const imageGalleryContext = useImageGalleryContext<At, Ch, Co, Ev, Me, Re, Us>();
+    const imageGalleryContext = useImageGalleryContext<StreamChatGenerics>();
 
     return <Component {...(props as P)} {...imageGalleryContext} />;
   };

package/src/contexts/keyboardContext/KeyboardContext.tsx

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { Keyboard } from 'react-native';
 
-import type { UnknownType } from '../../types/types';
+import type { DefaultStreamChatGenerics } from '../../types/types';
 import { getDisplayName } from '../utils/getDisplayName';
 
 export type KeyboardContextValue = {
@@ -20,14 +20,20 @@ export const KeyboardProvider: React.FC<{
 
 export const useKeyboardContext = () => useContext(KeyboardContext);
 
-export const withKeyboardContext = <P extends UnknownType>(
-  Component: React.ComponentType<P>,
-): React.FC<Omit<P, keyof KeyboardContextValue>> => {
-  const WithKeyboardContextComponent = (props: Omit<P, keyof KeyboardContextValue>) => {
+export const withKeyboardContext = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  Component: React.ComponentType<StreamChatGenerics>,
+): React.FC<Omit<StreamChatGenerics, keyof KeyboardContextValue>> => {
+  const WithKeyboardContextComponent = (
+    props: Omit<StreamChatGenerics, keyof KeyboardContextValue>,
+  ) => {
     const keyboardContext = useKeyboardContext();
 
-    return <Component {...(props as P)} {...keyboardContext} />;
+    return <Component {...(props as StreamChatGenerics)} {...keyboardContext} />;
   };
-  WithKeyboardContextComponent.displayName = `WithKeyboardContext${getDisplayName(Component)}`;
+  WithKeyboardContextComponent.displayName = `WithKeyboardContext${getDisplayName(
+    Component as React.ComponentType,
+  )}`;
   return WithKeyboardContextComponent;
 };

package/src/contexts/messageContext/MessageContext.tsx

@@ -7,16 +7,7 @@ import type { TouchableHandlerPayload } from '../../components/Message/Message';
 import type { GroupType, MessageType } from '../../components/MessageList/hooks/useMessageList';
 import type { ChannelContextValue } from '../../contexts/channelContext/ChannelContext';
 import type { MessageContentType } from '../../contexts/messagesContext/MessagesContext';
-import type {
-  DefaultAttachmentType,
-  DefaultChannelType,
-  DefaultCommandType,
-  DefaultEventType,
-  DefaultMessageType,
-  DefaultReactionType,
-  DefaultUserType,
-  UnknownType,
-} from '../../types/types';
+import type { DefaultStreamChatGenerics, UnknownType } from '../../types/types';
 import { getDisplayName } from '../utils/getDisplayName';
 
 export type Alignment = 'right' | 'left';
@@ -27,20 +18,14 @@ export type Reactions = {
 }[];
 
 export type MessageContextValue<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = {
   /** Whether or not actions can be performed on message */
   actionsEnabled: boolean;
   /** Position of the message, either 'right' or 'left' */
   alignment: Alignment;
   /** The files attached to a message */
-  files: Attachment<At>[];
+  files: Attachment<StreamChatGenerics>[];
   /**
    * Position of message in group - top, bottom, middle, single.
    *
@@ -60,13 +45,13 @@ export type MessageContextValue<
   /** Whether or not message has reactions */
   hasReactions: boolean;
   /** The images attached to a message */
-  images: Attachment<At>[];
+  images: Attachment<StreamChatGenerics>[];
   /** Whether or not this is the active user's message */
   isMyMessage: boolean;
   /** Whether or not this is the last message in a group of messages */
   lastGroupMessage: boolean;
   /** Current [message object](https://getstream.io/chat/docs/#message_format) */
-  message: MessageType<At, Ch, Co, Ev, Me, Re, Us>;
+  message: MessageType<StreamChatGenerics>;
   /** Order to render the message content */
   messageContentOrder: MessageContentType[];
   /**
@@ -97,7 +82,7 @@ export type MessageContextValue<
   onPress: (payload: TouchableHandlerPayload) => void;
   onPressIn: ((payload: TouchableHandlerPayload) => void) | null;
   /** The images attached to a message */
-  otherAttachments: Attachment<At>[];
+  otherAttachments: Attachment<StreamChatGenerics>[];
   reactions: Reactions;
   showMessageOverlay: (messageReactions?: boolean) => void;
   showMessageStatus: boolean;
@@ -110,23 +95,17 @@ export type MessageContextValue<
   preventPress?: boolean;
   /** Whether or not the avatar show show next to Message */
   showAvatar?: boolean;
-} & Pick<ChannelContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'channel' | 'disabled' | 'members'>;
+} & Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'disabled' | 'members'>;
 
 export const MessageContext = React.createContext({} as MessageContextValue);
 
 export const MessageProvider = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
   children,
   value,
 }: PropsWithChildren<{
-  value?: MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>;
+  value?: MessageContextValue<StreamChatGenerics>;
 }>) => (
   <MessageContext.Provider value={value as unknown as MessageContextValue}>
     {children}
@@ -134,14 +113,8 @@ export const MessageProvider = <
 );
 
 export const useMessageContext = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
->() => useContext(MessageContext) as unknown as MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>;
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>() => useContext(MessageContext) as unknown as MessageContextValue<StreamChatGenerics>;
 
 /**
  * Typescript currently does not support partial inference so if MessageContext
@@ -150,20 +123,14 @@ export const useMessageContext = <
  */
 export const withMessageContext = <
   P extends UnknownType,
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
   Component: React.ComponentType<P>,
-): React.FC<Omit<P, keyof MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>>> => {
+): React.FC<Omit<P, keyof MessageContextValue<StreamChatGenerics>>> => {
   const WithMessageContextComponent = (
-    props: Omit<P, keyof MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>>,
+    props: Omit<P, keyof MessageContextValue<StreamChatGenerics>>,
   ) => {
-    const messageContext = useMessageContext<At, Ch, Co, Ev, Me, Re, Us>();
+    const messageContext = useMessageContext<StreamChatGenerics>();
 
     return <Component {...(props as P)} {...messageContext} />;
   };