Resolve merge conflicts

This brings the gallery edit changes to the v1 directory, and merges the changes for the image block.
WordPress · Jun 3, 2021 · e183dcb · e183dcb
1 parent e5420c6
commit e183dcb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/packages/block-library/src/gallery/v1/edit.js b/packages/block-library/src/gallery/v1/edit.js
@@ -153,6 +153,10 @@ function GalleryEdit( props ) {
 		return {};
 	}, [ isSelected, attributes.ids, imageSizes ] );
 
+	function onFocusGalleryCaption() {
+		setSelectedImage();
+	}
+
 	function setAttributes( newAttrs ) {
 		if ( newAttrs.ids ) {
 			throw new Error(
@@ -464,6 +468,8 @@ function GalleryEdit( props ) {
 				onDeselectImage={ onDeselectImage }
 				onSetImageAttributes={ setImageAttributes }
 				blockProps={ blockProps }
+				// This prop is used by gallery.native.js.
+				onFocusGalleryCaption={ onFocusGalleryCaption }
 			/>
 		</>
 	);

diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
@@ -80,11 +80,8 @@ export function ImageEdit( {
 	insertBlocksAfter,
 	noticeOperations,
 	onReplace,
-<<<<<<< HEAD
 	context,
-=======
 	clientId,
->>>>>>> trunk
 } ) {
 	const {
 		url = '',
@@ -304,11 +301,8 @@ export function ImageEdit( {
 					onSelectURL={ onSelectURL }
 					onUploadError={ onUploadError }
 					containerRef={ ref }
-<<<<<<< HEAD
 					context={ context }
-=======
 					clientId={ clientId }
->>>>>>> trunk
 				/>
 			) }
 			{ ! url && (

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
@@ -87,21 +87,14 @@ export default function Image( {
 	onSelectURL,
 	onUploadError,
 	containerRef,
-<<<<<<< HEAD
 	context,
-} ) {
-	const captionRef = useRef();
-	const prevUrl = usePrevious( url );
-	const { allowResize = true, isGrouped = false } = context;
-	const { block, currentId, image, multiImageSelection } = useSelect(
-=======
 	clientId,
 } ) {
 	const captionRef = useRef();
 	const prevUrl = usePrevious( url );
+	const { allowResize = true, isGrouped = false } = context;
 	const { getBlock } = useSelect( blockEditorStore );
 	const { image, multiImageSelection } = useSelect(
->>>>>>> trunk
 		( select ) => {
 			const { getMedia } = select( coreStore );
 			const { getMultiSelectedBlockClientIds, getBlockName } = select(