Merge branch 'trunk' into Odie/restrict-escalation-until-enough-context

apps/wpcom-block-editor/src/wpcom/features/tracking.js

@@ -380,6 +380,32 @@ const maybeTrackPatternInsertion = ( actionData, additionalData ) => {
 	return null;
 };
 
+/**
+ * Track block drag and drop events.
+ * @param {Array} clientIds - Array of client IDs of the blocks being dragged.
+ * @param {string} fromRootClientId - Root client ID from where the blocks are dragged.
+ * @param {string} toRootClientId - Root client ID to where the blocks are dropped.
+ * @returns {void}
+ */
+const trackBlockDragDrop = ( clientIds, fromRootClientId, toRootClientId ) => {
+	const isDragging = select( 'core/block-editor' ).isDraggingBlocks();
+
+	// moveBlocksToPosition action is called when moving given blocks
+	// to a new position. This could be used in various scenarios such
+	// as mover arrows in the block toolbar, drag and drop, etc.
+	// Therefore this tracking ignore actions that are not related to
+	// dragging blocks.
+	if ( ! isDragging ) {
+		return;
+	}
+
+	getBlocksTracker( 'wpcom_block_moved_via_dragging' )(
+		clientIds,
+		fromRootClientId,
+		toRootClientId
+	);
+};
+
 /**
  * Track block insertion.
  * @param {Object | Array} blocks block instance object or an array of such objects
@@ -906,7 +932,7 @@ const REDUX_TRACKING = {
 		moveBlocksDown: getBlocksTracker( 'wpcom_block_moved_down' ),
 		removeBlocks: trackBlockRemoval,
 		removeBlock: trackBlockRemoval,
-		moveBlockToPosition: getBlocksTracker( 'wpcom_block_moved_via_dragging' ),
+		moveBlocksToPosition: trackBlockDragDrop,
 		insertBlock: trackBlockInsertion,
 		insertBlocks: trackBlockInsertion,
 		replaceBlock: trackBlockReplacement,