refactor: introduce WithComponents context provider

examples/ExpoMessaging/app/channel/[cid]/index.tsx

@@ -6,6 +6,7 @@ import {
   useChatContext,
   ThreadContextValue,
   MessageList,
+  WithComponents,
 } from 'stream-chat-expo';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { AuthProgressLoader } from '../../../components/AuthProgressLoader';
@@ -70,22 +71,23 @@ export default function ChannelScreen() {
       <Stack.Screen
         options={{ title: 'Channel Screen', contentStyle: { backgroundColor: 'white' } }}
       />
-      <Channel
-        audioRecordingEnabled={true}
-        channel={channel}
-        onPressMessage={onPressMessage}
-        keyboardVerticalOffset={headerHeight}
-        MessageLocation={MessageLocation}
-        thread={thread}
-      >
-        <MessageList
-          onThreadSelect={(thread: ThreadContextValue['thread']) => {
-            setThread(thread);
-            router.push(`/channel/${channel.cid}/thread/${thread?.cid ?? ''}`);
-          }}
-        />
-        <MessageComposer InputButtons={InputButtons} />
-      </Channel>
+      <WithComponents overrides={{ MessageLocation, InputButtons }}>
+        <Channel
+          audioRecordingEnabled={true}
+          channel={channel}
+          onPressMessage={onPressMessage}
+          keyboardVerticalOffset={headerHeight}
+          thread={thread}
+        >
+          <MessageList
+            onThreadSelect={(thread: ThreadContextValue['thread']) => {
+              setThread(thread);
+              router.push(`/channel/${channel.cid}/thread/${thread?.cid ?? ''}`);
+            }}
+          />
+          <MessageComposer />
+        </Channel>
+      </WithComponents>
     </View>
   );
 }

examples/ExpoMessaging/components/InputButtons.tsx

@@ -1,10 +1,11 @@
 import React, { useState } from 'react';
 import { Pressable, StyleSheet } from 'react-native';
-import { Channel, InputButtons as DefaultInputButtons } from 'stream-chat-expo';
+import type { ComponentOverrides } from 'stream-chat-expo';
+import { InputButtons as DefaultInputButtons } from 'stream-chat-expo';
 import { ShareLocationIcon } from '../icons/ShareLocationIcon';
 import { LiveLocationCreateModal } from './LocationSharing/CreateLocationModal';
 
