fix: Don't allow rows moved via the keyboard in the enhancedBootstrap…

… feature to swap with prepended or appended fields
kevinchappell · Oct 3, 2023 · 5af6feb · 5af6feb
1 parent f7fa676
commit 5af6feb
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/js/form-builder.js b/src/js/form-builder.js
@@ -2034,23 +2034,19 @@ function FormBuilder(opts, element, $) {
   })
 
   function moveFieldUp(rowWrapper) {
-    const previousRowSibling = rowWrapper.prevAll().not(tmpRowPlaceholderClassSelector).first()
+    const previousRowSibling = rowWrapper.prevAll().not(tmpRowPlaceholderClassSelector).not('.form-prepend').first()
     if (previousRowSibling.length) {
       $(gridModeTargetField.parent().parent()).swapWith(previousRowSibling)
-    } else {
-      return
+      h.toggleHighlight(gridModeTargetField)
     }
-    h.toggleHighlight(gridModeTargetField)
   }
 
   function moveFieldDown(rowWrapper) {
-    const nextRowSibling = rowWrapper.nextAll().not(invisibleRowPlaceholderClassSelector).first()
+    const nextRowSibling = rowWrapper.nextAll().not(invisibleRowPlaceholderClassSelector).not('.form-append').first()
     if (nextRowSibling.length) {
       $(gridModeTargetField.parent().parent()).swapWith(nextRowSibling)
-    } else {
-      return
+      h.toggleHighlight(gridModeTargetField)
     }
-    h.toggleHighlight(gridModeTargetField)
   }
 
   function moveFieldLeft() {