move reply to quoted reply

Author: nhannah

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.5.0]
+
+### Bug fixes
+- Mute status updates on every message
+
+###  **🛑 BREAKING**
+- `reply`, `handleReply`, and `handleReplyMessage` have now all been shifted to `quotedReply`, `handleQuotedReply`, and `handleQuotedReplyMessage` respectively.
+
 ## [3.4.0] (2021-05-14)
 
 ### Features

src/components/Channel/Channel.tsx

@@ -255,7 +255,7 @@ export type ChannelPropsWithContext<
       | 'handleFlag'
       | 'handleMute'
       | 'handleReaction'
-      | 'handleReply'
+      | 'handleQuotedReply'
       | 'handleRetry'
       | 'handleThreadReply'
       | 'InlineDateSeparator'
@@ -283,9 +283,9 @@ export type ChannelPropsWithContext<
       | 'onPressInMessage'
       | 'onPressMessage'
       | 'OverlayReactionList'
+      | 'quotedReply'
       | 'ReactionList'
       | 'Reply'
-      | 'reply'
       | 'retry'
       | 'ScrollToBottomButton'
       | 'selectReaction'
@@ -456,8 +456,8 @@ const ChannelWithContext = <
     handleEdit,
     handleFlag,
     handleMute,
+    handleQuotedReply,
     handleReaction,
-    handleReply,
     handleRetry,
     handleThreadReply,
     hasCommands = true,
@@ -512,11 +512,11 @@ const ChannelWithContext = <
     openSuggestions,
     OverlayReactionList = OverlayReactionListDefault,
     quotedRepliesEnabled: quotedRepliesEnabledProp,
+    quotedReply,
     ReactionList = ReactionListDefault,
     reactionsEnabled: reactionsEnabledProp,
     readEventsEnabled: readEventsEnabledProp,
     Reply = ReplyDefault,
-    reply,
     retry,
     ScrollToBottomButton = ScrollToBottomButtonDefault,
     selectReaction,
@@ -1729,8 +1729,8 @@ const ChannelWithContext = <
     handleEdit,
     handleFlag,
     handleMute,
+    handleQuotedReply,
     handleReaction,
-    handleReply,
     handleRetry,
     handleThreadReply,
     initialScrollToFirstUnreadMessage,
@@ -1759,10 +1759,10 @@ const ChannelWithContext = <
     onPressInMessage,
     onPressMessage,
     OverlayReactionList,
+    quotedReply,
     ReactionList,
     removeMessage,
     Reply,
-    reply,
     retry,
     retrySendMessage,
     ScrollToBottomButton,

src/components/Channel/hooks/useCreateMessagesContext.ts

@@ -52,8 +52,8 @@ export const useCreateMessagesContext = <
   handleEdit,
   handleFlag,
   handleMute,
+  handleQuotedReply,
   handleReaction,
-  handleReply,
   handleRetry,
   handleThreadReply,
   initialScrollToFirstUnreadMessage,
@@ -83,11 +83,11 @@ export const useCreateMessagesContext = <
   onPressMessage,
   OverlayReactionList,
   quotedRepliesEnabled,
+  quotedReply,
   ReactionList,
   reactionsEnabled,
   removeMessage,
   Reply,
-  reply,
   retry,
   retrySendMessage,
   ScrollToBottomButton,
@@ -154,8 +154,8 @@ export const useCreateMessagesContext = <
       handleEdit,
       handleFlag,
       handleMute,
+      handleQuotedReply,
       handleReaction,
-      handleReply,
       handleRetry,
       handleThreadReply,
       initialScrollToFirstUnreadMessage,
@@ -185,11 +185,11 @@ export const useCreateMessagesContext = <
       onPressMessage,
       OverlayReactionList,
       quotedRepliesEnabled,
+      quotedReply,
       ReactionList,
       reactionsEnabled,
       removeMessage,
       Reply,
-      reply,
       retry,
       retrySendMessage,
       ScrollToBottomButton,

src/components/Message/Message.tsx

