chore: move components down to MessagesContext

Author: isekovanic

package/src/components/AttachmentPicker/components/AttachmentPickerSelectionBar.tsx

@@ -1,7 +1,11 @@
 import React from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
-import { useChannelContext, useOwnCapabilitiesContext } from '../../../contexts';
+import {
+  useChannelContext,
+  useMessagesContext,
+  useOwnCapabilitiesContext,
+} from '../../../contexts';
 import { useAttachmentPickerContext } from '../../../contexts/attachmentPickerContext/AttachmentPickerContext';
 import { useMessageInputContext } from '../../../contexts/messageInputContext/MessageInputContext';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
@@ -38,7 +42,8 @@ export const AttachmentPickerSelectionBar = () => {
     sendMessage,
     takeAndUploadImage,
   } = useMessageInputContext();
-  const { hasCreatePoll, threadList } = useChannelContext();
+  const { threadList } = useChannelContext();
+  const { hasCreatePoll } = useMessagesContext();
   const ownCapabilities = useOwnCapabilitiesContext();
 
   const {

package/src/components/Channel/Channel.tsx

@@ -230,10 +230,6 @@ export type ChannelPropsWithContext<
       | 'maxTimeBetweenGroupedMessages'
       | 'NetworkDownIndicator'
       | 'StickyHeader'
-      | 'Poll'
-      | 'PollButtons'
-      | 'PollHeader'
-      | 'hasCreatePoll'
     >
   > &
   Pick<ChatContextValue<StreamChatGenerics>, 'client' | 'enableOfflineSupport'> &
@@ -334,6 +330,10 @@ export type ChannelPropsWithContext<
       | 'TypingIndicatorContainer'
       | 'UrlPreview'
       | 'VideoThumbnail'
+      | 'Poll'
+      | 'PollButtons'
+      | 'PollHeader'
+      | 'hasCreatePoll'
     >
   > &
   Partial<Pick<ThreadContextValue<StreamChatGenerics>, 'allowThreadMessagesInChannel'>> & {
@@ -2240,7 +2240,6 @@ const ChannelWithContext = <
     giphyEnabled:
       giphyEnabled ??
       !!(clientChannelConfig?.commands || [])?.some((command) => command.name === 'giphy'),
-    hasCreatePoll: hasCreatePoll === undefined ? true : hasCreatePoll,
     hideDateSeparators,
     hideStickyDateHeader,
     isAdmin,
@@ -2256,9 +2255,6 @@ const ChannelWithContext = <
     maxTimeBetweenGroupedMessages,
     members,
     NetworkDownIndicator,
-    Poll,
-    PollButtons,
-    PollHeader,
     read,
     reloadChannel,
     scrollToFirstUnreadThreshold,
@@ -2395,6 +2391,7 @@ const ChannelWithContext = <
     handleReaction,
     handleRetry,
     handleThreadReply,
+    hasCreatePoll: hasCreatePoll === undefined ? true : hasCreatePoll,
     ImageLoadingFailedIndicator,
     ImageLoadingIndicator,
     initialScrollToFirstUnreadMessage: !messageId && initialScrollToFirstUnreadMessage, // when messageId is set, we scroll to the messageId instead of first unread
@@ -2428,6 +2425,9 @@ const ChannelWithContext = <
     onPressInMessage,
     onPressMessage,
     OverlayReactionList,
+    Poll,
+    PollButtons,
+    PollHeader,
     ReactionList,
     removeMessage,
     Reply,

package/src/components/Channel/hooks/useCreateChannelContext.ts

@@ -13,7 +13,6 @@ export const useCreateChannelContext = <
   enforceUniqueReaction,
   error,
   giphyEnabled,
-  hasCreatePoll,
   hideDateSeparators,
   hideStickyDateHeader,
   isAdmin,
@@ -29,9 +28,6 @@ export const useCreateChannelContext = <
   maxTimeBetweenGroupedMessages,
   members,
   NetworkDownIndicator,
-  Poll,
-  PollButtons,
-  PollHeader,
   read,
   reloadChannel,
   scrollToFirstUnreadThreshold,
@@ -61,7 +57,6 @@ export const useCreateChannelContext = <
       enforceUniqueReaction,
       error,
       giphyEnabled,
-      hasCreatePoll,
       hideDateSeparators,
       hideStickyDateHeader,
       isAdmin,
@@ -77,9 +72,6 @@ export const useCreateChannelContext = <
       maxTimeBetweenGroupedMessages,
       members,
       NetworkDownIndicator,
-      Poll,
-      PollButtons,
-      PollHeader,
       read,
       reloadChannel,
       scrollToFirstUnreadThreshold,
@@ -106,7 +98,6 @@ export const useCreateChannelContext = <
       targetedMessage,
       threadList,
       watcherCount,
-      hasCreatePoll,
     ],
   );
 

package/src/components/Channel/hooks/useCreateMessagesContext.ts

@@ -43,6 +43,7 @@ export const useCreateMessagesContext = <
   handleReaction,
   handleRetry,
   handleThreadReply,
+  hasCreatePoll,
   ImageLoadingFailedIndicator,
   ImageLoadingIndicator,
   initialScrollToFirstUnreadMessage,
@@ -76,6 +77,9 @@ export const useCreateMessagesContext = <
   onPressInMessage,
   onPressMessage,
   OverlayReactionList,
+  Poll,
+  PollButtons,
+  PollHeader,
   ReactionList,
   removeMessage,
   Reply,
