Fix id, remove margins

packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js

@@ -122,6 +122,11 @@ export function useEventHandlers( { clientId, isSelected } ) {
 				const clone = node.cloneNode( true );
 				clone.style.visibility = 'hidden';
 
+				// Remove the id and leave it on the clone so that drop target
+				// calculations are correct.
+				const id = node.id;
+				node.id = null;
+
 				let _scale = 1;
 
 				let parentElement = node;
@@ -152,14 +157,14 @@ export function useEventHandlers( { clientId, isSelected } ) {
 				node.style.transformOrigin = `${ originX }px ${ originY }px`;
 				node.style.transition = 'transform 0.2s ease-out';
 				node.style.transform = `scale( 0.5 )`;
+				node.style.margin = '0';
 
 				let hasStarted = false;
 
 				function over( e ) {
 					if ( ! hasStarted ) {
 						hasStarted = true;
 						node.style.pointerEvents = 'none';
-						node.draggable = false;
 					}
 					node.style.top = `${ e.clientY * inverted - originY }px`;
 					node.style.left = `${ e.clientX * inverted - originX }px`;
@@ -177,8 +182,9 @@ export function useEventHandlers( { clientId, isSelected } ) {
 					node.style.left = '';
 					node.style.width = '';
 					node.style.pointerEvents = '';
-					node.draggable = true;
+					node.style.margin = '';
 					clone.remove();
+					node.id = id;
 					dragElement.remove();
 					stopDraggingBlocks();
 					document.body.classList.remove(

packages/block-editor/src/components/use-block-drop-zone/index.js

@@ -406,13 +406,7 @@ export default function useBlockDropZone( {
 					return;
 				}
 
-				// Don't include the dragged blocks in the block list, because
-				// they will have been dragged away, so the bounding client rect
-				// will be incorrect.
-				const blocks = getBlocks( targetRootClientId ).filter(
-					( block ) =>
-						! draggedBlockClientIds.includes( block.clientId )
-				);
+				const blocks = getBlocks( targetRootClientId );
 
 				// The block list is empty, don't show the insertion point but still allow dropping.
 				if ( blocks.length === 0 ) {