Skip to content

Commit bbcf5f7

Browse files
committed
fix: remove unused values from message input context
1 parent f99b02f commit bbcf5f7

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

package/src/components/MessageInput/MessageInput.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ type MessageInputPropsWithContext = Pick<
136136
| 'InputReplyStateHeader'
137137
| 'isValidMessage'
138138
| 'maxNumberOfFiles'
139-
| 'mentionedUsers'
140139
| 'numberOfUploads'
141140
| 'quotedMessage'
142141
| 'resetInput'
@@ -163,6 +162,7 @@ type MessageInputPropsWithContext = Pick<
163162
Pick<TranslationContextValue, 't'>;
164163

165164
const textComposerStateSelector = (state: TextComposerState) => ({
165+
mentionedUsers: state.mentionedUsers,
166166
suggestions: state.suggestions,
167167
text: state.text,
168168
});
@@ -209,7 +209,6 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
209209
isValidMessage,
210210
maxNumberOfFiles,
211211
members,
212-
mentionedUsers,
213212
numberOfUploads,
214213
quotedMessage,
215214
removeFile,
@@ -233,7 +232,7 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
233232

234233
const messageComposer = useMessageComposer();
235234
const { customDataManager, textComposer } = messageComposer;
236-
const { text } = useStateStore(textComposer.state, textComposerStateSelector);
235+
const { mentionedUsers, text } = useStateStore(textComposer.state, textComposerStateSelector);
237236
const { command } = useStateStore(customDataManager.state, customComposerDataSelector);
238237

