Merge pull request #2752 from open-webui/dev

fix: #2751

Merge pull request #2752 from open-webui/dev
fix: #2751
61287a16 · Timothy Jaeryang Baek · GitHub · 4b459e37 · 16e72b2f · 61287a16
Unverified Commit 61287a16 authored Jun 02, 2024 by Timothy Jaeryang Baek Committed by GitHub Jun 02, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

src/lib/components/chat/MessageInput.svelte src/lib/components/chat/MessageInput.svelte +12 -6

No files found.
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -828,13 +828,19 @@
 										e.preventDefault();
 									}
-									if (e.key === 'Enter' && !e.shiftKey && prompt !== '') {
+									const commandOptionButton = [
-										submitPrompt(prompt, user);
+										...document.getElementsByClassName('selected-command-option-button')
-										return;
+									]?.at(-1);
-									}
-									if (e.key === 'Enter' && e.shiftKey && prompt !== '') {
+									if (!commandOptionButton) {
-										return;
+										if (e.key === 'Enter' && !e.shiftKey && prompt !== '' && selected) {
+											submitPrompt(prompt, user);
+											return;
+										}
+										if (e.key === 'Enter' && e.shiftKey && prompt !== '') {
+											return;
+										}
 									}
 								}