fix: remove redundant droppingToPlaceholderRow which uses the same ch…

…eck as droppingToNewRow, and simplify the logic.
kevinchappell · Nov 4, 2023 · 62c0562 · 62c0562
1 parent b8fd49a
commit 62c0562
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/src/js/form-builder.js b/src/js/form-builder.js
@@ -1316,34 +1316,32 @@ function FormBuilder(opts, element, $) {
         const senderIsControlsBox = $(ui.sender).attr('id') === $cbUL.attr('id')
 
         const droppingToNewRow = $(ui.item).parent().hasClass(tmpRowPlaceholderClass)
-        const droppingToPlaceholderRow = $(ui.item).parent().hasClass(tmpRowPlaceholderClass)
-        const droppingToExistingRow =
-          $(ui.item).parent().hasClass(rowWrapperClass) && !$(ui.item).parent().hasClass(tmpRowPlaceholderClass)
+        const droppingToExistingRow = !droppingToNewRow && $(ui.item).parent().hasClass(rowWrapperClass)
 
-        if (droppingToNewRow && !senderIsControlsBox) {
-          const colWrapper = $(ui.item)
-
-          const columnData = prepareFieldRow({})
+        if (droppingToNewRow) {
+          if (senderIsControlsBox) {
+            insertTargetIsRow = true
+            insertingNewControl = true
+            $targetInsertWrapper = $(ui.item).parent()
+          } else {
+            const colWrapper = $(ui.item)
 
-          const rowWrapperNode = m('div', null, {
-            id: `${colWrapper.find('li').attr('id')}-row`,
-            className: `row row-${columnData.rowUniqueId} ${rowWrapperClass}`,
-          })
+            const columnData = prepareFieldRow({})
 
-          $(ui.item).parent().replaceWith(rowWrapperNode)
-          AttachColWrapperHandler($(ui.item))
+            const rowWrapperNode = m('div', null, {
+              id: `${colWrapper.find('li').attr('id')}-row`,
+              className: `row row-${columnData.rowUniqueId} ${rowWrapperClass}`,
+            })
 
-          colWrapper.appendTo(rowWrapperNode)
+            $(ui.item).parent().replaceWith(rowWrapperNode)
+            AttachColWrapperHandler($(ui.item))
 
-          setupSortableRowWrapper(rowWrapperNode)
-          syncFieldWithNewRow(colWrapper.attr('id'))
-          checkRowCleanup()
-        }
+            colWrapper.appendTo(rowWrapperNode)
 
-        if (droppingToPlaceholderRow && senderIsControlsBox) {
-          insertTargetIsRow = true
-          insertingNewControl = true
-          $targetInsertWrapper = $(ui.item).parent()
+            setupSortableRowWrapper(rowWrapperNode)
+            syncFieldWithNewRow(colWrapper.attr('id'))
+            checkRowCleanup()
+          }
         }
 
         if (droppingToExistingRow && senderIsControlsBox) {