239238
const [height, setHeight] = useState(0);
@@ -899,7 +898,6 @@ const areEqual = (
899898
imageUploads: prevImageUploads,
900899
isOnline: prevIsOnline,
901900
isValidMessage: prevIsValidMessage,
902-
mentionedUsers: prevMentionedUsers,
903901
openPollCreationDialog: prevOpenPollCreationDialog,
904902
quotedMessage: prevQuotedMessage,
905903
sending: prevSending,
@@ -923,7 +921,6 @@ const areEqual = (
923921
imageUploads: nextImageUploads,
924922
isOnline: nextIsOnline,
925923
isValidMessage: nextIsValidMessage,
926-
mentionedUsers: nextMentionedUsers,
927924
openPollCreationDialog: nextOpenPollCreationDialog,
928925
quotedMessage: nextQuotedMessage,
929926
sending: nextSending,
@@ -1036,11 +1033,6 @@ const areEqual = (
10361033
return false;
10371034
}
10381035

1039-
const mentionedUsersEqual = prevMentionedUsers.length === nextMentionedUsers.length;
1040-
if (!mentionedUsersEqual) {
1041-
return false;
1042-
}
1043-
10441036
const threadEqual =
10451037
prevThread?.id === nextThread?.id &&
10461038
prevThread?.text === nextThread?.text &&
@@ -1116,7 +1108,6 @@ export const MessageInput = (props: MessageInputProps) => {
11161108
InputReplyStateHeader,
11171109
isValidMessage,
11181110
maxNumberOfFiles,
1119-
mentionedUsers,
11201111
numberOfUploads,
11211112
openPollCreationDialog,
11221113
quotedMessage,
@@ -1194,7 +1185,6 @@ export const MessageInput = (props: MessageInputProps) => {
11941185
isValidMessage,
11951186
maxNumberOfFiles,
11961187
members,
1197-
mentionedUsers,
11981188
numberOfUploads,
11991189
openPollCreationDialog,
12001190
quotedMessage,

package/src/contexts/messageInputContext/MessageInputContext.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export type LocalMessageInputContext = {
143143
*
144144
*/
145145
fileUploads: FileUpload[];
146-
hasText: boolean;
147146
/**
148147
* An array of image objects which are set for upload. It has the following structure:
149148
*
@@ -166,7 +165,6 @@ export type LocalMessageInputContext = {
166165
imageUploads: FileUpload[];
167166
inputBoxRef: React.MutableRefObject<TextInput | null>;
168167
isValidMessage: () => boolean;
169-
mentionedUsers: string[];
170168
numberOfUploads: number;
171169
openAttachmentPicker: () => void;
172170
openFilePicker: () => void;
@@ -217,7 +215,6 @@ export type LocalMessageInputContext = {
217215
* Function for taking a photo and uploading it
218216
*/
219217
takeAndUploadImage: (mediaType?: MediaTypes) => Promise<void>;
220-
text: string;
221218
toggleAttachmentPicker: () => void;
222219
updateMessage: () => Promise<void>;
223220
/** Function for attempting to upload a file */
@@ -1389,7 +1386,6 @@ export const MessageInputProvider = ({
13891386
inputBoxRef,
13901387
isCommandUIEnabled,
13911388
isValidMessage,
1392-
mentionedUsers: mentionedUsers.map((user) => user.id),
13931389
numberOfUploads,
13941390
openAttachmentPicker,
13951391
openFilePicker: pickFile,
@@ -1413,7 +1409,6 @@ export const MessageInputProvider = ({
14131409
setShowMoreOptions,
14141410
showMoreOptions,
14151411
takeAndUploadImage,
1416-
text,
14171412
thread,
14181413
toggleAttachmentPicker,
14191414
updateMessage,
@@ -1423,7 +1418,6 @@ export const MessageInputProvider = ({
14231418
uploadNewImage,
14241419
...value,
14251420
closePollCreationDialog,
1426-
hasText: !!text,
14271421
openPollCreationDialog,
14281422
sendMessage, // overriding the originally passed in sendMessage
14291423
showPollCreationDialog,

package/src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const useCreateMessageInputContext = ({
4545
hasCommands,
4646
hasFilePicker,
4747
hasImagePicker,
48-
hasText,
4948
ImageUploadPreview,
5049
imageUploads,
5150
initialValue,
@@ -59,7 +58,6 @@ export const useCreateMessageInputContext = ({
5958
maxNumberOfFiles,
6059
mentionAllAppUsersEnabled,
6160
mentionAllAppUsersQuery,
62-
mentionedUsers,
6361
MoreOptionsButton,
6462
numberOfLines,
6563
numberOfUploads,
@@ -98,7 +96,6 @@ export const useCreateMessageInputContext = ({
9896
StartAudioRecordingButton,
9997
StopMessageStreamingButton,
10098
takeAndUploadImage,
101-
text,
10299
thread,
103100
toggleAttachmentPicker,
104101
updateMessage,
@@ -112,7 +109,6 @@ export const useCreateMessageInputContext = ({
112109
const fileUploadsValue = fileUploads.map(({ state }) => state).join();
113110
const imageUploadsValue = imageUploads.map(({ state }) => state).join();
114111
const asyncUploadsValue = Object.keys(asyncUploads).join();
115-
const mentionedUsersLength = mentionedUsers.length;
116112
const quotedMessageId = quotedMessage ? quotedMessage.id : '';
117113
const threadId = thread?.id;
118114
const asyncIdsLength = asyncIds.length;
@@ -159,7 +155,6 @@ export const useCreateMessageInputContext = ({
159155
hasCommands,
160156
hasFilePicker,
161157
hasImagePicker,
162-
hasText,
163158
ImageUploadPreview,
164159
imageUploads,
165160
initialValue,
@@ -174,7 +169,6 @@ export const useCreateMessageInputContext = ({
174169
maxNumberOfFiles,
175170
mentionAllAppUsersEnabled,
176171
mentionAllAppUsersQuery,
177-
mentionedUsers,
178172
MoreOptionsButton,
179173
numberOfLines,
180174
numberOfUploads,
@@ -213,7 +207,6 @@ export const useCreateMessageInputContext = ({
213207
StartAudioRecordingButton,
214208
StopMessageStreamingButton,
215209
takeAndUploadImage,
216-
text,
217210
toggleAttachmentPicker,
218211
updateMessage,
219212
uploadFile,
@@ -230,15 +223,12 @@ export const useCreateMessageInputContext = ({
230223
editingdep,
231224
fileUploadsValue,
232225
isCommandUIEnabled,
233-
hasText,
234226
imageUploadsValue,
235227
maxMessageLength,
236-
mentionedUsersLength,
237228
quotedMessageId,
238229
selectedPicker,
239230
sendThreadMessageInChannel,
240231
showMoreOptions,
241-
text,
242232
threadId,
243233
showPollCreationDialog,
244234
],

0 commit comments

Comments
 (0)