From d70d230b14f43c5de70fa24ccc0df61b52adbc3a Mon Sep 17 00:00:00 2001
From: Leandro Alonso <contato@leandroalonso.com>
Date: Tue, 28 Jan 2020 16:17:53 -0300
Subject: [PATCH 1/2] Revert "Avoid destructuring"

This reverts commit e1133106d76ca04b9710b5f6d4a3aaf59c2a1a73.
---
 packages/block-library/src/image/edit.native.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 10913ed3ac360..a8b169506126c 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -397,7 +397,7 @@ export class ImageEdit extends React.Component {
 
 		const imageContainerHeight = Dimensions.get( 'window' ).width / IMAGE_ASPECT_RATIO;
 
-		const editImageComponent = ( { openMediaOptions, mediaOptions } ) => (
+		const editImageComponent = ( openMediaOptions, mediaOptions ) => (
 			<TouchableWithoutFeedback
 				onPress={ openMediaOptions }>
 				<View style={ styles.edit }>
@@ -476,7 +476,9 @@ export class ImageEdit extends React.Component {
 												onSelect={ this.onSelectMediaUploadOption }
 												source={ { uri: url } }
 												openReplaceMediaOptions={ openMediaOptions }
-												render={ editImageComponent }
+												render={ ( { open, mediaOptions } ) => {
+													return editImageComponent( open, mediaOptions );
+												} }
 											/>
 										}
 									</ImageBackground>

From 0f8bf2578213b1a769dcb2145d4c9bf9fe6634b2 Mon Sep 17 00:00:00 2001
From: Leandro Alonso <contato@leandroalonso.com>
Date: Tue, 28 Jan 2020 17:03:16 -0300
Subject: [PATCH 2/2] Fix the var name

---
 packages/block-library/src/image/edit.native.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index a8b169506126c..7f27f99dd1de3 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -397,9 +397,9 @@ export class ImageEdit extends React.Component {
 
 		const imageContainerHeight = Dimensions.get( 'window' ).width / IMAGE_ASPECT_RATIO;
 
-		const editImageComponent = ( openMediaOptions, mediaOptions ) => (
+		const editImageComponent = ( { open, mediaOptions } ) => (
 			<TouchableWithoutFeedback
-				onPress={ openMediaOptions }>
+				onPress={ open }>
 				<View style={ styles.edit }>
 					{ mediaOptions() }
 					<Icon icon={ SvgIconCustomize } { ...styles.iconCustomise } />
@@ -476,9 +476,7 @@ export class ImageEdit extends React.Component {
 												onSelect={ this.onSelectMediaUploadOption }
 												source={ { uri: url } }
 												openReplaceMediaOptions={ openMediaOptions }
-												render={ ( { open, mediaOptions } ) => {
-													return editImageComponent( open, mediaOptions );
-												} }
+												render={ editImageComponent }
 											/>
 										}
 									</ImageBackground>