Skip to content

Commit eb4ae4c

Browse files
authored
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
1 parent 3ae97ed commit eb4ae4c

File tree

22 files changed

+176
-467
lines changed

22 files changed

+176
-467
lines changed

docusaurus/docs/reactnative/contexts/message-context.mdx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ id: message-context
33
title: MessageContext
44
---
55

6-
import Disabled from '../common-content/contexts/channel-context/disabled.mdx';
7-
86
import Alignment from '../common-content/contexts/message-context/alignment.mdx';
97
import Files from '../common-content/contexts/message-context/files.mdx';
108
import GroupStyles from '../common-content/contexts/message-context/group_styles.mdx';
@@ -80,10 +78,6 @@ True if one of the following condition is true:
8078
| ------- |
8179
| boolean |
8280

83-
### disabled
84-
85-
<Disabled />
86-
8781
### files
8882

8983
<Files />

package/src/components/Channel/Channel.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2219,7 +2219,6 @@ const ChannelWithContext = <
22192219
CommandsButton,
22202220
compressImageQuality,
22212221
CooldownTimer,
2222-
disabled: disabledValue,
22232222
doDocUploadRequest,
22242223
doImageUploadRequest,
22252224
editing,

package/src/components/Channel/__tests__/ownCapabilities.test.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,24 +314,6 @@ describe('Own capabilities', () => {
314314
});
315315
});
316316

317-
describe(`${allOwnCapabilities.sendMessage} capability`, () => {
318-
it(`should not render SendMessageDisallowedIndicator when "${allOwnCapabilities.sendMessage}" capability is enabled`, async () => {
319-
await generateChannelWithCapabilities([allOwnCapabilities.sendMessage]);
320-
const { queryByTestId } = render(getComponent());
321-
322-
await waitFor(() => expect(!!queryByTestId('send-message-disallowed-indicator')).toBeFalsy());
323-
});
324-
325-
it(`should render SendMessageDisallowedIndicator when "${allOwnCapabilities.sendMessage}" capability is disabled`, async () => {
326-
await generateChannelWithCapabilities();
327-
const { queryByTestId } = render(getComponent());
328-
329-
await waitFor(() =>
330-
expect(!!queryByTestId('send-message-disallowed-indicator')).toBeTruthy(),
331-
);
332-
});
333-
});
334-
335317
describe(`${allOwnCapabilities.sendLinks} capability`, () => {
336318
it(`should not allow sending links when "${allOwnCapabilities.sendLinks}" capability is disabled`, async () => {
337319
await generateChannelWithCapabilities([allOwnCapabilities.sendMessage]);

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export const useCreateInputMessageInputContext = <
2727
CommandsButton,
2828
compressImageQuality,
2929
CooldownTimer,
30-
disabled,
3130
doDocUploadRequest,
3231
doImageUploadRequest,
3332
editing,
@@ -96,7 +95,6 @@ export const useCreateInputMessageInputContext = <
9695
CommandsButton,
9796
compressImageQuality,
9897
CooldownTimer,
99-
disabled,
10098
doDocUploadRequest,
10199
doImageUploadRequest,
102100
editing,
@@ -131,15 +129,7 @@ export const useCreateInputMessageInputContext = <
131129
StartAudioRecordingButton,
132130
UploadProgressIndicator,
133131
}),
134-
[
135-
compressImageQuality,
136-
channelId,
137-
disabled,
138-
editingDep,
139-
initialValue,
140-
maxMessageLength,
141-
quotedMessageId,
142-
],
132+
[compressImageQuality, channelId, editingDep, initialValue, maxMessageLength, quotedMessageId],
143133
);
144134

145135
return inputMessageInputContext;

package/src/components/Message/Message.tsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ export type MessageActionHandlers<
132132

133133
export type MessagePropsWithContext<
134134
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
135-
> = Pick<
136-
ChannelContextValue<StreamChatGenerics>,
137-
'channel' | 'disabled' | 'enforceUniqueReaction' | 'members'
138-
> &
135+
> = Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'enforceUniqueReaction' | 'members'> &
139136
Pick<KeyboardContextValue, 'dismissKeyboard'> &
140137
Partial<Omit<MessageContextValue<StreamChatGenerics>, 'groupStyles' | 'message'>> &
141138
Pick<MessageContextValue<StreamChatGenerics>, 'groupStyles' | 'message'> &
@@ -245,7 +242,6 @@ const MessageWithContext = <
245242
chatContext,
246243
deleteMessage: deleteMessageFromContext,
247244
deleteReaction,
248-
disabled,
249245
dismissKeyboard,
250246
dismissKeyboardOnMessageTouch,
251247
enableLongPress = true,
@@ -627,7 +623,7 @@ const MessageWithContext = <
627623
};
628624

