Code change per review

WordPress · May 4, 2020 · 15b61e0 · 15b61e0
1 parent c164f19
commit 15b61e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/packages/block-editor/src/components/inserter/search-items.js b/packages/block-editor/src/components/inserter/search-items.js
@@ -122,9 +122,13 @@ export const searchItems = ( items, searchTerm, config = {} ) => {
 		const collection = getCollection( item );
 		const variations = getVariations( item );
 
-		const terms = [ title, keywords, category, collection, variations ]
-			.flat()
-			.join( ' ' );
+		const terms = [
+			title,
+			...keywords,
+			category,
+			collection,
+			...variations,
+		].join( ' ' );
 
 		const unmatchedTerms = removeMatchingTerms(
 			normalizedSearchTerms,

diff --git a/packages/block-editor/src/components/inserter/use-async-list.js b/packages/block-editor/src/components/inserter/use-async-list.js
@@ -13,16 +13,16 @@ import { createQueue } from '@wordpress/priority-queue';
  */
 function getFirstItemsPresentInState( list, state ) {
 	const firstItems = [];
-	let index = 0;
-	let alreadyRendered = false;
-	do {
-		const item = list[ index ];
-		alreadyRendered = state.indexOf( item ) !== -1;
-		if ( alreadyRendered ) {
-			firstItems.push( item );
+
+	for ( let i = 0; i < list.length; i++ ) {
+		const item = list[ i ];
+		if ( ! state.includes( item ) ) {
+			break;
 		}
-		index++;
-	} while ( alreadyRendered || index === list.length );
+
+		firstItems.push( item );
+	}
+
 	return firstItems;
 }