stream-chat-react-native-core 6.6.7 → 7.0.0-rc.1

package/src/components/MessageInput/hooks/useCooldown.ts

@@ -4,7 +4,7 @@ import { BuiltinRoles, ChannelResponse, Role } from 'stream-chat';
 
 import { useChannelContext } from '../../../contexts/channelContext/ChannelContext';
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import { ONE_SECOND_IN_MS } from '../../../utils/date';
 
 type Roles = Array<Role>;
@@ -13,14 +13,12 @@ type Roles = Array<Role>;
  * useCooldown can be used to start a cooldown defined
  * for a Channel by setting an end time for
  **/
-export const useCooldown = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
+export const useCooldown = () => {
   const [endsAt, setEndsAt] = useState(new Date());
 
-  const { client } = useChatContext<StreamChatGenerics>();
-  const { channel } = useChannelContext<StreamChatGenerics>();
-  const { cooldown } = (channel?.data || {}) as ChannelResponse<StreamChatGenerics>;
+  const { client } = useChatContext();
+  const { channel } = useChannelContext();
+  const { cooldown } = (channel?.data || {}) as ChannelResponse;
   const interval: number = cooldown ?? 0;
 
   /**

package/src/components/MessageList/InlineLoadingMoreIndicator.tsx

@@ -4,8 +4,6 @@ import { ActivityIndicator, StyleSheet, View } from 'react-native';
 import { usePaginatedMessageListContext } from '../../contexts/paginatedMessageListContext/PaginatedMessageListContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   activityIndicatorContainer: {
     padding: 10,
@@ -57,10 +55,8 @@ const MemoizedInlineLoadingMoreIndicator = React.memo(
   areEqual,
 ) as typeof InlineLoadingMoreIndicatorWithContext;
 
-export const InlineLoadingMoreIndicator = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const { loadingMore } = usePaginatedMessageListContext<StreamChatGenerics>();
+export const InlineLoadingMoreIndicator = () => {
+  const { loadingMore } = usePaginatedMessageListContext();
 
   return <MemoizedInlineLoadingMoreIndicator loadingMore={loadingMore} />;
 };

package/src/components/MessageList/InlineLoadingMoreRecentIndicator.tsx

@@ -4,8 +4,6 @@ import { ActivityIndicator, StyleSheet, View } from 'react-native';
 import { usePaginatedMessageListContext } from '../../contexts/paginatedMessageListContext/PaginatedMessageListContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   activityIndicatorContainer: {
     padding: 10,
@@ -57,10 +55,8 @@ const MemoizedInlineLoadingMoreRecentIndicator = React.memo(
   areEqual,
 ) as typeof InlineLoadingMoreRecentIndicatorWithContext;
 
-export const InlineLoadingMoreRecentIndicator = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const { loadingMoreRecent } = usePaginatedMessageListContext<StreamChatGenerics>();
+export const InlineLoadingMoreRecentIndicator = () => {
+  const { loadingMoreRecent } = usePaginatedMessageListContext();
 
   return <MemoizedInlineLoadingMoreRecentIndicator loadingMoreRecent={loadingMoreRecent} />;
 };

package/src/components/MessageList/InlineLoadingMoreRecentThreadIndicator.tsx

@@ -4,8 +4,6 @@ import { ActivityIndicator, StyleSheet, View } from 'react-native';
 import { useThreadContext } from '../../contexts';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   activityIndicatorContainer: {
     padding: 10,
@@ -57,10 +55,8 @@ const MemoizedInlineLoadingMoreRecentIndicator = React.memo(
   areEqual,
 ) as typeof InlineLoadingMoreRecentIndicatorWithContext;
 
-export const InlineLoadingMoreRecentThreadIndicator = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const { threadLoadingMoreRecent } = useThreadContext<StreamChatGenerics>();
+export const InlineLoadingMoreRecentThreadIndicator = () => {
+  const { threadLoadingMoreRecent } = useThreadContext();
 
   return <MemoizedInlineLoadingMoreRecentIndicator loadingMoreRecent={threadLoadingMoreRecent} />;
 };

package/src/components/MessageList/MessageList.tsx

@@ -53,7 +53,7 @@ import {
 import { mergeThemes, ThemeProvider, useTheme } from '../../contexts/themeContext/ThemeContext';
 import { ThreadContextValue, useThreadContext } from '../../contexts/threadContext/ThreadContext';
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 
 // This is just to make sure that the scrolling happens in a different task queue.
 // TODO: Think if we really need this and strive to remove it if we can.
@@ -90,11 +90,7 @@ const styles = StyleSheet.create({
   },
 });
 
-const keyExtractor = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  item: MessageType<StreamChatGenerics>,
-) => {
+const keyExtractor = (item: MessageType) => {
   if (item.id) {
     return item.id;
   }
@@ -108,11 +104,12 @@ const flatListViewabilityConfig: ViewabilityConfig = {
   viewAreaCoveragePercentThreshold: 1,
 };
 
-type MessageListPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<AttachmentPickerContextValue, 'closePicker' | 'selectedPicker' | 'setSelectedPicker'> &
+type MessageListPropsWithContext = Pick<
+  AttachmentPickerContextValue,
+  'closePicker' | 'selectedPicker' | 'setSelectedPicker'
+> &
   Pick<
-    ChannelContextValue<StreamChatGenerics>,
+    ChannelContextValue,
     | 'channel'
     | 'channelUnreadState'
     | 'disabled'
@@ -131,12 +128,12 @@ type MessageListPropsWithContext<
     | 'targetedMessage'
     | 'threadList'
   > &
-  Pick<ChatContextValue<StreamChatGenerics>, 'client'> &
-  Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setMessages'> &
-  Pick<PaginatedMessageListContextValue<StreamChatGenerics>, 'loadMore' | 'loadMoreRecent'> &
+  Pick<ChatContextValue, 'client'> &
+  Pick<ImageGalleryContextValue, 'setMessages'> &
+  Pick<PaginatedMessageListContextValue, 'loadMore' | 'loadMoreRecent'> &
   Pick<OverlayContextValue, 'overlay'> &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'DateHeader'
     | 'disableTypingIndicator'
     | 'FlatList'
@@ -153,7 +150,7 @@ type MessageListPropsWithContext<
     | 'UnreadMessagesNotification'
   > &
   Pick<
-    ThreadContextValue<StreamChatGenerics>,
+    ThreadContextValue,
     'loadMoreRecentThread' | 'loadMoreThread' | 'thread' | 'threadInstance'
   > & {
     /**
@@ -170,7 +167,7 @@ type MessageListPropsWithContext<
      *  additionalFlatListProps={{ bounces: true, keyboardDismissMode: true }} />
      * ```
      */
-    additionalFlatListProps?: Partial<FlatListProps<MessageType<StreamChatGenerics>>>;
+    additionalFlatListProps?: Partial<FlatListProps<MessageType>>;
     /**
      * UI component for footer of message list. By default message list will use `InlineLoadingMoreIndicator`
      * as FooterComponent. If you want to implement your own inline loading indicator, you can access `loadingMore`
@@ -200,7 +197,7 @@ type MessageListPropsWithContext<
      *
      * @param message A message object to open the thread upon.
      */
-    onThreadSelect?: (message: ThreadContextValue<StreamChatGenerics>['thread']) => void;
+    onThreadSelect?: (message: ThreadContextValue['thread']) => void;
     /**
      * Use `setFlatListRef` to get access to ref to inner FlatList.
      *
@@ -212,7 +209,7 @@ type MessageListPropsWithContext<
      *  }}
      * ```
      */
-    setFlatListRef?: (ref: FlatListType<MessageType<StreamChatGenerics>> | null) => void;
+    setFlatListRef?: (ref: FlatListType<MessageType> | null) => void;
   };
 
 /**
@@ -224,11 +221,7 @@ type MessageListPropsWithContext<
  * [ThreadContext](https://getstream.io/chat/docs/sdk/reactnative/contexts/thread-context/)
  * [TranslationContext](https://getstream.io/chat/docs/sdk/reactnative/contexts/translation-context/)
  */
