Merge pull request #2453 from SillyTavern/input-popup-respect-enter-to-send Make input popups respect "Enter to Send" setting

ce92385454fd179ddb998663bbb19aaef85b13b7

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/popup.js+10 -1 Viewed

+import { shouldSendOnEnter } from './RossAscends-mods.js';
 import { power_user } from './power-user.js';
 import { removeFromArray, runAfterAnimation, uuidv4 } from './utils.js';

                     if (this.dlg != document.activeElement?.closest('.popup'))
                         return;
-                    // Check if the current focus is a result control. Only should we apply the compelete action
+                    // Check if the current focus is a result control. Only should we apply the complete action
                     const resultControl = document.activeElement?.closest('.result-control');
                     if (!resultControl)
                         return;
+                    // Check if we are inside an input type text or a textarea field and send on enter is disabled
+                    const textarea = document.activeElement?.closest('textarea');
+                    if (textarea instanceof HTMLTextAreaElement && !shouldSendOnEnter())
+                        return;
+                    const input = document.activeElement?.closest('input[type="text"]');
+                    if (input instanceof HTMLInputElement && !shouldSendOnEnter())
+                        return;
                     evt.preventDefault();
                     evt.stopPropagation();
                     const result = Number(document.activeElement.getAttribute('data-result') ?? this.defaultResult);