@@ -157,7 +157,7 @@ export type MessageTouchableHandlerPayload<
 export type MessageActionHandlers = {
   deleteMessage: () => Promise<void>;
   editMessage: () => void;
-  reply: () => void;
+  quotedReply: () => void;
   resendMessage: () => Promise<void>;
   showMessageOverlay: () => void;
   toggleBanUser: () => Promise<void>;
@@ -211,8 +211,8 @@ export type MessagePropsWithContext<
     | 'handleEdit'
     | 'handleFlag'
     | 'handleMute'
+    | 'handleQuotedReply'
     | 'handleReaction'
-    | 'handleReply'
     | 'handleRetry'
     | 'handleThreadReply'
     | 'messageActions'
@@ -225,9 +225,9 @@ export type MessagePropsWithContext<
     | 'onPressMessage'
     | 'OverlayReactionList'
     | 'quotedRepliesEnabled'
+    | 'quotedReply'
     | 'reactionsEnabled'
     | 'removeMessage'
-    | 'reply'
     | 'retry'
     | 'retrySendMessage'
     | 'selectReaction'
@@ -340,8 +340,8 @@ const MessageWithContext = <
     handleEdit,
     handleFlag,
     handleMute,
+    handleQuotedReply,
     handleReaction: handleReactionProp,
-    handleReply,
     handleRetry,
     handleThreadReply,
     isAdmin,
@@ -369,7 +369,7 @@ const MessageWithContext = <
     reactionsEnabled,
     readEventsEnabled,
     removeMessage,
-    reply: replyProp,
+    quotedReply: quotedReplyProp,
     retry: retryProp,
     retrySendMessage,
     selectReaction,
@@ -671,7 +671,7 @@ const MessageWithContext = <
   const handleResendMessage = () =>
     retrySendMessage(message as MessageResponse<At, Ch, Co, Me, Re, Us>);
 
-  const handleReplyMessage = () => {
+  const handleQuotedReplyMessage = () => {
     setQuotedMessageState(message);
   };
 
@@ -894,17 +894,17 @@ const MessageWithContext = <
           title: isMuted ? t('Unmute User') : t('Mute User'),
         };
 
-    const reply = replyProp
-      ? replyProp(message)
-      : replyProp === null
+    const quotedReply = quotedReplyProp
+      ? quotedReplyProp(message)
+      : quotedReplyProp === null
       ? null
       : {
           action: () => {
             setOverlay('none');
-            if (handleReply) {
-              handleReply(message);
+            if (handleQuotedReply) {
+              handleQuotedReply(message);
             }
-            handleReplyMessage();
+            handleQuotedReplyMessage();
           },
           icon: <CurveLineLeftUp pathFill={grey} />,
           title: t('Reply'),
@@ -963,7 +963,7 @@ const MessageWithContext = <
             messageReactions,
             muteUser,
             quotedRepliesEnabled,
-            reply,
+            quotedReply,
             retry,
             threadRepliesEnabled,
             threadReply,
@@ -996,7 +996,7 @@ const MessageWithContext = <
   const actionHandlers: MessageActionHandlers = {
     deleteMessage: handleDeleteMessage,
     editMessage: handleEditMessage,
-    reply: handleReplyMessage,
+    quotedReply: handleQuotedReplyMessage,
     resendMessage: handleResendMessage,
     showMessageOverlay,
     toggleBanUser: handleToggleBanUser,
@@ -1046,7 +1046,7 @@ const MessageWithContext = <
     handleAction,
     handleDeleteMessage,
     handleEditMessage,
-    handleReplyMessage,
+    handleQuotedReplyMessage,
     handleResendMessage,
     handleToggleBanUser,
     handleToggleMuteUser,

src/components/Message/hooks/useCreateMessageContext.ts

@@ -34,7 +34,7 @@ export const useCreateMessageContext = <
   handleAction,
   handleDeleteMessage,
   handleEditMessage,
-  handleReplyMessage,
+  handleQuotedReplyMessage,
   handleResendMessage,
   handleToggleBanUser,
   handleToggleMuteUser,
@@ -98,7 +98,7 @@ export const useCreateMessageContext = <
       handleAction,
       handleDeleteMessage,
       handleEditMessage,
-      handleReplyMessage,
+      handleQuotedReplyMessage,
       handleResendMessage,
       handleToggleBanUser,
       handleToggleMuteUser,

src/components/Message/utils/messageActions.ts

@@ -34,7 +34,7 @@ export const messageActions = <
   messageReactions,
   muteUser,
   quotedRepliesEnabled,
-  reply,
+  quotedReply,
   retry,
   threadRepliesEnabled,
   threadReply,
@@ -51,7 +51,7 @@ export const messageActions = <
   message: MessageType<At, Ch, Co, Ev, Me, Re, Us>;
   messageReactions: boolean;
   muteUser: MessageAction | null;
-  reply: MessageAction | null;
+  quotedReply: MessageAction | null;
   retry: MessageAction | null;
   threadReply: MessageAction | null;
   quotedRepliesEnabled?: boolean;
@@ -68,7 +68,7 @@ export const messageActions = <
   }
 
   if (quotedRepliesEnabled && !isThreadMessage && !error) {
-    actions.push(reply);
+    actions.push(quotedReply);
   }
 
   if (threadRepliesEnabled && !isThreadMessage && !error) {

src/contexts/messageContext/MessageContext.md

@@ -11,7 +11,7 @@ const SomeChildComponent = () => {
   const {
     handleDeleteMessage,
     handleEditMessage,
-    handleReplyMessage,
+    handleQuotedReplyMessage,
     handleResendMessage,
     handleToggleBanUser,
     handleToggleMuteUser,

src/contexts/messageContext/MessageContext.tsx

@@ -60,7 +60,7 @@ export type MessageContextValue<
   handleAction: ActionHandler;
   handleDeleteMessage: () => Promise<void>;
   handleEditMessage: () => void;
-  handleReplyMessage: () => void;
+  handleQuotedReplyMessage: () => void;
   handleResendMessage: () => Promise<void>;
   handleToggleBanUser: () => Promise<void>;
   handleToggleMuteUser: () => Promise<void>;