Apply correct conditions for showing suggestions and apply UI

WordPress · May 26, 2023 · bd39b55 · bd39b55
1 parent 7ebe82a
commit bd39b55
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
@@ -305,8 +305,6 @@ function LinkControl( {
 	// See https://github.com/WordPress/gutenberg/pull/33849/#issuecomment-932194927.
 	const showTextControl = hasLinkValue && hasTextControl;
 
-	const isEditing = ( isEditingLink || ! value ) && ! isCreatingPage;
-
 	return (
 		<div
 			tabIndex={ -1 }
@@ -349,7 +347,9 @@ function LinkControl( {
 						showInitialSuggestions={ showInitialSuggestions }
 						allowDirectEntry={ ! noDirectEntry }
 						showSuggestions={
-							hasLinkValue && valueHasChanges && showSuggestions
+							( ! hasLinkValue ||
+								( hasLinkValue && valueHasChanges ) ) &&
+							showSuggestions
 						}
 						suggestionsQuery={ suggestionsQuery }
 						withURLSuggestion={ ! noURLSuggestion }
@@ -370,7 +370,7 @@ function LinkControl( {
 				) }
 			</>
 
-			{ isEditing && (
+			{ hasLinkValue && ! isCreatingPage && (
 				<div className="block-editor-link-control__tools">
 					{ ( showSettings || showTextControl ) && (
 						<LinkControlSettingsDrawer