Gallery Block: Get media data in a single request

WordPress · Aug 30, 2021 · 9e51ff6 · 9e51ff6
1 parent 476d89c
commit 9e51ff6
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/packages/block-library/src/gallery/use-get-media.js b/packages/block-library/src/gallery/use-get-media.js
@@ -26,23 +26,18 @@ export default function useGetMedia( innerBlockImages ) {
 			if ( imageIds.length === 0 ) {
 				return currentImageMedia;
 			}
-			const getMedia = select( coreStore ).getMedia;
-			const newImageMedia = imageIds.map( ( img ) => {
-				return getMedia( img );
-			} );
 
-			if ( newImageMedia.some( ( img ) => ! img ) ) {
-				return currentImageMedia;
-			}
-
-			return newImageMedia;
+			return select( coreStore ).getMediaItems( {
+				include: imageIds.join( ',' ),
+				per_page: imageIds.length,
+			} );
 		},
 		[ innerBlockImages ]
 	);
 
 	if (
-		imageMedia?.length !== currentImageMedia.length ||
-		imageMedia.some(
+		imageMedia?.length !== currentImageMedia?.length ||
+		imageMedia?.some(
 			( newImage ) =>
 				! currentImageMedia.find(
 					( currentImage ) => currentImage.id === newImage.id