Simplify and fix in site editor

packages/block-editor/src/components/block-list/validate-multiple-usage.js

@@ -12,36 +12,9 @@ import { __ } from '@wordpress/i18n';
 import { store as blockEditorStore } from '../../store';
 import Warning from '../warning';
 
-/**
- * Recursively find very first block of an specific block type.
- *
- * @param {Object[]} blocks List of blocks.
- * @param {string}   name   Block name to search.
- *
- * @return {Object|undefined} Return block object or undefined.
- */
-function findFirstOfSameType( blocks, name ) {
-	if ( ! Array.isArray( blocks ) || ! blocks.length ) {
-		return;
-	}
-
-	for ( const block of blocks ) {
-		if ( block.name === name ) {
-			return block;
-		}
-
-		// Search inside innerBlocks.
-		const firstBlock = findFirstOfSameType( block.innerBlocks, name );
-
-		if ( firstBlock ) {
-			return firstBlock;
-		}
-	}
-}
-
 export function useOriginalBlockOnlyUseOnce( clientId ) {
 	return useSelect( ( select ) => {
-		const { getBlockName } = select( blockEditorStore );
+		const { getBlockName, getBlocksByName } = select( blockEditorStore );
 		const blockName = getBlockName( clientId );
 		const multiple = hasBlockSupport( blockName, 'multiple', true );
 
@@ -50,14 +23,10 @@ export function useOriginalBlockOnlyUseOnce( clientId ) {
 		if ( multiple ) {
 			return false;
 		}
-
-		// Otherwise, only pass `originalBlockClientId` if it refers to a different
-		// block from the current one.
-		const blocks = select( blockEditorStore ).getBlocks();
-		const firstOfSameType = findFirstOfSameType( blocks, blockName );
+		const blocksWithSameName = getBlocksByName( blockName );
 		const isInvalid =
-			firstOfSameType && firstOfSameType.clientId !== clientId;
-		return isInvalid ? firstOfSameType.clientId : false;
+			blocksWithSameName.length && blocksWithSameName[ 0 ] !== clientId;
+		return isInvalid ? blocksWithSameName[ 0 ] : false;
 	} );
 }