stream-chat-react-native-core 6.7.4 → 7.0.0-beta.1

package/src/components/ChannelPreview/ChannelAvatar.tsx

@@ -6,13 +6,11 @@ import { useChannelPreviewDisplayPresence } from './hooks/useChannelPreviewDispl
 
 import { ChatContextValue, useChatContext } from '../../contexts/chatContext/ChatContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { Avatar } from '../Avatar/Avatar';
 import { GroupAvatar } from '../Avatar/GroupAvatar';
 
-export type ChannelAvatarProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> & {
+export type ChannelAvatarProps = Pick<ChannelPreviewProps, 'channel'> & {
   /**
    * The size of the avatar.
    */
@@ -22,10 +20,8 @@ export type ChannelAvatarProps<
 /**
  * This UI component displays an avatar for a particular channel.
  */
-export const ChannelAvatarWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelAvatarProps<StreamChatGenerics> & Pick<ChatContextValue, 'ImageComponent'>,
+export const ChannelAvatarWithContext = (
+  props: ChannelAvatarProps & Pick<ChatContextValue, 'ImageComponent'>,
 ) => {
   const { channel, ImageComponent, size: propSize } = props;
   const {
@@ -63,12 +59,8 @@ export const ChannelAvatarWithContext = <
   );
 };
 
-export const ChannelAvatar = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelAvatarProps<StreamChatGenerics>,
-) => {
-  const { ImageComponent } = useChatContext<StreamChatGenerics>();
+export const ChannelAvatar = (props: ChannelAvatarProps) => {
+  const { ImageComponent } = useChatContext();
 
   return <ChannelAvatarWithContext {...props} ImageComponent={ImageComponent} />;
 };

package/src/components/ChannelPreview/ChannelPreview.tsx

@@ -10,27 +10,19 @@ import {
 } from '../../contexts/channelsContext/ChannelsContext';
 import { ChatContextValue, useChatContext } from '../../contexts/chatContext/ChatContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
-export type ChannelPreviewProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Pick<ChatContextValue<StreamChatGenerics>, 'client'>> &
-  Partial<Pick<ChannelsContextValue<StreamChatGenerics>, 'Preview' | 'forceUpdate'>> & {
+export type ChannelPreviewProps = Partial<Pick<ChatContextValue, 'client'>> &
+  Partial<Pick<ChannelsContextValue, 'Preview' | 'forceUpdate'>> & {
     /**
      * Instance of Channel from stream-chat package.
      */
-    channel: Channel<StreamChatGenerics>;
+    channel: Channel;
   };
 
-export const ChannelPreview = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewProps<StreamChatGenerics>,
-) => {
+export const ChannelPreview = (props: ChannelPreviewProps) => {
   const { channel, client: propClient, forceUpdate: propForceUpdate, Preview: propPreview } = props;
 
-  const { client: contextClient } = useChatContext<StreamChatGenerics>();
-  const { Preview: contextPreview } = useChannelsContext<StreamChatGenerics>();
+  const { client: contextClient } = useChatContext();
+  const { Preview: contextPreview } = useChannelsContext();
 
   const client = propClient || contextClient;
   const Preview = propPreview || contextPreview;

package/src/components/ChannelPreview/ChannelPreviewMessage.tsx

@@ -5,8 +5,6 @@ import type { LatestMessagePreview } from './hooks/useLatestMessagePreview';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   bold: { fontWeight: '600' },
   message: {
@@ -15,20 +13,14 @@ const styles = StyleSheet.create({
   },
 });
 
-export type ChannelPreviewMessageProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type ChannelPreviewMessageProps = {
   /**
    * Latest message on a channel, formatted for preview.
    */
-  latestMessagePreview: LatestMessagePreview<StreamChatGenerics>;
+  latestMessagePreview: LatestMessagePreview;
 };
 
-export const ChannelPreviewMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewMessageProps<StreamChatGenerics>,
-) => {
+export const ChannelPreviewMessage = (props: ChannelPreviewMessageProps) => {
   const { latestMessagePreview } = props;
 
   const {

package/src/components/ChannelPreview/ChannelPreviewMessenger.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
-import { StyleSheet, View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import { ChannelAvatar } from './ChannelAvatar';
 import type { ChannelPreviewProps } from './ChannelPreview';
@@ -19,7 +18,6 @@ import {
 } from '../../contexts/channelsContext/ChannelsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useViewport } from '../../hooks/useViewport';
-import type { DefaultStreamChatGenerics } from '../../types/types';
 
 const styles = StyleSheet.create({
   container: {
@@ -44,11 +42,9 @@ const styles = StyleSheet.create({
   title: { fontSize: 14, fontWeight: '700' },
 });
 
-export type ChannelPreviewMessengerPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> &
+export type ChannelPreviewMessengerPropsWithContext = Pick<ChannelPreviewProps, 'channel'> &
   Pick<
-    ChannelsContextValue<StreamChatGenerics>,
+    ChannelsContextValue,
     | 'maxUnreadCount'
     | 'onSelect'
     | 'PreviewAvatar'
@@ -83,7 +79,7 @@ export type ChannelPreviewMessengerPropsWithContext<
      *
      * @overrideType object
      */
-    latestMessagePreview: LatestMessagePreview<StreamChatGenerics>;
+    latestMessagePreview: LatestMessagePreview;
     /**
      * Formatter function for date of latest message.
      * @param date Message date
@@ -100,11 +96,7 @@ export type ChannelPreviewMessengerPropsWithContext<
     unread?: number;
   };
 
-const ChannelPreviewMessengerWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewMessengerPropsWithContext<StreamChatGenerics>,
-) => {
+const ChannelPreviewMessengerWithContext = (props: ChannelPreviewMessengerPropsWithContext) => {
   const {
     channel,
     formatLatestMessageDate,
@@ -144,6 +136,7 @@ const ChannelPreviewMessengerWithContext = <
         }
       }}
       style={[
+        // { opacity: pressed ? 0.5 : 1 },
         styles.container,
         { backgroundColor: white_snow, borderBottomColor: border },
         container,
@@ -175,18 +168,10 @@ const ChannelPreviewMessengerWithContext = <
   );
 };
 
-export type ChannelPreviewMessengerProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<
-  Omit<
-    ChannelPreviewMessengerPropsWithContext<StreamChatGenerics>,
-    'channel' | 'latestMessagePreview'
-  >
+export type ChannelPreviewMessengerProps = Partial<
+  Omit<ChannelPreviewMessengerPropsWithContext, 'channel' | 'latestMessagePreview'>
 > &
-  Pick<
-    ChannelPreviewMessengerPropsWithContext<StreamChatGenerics>,
-    'channel' | 'latestMessagePreview'
-  >;
+  Pick<ChannelPreviewMessengerPropsWithContext, 'channel' | 'latestMessagePreview'>;
 
 const MemoizedChannelPreviewMessengerWithContext = React.memo(
   ChannelPreviewMessengerWithContext,
@@ -196,11 +181,7 @@ const MemoizedChannelPreviewMessengerWithContext = React.memo(
  * This UI component displays an individual preview item for each channel in a list. It also receives all props
  * from the ChannelPreview component.
  */
-export const ChannelPreviewMessenger = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewMessengerProps<StreamChatGenerics>,
-) => {
+export const ChannelPreviewMessenger = (props: ChannelPreviewMessengerProps) => {
   const {
     forceUpdate,
     maxUnreadCount,
@@ -211,7 +192,7 @@ export const ChannelPreviewMessenger = <
     PreviewStatus,
     PreviewTitle,
     PreviewUnreadCount,
-  } = useChannelsContext<StreamChatGenerics>();
+  } = useChannelsContext();
   return (
     <MemoizedChannelPreviewMessengerWithContext
       {...{

package/src/components/ChannelPreview/ChannelPreviewStatus.tsx

@@ -9,7 +9,6 @@ import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 import { Check, CheckAll } from '../../icons';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { getDateString } from '../../utils/i18n/getDateString';
 
 const styles = StyleSheet.create({
@@ -23,19 +22,13 @@ const styles = StyleSheet.create({
   },
 });
 
-export type ChannelPreviewStatusProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  ChannelPreviewMessengerPropsWithContext<StreamChatGenerics>,
+export type ChannelPreviewStatusProps = Pick<
+  ChannelPreviewMessengerPropsWithContext,
   'latestMessagePreview' | 'formatLatestMessageDate'
 > &
-  Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'>;
+  Pick<ChannelPreviewProps, 'channel'>;
 
-export const ChannelPreviewStatus = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewStatusProps<StreamChatGenerics>,
-) => {
+export const ChannelPreviewStatus = (props: ChannelPreviewStatusProps) => {
   const { formatLatestMessageDate, latestMessagePreview } = props;
   const { t, tDateTimeParser } = useTranslationContext();
   const {

package/src/components/ChannelPreview/ChannelPreviewTitle.tsx

@@ -4,26 +4,19 @@ import { StyleSheet, Text } from 'react-native';
 import type { ChannelPreviewProps } from './ChannelPreview';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
-import type { DefaultStreamChatGenerics } from '../../types/types';
 
 const styles = StyleSheet.create({
   title: { fontSize: 14, fontWeight: '700' },
 });
 
-export type ChannelPreviewTitleProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> & {
+export type ChannelPreviewTitleProps = Pick<ChannelPreviewProps, 'channel'> & {
   /**
    * Formatted name for the previewed channel.
    */
   displayName: string;
 };
 
-export const ChannelPreviewTitle = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewTitleProps<StreamChatGenerics>,
-) => {
+export const ChannelPreviewTitle = (props: ChannelPreviewTitleProps) => {
   const { displayName } = props;
   const {
     theme: {

package/src/components/ChannelPreview/ChannelPreviewUnreadCount.tsx

@@ -6,23 +6,15 @@ import { ChannelPreviewProps } from './ChannelPreview';
 import type { ChannelsContextValue } from '../../contexts/channelsContext/ChannelsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
-export type ChannelPreviewUnreadCountProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelsContextValue<StreamChatGenerics>, 'maxUnreadCount'> &
-  Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> & {
+export type ChannelPreviewUnreadCountProps = Pick<ChannelsContextValue, 'maxUnreadCount'> &
+  Pick<ChannelPreviewProps, 'channel'> & {
     /**
      * Number of unread messages on the channel
      */
     unread?: number;
   };
 
-export const ChannelPreviewUnreadCount = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ChannelPreviewUnreadCountProps<StreamChatGenerics>,
-) => {
+export const ChannelPreviewUnreadCount = (props: ChannelPreviewUnreadCountProps) => {
   const { maxUnreadCount, unread } = props;
   const {
     theme: {

package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayName.test.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 
 import { render, screen, waitFor } from '@testing-library/react-native';
 
-import type { Channel, ChannelMemberResponse, DefaultGenerics, StreamChat } from 'stream-chat';
+import type { Channel, ChannelMemberResponse, StreamChat } from 'stream-chat';
 
 import {
   GROUP_CHANNEL_MEMBERS_MOCK,
@@ -12,7 +12,7 @@ import {
 } from '../../../../mock-builders/api/queryMembers';
 import { generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
+
 import {
   getChannelPreviewDisplayName,
   useChannelPreviewDisplayName,
@@ -20,7 +20,7 @@ import {
 
 describe('useChannelPreviewDisplayName', () => {
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat | StreamChat;
   const CHARACTER_LENGTH = 15;
 
   beforeEach(async () => {
@@ -34,7 +34,7 @@ describe('useChannelPreviewDisplayName', () => {
       const channelDisplayName = useChannelPreviewDisplayName(
         {
           data: { name: channelName },
-        } as unknown as Channel<DefaultGenerics>,
+        } as unknown as Channel,
         CHARACTER_LENGTH,
       );
       return <Text>{channelDisplayName}</Text>;
@@ -71,10 +71,7 @@ describe('useChannelPreviewDisplayName', () => {
       const displayName = getChannelPreviewDisplayName({
         characterLimit: characterLength,
         currentUserId,
-        members: members as unknown as Record<
-          string,
-          ChannelMemberResponse<DefaultStreamChatGenerics>
-        >,
+        members: members as unknown as Record<string, ChannelMemberResponse>,
       });
 
       expect(displayName).toEqual(expected);

package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayPresence.test.tsx

@@ -4,16 +4,15 @@ import type { Channel, StreamChat, UserResponse } from 'stream-chat';
 import type { ChatContextValue } from '../../../../contexts/chatContext/ChatContext';
 import * as ChatContext from '../../../../contexts/chatContext/ChatContext';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
-import { DefaultStreamChatGenerics } from '../../../../types/types';
 import { useChannelPreviewDisplayPresence } from '../useChannelPreviewDisplayPresence';
 
 describe('useChannelPreviewDisplayPresence', () => {
   // Mock user data
   const currentUserId = 'current-user';
   const otherUserId = 'other-user';
-  let chatClient: StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat;
 
-  let mockChannel: Channel<DefaultStreamChatGenerics>;
+  let mockChannel: Channel;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -27,14 +26,14 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId, online: true } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId, online: true } as UserResponse,
           },
           [otherUserId]: {
-            user: { id: otherUserId, online: false } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: otherUserId, online: false } as UserResponse,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     // Mock the useChatContext hook
     jest
@@ -53,17 +52,17 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId } as UserResponse,
           },
           [otherUserId]: {
-            user: { id: otherUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: otherUserId } as UserResponse,
           },
           [thirdUserId]: {
-            user: { id: thirdUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: thirdUserId } as UserResponse,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     const { result } = renderHook(() => useChannelPreviewDisplayPresence(channelWithThreeMembers));
     expect(result.current).toBe(false);
@@ -79,7 +78,7 @@ describe('useChannelPreviewDisplayPresence', () => {
     const onlineUser = {
       ...mockChannel.state.members[otherUserId].user,
       online: true,
-    } as UserResponse<DefaultStreamChatGenerics>;
+    } as UserResponse;
 
     mockChannel.state.members[otherUserId].user = onlineUser;
 
@@ -93,14 +92,14 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId } as UserResponse,
           },
           'null-user': {
             user: null,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     const { result } = renderHook(() => useChannelPreviewDisplayPresence(channelWithNullUser));
     expect(result.current).toBe(false);

package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx

@@ -1,16 +1,15 @@
 import { act, renderHook, waitFor } from '@testing-library/react-native';
-import { Channel, DefaultGenerics, StreamChat } from 'stream-chat';
+import { Channel, StreamChat } from 'stream-chat';
 
 import * as ChatContext from '../../../../contexts/chatContext/ChatContext';
 import dispatchNotificationChannelMutesUpdated from '../../../../mock-builders/event/notificationChannelMutesUpdated';
 import { generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
-import { DefaultStreamChatGenerics } from '../../../../types/types';
 import { useIsChannelMuted } from '../useIsChannelMuted';
 
 describe('useChannelPreviewMuted', () => {
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat;
 
   beforeEach(async () => {
     chatClient = await getTestClientWithUser(clientUser);
@@ -35,7 +34,7 @@ describe('useChannelPreviewMuted', () => {
       expiresAt: Date.now() + 5000,
       muted: false,
     }),
-  } as unknown as Channel<DefaultStreamChatGenerics>;
+  } as unknown as Channel;
 
   it('should return the correct mute status', () => {
     const { result } = renderHook(() => useIsChannelMuted(mockChannel));

package/src/components/ChannelPreview/hooks/__tests__/useLatestMessagePreview.test.tsx

@@ -2,7 +2,7 @@ import React, { FC } from 'react';
 
 import { renderHook, waitFor } from '@testing-library/react-native';
 
-import type { DefaultGenerics, MessageResponse, StreamChat } from 'stream-chat';
+import type { MessageResponse, StreamChat } from 'stream-chat';
 
 import { ChatContext, ChatContextValue } from '../../../../contexts/chatContext/ChatContext';
 import {
@@ -18,14 +18,13 @@ import {
 
 import { generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
 
 import { useLatestMessagePreview } from '../useLatestMessagePreview';
 
 describe('useLatestMessagePreview', () => {
   const FORCE_UPDATE = 15;
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat | StreamChat;
 
   beforeEach(async () => {
     chatClient = await getTestClientWithUser(clientUser);

package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts

@@ -8,23 +8,19 @@ import { useIsChannelMuted } from './useIsChannelMuted';
 import { useLatestMessagePreview } from './useLatestMessagePreview';
 
 import { useChannelsContext } from '../../../contexts';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 
-export const useChannelPreviewData = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-  client: StreamChat<StreamChatGenerics>,
+export const useChannelPreviewData = (
+  channel: Channel,
+  client: StreamChat,
   forceUpdateOverride?: number,
 ) => {
   const [forceUpdate, setForceUpdate] = useState(0);
   const [lastMessage, setLastMessage] = useState<
-    | ReturnType<ChannelState<StreamChatGenerics>['formatMessage']>
-    | MessageResponse<StreamChatGenerics>
+    ReturnType<ChannelState['formatMessage']> | MessageResponse
   >(channel.state.messages[channel.state.messages.length - 1]);
   const [unread, setUnread] = useState(channel.countUnread());
   const { muted } = useIsChannelMuted(channel);
-  const { forceUpdate: contextForceUpdate } = useChannelsContext<StreamChatGenerics>();
+  const { forceUpdate: contextForceUpdate } = useChannelsContext();
   const channelListForceUpdate = forceUpdateOverride ?? contextForceUpdate;
 
   const channelLastMessage = channel.lastMessage();
@@ -113,7 +109,7 @@ export const useChannelPreviewData = <
       refreshUnreadCount();
     };
 
-    const handleNewMessageEvent = (event: Event<StreamChatGenerics>) => {
+    const handleNewMessageEvent = (event: Event) => {
       const message = event.message;
       if (message && (!message.parent_id || message.show_in_channel)) {
         setLastMessage(message);
@@ -121,7 +117,7 @@ export const useChannelPreviewData = <
       }
     };
 
-    const handleUpdatedOrDeletedMessage = (event: Event<StreamChatGenerics>) => {
+    const handleUpdatedOrDeletedMessage = (event: Event) => {
       setLastMessage((prevLastMessage) => {
         if (prevLastMessage?.id === event.message?.id) {
           return event.message;

package/src/components/ChannelPreview/hooks/useChannelPreviewDisplayAvatar.ts

@@ -4,14 +4,7 @@ import type { Channel, StreamChat } from 'stream-chat';
 
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
-export const getChannelPreviewDisplayAvatar = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-  client: StreamChat<StreamChatGenerics>,
-) => {
+export const getChannelPreviewDisplayAvatar = (channel: Channel, client: StreamChat) => {
   const currentUserId = client?.user?.id;
   const channelId = channel?.id;
   const channelData = channel?.data;
@@ -54,12 +47,8 @@ export const getChannelPreviewDisplayAvatar = <
  *
  * @returns {object} e.g., { image: 'http://dummyurl.com/test.png', name: 'Uhtred Bebbanburg' }
  */
-export const useChannelPreviewDisplayAvatar = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => {
-  const { client } = useChatContext<StreamChatGenerics>();
+export const useChannelPreviewDisplayAvatar = (channel: Channel) => {
+  const { client } = useChatContext();
 
   const displayAvatar = useMemo(
     () => getChannelPreviewDisplayAvatar(channel, client),

package/src/components/ChannelPreview/hooks/useChannelPreviewDisplayName.ts

@@ -5,16 +5,12 @@ import type { Channel, ChannelMemberResponse } from 'stream-chat';
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
 import { useViewport } from '../../../hooks/useViewport';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
 const ELLIPSIS = '...';
 
 const getMemberName = (member: ChannelMemberResponse) =>
   member.user?.name || member.user?.id || 'Unknown User';
 
-export const getChannelPreviewDisplayName = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getChannelPreviewDisplayName = ({
   channelName,
   characterLimit,
   currentUserId,
@@ -23,7 +19,7 @@ export const getChannelPreviewDisplayName = <
   characterLimit: number;
   channelName?: string;
   currentUserId?: string;
-  members?: Channel<StreamChatGenerics>['state']['members'];
+  members?: Channel['state']['members'];
 }): string => {
   if (channelName) {
     return channelName.length > characterLimit
@@ -76,13 +72,8 @@ export const getChannelPreviewDisplayName = <
   return name;
 };
 
-export const useChannelPreviewDisplayName = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel?: Channel<StreamChatGenerics>,
-  characterLength?: number,
-) => {
-  const { client } = useChatContext<StreamChatGenerics>();
+export const useChannelPreviewDisplayName = (channel?: Channel, characterLength?: number) => {
+  const { client } = useChatContext();
   const { vw } = useViewport();
 
   const DEFAULT_MAX_CHARACTER_LENGTH = Math.floor((vw(100) - 16) / 6);

package/src/components/ChannelPreview/hooks/useChannelPreviewDisplayPresence.ts

@@ -3,7 +3,6 @@ import type { Channel, EventTypes, StreamChat } from 'stream-chat';
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
 
 import { useSyncClientEventsToChannel } from '../../../hooks/useSyncClientEvents';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 
 /**
  * Selector to get the display avatar presence for channel preview
@@ -13,10 +12,7 @@ import type { DefaultStreamChatGenerics } from '../../../types/types';
  *
  * NOTE: If you want to listen to the value changes where you call the hook, the selector should return primitive values instead of object.
  */
-const selector = <StreamChatGenerics extends DefaultStreamChatGenerics>(
-  channel: Channel<StreamChatGenerics>,
-  client: StreamChat<StreamChatGenerics>,
-) => {
+const selector = (channel: Channel, client: StreamChat) => {
   const members = channel.state.members;
   const membersCount = Object.keys(members).length;
   const otherMember = Object.values(members).find((member) => member.user?.id !== client.userID);
@@ -33,9 +29,7 @@ const keys: EventTypes[] = ['user.presence.changed', 'user.updated'];
  *
  * @returns {boolean} e.g., true
  */
-export function useChannelPreviewDisplayPresence<
-  StreamChatGenerics extends DefaultStreamChatGenerics,
->(channel: Channel<StreamChatGenerics>) {
-  const { client } = useChatContext<StreamChatGenerics>();
+export function useChannelPreviewDisplayPresence(channel: Channel) {
+  const { client } = useChatContext();
   return useSyncClientEventsToChannel({ channel, client, selector, stateChangeEventKeys: keys });
 }