Remove dragged component from consideration of drop target

packages/client/src/components/preview/DNDHandler.svelte

@@ -183,7 +183,9 @@
 
     // Find the next valid component to consider dropping over, ignoring nested
     // block components
-    const component = e.target?.closest?.(".component:not(.block)")
+    const component = e.target?.closest?.(
+      `.component:not(.block):not(.${sourceId})`
+    )
     if (component && component.classList.contains("droppable")) {
       targetInfo = {
         id: component.dataset.id,

packages/client/src/stores/screens.js

@@ -46,8 +46,7 @@ const createScreenStore = () => {
 
       // Insert DND placeholder if required
       const { dndParent, dndIndex, selectedComponentId } = $builderStore
-      const insert = true
-      if (insert && activeScreen && dndParent && dndIndex != null) {
+      if (activeScreen && dndParent && dndIndex != null) {
         // Remove selected component from tree
         let selectedParent = findComponentParent(
           activeScreen.props,