Merge branch 'develop' into pr/fix-10299

craftcms · Jun 9, 2022 · 70d9088 · 70d9088
2 parents 5070269 + b8eb2bb
commit 70d9088
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
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
@@ -113,8 +113,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;
         }
       });