fix: change quotedMessage type to MessageType or undefined (#2527)

* fix: change quotedMessage type to MessageType or undefined * docs: fix lint issues
GetStream · Jun 6, 2024 · e9f8a52 · e9f8a52
1 parent 9b0367f
commit e9f8a52
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 28 deletions.
diff --git a/...urus/docs/reactnative/common-content/contexts/message-input-context/editing.mdx b/...urus/docs/reactnative/common-content/contexts/message-input-context/editing.mdx
@@ -1,5 +1,5 @@
 Defined with message type if the user is editing some message within `MessageInput` component else its undefined.
 
-| Type    |
-| ------- |
-| Boolean |
+| Type                    |
+| ----------------------- |
+| `Message`\| `undefined` |
diff --git a/...cs/reactnative/common-content/contexts/message-input-context/quoted_message.mdx b/...cs/reactnative/common-content/contexts/message-input-context/quoted_message.mdx
@@ -1,5 +1,5 @@
 Message that is quoted to the original message
 
-| Type                        |
-| --------------------------- |
-| `Boolean` \| `Message` type |
+| Type                    |
+| ----------------------- |
+| `Message`\| `undefined` |
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
@@ -609,8 +609,8 @@ const ChannelWithContext = <
   const [loadingMore, setLoadingMore] = useState(false);
 
   const [loadingMoreRecent, setLoadingMoreRecent] = useState(false);
-  const [quotedMessage, setQuotedMessage] = useState<boolean | MessageType<StreamChatGenerics>>(
-    false,
+  const [quotedMessage, setQuotedMessage] = useState<MessageType<StreamChatGenerics> | undefined>(
+    undefined,
   );
   const [thread, setThread] = useState<ThreadContextValue<StreamChatGenerics>['thread']>(
     threadProps || null,
@@ -1946,7 +1946,7 @@ const ChannelWithContext = <
     () => setEditing(undefined);
 
   const clearQuotedMessageState: InputMessageInputContextValue<StreamChatGenerics>['clearQuotedMessageState'] =
-    () => setQuotedMessage(false);
+    () => setQuotedMessage(undefined);
 
   /**
    * Removes the message from local state

diff --git a/package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts b/package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts
@@ -67,12 +67,8 @@ export const useCreateInputMessageInputContext = <
    */
   channelId?: string;
 }) => {
-  const editingDep = typeof editing === 'boolean' ? editing : editing?.id;
-  const quotedMessageId = quotedMessage
-    ? typeof quotedMessage === 'boolean'
-      ? ''
-      : quotedMessage.id
-    : '';
+  const editingDep = editing ? editing.id : '';
+  const quotedMessageId = quotedMessage ? quotedMessage.id : '';
 
   const inputMessageInputContext: InputMessageInputContextValue<StreamChatGenerics> = useMemo(
     () => ({

diff --git a/package/src/components/Message/MessageSimple/MessageAvatar.tsx b/package/src/components/Message/MessageSimple/MessageAvatar.tsx
@@ -92,6 +92,7 @@ export const MessageAvatar = <
   const { alignment, lastGroupMessage, message, showAvatar } =
     useMessageContext<StreamChatGenerics>();
   const { ImageComponent } = useChatContext<StreamChatGenerics>();
+
   return (
     <MemoizedMessageAvatar
       {...{

diff --git a/package/src/components/Reply/Reply.tsx b/package/src/components/Reply/Reply.tsx
@@ -167,14 +167,14 @@ const ReplyWithContext = <
     },
   } = useTheme();
 
-  const messageText = typeof quotedMessage === 'boolean' ? '' : quotedMessage.text || '';
+  const messageText = quotedMessage ? quotedMessage.text : '';
 
   const emojiOnlyText = useMemo(() => {
     if (!messageText) return false;
     return hasOnlyEmojis(messageText);
   }, [messageText]);
 
-  if (typeof quotedMessage === 'boolean') return null;
+  if (!quotedMessage) return null;
 
   const lastAttachment = quotedMessage.attachments?.slice(-1)[0] as Attachment<StreamChatGenerics>;
   const messageType = lastAttachment && getMessageType(lastAttachment);

diff --git a/package/src/contexts/messageInputContext/MessageInputContext.tsx b/package/src/contexts/messageInputContext/MessageInputContext.tsx
@@ -331,7 +331,6 @@ export type InputMessageInputContextValue<
   MoreOptionsButton: React.ComponentType<MoreOptionsButtonProps<StreamChatGenerics>>;
   /** Limit on the number of lines in the text input before scrolling */
   numberOfLines: number;
-  quotedMessage: boolean | MessageType<StreamChatGenerics>;
   /**
    * Custom UI component for send button.
    *
@@ -457,6 +456,7 @@ export type InputMessageInputContextValue<
    * Callback that is called when the text input's text changes. Changed text is passed as a single string argument to the callback handler.
    */
   onChangeText?: (newText: string) => void;
+  quotedMessage?: MessageType<StreamChatGenerics>;
   SendMessageDisallowedIndicator?: React.ComponentType;
   /**
    * ref for input setter function
@@ -906,8 +906,7 @@ export const MessageInputProvider = <
           mentioned_users: uniq(mentionedUsers),
           /** Parent message id - in case of thread */
           parent_id: thread?.id,
-          quoted_message_id:
-            typeof value.quotedMessage === 'boolean' ? undefined : value.quotedMessage.id,
+          quoted_message_id: value.quotedMessage ? value.quotedMessage.id : undefined,
           show_in_channel: sendThreadMessageInChannel || undefined,
           text: prevText,
           ...customMessageData,
@@ -947,8 +946,7 @@ export const MessageInputProvider = <
           attachments,
           mentioned_users: [],
           parent_id: thread?.id,
-          quoted_message_id:
-            typeof value.quotedMessage === 'boolean' ? undefined : value.quotedMessage.id,
+          quoted_message_id: value.quotedMessage ? value.quotedMessage.id : undefined,
           show_in_channel: sendThreadMessageInChannel || undefined,
           text: '',
         } as unknown as Partial<StreamMessage<StreamChatGenerics>>);

diff --git a/package/src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts b/package/src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts
@@ -117,11 +117,7 @@ export const useCreateMessageInputContext = <
   const imageUploadsValue = imageUploads.map(({ state }) => state).join();
   const asyncUploadsValue = Object.keys(asyncUploads).join();
   const mentionedUsersLength = mentionedUsers.length;
-  const quotedMessageId = quotedMessage
-    ? typeof quotedMessage === 'boolean'
-      ? ''
-      : quotedMessage.id
-    : '';
+  const quotedMessageId = quotedMessage ? quotedMessage.id : '';
   const threadId = thread?.id;
   const asyncIdsLength = asyncIds.length;
 

diff --git a/package/src/contexts/messagesContext/MessagesContext.tsx b/package/src/contexts/messagesContext/MessagesContext.tsx
@@ -242,7 +242,7 @@ export type MessagesContextValue<
   ScrollToBottomButton: React.ComponentType<ScrollToBottomButtonProps>;
   sendReaction: (type: string, messageId: string) => Promise<void>;
   setEditingState: (message?: MessageType<StreamChatGenerics>) => void;
-  setQuotedMessageState: (message: MessageType<StreamChatGenerics> | boolean) => void;
+  setQuotedMessageState: (message?: MessageType<StreamChatGenerics>) => void;
   supportedReactions: ReactionData[];
   /**
    * UI component for TypingIndicator