629625
const onLongPressMessage =
630-
disabled || hasAttachmentActions || isBlockedMessage(message)
626+
hasAttachmentActions || isBlockedMessage(message)
631627
? () => null
632628
: onLongPressMessageProp
633629
? (payload?: TouchableHandlerPayload) =>
@@ -662,7 +658,6 @@ const MessageWithContext = <
662658
actionsEnabled,
663659
alignment,
664660
channel,
665-
disabled,
666661
files: attachments.files,
667662
goToMessage,
668663
groupStyles,
@@ -780,7 +775,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
780775
) => {
781776
const {
782777
chatContext: { mutedUsers: prevMutedUsers },
783-
disabled: prevDisabled,
784778
goToMessage: prevGoToMessage,
785779
groupStyles: prevGroupStyles,
786780
isAttachmentEqual,
@@ -794,7 +788,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
794788
} = prevProps;
795789
const {
796790
chatContext: { mutedUsers: nextMutedUsers },
797-
disabled: nextDisabled,
798791
goToMessage: nextGoToMessage,
799792
groupStyles: nextGroupStyles,
800793
isTargetedMessage: nextIsTargetedMessage,
@@ -806,9 +799,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
806799
t: nextT,
807800
} = nextProps;
808801

809-
const disabledEqual = prevDisabled === nextDisabled;
810-
if (!disabledEqual) return false;
811-
812802
const membersEqual = Object.keys(prevMembers).length === Object.keys(nextMembers).length;
813803
if (!membersEqual) return false;
814804

@@ -935,8 +925,7 @@ export const Message = <
935925
>(
936926
props: MessageProps<StreamChatGenerics>,
937927
) => {
938-
const { channel, disabled, enforceUniqueReaction, members } =
939-
useChannelContext<StreamChatGenerics>();
928+
const { channel, enforceUniqueReaction, members } = useChannelContext<StreamChatGenerics>();
940929
const chatContext = useChatContext<StreamChatGenerics>();
941930
const { dismissKeyboard } = useKeyboardContext();
942931
const { setData } = useMessageOverlayContext<StreamChatGenerics>();
@@ -951,7 +940,6 @@ export const Message = <
951940
{...{
952941
channel,
953942
chatContext,
954-
disabled,
955943
dismissKeyboard,
956944
enforceUniqueReaction,
957945
members,

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ export type MessageContentPropsWithContext<
6363
> = Pick<
6464
MessageContextValue<StreamChatGenerics>,
6565
| 'alignment'
66-
| 'disabled'
6766
| 'isEditedMessageOpen'
6867
| 'goToMessage'
6968
| 'groupStyles'
@@ -116,7 +115,6 @@ const MessageContentWithContext = <
116115
additionalTouchableProps,
117116
alignment,
118117
Attachment,
119-
disabled,
120118
FileAttachmentGroup,
121119
Gallery,
122120
groupStyles,
@@ -272,7 +270,7 @@ const MessageContentWithContext = <
272270
return (
273271
<TouchableOpacity
274272
activeOpacity={0.7}
275-
disabled={disabled || preventPress}
273+
disabled={preventPress}
276274
onLongPress={(event) => {
277275
if (onLongPress) {
278276
onLongPress({
@@ -402,7 +400,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
402400
nextProps: MessageContentPropsWithContext<StreamChatGenerics>,
403401
) => {
404402
const {
405-
disabled: prevDisabled,
406403
goToMessage: prevGoToMessage,
407404
groupStyles: prevGroupStyles,
408405
hasReactions: prevHasReactions,
@@ -418,7 +415,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
418415
t: prevT,
419416
} = prevProps;
420417
const {
421-
disabled: nextDisabled,
422418
goToMessage: nextGoToMessage,
423419
groupStyles: nextGroupStyles,
424420
hasReactions: nextHasReactions,
@@ -433,9 +429,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
433429
t: nextT,
434430
} = nextProps;
435431

436-
const disabledEqual = prevDisabled === nextDisabled;
437-
if (!disabledEqual) return false;
438-
439432
const hasReactionsEqual = prevHasReactions === nextHasReactions;
440433
if (!hasReactionsEqual) return false;
441434

@@ -554,7 +547,6 @@ export const MessageContent = <
554547
) => {
555548
const {
556549
alignment,
557-
disabled,
558550
goToMessage,
559551
groupStyles,
560552
hasReactions,
@@ -598,7 +590,6 @@ export const MessageContent = <
598590
additionalTouchableProps,
599591
alignment,
600592
Attachment,
601-
disabled,
602593
FileAttachmentGroup,
603594
Gallery,
604595
goToMessage,

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@ export type MessageSimplePropsWithContext<
3131
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
3232
> = Pick<
3333
MessageContextValue<StreamChatGenerics>,
34-
| 'alignment'
35-
| 'channel'
36-
| 'disabled'
37-
| 'isEditedMessageOpen'
38-
| 'groupStyles'
39-
| 'hasReactions'
40-
| 'message'
34+
'alignment' | 'channel' | 'isEditedMessageOpen' | 'groupStyles' | 'hasReactions' | 'message'
4135
> &
4236
Pick<
4337
MessagesContextValue<StreamChatGenerics>,
@@ -125,7 +119,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
125119
) => {
126120
const {
127121
channel: prevChannel,
128-
disabled: prevDisabled,
129122
groupStyles: prevGroupStyles,
130123
hasReactions: prevHasReactions,
131124
isEditedMessageOpen: prevIsEditedMessageOpen,
@@ -134,17 +127,13 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
134127
} = prevProps;
135128
const {
136129
channel: nextChannel,
137-
disabled: nextDisabled,
138130
groupStyles: nextGroupStyles,
139131
hasReactions: nextHasReactions,
140132
isEditedMessageOpen: nextIsEditedMessageOpen,
141133
message: nextMessage,
142134
myMessageTheme: nextMyMessageTheme,
143135
} = nextProps;
144136

145-
const disabledEqual = prevDisabled === nextDisabled;
146-
if (!disabledEqual) return false;
147-
148137
const hasReactionsEqual = prevHasReactions === nextHasReactions;
149138
if (!hasReactionsEqual) return false;
150139

@@ -231,7 +220,7 @@ export const MessageSimple = <
231220
>(
232221
props: MessageSimpleProps<StreamChatGenerics>,
233222
) => {
234-
const { alignment, channel, disabled, groupStyles, hasReactions, isEditedMessageOpen, message } =
223+
const { alignment, channel, groupStyles, hasReactions, isEditedMessageOpen, message } =
235224
useMessageContext<StreamChatGenerics>();
236225
const {
237226
enableMessageGroupingByUser,
@@ -246,7 +235,6 @@ export const MessageSimple = <
246235
{...{
247236
alignment,
248237
channel,
249-
disabled,
250238
enableMessageGroupingByUser,
251239
groupStyles,
252240
hasReactions,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const useCreateMessageContext = <
1010
actionsEnabled,
1111
alignment,
1212
channel,
13-
disabled,
1413
files,
1514
goToMessage,
1615
groupStyles,
@@ -63,7 +62,6 @@ export const useCreateMessageContext = <
6362
actionsEnabled,
6463
alignment,
6564
channel,
66-
disabled,
6765
files,
6866
goToMessage,
6967
groupStyles,
@@ -106,7 +104,6 @@ export const useCreateMessageContext = <
106104
actionsEnabled,
107105
quotedMessageDeletedValue,
108106
alignment,
109-
disabled,
110107
goToMessage,
111108
groupStylesLength,
112109
hasReactions,

0 commit comments

Comments
 (0)