shared the destructiveButton logic between the Image & Cover block.

WordPress · Sep 3, 2020 · 7de89e0 · 7de89e0
1 parent 9f3269b
commit 7de89e0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/packages/block-library/src/cover/edit.native.js b/packages/block-library/src/cover/edit.native.js
@@ -486,16 +486,7 @@ const Cover = ( {
 						<ImageEditingButton
 							onSelectMediaUploadOption={ onSelectMedia }
 							openMediaOptions={ openMediaOptionsRef.current }
-							pickerOptions={ [
-								{
-									destructiveButton: true,
-									id: 'clearMedia',
-									label: __( 'Clear Media' ),
-									onPress: onClearMedia,
-									separated: true,
-									value: 'clearMedia',
-								},
-							] }
+							onClearMedia={ onClearMedia }
 							url={ url }
 						/>
 					</View>

diff --git a/packages/components/src/mobile/image/image-editing-button.native.js b/packages/components/src/mobile/image/image-editing-button.native.js
@@ -7,6 +7,7 @@ import { TouchableWithoutFeedback, View } from 'react-native';
  * WordPress dependencies
  */
 import { Icon } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -18,7 +19,7 @@ import styles from './style.scss';
 const ImageEditingButton = ( {
 	onSelectMediaUploadOption,
 	openMediaOptions,
-	pickerOptions,
+	onClearMedia,
 	url,
 } ) => {
 	return (
@@ -40,7 +41,16 @@ const ImageEditingButton = ( {
 					</View>
 				</TouchableWithoutFeedback>
 			) }
-			pickerOptions={ pickerOptions }
+			pickerOptions={ [
+				{
+					destructiveButton: true,
+					id: 'clearMedia',
+					label: __( 'Clear Media' ),
+					onPress: onClearMedia,
+					separated: true,
+					value: 'clearMedia',
+				},
+			] }
 		/>
 	);
 };

diff --git a/packages/components/src/mobile/image/index.native.js b/packages/components/src/mobile/image/index.native.js
@@ -225,16 +225,7 @@ const ImageComponent = ( {
 							}
 							openMediaOptions={ openMediaOptions }
 							url={ url }
-							pickerOptions={ [
-								{
-									destructiveButton: true,
-									id: 'clearMedia',
-									label: __( 'Clear Media' ),
-									onPress: onClearMedia,
-									separated: true,
-									value: 'clearMedia',
-								},
-							] }
+							onClearMedia={ onClearMedia }
 						/>
 					) }
 			</View>