-const InputButtons: NonNullable<React.ComponentProps<typeof Channel>['InputButtons']> = (props) => {
+const InputButtons: NonNullable<ComponentOverrides['InputButtons']> = (props) => {
   const [modalVisible, setModalVisible] = useState(false);
 
   const onRequestClose = () => {

examples/SampleApp/src/screens/ChannelListScreen.tsx

@@ -9,7 +9,7 @@ import {
   View,
 } from 'react-native';
 import { useNavigation, useScrollToTop } from '@react-navigation/native';
-import { ChannelList, useTheme, useStableCallback, ChannelActionItem } from 'stream-chat-react-native';
+import { ChannelList, useTheme, useStableCallback, ChannelActionItem, WithComponents } from 'stream-chat-react-native';
 import { Channel } from 'stream-chat';
 import { ChannelPreview } from '../components/ChannelPreview';
 import { ChatScreenHeader } from '../components/ChatScreenHeader';
@@ -245,18 +245,23 @@ export const ChannelListScreen: React.FC = () => {
         )}
         <View style={{ flex: searchQuery ? 0 : 1 }}>
           <View style={[styles.channelListContainer, { opacity: searchQuery ? 0 : 1 }]}>
-            <ChannelList
-              additionalFlatListProps={additionalFlatListProps}
-              filters={filters}
-              HeaderNetworkDownIndicator={HeaderNetworkDownIndicator}
-              maxUnreadCount={99}
-              onSelect={onSelect}
-              options={options}
-              Preview={ChannelPreview}
-              setFlatListRef={setScrollRef}
-              getChannelActionItems={getChannelActionItems}
-              sort={sort}
-            />
+            <WithComponents
+              overrides={{
+                HeaderNetworkDownIndicator,
+                Preview: ChannelPreview,
+              }}
+            >
+              <ChannelList
+                additionalFlatListProps={additionalFlatListProps}
+                filters={filters}
+                maxUnreadCount={99}
+                onSelect={onSelect}
+                options={options}
+                setFlatListRef={setScrollRef}
+                getChannelActionItems={getChannelActionItems}
+                sort={sort}
+              />
+            </WithComponents>
           </View>
         </View>
       </View>

examples/SampleApp/src/screens/ChannelScreen.tsx

@@ -17,6 +17,7 @@ import {
   MessageActionsParams,
   ChannelAvatar,
   PortalWhileClosingView,
+  WithComponents,
 } from 'stream-chat-react-native';
 import { Pressable, StyleSheet, View } from 'react-native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
@@ -265,19 +266,23 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({ navigation, route
 
   return (
     <View style={[styles.flex, { backgroundColor: 'transparent' }]}>
+      <WithComponents
+        overrides={{
+          // AttachmentPickerSelectionBar: CustomAttachmentPickerSelectionBar,
+          AttachmentPickerContent: CustomAttachmentPickerContent,
+          MessageLocation,
+          NetworkDownIndicator: () => null,
+        }}
+      >
       <Channel
         audioRecordingEnabled={true}
-        // AttachmentPickerSelectionBar={CustomAttachmentPickerSelectionBar}
-        AttachmentPickerContent={CustomAttachmentPickerContent}
         channel={channel}
         messageInputFloating={messageInputFloating}
         onPressMessage={onPressMessage}
         initialScrollToFirstUnreadMessage
         keyboardVerticalOffset={0}
         messageActions={messageActions}
-        MessageLocation={MessageLocation}
         messageId={messageId}
-        NetworkDownIndicator={() => null}
         onAlsoSentToChannelHeaderPress={onAlsoSentToChannelHeaderPress}
         thread={selectedThread}
         maximumMessageLimit={messageListPruning}
@@ -306,6 +311,7 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({ navigation, route
           />
         )}
       </Channel>
+      </WithComponents>
     </View>
   );
 };

examples/SampleApp/src/screens/NewDirectMessagingScreen.tsx

@@ -8,6 +8,7 @@ import {
   MessageList,
   UserAdd,
   useTheme,
+  WithComponents,
 } from 'stream-chat-react-native';
 
 import { User } from '../icons/User';
@@ -338,32 +339,37 @@ export const NewDirectMessagingScreen: React.FC<NewDirectMessagingScreenProps> =
         },
       ]}
     >
-      <Channel
-        additionalTextInputProps={{
-          onFocus: () => {
-            setFocusOnMessageInput(true);
-            setFocusOnSearchInput(false);
-            if (messageInputRef.current) {
-              messageInputRef.current.focus();
-            }
-          },
+      <WithComponents
+        overrides={{
+          EmptyStateIndicator: EmptyMessagesIndicator,
+          SendButton: NewDirectMessagingSendButton,
         }}
-        audioRecordingEnabled={true}
-        channel={currentChannel.current}
-        EmptyStateIndicator={EmptyMessagesIndicator}
-        enforceUniqueReaction
-        keyboardVerticalOffset={0}
-        onChangeText={setMessageInputText}
-        overrideOwnCapabilities={{ sendMessage: true }}
-        SendButton={NewDirectMessagingSendButton}
-        setInputRef={(ref) => (messageInputRef.current = ref)}
       >
-        {renderUserSearch({ inSafeArea: true })}
-        {results && results.length >= 0 && !focusOnSearchInput && focusOnMessageInput && (
-          <MessageList />
-        )}
-        <MessageComposer />
-      </Channel>
+        <Channel
+          additionalTextInputProps={{
+            onFocus: () => {
+              setFocusOnMessageInput(true);
+              setFocusOnSearchInput(false);
+              if (messageInputRef.current) {
+                messageInputRef.current.focus();
+              }
+            },
+          }}
+          audioRecordingEnabled={true}
+          channel={currentChannel.current}
+          enforceUniqueReaction
+          keyboardVerticalOffset={0}
+          onChangeText={setMessageInputText}
+          overrideOwnCapabilities={{ sendMessage: true }}
+          setInputRef={(ref) => (messageInputRef.current = ref)}
+        >
+          {renderUserSearch({ inSafeArea: true })}
+          {results && results.length >= 0 && !focusOnSearchInput && focusOnMessageInput && (
+            <MessageList />
+          )}
+          <MessageComposer />
+        </Channel>
+      </WithComponents>
     </SafeAreaView>
   );
 };

