Update gallery block fixtures to match with gallery refactor to nested Image Blocks

packages/block-editor/src/components/media-placeholder/index.js

@@ -63,6 +63,7 @@ export function MediaPlaceholder( {
 	isAppender,
 	accept,
 	addToGallery,
+	isGallery = false,
 	multiple = false,
 	dropZoneUIOnly,
 	disableDropZone,
@@ -117,48 +118,25 @@ export function MediaPlaceholder( {
 		}
 	};
 
+	const onMediaLibrarySelection = ( files ) => {
+		if ( isGallery ) {
+			onSelect( files, true );
+			return;
+		}
+		onSelect( files );
+	};
+
 	const onFilesUpload = ( files ) => {
+		if ( isGallery ) {
+			// Because the Gallery hands the files over to Image component InnerBlocks just
+			// hand the handling of the files over to the Gallery
+			onSelect( files );
+			return;
+		}
 		onFilesPreUpload( files );
 		let setMedia;
 		if ( multiple ) {
-			if ( addToGallery ) {
-				// Since the setMedia function runs multiple times per upload group
-				// and is passed newMedia containing every item in its group each time, we must
-				// filter out whatever this upload group had previously returned to the
-				// gallery before adding and returning the image array with replacement newMedia
-				// values.
-
-				// Define an array to store urls from newMedia between subsequent function calls.
-				let lastMediaPassed = [];
-				setMedia = ( newMedia ) => {
-					// Remove any images this upload group is responsible for (lastMediaPassed).
-					// Their replacements are contained in newMedia.
-					const filteredMedia = ( value ?? [] ).filter( ( item ) => {
-						// If Item has id, only remove it if lastMediaPassed has an item with that id.
-						if ( item.id ) {
-							return ! lastMediaPassed.some(
-								// Be sure to convert to number for comparison.
-								( { id } ) => Number( id ) === Number( item.id )
-							);
-						}
-						// Compare transient images via .includes since gallery may append extra info onto the url.
-						return ! lastMediaPassed.some( ( { urlSlug } ) =>
-							item.url.includes( urlSlug )
-						);
-					} );
-					// Return the filtered media array along with newMedia.
-					onSelect( filteredMedia.concat( newMedia ) );
-					// Reset lastMediaPassed and set it with ids and urls from newMedia.
-					lastMediaPassed = newMedia.map( ( media ) => {
-						// Add everything up to '.fileType' to compare via .includes.
-						const cutOffIndex = media.url.lastIndexOf( '.' );
-						const urlSlug = media.url.slice( 0, cutOffIndex );
-						return { id: media.id, urlSlug };
-					} );
-				};
-			} else {
-				setMedia = onSelect;
-			}
+			setMedia = onSelect;
 		} else {
 			setMedia = ( [ media ] ) => onSelect( media );
 		}
@@ -306,7 +284,7 @@ export function MediaPlaceholder( {
 				addToGallery={ addToGallery }
 				gallery={ multiple && onlyAllowsImages() }
 				multiple={ multiple }
-				onSelect={ onSelect }
+				onSelect={ onMediaLibrarySelection }
 				allowedTypes={ allowedTypes }
 				value={
 					Array.isArray( value )

packages/block-library/src/gallery/block.json

@@ -3,56 +3,19 @@
 	"name": "core/gallery",
 	"category": "media",
 	"attributes": {
-		"images": {
+		"imageUploads": {
 			"type": "array",
 			"default": [],
-			"source": "query",
-			"selector": ".blocks-gallery-item",
-			"query": {
-				"url": {
-					"type": "string",
-					"source": "attribute",
-					"selector": "img",
-					"attribute": "src"
-				},
-				"fullUrl": {
-					"type": "string",
-					"source": "attribute",
-					"selector": "img",
-					"attribute": "data-full-url"
-				},
-				"link": {
-					"type": "string",
-					"source": "attribute",
-					"selector": "img",
-					"attribute": "data-link"
-				},
-				"alt": {
-					"type": "string",
-					"source": "attribute",
-					"selector": "img",
-					"attribute": "alt",
-					"default": ""
-				},
-				"id": {
-					"type": "string",
-					"source": "attribute",
-					"selector": "img",
-					"attribute": "data-id"
-				},
-				"caption": {
-					"type": "string",
-					"source": "html",
-					"selector": ".blocks-gallery-item__caption"
-				}
+			"items": {
+				"type": "object"
 			}
 		},
-		"ids": {
+		"shortCodeTransforms": {
 			"type": "array",
+			"default": [],
 			"items": {
-				"type": "number"
-			},
-			"default": []
+				"type": "object"
+			}
 		},
 		"columns": {
 			"type": "number",
@@ -68,14 +31,39 @@
 			"type": "boolean",
 			"default": true
 		},
+		"linkTarget": {
+			"type": "string"
+		},
 		"linkTo": {
 			"type": "string"
 		},
 		"sizeSlug": {
 			"type": "string",
 			"default": "large"
+		},
+		"allowResize": {
+			"type": "boolean",
+			"default": false
+		},
+		"isGrouped": {
+			"type": "boolean",
+			"default": true
+		},
+		"imageCount": {
+			"type": "number",
+			"default": 0
+		},
+		"gutterSize": {
+			"type": "number"
 		}
 	},
+	"providesContext": {
+		"allowResize": "allowResize",
+		"isGrouped": "isGrouped",
+		"linkTo": "linkTo",
+		"linkTarget": "linkTarget",
+		"sizeSlug": "sizeSlug"
+	},
 	"supports": {
 		"anchor": true,
 		"align": true

packages/block-library/src/gallery/constants.js

@@ -1,3 +1,3 @@
 export const LINK_DESTINATION_NONE = 'none';
-export const LINK_DESTINATION_MEDIA = 'file';
-export const LINK_DESTINATION_ATTACHMENT = 'post';
+export const LINK_DESTINATION_MEDIA = 'media';
+export const LINK_DESTINATION_ATTACHMENT = 'attachment';