stream-chat-react-native-core 5.24.0-beta.3 → 5.24.0-beta.4

package/lib/typescript/i18n/tr.json

@@ -1,19 +1,21 @@
 {
-    "1 Reply": "1 Cevap",
+    "1 Reply": "",
     "1 Thread Reply": "",
-    "Allow access to your Gallery": "Galerinize erişime izin verin",
-    "Allow camera access in device settings": "Cihaz ayarlarında kamera erişimine izin ver",
-    "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "",
-    "Block User": "",
-    "Cancel": "",
-    "Cannot Flag Message": "",
-    "Copy Message": "",
-    "Delete": "",
-    "Delete Message": "",
-    "Device camera is used to take photos or videos.": "Cihaz kamerası fotoğraf veya video çekmek için kullanılır.",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "",
-    "Edit Message": "",
+    "Allow access to your Gallery": "",
+    "Allow camera access in device settings": "",
+    "Also send to channel": "Kanala da gönder",
+    "Are you sure you want to permanently delete this message?": "Bu mesajı kalıcı olarak silmek istediğinizden emin misiniz?",
+    "Are you sure?": "Emin misiniz?",
+    "Block User": "Kullanıcıyı engelle",
+    "Cancel": "İptal",
+    "Cannot Flag Message": "Raporlama Başarısız",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Yorumunuzun diğerlerini nasıl hissettirebileceğini düşünün ve topluluk kurallarımızı takip ettiğinizden emin olun",
+    "Copy Message": "Mesajı Kopyala",
+    "Delete": "Sil",
+    "Delete Message": "Mesajı Sil",
+    "Device camera is used to take photos or videos.": "",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
+    "Edit Message": "Mesajı Düzenle",
     "Editing Message": "",
     "Emoji matching": "",
     "Empty message...": "",
@@ -21,10 +23,10 @@
     "Error loading channel list...": "",
     "Error loading messages for this channel...": "",
     "Error while loading, please reload/refresh": "",
-    "File type not supported": "Dosya türü desteklenmiyor",
-    "Flag": "",
-    "Flag Message": "",
-    "Flag action failed either due to a network issue or the message is already flagged": "",
+    "File type not supported": "",
+    "Flag": "Raporla",
+    "Flag Message": "Mesajı Raporla",
+    "Flag action failed either due to a network issue or the message is already flagged": "Mesajın daha önce raporlanmış olması veya bir ağ bağlantısı sorunu nedeniyle raporlama işlemi başarısız oldu.",
     "How about sending your first message to a friend?": "",
     "Instant Commands": "",
     "Let's start chatting!": "",
@@ -32,44 +34,45 @@
     "Loading channels...": "",
     "Loading messages...": "",
     "Loading...": "",
-    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
+    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Maksimum dosya boyutu yükleme sınırına ulaşıldı. Lütfen {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB'ın altında bir dosya yükleyin.",
     "Message Reactions": "",
     "Message deleted": "",
-    "Message flagged": "",
-    "Mute User": "",
-    "Not supported": "Desteklenmiyor",
+    "Message flagged": "Mesaj işaretlendi",
+    "Mute User": "Kullanıcıyı sessize al",
+    "Not supported": "",
     "Nothing yet...": "",
-    "Ok": "",
-    "Only visible to you": "Sadece siz görebilirsiniz",
-    "Open Settings": "Ayarları aç",
+    "Ok": "Tamam",
+    "Only visible to you": "",
+    "Open Settings": "",
     "Photo": "",
-    "Photos and Videos": "Fotoğraflar ve Videolar",
-    "Pin to Conversation": "",
-    "Pinned by": "Tarafından sabitlendi",
-    "Please enable access to your photos and videos so you can share them.": "Paylaşım yapabilmek için lutfen fotoğraflarınıza ve videolarınıza erişimi etkinleştirin.",
+    "Photos and Videos": "",
+    "Pin to Conversation": "Konuşmaya sabitle",
+    "Pinned by": "",
+    "Please enable access to your photos and videos so you can share them.": "",
     "Please select a channel first": "Lütfen önce bir kanal seçiniz",
     "Reconnecting...": "",
-    "Reply": "",
-    "Reply to Message": "Mesajı Yanıtla",
-    "Resend": "",
-    "Search GIFs": "GIF Ara",
-    "Select More Photos": "Daha Fazla Fotoğraf Seçin",
-    "Send a message": "Mesaj gönder",
+    "Reply": "Yanıtla",
+    "Reply to Message": "",
+    "Resend": "Yeniden gönder",
+    "Search GIFs": "",
+    "Select More Photos": "",
+    "Send Anyway": "Yine de Gönder",
+    "Send a message": "",
     "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
-    "Slow mode ON": "Yavaş Mod Açık",
-    "The message has been reported to a moderator.": "",
-    "Thread Reply": "",
-    "Unblock User": "",
-    "Unknown User": "Bilinmeyen kullanıcı",
-    "Unmute User": "",
-    "Unpin from Conversation": "",
-    "Unread Messages": "",
+    "Slow mode ON": "",
+    "The message has been reported to a moderator.": "Mesaj moderatöre bildirildi.",
+    "Thread Reply": "Konu Yanıtı",
+    "Unblock User": "Kullanıcının engelini kaldır",
+    "Unknown User": "",
+    "Unmute User": "Kullanıcının sesini aç",
+    "Unpin from Conversation": "Sabitlemeyi kaldır",
+    "Unread Messages": "Okunmamış Mesajlar",
     "Video": "",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Bu konuşmaya mesaj gönderemezsiniz",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "{{ index }} / {{ photoLength }}",
-    "{{ replyCount }} Replies": "{{ replyCount }} Cevap",
+    "{{ index }} of {{ photoLength }}": "",
+    "{{ replyCount }} Replies": "",
     "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""

package/lib/typescript/utils/Streami18n.d.ts

@@ -119,9 +119,11 @@ export declare class Streami18n {
                 "Allow camera access in device settings": string;
                 "Also send to channel": string;
                 "Are you sure you want to permanently delete this message?": string;
+                "Are you sure?": string;
                 "Block User": string;
                 Cancel: string;
                 "Cannot Flag Message": string;
+                "Consider how your comment might make others feel and be sure to follow our Community Guidelines": string;
                 "Copy Message": string;
                 Delete: string;
                 "Delete Message": string;
@@ -168,6 +170,7 @@ export declare class Streami18n {
                 Resend: string;
                 "Search GIFs": string;
                 "Select More Photos": string;
+                "Send Anyway": string;
                 "Send a message": string;
                 "Sending links is not allowed in this conversation": string;
                 "Slow mode ON": string;

package/lib/typescript/utils/removeReservedFields.d.ts

@@ -1,3 +1,4 @@
+import type { MessageResponse } from 'stream-chat';
 import type { MessageType } from '../components/MessageList/hooks/useMessageList';
 import type { DefaultStreamChatGenerics } from '../types/types';
-export declare const removeReservedFields: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => MessageType<StreamChatGenerics>;
+export declare const removeReservedFields: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>) => MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>;

package/lib/typescript/utils/utils.d.ts

@@ -33,7 +33,18 @@ export declare const MessageStatusTypes: {
 export declare type FileStateValue = typeof FileState[keyof typeof FileState];
 declare type Progress = ValueOf<typeof ProgressIndicatorTypes>;
 export declare const getIndicatorTypeForFileState: (fileState: FileStateValue, enableOfflineSupport: boolean) => Progress | null;
+/**
+ * Utility to check if the message is a Blocked message.
+ * @param message
+ * @returns boolean
+ */
 export declare const isBlockedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: TableRowJoinedUser<"messages"> | MessageType<StreamChatGenerics>) => boolean | "" | undefined;
+/**
+ *  Utility to check if the message is a Bounced message.
+ * @param message
+ * @returns boolean
+ */
+export declare const isBouncedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => boolean;
 export declare const queryMembersDebounced: DebouncedFunc<(<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>, query: SuggestionUser<StreamChatGenerics>["name"], onReady?: ((users: SuggestionUser<StreamChatGenerics>[]) => void) | undefined, options?: {
     limit?: number;
 }) => Promise<void>)>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.24.0-beta.3",
+  "version": "5.24.0-beta.4",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -80,7 +80,7 @@
     "path": "0.12.7",
     "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^1.3.0",
-    "stream-chat": "8.14.4"
+    "stream-chat": "8.15.0"
   },
   "peerDependencies": {
     "react-native-quick-sqlite": ">=5.1.0",

package/src/components/Channel/Channel.tsx

@@ -82,7 +82,14 @@ import { compressedImageURI } from '../../utils/compressImage';
 import { DBSyncManager } from '../../utils/DBSyncManager';
 import { patchMessageTextCommand } from '../../utils/patchMessageTextCommand';
 import { removeReactionFromLocalState } from '../../utils/removeReactionFromLocalState';
-import { generateRandomId, isLocalUrl, MessageStatusTypes, ReactionData } from '../../utils/utils';
+import { removeReservedFields } from '../../utils/removeReservedFields';
+import {
+  generateRandomId,
+  isBouncedMessage,
+  isLocalUrl,
+  MessageStatusTypes,
+  ReactionData,
+} from '../../utils/utils';
 import { Attachment as AttachmentDefault } from '../Attachment/Attachment';
 import { AttachmentActions as AttachmentActionsDefault } from '../Attachment/AttachmentActions';
 import { AudioAttachment as AudioAttachmentDefault } from '../Attachment/AudioAttachment';
@@ -107,6 +114,7 @@ import { LoadingIndicator as LoadingIndicatorDefault } from '../Indicators/Loadi
 import { KeyboardCompatibleView as KeyboardCompatibleViewDefault } from '../KeyboardCompatibleView/KeyboardCompatibleView';
 import { Message as MessageDefault } from '../Message/Message';
 import { MessageAvatar as MessageAvatarDefault } from '../Message/MessageSimple/MessageAvatar';
+import { MessageBounce as MessageBounceDefault } from '../Message/MessageSimple/MessageBounce';
 import { MessageContent as MessageContentDefault } from '../Message/MessageSimple/MessageContent';
 import { MessageDeleted as MessageDeletedDefault } from '../Message/MessageSimple/MessageDeleted';
 import { MessageError as MessageErrorDefault } from '../Message/MessageSimple/MessageError';
@@ -273,6 +281,7 @@ export type ChannelPropsWithContext<
       | 'Message'
       | 'messageActions'
       | 'MessageAvatar'
+      | 'MessageBounce'
       | 'MessageContent'
       | 'messageContentOrder'
       | 'MessageDeleted'
@@ -495,6 +504,7 @@ const ChannelWithContext = <
     Message = MessageDefault,
     messageActions,
     MessageAvatar = MessageAvatarDefault,
+    MessageBounce = MessageBounceDefault,
     MessageContent = MessageContentDefault,
     messageContentOrder = ['quoted_reply', 'gallery', 'files', 'text', 'attachments'],
     MessageDeleted = MessageDeletedDefault,
@@ -564,7 +574,7 @@ const ChannelWithContext = <
     },
   } = useTheme();
   const [deleted, setDeleted] = useState(false);
