fix: enable frozen channel message actions behaviour (#2598)

* fix: enable frozen channel message actions behaviour * fix: remove disabled prop from MessageContext * docs: remove disabled prop from message-context * fix: remive disabled prop from useless component * fix: message input disabled state * fix: message input disabled state * fix: channel frozen disabled behaviout
GetStream · Aug 1, 2024 · eb4ae4c · eb4ae4c
1 parent 3ae97ed
commit eb4ae4c
Show file tree

Hide file tree

Showing 22 changed files with 176 additions and 467 deletions.
diff --git a/docusaurus/docs/reactnative/contexts/message-context.mdx b/docusaurus/docs/reactnative/contexts/message-context.mdx
@@ -3,8 +3,6 @@ id: message-context
 title: MessageContext
 ---
 
-import Disabled from '../common-content/contexts/channel-context/disabled.mdx';
-
 import Alignment from '../common-content/contexts/message-context/alignment.mdx';
 import Files from '../common-content/contexts/message-context/files.mdx';
 import GroupStyles from '../common-content/contexts/message-context/group_styles.mdx';
@@ -80,10 +78,6 @@ True if one of the following condition is true:
 | ------- |
 | boolean |
 
-### disabled
-
-<Disabled />
-
 ### files
 
 <Files />

diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
@@ -2219,7 +2219,6 @@ const ChannelWithContext = <
     CommandsButton,
     compressImageQuality,
     CooldownTimer,
-    disabled: disabledValue,
     doDocUploadRequest,
     doImageUploadRequest,
     editing,

diff --git a/package/src/components/Channel/__tests__/ownCapabilities.test.js b/package/src/components/Channel/__tests__/ownCapabilities.test.js
@@ -314,24 +314,6 @@ describe('Own capabilities', () => {
     });
   });
 