examples/SampleApp/src/screens/SharedGroupsScreen.tsx

@@ -3,8 +3,6 @@ import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { NavigationProp, RouteProp, useNavigation } from '@react-navigation/native';
 import {
   ChannelList,
-  ChannelListView,
-  ChannelListViewProps,
   ChannelPreviewViewProps,
   getChannelPreviewDisplayAvatar,
   GroupAvatar,
@@ -13,6 +11,7 @@ import {
   useTheme,
   Avatar,
   getInitialsFromName,
+  WithComponents,
 } from 'stream-chat-react-native';
 
 import { ScreenHeader } from '../components/ScreenHeader';
@@ -145,18 +144,19 @@ const EmptyListComponent = () => {
   );
 };
 
-type ListComponentProps = ChannelListViewProps;
-
-// If the length of channels is 1, which means we only got 1:1-distinct channel,
-// And we don't want to show 1:1-distinct channel in this list.
-const ListComponent: React.FC<ListComponentProps> = (props) => {
+// Custom empty state that also shows when there's only the 1:1 direct channel
+const SharedGroupsEmptyState = () => {
   const { channels, loadingChannels, refreshing } = useChannelsContext();
 
-  if (channels && channels.length <= 1 && !loadingChannels && !refreshing) {
+  if (loadingChannels || refreshing) {
+    return null;
+  }
+
+  if (!channels || channels.length <= 1) {
     return <EmptyListComponent />;
   }
 
-  return <ChannelListView {...props} />;
+  return null;
 };
 
 type SharedGroupsScreenRouteProp = RouteProp<StackNavigatorParamList, 'SharedGroupsScreen'>;
@@ -179,19 +179,24 @@ export const SharedGroupsScreen: React.FC<SharedGroupsScreenProps> = ({
   return (
     <View style={styles.container}>
       <ScreenHeader titleText='Shared Groups' />
-      <ChannelList
-        filters={{
-          $and: [{ members: { $in: [chatClient?.user?.id] } }, { members: { $in: [user.id] } }],
+      <WithComponents
+        overrides={{
+          EmptyStateIndicator: SharedGroupsEmptyState,
+          Preview: CustomPreview,
         }}
-        List={ListComponent}
-        options={{
-          watch: false,
-        }}
-        Preview={CustomPreview}
-        sort={{
-          last_updated: -1,
-        }}
-      />
+      >
+        <ChannelList
+          filters={{
+            $and: [{ members: { $in: [chatClient?.user?.id] } }, { members: { $in: [user.id] } }],
+          }}
+          options={{
+            watch: false,
+          }}
+          sort={{
+            last_updated: -1,
+          }}
+        />
+      </WithComponents>
     </View>
   );
 };

examples/SampleApp/src/screens/ThreadScreen.tsx

@@ -12,6 +12,7 @@ import {
   useTranslationContext,
   useTypingString,
   PortalWhileClosingView,
+  WithComponents,
 } from 'stream-chat-react-native';
 import { useStateStore } from 'stream-chat-react-native';
 
@@ -148,15 +149,19 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
 
   return (
     <View style={[styles.container, { backgroundColor: white }]}>
+      <WithComponents
+        overrides={{
+          // AttachmentPickerSelectionBar: CustomAttachmentPickerSelectionBar,
+          MessageLocation,
+        }}
+      >
       <Channel
         audioRecordingEnabled={true}
-        // AttachmentPickerSelectionBar={CustomAttachmentPickerSelectionBar}
         channel={channel}
         enforceUniqueReaction
         keyboardVerticalOffset={0}
         messageActions={messageActions}
         messageInputFloating={messageInputFloating}
-        MessageLocation={MessageLocation}
         onPressMessage={onPressMessage}
         thread={thread}
         threadList
@@ -174,6 +179,7 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
           shouldUseFlashList={messageListImplementation === 'flashlist'}
         />
       </Channel>
+      </WithComponents>
     </View>
   );
 };