-  const [editing, setEditing] = useState<boolean | MessageType<StreamChatGenerics>>(false);
+  const [editing, setEditing] = useState<MessageType<StreamChatGenerics> | undefined>(undefined);
   const [error, setError] = useState<Error | boolean>(false);
   const [hasMore, setHasMore] = useState(true);
   const [lastRead, setLastRead] = useState<ChannelContextValue<StreamChatGenerics>['lastRead']>();
@@ -1679,9 +1689,17 @@ const ChannelWithContext = <
       status: MessageStatusTypes.SENDING,
     };
 
-    updateMessage(statusPendingMessage);
+    const messageWithoutReservedFields = removeReservedFields(statusPendingMessage);
+
+    // For bounced messages, we don't need to update the message, instead always send a new message.
+    if (!isBouncedMessage(message)) {
+      updateMessage(messageWithoutReservedFields as MessageResponse<StreamChatGenerics>);
+    }
 
-    await sendMessageRequest(statusPendingMessage, true);
+    await sendMessageRequest(
+      messageWithoutReservedFields as MessageResponse<StreamChatGenerics>,
+      true,
+    );
   };
 
   // hard limit to prevent you from scrolling faster than 1 page per 2 seconds
@@ -1843,10 +1861,10 @@ const ChannelWithContext = <
       : client.updateMessage(updatedMessage);
 
   const setEditingState: MessagesContextValue<StreamChatGenerics>['setEditingState'] = (
-    messageOrBoolean,
+    message,
   ) => {
     clearQuotedMessageState();
-    setEditing(messageOrBoolean);
+    setEditing(message);
   };
 
   const setQuotedMessageState: MessagesContextValue<StreamChatGenerics>['setQuotedMessageState'] = (
@@ -1856,7 +1874,7 @@ const ChannelWithContext = <
   };
 
   const clearEditingState: InputMessageInputContextValue<StreamChatGenerics>['clearEditingState'] =