@@ -141,6 +145,7 @@ export const useCreateMessagesContext = <
       handleReaction,
       handleRetry,
       handleThreadReply,
+      hasCreatePoll,
       ImageLoadingFailedIndicator,
       ImageLoadingIndicator,
       initialScrollToFirstUnreadMessage,
@@ -174,6 +179,9 @@ export const useCreateMessagesContext = <
       onPressInMessage,
       onPressMessage,
       OverlayReactionList,
+      Poll,
+      PollButtons,
+      PollHeader,
       ReactionList,
       removeMessage,
       Reply,
@@ -203,6 +211,7 @@ export const useCreateMessagesContext = <
       supportedReactionsLength,
       myMessageTheme,
       targetedMessage,
+      hasCreatePoll,
     ],
   );
 

package/src/components/Message/Message.tsx

@@ -176,6 +176,9 @@ export type MessagePropsWithContext<
     | 'setQuotedMessageState'
     | 'supportedReactions'
     | 'updateMessage'
+    | 'Poll'
+    | 'PollButtons'
+    | 'PollHeader'
   > &
   Pick<MessageOverlayContextValue<StreamChatGenerics>, 'setData'> &
   Pick<OverlayContextValue, 'setOverlay'> &
@@ -285,6 +288,9 @@ const MessageWithContext = <
     onThreadSelect,
     openThread,
     OverlayReactionList,
+    Poll,
+    PollButtons,
+    PollHeader,
     preventPress,
     removeMessage,
     retrySendMessage,
@@ -563,7 +569,6 @@ const MessageWithContext = <
   });
 
   const { userLanguage } = useTranslationContext();
-  const { Poll, PollButtons, PollHeader } = useChannelContext();
 
   // TODO: Can be removed in V6 and from here completely once it becomes baseline.
   const PollWrapper = useCallback(() => {

package/src/components/Message/MessageSimple/MessageContent.tsx

@@ -9,7 +9,7 @@ import {
 
 import { MessageTextContainer } from './MessageTextContainer';
 
-import { useChannelContext, useChatContext } from '../../../contexts';
+import { useChatContext } from '../../../contexts';
 import {
   MessageContextValue,
   useMessageContext,
@@ -145,7 +145,7 @@ const MessageContentWithContext = <
     threadList,
   } = props;
   const { client } = useChatContext();
-  const { Poll: PollOverride, PollButtons, PollHeader } = useChannelContext();
+  const { Poll: PollOverride, PollButtons, PollHeader } = useMessagesContext();
 
   const {
     theme: {

package/src/components/MessageInput/components/NativeAttachmentPicker.tsx

@@ -1,7 +1,11 @@
 import React, { useEffect, useRef } from 'react';
 import { Animated, Easing, LayoutRectangle, Pressable, StyleSheet } from 'react-native';
 
-import { useChannelContext, useOwnCapabilitiesContext } from '../../../contexts';
+import {
+  useChannelContext,
+  useMessagesContext,
+  useOwnCapabilitiesContext,
+} from '../../../contexts';
 import { useMessageInputContext } from '../../../contexts/messageInputContext/MessageInputContext';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 
@@ -46,7 +50,8 @@ export const NativeAttachmentPicker = ({
     sendMessage,
     takeAndUploadImage,
   } = useMessageInputContext();
-  const { hasCreatePoll, threadList } = useChannelContext();
+  const { threadList } = useChannelContext();
+  const { hasCreatePoll } = useMessagesContext();
   const ownCapabilities = useOwnCapabilitiesContext();
 
   const popupHeight =

package/src/contexts/channelContext/ChannelContext.tsx

@@ -55,7 +55,6 @@ export type ChannelContextValue<
    * When set to false, it will disable giphy command on MessageInput component.
    */
   giphyEnabled: boolean;
-  hasCreatePoll: boolean;
   /**
    * Hide inline date separators on channel
    */
@@ -177,9 +176,6 @@ export type ChannelContextValue<
    * to still consider them grouped together
    */
   maxTimeBetweenGroupedMessages?: number;
-  Poll?: React.ComponentType;
-  PollButtons?: React.ComponentType;
-  PollHeader?: React.ComponentType;
   /**
    * Custom UI component for sticky header of channel.
    *

package/src/contexts/messagesContext/MessagesContext.tsx

@@ -356,6 +356,7 @@ export type MessagesContextValue<
   handleRetry?: (message: MessageType<StreamChatGenerics>) => Promise<void>;
   /** Handler to access when a thread reply action is invoked */
   handleThreadReply?: (message: MessageType<StreamChatGenerics>) => Promise<void>;
+  hasCreatePoll?: boolean;
   /** Handler to deal with custom memoization logic of Attachment */
   isAttachmentEqual?: (
     prevAttachment: Attachment<StreamChatGenerics>,
@@ -508,7 +509,9 @@ export type MessagesContextValue<
    * ```
    */
   onPressMessage?: (payload: MessageTouchableHandlerPayload<StreamChatGenerics>) => void;
-
+  Poll?: React.ComponentType;
+  PollButtons?: React.ComponentType;
+  PollHeader?: React.ComponentType;
   /**
    * Full override of the reaction function on Message and Message Overlay
    *
@@ -517,7 +520,6 @@ export type MessagesContextValue<
   selectReaction?: (
     message: MessageType<StreamChatGenerics>,
   ) => (reactionType: string) => Promise<void>;
-
   targetedMessage?: string;
 };