Don't submit the form on Return press for FLD search inputs

Resolves #11415
craftcms · Jun 9, 2022 · 28910a3 · 28910a3
1 parent 7410544
commit 28910a3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Changed
 - Element index queries are no longer cached if they contain a search term.
+- Search inputs within field layout designers now prevent the containing form from being submitted when the <kbd>Return</kbd> key is pressed. ([#11415](https://github.com/craftcms/cms/discussions/11415))
 
 ### Fixed
 - Fixed a bug where element types’ `actions()` methods were getting called for all `element-indexes/*` action requests.

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/FieldLayoutDesigner.js b/src/web/assets/cp/src/js/FieldLayoutDesigner.js
@@ -114,8 +114,14 @@ Craft.FieldLayoutDesigner = Garnish.Base.extend(
       });
 
       this.addListener(this.$fieldSearch, 'keydown', (ev) => {
-        if (ev.keyCode === Garnish.ESC_KEY) {
-          this.$fieldSearch.val('').trigger('input');
+        switch (ev.keyCode) {
+          case Garnish.ESC_KEY:
+            this.$fieldSearch.val('').trigger('input');
+            break;
+          case Garnish.RETURN_KEY:
+            // they most likely don't want to submit the form from here
+            ev.preventDefault();
+            break;
         }
       });