-    () => setEditing(false);
+    () => setEditing(undefined);
 
   const clearQuotedMessageState: InputMessageInputContextValue<StreamChatGenerics>['clearQuotedMessageState'] =
     () => setQuotedMessage(false);
@@ -2223,6 +2241,7 @@ const ChannelWithContext = <
     Message,
     messageActions,
     MessageAvatar,
+    MessageBounce,
     MessageContent,
     messageContentOrder,
     MessageDeleted,

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

@@ -54,6 +54,7 @@ export const useCreateMessagesContext = <
   Message,
   messageActions,
   MessageAvatar,
+  MessageBounce,
   MessageContent,
   messageContentOrder,
   MessageDeleted,
@@ -149,6 +150,7 @@ export const useCreateMessagesContext = <
       Message,
       messageActions,
       MessageAvatar,
+      MessageBounce,
       MessageContent,
       messageContentOrder,
       MessageDeleted,

package/src/components/Message/Message.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import { GestureResponderEvent, Keyboard, StyleProp, View, ViewStyle } from 'react-native';
 
 import type { Attachment, UserResponse } from 'stream-chat';
@@ -44,7 +44,12 @@ import {
 
 import { isVideoPackageAvailable, triggerHaptic } from '../../native';
 import type { DefaultStreamChatGenerics } from '../../types/types';
-import { hasOnlyEmojis, isBlockedMessage, MessageStatusTypes } from '../../utils/utils';
+import {
+  hasOnlyEmojis,
+  isBlockedMessage,
+  isBouncedMessage,
+  MessageStatusTypes,
+} from '../../utils/utils';
 
 import {
   isMessageWithStylesReadByAndDateSeparator,
@@ -141,6 +146,7 @@ export type MessagePropsWithContext<
     | 'isAttachmentEqual'
     | 'messageActions'
     | 'messageContentOrder'
+    | 'MessageBounce'
     | 'MessageSimple'
     | 'onLongPressMessage'
     | 'onPressInMessage'
@@ -217,6 +223,7 @@ const MessageWithContext = <
 >(
   props: MessagePropsWithContext<StreamChatGenerics>,
 ) => {
+  const [isBounceDialogOpen, setIsBounceDialogOpen] = useState(false);
   const isMessageTypeDeleted = props.message.type === 'deleted';
 
   const {
@@ -249,6 +256,7 @@ const MessageWithContext = <
     messageActions: messageActionsProp = defaultMessageActions,
     messageContentOrder: messageContentOrderProp,
     messagesContext,
+    MessageBounce,
     MessageSimple,
     onLongPress: onLongPressProp,
     onLongPressMessage: onLongPressMessageProp,
@@ -319,9 +327,19 @@ const MessageWithContext = <
     }
     const quotedMessage = message.quoted_message as MessageType<StreamChatGenerics>;
     if (error) {
+      /**
+       * If its a Blocked message, we don't do anything as per specs.
+       */
       if (isBlockedMessage(message)) {
         return;
       }
+      /**
+       * If its a Bounced message, we open the message bounced options modal.
+       */
+      if (isBouncedMessage(message)) {
+        setIsBounceDialogOpen(true);
+        return;
+      }
       showMessageOverlay(false, true);
     } else if (quotedMessage) {
       onPressQuotedMessage(quotedMessage);
@@ -622,6 +640,11 @@ const MessageWithContext = <
           })
       : enableLongPress
       ? () => {
+          // If a message is bounced, on long press the message bounce options modal should open.
+          if (isBouncedMessage(message)) {
+            setIsBounceDialogOpen(true);
+            return;
+          }
           triggerHaptic('impactMedium');
           showMessageOverlay(false);
         }
@@ -730,6 +753,7 @@ const MessageWithContext = <
         >
           <MessageProvider value={messageContext}>
             <MessageSimple />
+            {isBounceDialogOpen && <MessageBounce setIsBounceDialogOpen={setIsBounceDialogOpen} />}
           </MessageProvider>
         </View>
       </View>

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

@@ -0,0 +1,119 @@
+import React from 'react';
+import { Alert } from 'react-native';
+
+import {
+  MessageContextValue,
+  useMessageContext,
+} from '../../../contexts/messageContext/MessageContext';
+import {
+  MessagesContextValue,
+  useMessagesContext,
+} from '../../../contexts/messagesContext/MessagesContext';
+import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
+
+import type { DefaultStreamChatGenerics } from '../../../types/types';
+
+export type MessageBouncePropsWithContext<
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Pick<
+  MessagesContextValue<StreamChatGenerics>,
+  'setEditingState' | 'removeMessage' | 'retrySendMessage'
+> &
+  Pick<MessageContextValue<StreamChatGenerics>, 'message'> & {
+    setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  };
+
+export const MessageBounceWithContext = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  props: MessageBouncePropsWithContext<StreamChatGenerics>,
+) => {
+  const { t } = useTranslationContext();
+  const { message, removeMessage, retrySendMessage, setEditingState, setIsBounceDialogOpen } =
+    props;
+
+  const handleEditMessage = () => {
+    setEditingState(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  const handleResend = () => {
+    retrySendMessage(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  const handleRemoveMessage = () => {
+    removeMessage(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  return (
+    <>
+      {Alert.alert(
+        t('Are you sure?'),
+        t(
+          'Consider how your comment might make others feel and be sure to follow our Community Guidelines',
+        ),
+        [
+          { onPress: handleResend, text: t('Send Anyway') },
+          { onPress: handleEditMessage, text: t('Edit Message') },
+          { onPress: handleRemoveMessage, text: t('Delete Message') },
+        ],
+        { cancelable: true },
+      )}
+    </>
+  );
+};
+
+const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
+  prevProps: MessageBouncePropsWithContext<StreamChatGenerics>,
+  nextProps: MessageBouncePropsWithContext<StreamChatGenerics>,
+) => {
+  const { message: prevMessage } = prevProps;
+  const { message: nextMessage } = nextProps;
+  const messageEqual =
+    prevMessage.cid === nextMessage.cid &&
+    prevMessage.type === nextMessage.type &&
+    prevMessage.text === nextMessage.text;
+  if (!messageEqual) return false;
+
+  return true;
+};
+
+const MemoizedMessageBounce = React.memo(
+  MessageBounceWithContext,
+  areEqual,
+) as typeof MessageBounceWithContext;
+
+export type MessageBounceProps<
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Partial<MessageBouncePropsWithContext<StreamChatGenerics>> & {
+  setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
+};
+
+export const MessageBounce = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  props: MessageBounceProps<StreamChatGenerics>,
+) => {
+  const { message } = useMessageContext<StreamChatGenerics>();
+  const { removeMessage, retrySendMessage, setEditingState } =
+    useMessagesContext<StreamChatGenerics>();
+  return (
+    <MemoizedMessageBounce<StreamChatGenerics>
+      {...{
+        message,
+        removeMessage,
+        retrySendMessage,
+        setEditingState,
+      }}
+      {...props}
+    />
+  );
+};

package/src/components/Message/hooks/useMessageActionHandlers.ts

@@ -32,8 +32,7 @@ export const useMessageActionHandlers = <
   Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'enforceUniqueReaction'> &
   Pick<ChatContextValue<StreamChatGenerics>, 'client'> &
   Pick<MessageContextValue<StreamChatGenerics>, 'message'>) => {
-  const handleResendMessage = () =>
-    retrySendMessage(message as MessageResponse<StreamChatGenerics>);
+  const handleResendMessage = () => retrySendMessage(message);
 
   const handleQuotedReplyMessage = () => {
     setQuotedMessageState(message);

package/src/components/Message/hooks/useMessageActions.tsx

@@ -339,7 +339,7 @@ export const useMessageActions = <
       setOverlay('none');
       const messageWithoutReservedFields = removeReservedFields(message);
       if (handleRetry) {
-        handleRetry(messageWithoutReservedFields);
+        handleRetry(messageWithoutReservedFields as MessageType<StreamChatGenerics>);
       }
 
       await handleResendMessage();

package/src/components/index.ts

@@ -96,6 +96,7 @@ export * from './Message/hooks/useMessageActions';
 export * from './Message/hooks/useMessageActionHandlers';
 export * from './Message/Message';
 export * from './Message/MessageSimple/MessageAvatar';
+export * from './Message/MessageSimple/MessageBounce';
 export * from './Message/MessageSimple/MessageContent';
 export * from './Message/MessageSimple/MessageDeleted';
 export * from './Message/MessageSimple/MessageError';

package/src/contexts/messageInputContext/MessageInputContext.tsx

@@ -18,7 +18,7 @@ import {
 } from 'stream-chat';
 
 import { useCreateMessageInputContext } from './hooks/useCreateMessageInputContext';
-import { isEditingBoolean, useMessageDetailsForState } from './hooks/useMessageDetailsForState';
+import { useMessageDetailsForState } from './hooks/useMessageDetailsForState';
 
 import { parseLinksFromText } from '../../components/Message/MessageSimple/utils/parseLinks';
 import type { AttachButtonProps } from '../../components/MessageInput/AttachButton';
@@ -53,11 +53,13 @@ import {
   FileState,
   FileStateValue,
   generateRandomId,
+  isBouncedMessage,
   TriggerSettings,
 } from '../../utils/utils';
 import { useAttachmentPickerContext } from '../attachmentPickerContext/AttachmentPickerContext';
 import { ChannelContextValue, useChannelContext } from '../channelContext/ChannelContext';
 import { useChatContext } from '../chatContext/ChatContext';
+import { useMessagesContext } from '../messagesContext/MessagesContext';
 import { useOwnCapabilitiesContext } from '../ownCapabilitiesContext/OwnCapabilitiesContext';
 import { useThreadContext } from '../threadContext/ThreadContext';
 import { useTranslationContext } from '../translationContext/TranslationContext';
@@ -226,7 +228,6 @@ export type InputMessageInputContextValue<
    * **default** [CooldownTimer](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/MessageInput/CooldownTimer.tsx)
    */
   CooldownTimer: React.ComponentType<CooldownTimerProps>;
-  editing: boolean | MessageType<StreamChatGenerics>;
   editMessage: StreamChat<StreamChatGenerics>['updateMessage'];
 
   /**
@@ -331,6 +332,12 @@ export type InputMessageInputContextValue<
     channel: ChannelContextValue<StreamChatGenerics>['channel'],
   ) => Promise<SendFileAPIResponse>;
 
+  /**
+   * Variable that tracks the editing state.
+   * It is defined with message type if the editing state is true, else its undefined.
+   */
+  editing?: MessageType<StreamChatGenerics>;
+
   /** Initial value to set on input */
   initialValue?: string;
   /**
@@ -398,6 +405,7 @@ export const MessageInputProvider = <
   const { closePicker, openPicker, selectedPicker, setSelectedPicker } =
     useAttachmentPickerContext();
   const { appSettings, client, enableOfflineSupport } = useChatContext<StreamChatGenerics>();
+  const { removeMessage } = useMessagesContext();
 
   const getFileUploadConfig = () => {
     const fileConfig = appSettings?.app?.file_upload_config;
@@ -625,6 +633,9 @@ export const MessageInputProvider = <
       (prevNumberOfUploads) => prevNumberOfUploads - (pendingAttachments?.length || 0),
     );
     setText('');
+    if (value.editing) {
+      value.clearEditingState();
+    }
   };
 
   const mapImageUploadToAttachment = (image: ImageUpload): Attachment<StreamChatGenerics> => {
@@ -771,9 +782,10 @@ export const MessageInputProvider = <
       return;
     }
 
-    if (value.editing && !isEditingBoolean(value.editing)) {
+    const message = value.editing;
+    if (message && message.type !== 'error') {
       const updatedMessage = {
-        ...value.editing,
+        ...message,
         attachments,
         mentioned_users: mentionedUsers,
         quoted_message: undefined,
@@ -795,6 +807,12 @@ export const MessageInputProvider = <
       sending.current = false;
     } else {
       try {
+        /**
+         * If the message is bounced by moderation, we firstly remove the message from message list and then send a new message.
+         */
+        if (message && isBouncedMessage(message as MessageType<StreamChatGenerics>)) {
+          removeMessage(message);
+        }
         value.sendMessage({
           attachments,
           mentioned_users: uniq(mentionedUsers),
@@ -890,7 +908,7 @@ export const MessageInputProvider = <
 
   const updateMessage = async () => {
     try {
-      if (!isEditingBoolean(value.editing)) {
+      if (value.editing) {
         await client.updateMessage({
           ...value.editing,
           quoted_message: undefined,
@@ -898,8 +916,8 @@ export const MessageInputProvider = <
         } as Parameters<StreamChat<StreamChatGenerics>['updateMessage']>[0]);
       }
 
-      resetInput();
       value.clearEditingState();
+      resetInput();
     } catch (error) {
       console.log(error);
     }