chore: Audio and video message actions disabled while typing (#40334)

Author: dougfabris

apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx

@@ -484,7 +484,6 @@ const MessageBox = ({
 						)}
 						<MessageBoxActionsToolbar
 							canSend={canSend}
-							typing={typing}
 							isMicrophoneDenied={isMicrophoneDenied}
 							rid={room._id}
 							tmid={tmid}

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx

@@ -22,7 +22,6 @@ import { useRoom } from '../../../contexts/RoomContext';
 
 type MessageBoxActionsToolbarProps = {
 	canSend: boolean;
-	typing: boolean;
 	isMicrophoneDenied: boolean;
 	variant: 'small' | 'large';
 	isRecording: boolean;
@@ -40,7 +39,6 @@ const isHidden = (hiddenActions: Array<string>, action: GenericMenuItemProps) =>
 
 const MessageBoxActionsToolbar = ({
 	canSend,
-	typing,
 	isRecording,
 	rid,
 	tmid,
@@ -57,8 +55,8 @@ const MessageBoxActionsToolbar = ({
 
 	const room = useRoom();
 
-	const audioMessageAction = useAudioMessageAction(!canSend || typing || isRecording || isMicrophoneDenied, isMicrophoneDenied);
-	const videoMessageAction = useVideoMessageAction(!canSend || typing || isRecording);
+	const audioMessageAction = useAudioMessageAction(!canSend || isRecording || isMicrophoneDenied, isMicrophoneDenied);
+	const videoMessageAction = useVideoMessageAction(!canSend || isRecording);
 	const fileUploadAction = useFileUploadAction(!canSend || isRecording || isEditing);
 	const webdavActions = useWebdavActions(!canSend || isRecording || isEditing);
 	const createDiscussionAction = useCreateDiscussionAction(room);

apps/meteor/tests/e2e/file-upload.spec.ts

@@ -132,8 +132,13 @@ test.describe.serial('file-upload', () => {
 
 	test('should upload file in composer after recording video message', async ({ context }) => {
 		await context.grantPermissions(['camera', 'microphone']);
-
 		await poHomeChannel.navbar.openChat(targetChannel);
+
+		await test.step('should be able to record a video with text content in composer ', async () => {
+			await poHomeChannel.composer.inputMessage.fill('this is a message with video message');
+			await expect(poHomeChannel.composer.btnVideoMessage).toBeEnabled();
+		});
+
 		await poHomeChannel.composer.btnVideoMessage.click();
 		await poHomeChannel.composer.videoRecorderPopup.record();
 

apps/meteor/tests/e2e/message-composer.spec.ts

@@ -175,8 +175,13 @@ test.describe.serial('message-composer', () => {
 	test.describe('audio recorder', () => {
 		test('should open audio recorder', async () => {
 			await poHomeChannel.navbar.openChat(targetChannel);
-			await poHomeChannel.composer.btnAudioMessage.click();
 
+			await test.step('should be able to record an audio with text content in composer ', async () => {
+				await poHomeChannel.composer.inputMessage.fill('this is a message with audio message');
+				await expect(poHomeChannel.composer.btnAudioMessage).toBeEnabled();
+			});
+
+			await poHomeChannel.composer.btnAudioMessage.click();
 			await expect(poHomeChannel.audioRecorder).toBeVisible();
 		});