From 65f1b1dab331d143a7ee8cb17fd26754d0050aed Mon Sep 17 00:00:00 2001
From: Jorge <jorge.costa@developer.pt>
Date: Mon, 15 Apr 2019 12:24:58 +0100
Subject: [PATCH] Update: Image Block: Change image by drag & drop an image
 from the desktop

---
 packages/block-library/src/image/edit.js | 60 ++++++++++++------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index bc4a18927b0f0..cea813aefc4a6 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -400,39 +400,40 @@ class ImageEdit extends Component {
 				) }
 			</BlockControls>
 		);
+		const src = isExternal ? url : undefined;
+		const labels = {
+			title: ! url ? __( 'Image' ) : __( 'Edit image' ),
+			instructions: __( 'Drag an image to upload, select a file from your library or add one from an URL.' ),
+		};
+		const mediaPreview = ( !! url && <img
+			alt={ __( 'Edit image' ) }
+			title={ __( 'Edit image' ) }
+			className={ 'edit-image-preview' }
+			src={ url }
+		/> );
+		const mediaPlaceholder = (
+			<MediaPlaceholder
+				icon={ <BlockIcon icon={ icon } /> }
+				className={ className }
+				labels={ labels }
+				onSelect={ this.onSelectImage }
+				onSelectURL={ this.onSelectURL }
+				onDoubleClick={ this.toggleIsEditing }
+				onCancel={ !! url && this.toggleIsEditing }
+				notices={ noticeUI }
+				onError={ this.onUploadError }
+				accept="image/*"
+				allowedTypes={ ALLOWED_MEDIA_TYPES }
+				value={ { id, src } }
+				mediaPreview={ mediaPreview }
+				dropZoneUIOnly={ ! isEditing && url }
+			/>
+		);
 		if ( isEditing || ! url ) {
-			const src = isExternal ? url : undefined;
-
-			const labels = {
-				title: ! url ? __( 'Image' ) : __( 'Edit image' ),
-				instructions: __( 'Drag an image to upload, select a file from your library or add one from an URL.' ),
-			};
-
-			const mediaPreview = ( !! url && <img
-				alt={ __( 'Edit image' ) }
-				title={ __( 'Edit image' ) }
-				className={ 'edit-image-preview' }
-				src={ url }
-			/> );
-
 			return (
 				<Fragment>
 					{ controls }
-					<MediaPlaceholder
-						icon={ <BlockIcon icon={ icon } /> }
-						className={ className }
-						labels={ labels }
-						onSelect={ this.onSelectImage }
-						onSelectURL={ this.onSelectURL }
-						onDoubleClick={ this.toggleIsEditing }
-						onCancel={ !! url && this.toggleIsEditing }
-						notices={ noticeUI }
-						onError={ this.onUploadError }
-						accept="image/*"
-						allowedTypes={ ALLOWED_MEDIA_TYPES }
-						value={ { id, src } }
-						mediaPreview={ mediaPreview }
-					/>
+					{ mediaPlaceholder }
 				</Fragment>
 			);
 		}
@@ -707,6 +708,7 @@ class ImageEdit extends Component {
 						/>
 					) }
 				</figure>
+				{ mediaPlaceholder }
 			</Fragment>
 		);
 		/* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/onclick-has-role, jsx-a11y/click-events-have-key-events */