-  describe(`${allOwnCapabilities.sendMessage} capability`, () => {
-    it(`should not render SendMessageDisallowedIndicator when "${allOwnCapabilities.sendMessage}" capability is enabled`, async () => {
-      await generateChannelWithCapabilities([allOwnCapabilities.sendMessage]);
-      const { queryByTestId } = render(getComponent());
-
-      await waitFor(() => expect(!!queryByTestId('send-message-disallowed-indicator')).toBeFalsy());
-    });
-
-    it(`should render SendMessageDisallowedIndicator when "${allOwnCapabilities.sendMessage}" capability is disabled`, async () => {
-      await generateChannelWithCapabilities();
-      const { queryByTestId } = render(getComponent());
-
-      await waitFor(() =>
-        expect(!!queryByTestId('send-message-disallowed-indicator')).toBeTruthy(),
-      );
-    });
-  });
-
   describe(`${allOwnCapabilities.sendLinks} capability`, () => {
     it(`should not allow sending links when "${allOwnCapabilities.sendLinks}" capability is disabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.sendMessage]);

diff --git a/package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts b/package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts
@@ -27,7 +27,6 @@ export const useCreateInputMessageInputContext = <
   CommandsButton,
   compressImageQuality,
   CooldownTimer,
-  disabled,
   doDocUploadRequest,
   doImageUploadRequest,
   editing,
@@ -96,7 +95,6 @@ export const useCreateInputMessageInputContext = <
       CommandsButton,
       compressImageQuality,
       CooldownTimer,
-      disabled,
       doDocUploadRequest,
       doImageUploadRequest,
       editing,
@@ -131,15 +129,7 @@ export const useCreateInputMessageInputContext = <
       StartAudioRecordingButton,
       UploadProgressIndicator,
     }),
-    [
-      compressImageQuality,
-      channelId,
-      disabled,
-      editingDep,
-      initialValue,
-      maxMessageLength,
-      quotedMessageId,
-    ],
+    [compressImageQuality, channelId, editingDep, initialValue, maxMessageLength, quotedMessageId],
   );
 
   return inputMessageInputContext;

diff --git a/package/src/components/Message/Message.tsx b/package/src/components/Message/Message.tsx
@@ -132,10 +132,7 @@ export type MessageActionHandlers<
 
 export type MessagePropsWithContext<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  ChannelContextValue<StreamChatGenerics>,
-  'channel' | 'disabled' | 'enforceUniqueReaction' | 'members'
-> &
+> = Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'enforceUniqueReaction' | 'members'> &
   Pick<KeyboardContextValue, 'dismissKeyboard'> &
   Partial<Omit<MessageContextValue<StreamChatGenerics>, 'groupStyles' | 'message'>> &
   Pick<MessageContextValue<StreamChatGenerics>, 'groupStyles' | 'message'> &
@@ -245,7 +242,6 @@ const MessageWithContext = <
     chatContext,
     deleteMessage: deleteMessageFromContext,
     deleteReaction,
-    disabled,
     dismissKeyboard,
     dismissKeyboardOnMessageTouch,
     enableLongPress = true,
@@ -627,7 +623,7 @@ const MessageWithContext = <
   };
 
   const onLongPressMessage =
-    disabled || hasAttachmentActions || isBlockedMessage(message)
+    hasAttachmentActions || isBlockedMessage(message)
       ? () => null
       : onLongPressMessageProp
       ? (payload?: TouchableHandlerPayload) =>
@@ -662,7 +658,6 @@ const MessageWithContext = <
     actionsEnabled,
     alignment,
     channel,
-    disabled,
     files: attachments.files,
     goToMessage,
     groupStyles,
@@ -780,7 +775,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 ) => {
   const {
     chatContext: { mutedUsers: prevMutedUsers },
-    disabled: prevDisabled,
     goToMessage: prevGoToMessage,
     groupStyles: prevGroupStyles,
     isAttachmentEqual,
@@ -794,7 +788,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
   } = prevProps;
   const {
     chatContext: { mutedUsers: nextMutedUsers },
-    disabled: nextDisabled,
     goToMessage: nextGoToMessage,
     groupStyles: nextGroupStyles,
     isTargetedMessage: nextIsTargetedMessage,
@@ -806,9 +799,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     t: nextT,
   } = nextProps;
 
-  const disabledEqual = prevDisabled === nextDisabled;
-  if (!disabledEqual) return false;
-
   const membersEqual = Object.keys(prevMembers).length === Object.keys(nextMembers).length;
   if (!membersEqual) return false;
 
@@ -935,8 +925,7 @@ export const Message = <
 >(
   props: MessageProps<StreamChatGenerics>,
 ) => {
-  const { channel, disabled, enforceUniqueReaction, members } =
-    useChannelContext<StreamChatGenerics>();
+  const { channel, enforceUniqueReaction, members } = useChannelContext<StreamChatGenerics>();
   const chatContext = useChatContext<StreamChatGenerics>();
   const { dismissKeyboard } = useKeyboardContext();
   const { setData } = useMessageOverlayContext<StreamChatGenerics>();
@@ -951,7 +940,6 @@ export const Message = <
       {...{
         channel,
         chatContext,
-        disabled,
         dismissKeyboard,
         enforceUniqueReaction,
         members,

diff --git a/package/src/components/Message/MessageSimple/MessageContent.tsx b/package/src/components/Message/MessageSimple/MessageContent.tsx
@@ -63,7 +63,6 @@ export type MessageContentPropsWithContext<
 > = Pick<
   MessageContextValue<StreamChatGenerics>,
   | 'alignment'
-  | 'disabled'
   | 'isEditedMessageOpen'
   | 'goToMessage'
   | 'groupStyles'
@@ -116,7 +115,6 @@ const MessageContentWithContext = <
     additionalTouchableProps,
     alignment,
     Attachment,
-    disabled,
     FileAttachmentGroup,
     Gallery,
     groupStyles,
@@ -272,7 +270,7 @@ const MessageContentWithContext = <
   return (
     <TouchableOpacity
       activeOpacity={0.7}
-      disabled={disabled || preventPress}
+      disabled={preventPress}
       onLongPress={(event) => {
         if (onLongPress) {
           onLongPress({
@@ -402,7 +400,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
   nextProps: MessageContentPropsWithContext<StreamChatGenerics>,
 ) => {
   const {
-    disabled: prevDisabled,
     goToMessage: prevGoToMessage,
     groupStyles: prevGroupStyles,
     hasReactions: prevHasReactions,
@@ -418,7 +415,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     t: prevT,
   } = prevProps;
   const {
-    disabled: nextDisabled,
     goToMessage: nextGoToMessage,
     groupStyles: nextGroupStyles,
     hasReactions: nextHasReactions,
@@ -433,9 +429,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     t: nextT,
   } = nextProps;
 
-  const disabledEqual = prevDisabled === nextDisabled;
-  if (!disabledEqual) return false;
-
   const hasReactionsEqual = prevHasReactions === nextHasReactions;
   if (!hasReactionsEqual) return false;
 
@@ -554,7 +547,6 @@ export const MessageContent = <
 ) => {
   const {
     alignment,
-    disabled,
     goToMessage,
     groupStyles,
     hasReactions,
@@ -598,7 +590,6 @@ export const MessageContent = <
         additionalTouchableProps,
         alignment,
         Attachment,
-        disabled,
         FileAttachmentGroup,
         Gallery,
         goToMessage,

diff --git a/package/src/components/Message/MessageSimple/MessageSimple.tsx b/package/src/components/Message/MessageSimple/MessageSimple.tsx
@@ -31,13 +31,7 @@ export type MessageSimplePropsWithContext<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = Pick<
   MessageContextValue<StreamChatGenerics>,
-  | 'alignment'
-  | 'channel'
-  | 'disabled'
-  | 'isEditedMessageOpen'
-  | 'groupStyles'
-  | 'hasReactions'
-  | 'message'
+  'alignment' | 'channel' | 'isEditedMessageOpen' | 'groupStyles' | 'hasReactions' | 'message'
 > &
   Pick<
     MessagesContextValue<StreamChatGenerics>,
@@ -125,7 +119,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 ) => {
   const {
     channel: prevChannel,
-    disabled: prevDisabled,
     groupStyles: prevGroupStyles,
     hasReactions: prevHasReactions,
     isEditedMessageOpen: prevIsEditedMessageOpen,
@@ -134,17 +127,13 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
   } = prevProps;
   const {
     channel: nextChannel,
-    disabled: nextDisabled,
     groupStyles: nextGroupStyles,
     hasReactions: nextHasReactions,
     isEditedMessageOpen: nextIsEditedMessageOpen,
     message: nextMessage,
     myMessageTheme: nextMyMessageTheme,
   } = nextProps;
 
-  const disabledEqual = prevDisabled === nextDisabled;
-  if (!disabledEqual) return false;
-
   const hasReactionsEqual = prevHasReactions === nextHasReactions;
   if (!hasReactionsEqual) return false;
 
@@ -231,7 +220,7 @@ export const MessageSimple = <
 >(
   props: MessageSimpleProps<StreamChatGenerics>,
 ) => {
-  const { alignment, channel, disabled, groupStyles, hasReactions, isEditedMessageOpen, message } =
+  const { alignment, channel, groupStyles, hasReactions, isEditedMessageOpen, message } =
     useMessageContext<StreamChatGenerics>();
   const {
     enableMessageGroupingByUser,
@@ -246,7 +235,6 @@ export const MessageSimple = <
       {...{
         alignment,
         channel,
-        disabled,
         enableMessageGroupingByUser,
         groupStyles,
         hasReactions,

diff --git a/package/src/components/Message/hooks/useCreateMessageContext.ts b/package/src/components/Message/hooks/useCreateMessageContext.ts
@@ -10,7 +10,6 @@ export const useCreateMessageContext = <
   actionsEnabled,
   alignment,
   channel,
-  disabled,
   files,
   goToMessage,
   groupStyles,
@@ -63,7 +62,6 @@ export const useCreateMessageContext = <
       actionsEnabled,
       alignment,
       channel,
-      disabled,
       files,
       goToMessage,
       groupStyles,
@@ -106,7 +104,6 @@ export const useCreateMessageContext = <
       actionsEnabled,
       quotedMessageDeletedValue,
       alignment,
-      disabled,
       goToMessage,
       groupStylesLength,
       hasReactions,