fix

RocketChat · Jul 24, 2024 · 54fe110 · 54fe110
1 parent 05db8aa
commit 54fe110
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
@@ -192,6 +192,10 @@ const MessageBox = ({
 		const isSubmitKey = keyCode === keyCodes.CARRIAGE_RETURN || keyCode === keyCodes.NEW_LINE;
 
 		if (isSubmitKey) {
+			if (popup) {
+				return;
+			}
+
 			const withModifier = event.shiftKey || event.ctrlKey || event.altKey || event.metaKey;
 			const isSending = (sendOnEnter && !withModifier) || (!sendOnEnter && withModifier);
 
@@ -357,7 +361,8 @@ const MessageBox = ({
 		[handler],
 	);
 
-	const mergedRefs = useMessageComposerMergedRefs(c, textareaRef, callbackRef, autofocusRef, keyDownHandlerCallbackRef);
+	// TODO: Fix this! Parameter order matters here!
+	const mergedRefs = useMessageComposerMergedRefs(keyDownHandlerCallbackRef, c, textareaRef, callbackRef, autofocusRef);
 
 	const shouldPopupPreview = useEnablePopupPreview(filter, popup);