[RNMobile] Embed block: Enable replace option (#33253)

* Add replace option to native version of embed block * Add invalid and empty URL cases to replace action
WordPress · Jul 7, 2021 · 2f25d1c · 2f25d1c
1 parent 5052772
commit 2f25d1c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/packages/block-library/src/embed/edit.js b/packages/block-library/src/embed/edit.js
@@ -238,6 +238,7 @@ const EmbedEdit = ( props ) => {
 						invalidateResolution( 'getEmbedPreview', [ url ] );
 					} }
 					isSelected={ isSelected }
+					isEditingURL={ isEditingURL }
 				/>
 			</View>
 		);

diff --git a/packages/block-library/src/embed/embed-bottom-sheet.native.js b/packages/block-library/src/embed/embed-bottom-sheet.native.js
@@ -41,9 +41,16 @@ const EmbedBottomSheet = ( { value, isVisible, onClose, onSubmit } ) => {
 				createErrorNotice(
 					__( 'Invalid URL. Please enter a valid URL.' )
 				);
+				// If the URL was already defined, we submit it to stop showing the embed placeholder.
+				if ( value !== '' ) {
+					onSubmit( value );
+				}
 			}
+		} else if ( value !== '' ) {
+			// Resets the URL when new value is empty and URL was already defined.
+			onSubmit( '' );
 		}
-	}, [ url, onSubmit ] );
+	}, [ url, onSubmit, value ] );
 
 	function setAttributes( attributes ) {
 		setURL( attributes.url );

diff --git a/packages/block-library/src/embed/embed-placeholder.native.js b/packages/block-library/src/embed/embed-placeholder.native.js
@@ -23,6 +23,7 @@ import styles from './styles.scss';
 
 const EmbedPlaceholder = ( {
 	icon,
+	isEditingURL,
 	isSelected,
 	label,
 	onFocus,
@@ -39,7 +40,7 @@ const EmbedPlaceholder = ( {
 		[ clientId ]
 	);
 	const [ isEmbedSheetVisible, setIsEmbedSheetVisible ] = useState(
-		isSelected && wasBlockJustInserted && ! value
+		isSelected && ( ( wasBlockJustInserted && ! value ) || isEditingURL )
 	);
 
 	const containerStyle = usePreferredColorSchemeStyle(
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,6 +238,7 @@ const EmbedEdit = ( props ) => { @@
     						invalidateResolution( 'getEmbedPreview', [ url ] );
     					} }
     					isSelected={ isSelected }
+    					isEditingURL={ isEditingURL }
     				/>
     			</View>
     		);
@@ Expand Down @@