Merge pull request #349 from GetStream/thread-message-hotfix

Use Message prop for Thread

Author: DanC5

src/components/Thread/Thread.js

@@ -45,7 +45,7 @@ const Thread = (props) => {
   const { t } = translationContext;
   const channelContext = useContext(ChannelContext);
   const { channel } = channelContext;
-  const { Message } = useContext(MessagesContext);
+  const { Message: MessageFromContext } = useContext(MessagesContext);
   const {
     loadMoreThread,
     thread,
@@ -56,6 +56,7 @@ const Thread = (props) => {
   const chatContext = useContext(ChatContext);
   const {
     autoFocus = true,
+    Message: MessageFromProps,
     MessageList = DefaultMessageList,
     MessageInput = DefaultMessageInput,
     additionalParentMessageProps,
@@ -64,6 +65,8 @@ const Thread = (props) => {
     additionalMessageInputProps,
   } = props;
 
+  const Message = MessageFromProps || MessageFromContext;
+
   /**
    * TODO: This should be removed when possible along with the spread into Message
    */
@@ -164,6 +167,11 @@ Thread.propTypes = {
    * */
   /** Disables the thread UI. So MessageInput and MessageList will be disabled. */
   disabled: PropTypes.bool,
+  /**
+   * Custom UI component to display a message in MessageList component
+   * Default component (accepts the same props): [MessageSimple](https://getstream.github.io/stream-chat-react-native/#messagesimple)
+   * */
+  Message: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
   MessageInput: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
   /**
    * **Customized MessageList component to used within Thread instead of default MessageList