-const MessageListWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageListPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageListWithContext = (props: MessageListPropsWithContext) => {
   const LoadingMoreRecentIndicator = props.threadList
     ? InlineLoadingMoreRecentThreadIndicator
     : InlineLoadingMoreRecentIndicator;
@@ -306,7 +299,7 @@ const MessageListWithContext = <
    * NOTE: rawMessageList changes only when messages array state changes
    * processedMessageList changes on any state change
    */
-  const { processedMessageList, rawMessageList } = useMessageList<StreamChatGenerics>({
+  const { processedMessageList, rawMessageList } = useMessageList({
     noGroupByUser,
     threadList,
   });
@@ -317,11 +310,9 @@ const MessageListWithContext = <
    * We need topMessage and channelLastRead values to set the initial scroll position.
    * So these values only get used if `initialScrollToFirstUnreadMessage` prop is true.
    */
-  const topMessageBeforeUpdate = useRef<FormatMessageResponse<StreamChatGenerics>>(undefined);
-  const latestNonCurrentMessageBeforeUpdateRef =
-    useRef<FormatMessageResponse<StreamChatGenerics>>(undefined);
-  const topMessageAfterUpdate: FormatMessageResponse<StreamChatGenerics> | undefined =
-    rawMessageList[0];
+  const topMessageBeforeUpdate = useRef<FormatMessageResponse>(undefined);
+  const latestNonCurrentMessageBeforeUpdateRef = useRef<FormatMessageResponse>(undefined);
+  const topMessageAfterUpdate: FormatMessageResponse | undefined = rawMessageList[0];
 
   const shouldScrollToRecentOnNewOwnMessageRef = useShouldScrollToRecentOnNewOwnMessage(
     rawMessageList,
@@ -340,7 +331,7 @@ const MessageListWithContext = <
   const onStartReachedInPromise = useRef<Promise<void> | null>(null);
   const onEndReachedInPromise = useRef<Promise<void> | null>(null);
 
-  const flatListRef = useRef<FlatListType<MessageType<StreamChatGenerics>> | null>(null);
+  const flatListRef = useRef<FlatListType<MessageType> | null>(null);
 
   const channelResyncScrollSet = useRef<boolean>(true);
 
@@ -669,13 +660,7 @@ const MessageListWithContext = <
   // TODO: do not apply on RN 0.73 and above
   const shouldApplyAndroidWorkaround = inverted && Platform.OS === 'android';
 
-  const renderItem = ({
-    index,
-    item: message,
-  }: {
-    index: number;
-    item: MessageType<StreamChatGenerics>;
-  }) => {
+  const renderItem = ({ index, item: message }: { index: number; item: MessageType }) => {
     if (!channel || channel.disconnected || (!channel.initialized && !channel.offlineMode)) {
       return null;
     }
@@ -905,49 +890,49 @@ const MessageListWithContext = <
 
   const scrollToIndexFailedRetryCountRef = useRef<number>(0);
   const failScrollTimeoutId = useRef<ReturnType<typeof setTimeout>>(undefined);
-  const onScrollToIndexFailedRef = useRef<
-    FlatListProps<MessageType<StreamChatGenerics>>['onScrollToIndexFailed']
-  >((info) => {
-    // We got a failure as we tried to scroll to an item that was outside the render length
-    if (!flatListRef.current) {
-      return;
-    }
-    // we don't know the actual size of all items but we can see the average, so scroll to the closest offset
-    // since we used only an average offset... we won't go to the center of the item yet
-    // with a little delay to wait for scroll to offset to complete, we can then scroll to the index
-    failScrollTimeoutId.current = setTimeout(() => {
-      try {
-        flatListRef.current?.scrollToIndex({
-          animated: true,
-          index: info.index,
-          viewPosition: 0.5, // try to place message in the center of the screen
-        });
-        if (messageIdLastScrolledToRef.current) {
-          // in case the target message was cleared out
-          // the state being set again will trigger the highlight again
-          setTargetedMessage(messageIdLastScrolledToRef.current);
-        }
-        scrollToIndexFailedRetryCountRef.current = 0;
-      } catch (e) {
-        if (
-          !onScrollToIndexFailedRef.current ||
-          scrollToIndexFailedRetryCountRef.current > MAX_RETRIES_AFTER_SCROLL_FAILURE
-        ) {
+  const onScrollToIndexFailedRef = useRef<FlatListProps<MessageType>['onScrollToIndexFailed']>(
+    (info) => {
+      // We got a failure as we tried to scroll to an item that was outside the render length
+      if (!flatListRef.current) {
+        return;
+      }
+      // we don't know the actual size of all items but we can see the average, so scroll to the closest offset
+      // since we used only an average offset... we won't go to the center of the item yet
+      // with a little delay to wait for scroll to offset to complete, we can then scroll to the index
+      failScrollTimeoutId.current = setTimeout(() => {
+        try {
+          flatListRef.current?.scrollToIndex({
+            animated: true,
+            index: info.index,
+            viewPosition: 0.5, // try to place message in the center of the screen
+          });
+          if (messageIdLastScrolledToRef.current) {
+            // in case the target message was cleared out
+            // the state being set again will trigger the highlight again
+            setTargetedMessage(messageIdLastScrolledToRef.current);
+          }
           scrollToIndexFailedRetryCountRef.current = 0;
-          return;
+        } catch (e) {
+          if (
+            !onScrollToIndexFailedRef.current ||
+            scrollToIndexFailedRetryCountRef.current > MAX_RETRIES_AFTER_SCROLL_FAILURE
+          ) {
+            scrollToIndexFailedRetryCountRef.current = 0;
+            return;
+          }
+          // At some cases the index we're trying to scroll to, doesn't exist yet in the messageList
+          // Scrolling to an index not in range of the Flatlist's data will result in a crash that
+          // won't call onScrollToIndexFailed.
+          // By catching this error we retry scrolling by calling onScrollToIndexFailedRef
+          scrollToIndexFailedRetryCountRef.current += 1;
+          onScrollToIndexFailedRef.current(info);
         }
-        // At some cases the index we're trying to scroll to, doesn't exist yet in the messageList
-        // Scrolling to an index not in range of the Flatlist's data will result in a crash that
-        // won't call onScrollToIndexFailed.
-        // By catching this error we retry scrolling by calling onScrollToIndexFailedRef
-        scrollToIndexFailedRetryCountRef.current += 1;
-        onScrollToIndexFailedRef.current(info);
-      }
-    }, WAIT_FOR_SCROLL_TIMEOUT);
+      }, WAIT_FOR_SCROLL_TIMEOUT);
 
-    // Only when index is greater than 0 and in range of items in FlatList
-    // this onScrollToIndexFailed will be called again
-  });
+      // Only when index is greater than 0 and in range of items in FlatList
+      // this onScrollToIndexFailed will be called again
+    },
+  );
 
   const messagesWithImages =
     legacyImageViewerSwipeBehaviour &&
@@ -990,7 +975,7 @@ const MessageListWithContext = <
       isListActive &&
       ((threadList && thread) || (!threadList && !thread))
     ) {
-      setMessages(messagesWithImages as MessageType<StreamChatGenerics>[]);
+      setMessages(messagesWithImages as MessageType[]);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
@@ -1019,7 +1004,7 @@ const MessageListWithContext = <
     onUserScrollEvent(event);
   };
 
-  const refCallback = (ref: FlatListType<MessageType<StreamChatGenerics>>) => {
+  const refCallback = (ref: FlatListType<MessageType>) => {
     flatListRef.current = ref;
 
     if (setFlatListRef) {
@@ -1185,15 +1170,9 @@ const MessageListWithContext = <
   );
 };
 
-export type MessageListProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageListPropsWithContext<StreamChatGenerics>>;
+export type MessageListProps = Partial<MessageListPropsWithContext>;
 
-export const MessageList = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageListProps<StreamChatGenerics>,
-) => {
+export const MessageList = (props: MessageListProps) => {
   const { closePicker, selectedPicker, setSelectedPicker } = useAttachmentPickerContext();
   const {
     channel,
@@ -1216,9 +1195,9 @@ export const MessageList = <
     StickyHeader,
     targetedMessage,
     threadList,
-  } = useChannelContext<StreamChatGenerics>();
-  const { client } = useChatContext<StreamChatGenerics>();
-  const { setMessages } = useImageGalleryContext<StreamChatGenerics>();
+  } = useChannelContext();
+  const { client } = useChatContext();
+  const { setMessages } = useImageGalleryContext();
   const {
     DateHeader,
     disableTypingIndicator,
@@ -1234,11 +1213,10 @@ export const MessageList = <
     TypingIndicator,
     TypingIndicatorContainer,
     UnreadMessagesNotification,
-  } = useMessagesContext<StreamChatGenerics>();
-  const { loadMore, loadMoreRecent } = usePaginatedMessageListContext<StreamChatGenerics>();
+  } = useMessagesContext();
+  const { loadMore, loadMoreRecent } = usePaginatedMessageListContext();
   const { overlay } = useOverlayContext();
-  const { loadMoreRecentThread, loadMoreThread, thread, threadInstance } =
-    useThreadContext<StreamChatGenerics>();
+  const { loadMoreRecentThread, loadMoreThread, thread, threadInstance } = useThreadContext();
 
   return (
     <MessageListWithContext

package/src/components/MessageList/MessageSystem.tsx

@@ -6,14 +6,11 @@ import type { MessageType } from './hooks/useMessageList';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { getDateString } from '../../utils/i18n/getDateString';
 
-export type MessageSystemProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type MessageSystemProps = {
   /** Current [message object](https://getstream.io/chat/docs/#message_format) */
-  message: MessageType<StreamChatGenerics>;
+  message: MessageType;
   /**
    * Additional styles for the system message container.
    */
@@ -28,11 +25,7 @@ export type MessageSystemProps<
  * they can attach a message with that update. That message will be available
  * in message list as (type) system message.
  */
-export const MessageSystem = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageSystemProps<StreamChatGenerics>,
-) => {
+export const MessageSystem = (props: MessageSystemProps) => {
   const { message, style } = props;
 
   const {

package/src/components/MessageList/StickyHeader.tsx

@@ -3,15 +3,12 @@ import React, { useMemo } from 'react';
 import { MessagesContextValue } from '../../contexts/messagesContext/MessagesContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 
-import { DefaultStreamChatGenerics } from '../../types/types';
 import { getDateString } from '../../utils/i18n/getDateString';
 
 /**
  * Props for the StickyHeader component.
  */
-export type StickyHeaderProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessagesContextValue<StreamChatGenerics>, 'DateHeader'> & {
+export type StickyHeaderProps = Pick<MessagesContextValue, 'DateHeader'> & {
   /**
    * Date to be displayed in the sticky header.
    */

package/src/components/MessageList/TypingIndicator.tsx

@@ -5,7 +5,6 @@ import { useTypingString } from './hooks/useTypingString';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { LoadingDots } from '../Indicators/LoadingDots';
 
 const styles = StyleSheet.create({
@@ -23,16 +22,14 @@ const styles = StyleSheet.create({
   },
 });
 
-export const TypingIndicator = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
+export const TypingIndicator = () => {
   const {
     theme: {
       colors: { grey, white_snow },
       typingIndicator: { container, text },
     },
   } = useTheme();
-  const typingString = useTypingString<StreamChatGenerics>();
+  const typingString = useTypingString();
 
   return (
     <View

package/src/components/MessageList/TypingIndicatorContainer.tsx

@@ -8,8 +8,6 @@ import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { ThreadContextValue, useThreadContext } from '../../contexts/threadContext/ThreadContext';
 import { TypingContextValue, useTypingContext } from '../../contexts/typingContext/TypingContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   container: {
     bottom: 0,
@@ -18,16 +16,12 @@ const styles = StyleSheet.create({
   },
 });
 
-type TypingIndicatorContainerPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<TypingContextValue<StreamChatGenerics>, 'typing'> &
-  Pick<ChatContextValue<StreamChatGenerics>, 'client'> &
-  Pick<ThreadContextValue<StreamChatGenerics>, 'thread'>;
+type TypingIndicatorContainerPropsWithContext = Pick<TypingContextValue, 'typing'> &
+  Pick<ChatContextValue, 'client'> &
+  Pick<ThreadContextValue, 'thread'>;
 
-const TypingIndicatorContainerWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: PropsWithChildren<TypingIndicatorContainerPropsWithContext<StreamChatGenerics>>,
+const TypingIndicatorContainerWithContext = (
+  props: PropsWithChildren<TypingIndicatorContainerPropsWithContext>,
 ) => {
   const { children, client, thread, typing } = props;
 
@@ -49,18 +43,14 @@ const TypingIndicatorContainerWithContext = <
   );
 };
 
-export type TypingIndicatorContainerProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = PropsWithChildren<Partial<TypingIndicatorContainerPropsWithContext<StreamChatGenerics>>>;
+export type TypingIndicatorContainerProps = PropsWithChildren<
+  Partial<TypingIndicatorContainerPropsWithContext>
+>;
 
-export const TypingIndicatorContainer = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: TypingIndicatorContainerProps<StreamChatGenerics>,
-) => {
-  const { typing } = useTypingContext<StreamChatGenerics>();
-  const { client } = useChatContext<StreamChatGenerics>();
-  const { thread } = useThreadContext<StreamChatGenerics>();
+export const TypingIndicatorContainer = (props: TypingIndicatorContainerProps) => {
+  const { typing } = useTypingContext();
+  const { client } = useChatContext();
+  const { thread } = useThreadContext();
 
   return <TypingIndicatorContainerWithContext {...{ client, thread, typing }} {...props} />;
 };

package/src/components/MessageList/__tests__/useMessageList.test.tsx

@@ -15,7 +15,7 @@ import {
 import { generateMessage } from '../../../mock-builders/generator/message';
 import { generateUser } from '../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../mock-builders/mock';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import { useMessageList } from '../hooks/useMessageList';
 
 const clientUser = generateUser();

package/src/components/MessageList/hooks/useLastReadData.ts

@@ -4,25 +4,17 @@ import type { ChannelState } from 'stream-chat';
 
 import { PaginatedMessageListContextValue } from '../../../contexts/paginatedMessageListContext/PaginatedMessageListContext';
 import { ThreadContextValue } from '../../../contexts/threadContext/ThreadContext';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import { getReadStates } from '../utils/getReadStates';
 
-type UseLastReadDataParams<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  messages:
-    | PaginatedMessageListContextValue<StreamChatGenerics>['messages']
-    | ThreadContextValue<StreamChatGenerics>['threadMessages'];
+type UseLastReadDataParams = {
+  messages: PaginatedMessageListContextValue['messages'] | ThreadContextValue['threadMessages'];
   userID: string | undefined;
-  read?: ChannelState<StreamChatGenerics>['read'];
+  read?: ChannelState['read'];
   returnAllReadData?: boolean;
 };
 
-export const useLastReadData = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: UseLastReadDataParams<StreamChatGenerics>,
-) => {
+export const useLastReadData = (props: UseLastReadDataParams) => {
   const { messages, read, returnAllReadData = true, userID } = props;
 
   return useMemo(