From 4d693f37e356defa6dea06e9053d988835009f6f Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 7 Jan 2020 11:32:11 +0000
Subject: [PATCH 01/29] Adds ability to manual trigger search data fetch

---
 .../src/components/link-control/index.js      |  3 ++-
 .../components/link-control/search-input.js   |  2 ++
 .../src/components/url-input/index.js         | 26 ++++++++++++++-----
 .../block-library/src/navigation-link/edit.js |  8 ++++++
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index e434fa33c4c74b..8c467afa7a4d2b 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -36,7 +36,7 @@ export function LinkControl( {
 	value,
 	settings,
 	onChange = noop,
-	fetchSearchSuggestions,
+	manualSearch,
 } ) {
 	const instanceId = useInstanceId( LinkControl );
 	const [ inputValue, setInputValue ] = useState( '' );
@@ -200,6 +200,7 @@ export function LinkControl( {
 					renderSuggestions={ renderSearchResults }
 					fetchSuggestions={ getSearchHandler }
 					onReset={ resetInput }
+							manualSearch={ manualSearch }
 				/>
 			) }
 
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index 9360ef00801378..6d3b02ada05cd2 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -32,6 +32,7 @@ const handleLinkControlOnKeyPress = ( event ) => {
 
 const LinkControlSearchInput = ( {
 	value,
+	manualSearch,
 	onChange,
 	onSelect,
 	renderSuggestions,
@@ -68,6 +69,7 @@ const LinkControlSearchInput = ( {
 				__experimentalRenderSuggestions={ renderSuggestions }
 				__experimentalFetchLinkSuggestions={ fetchSuggestions }
 				__experimentalHandleURLSuggestions={ true }
+				manualSearch={ manualSearch }
 			/>
 
 			<Button
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 9f2e6fd1a7dc8d..3566dd470a73f5 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -60,6 +60,15 @@ class URLInput extends Component {
 		}
 	}
 
+	componentDidMount() {
+		const { manualSearch = '' } = this.props;
+		if ( manualSearch ) {
+			this.updateSuggestions( 'sdfsdfsdf', {
+				isManualSearch: true,
+			} );
+		}
+	}
+
 	componentWillUnmount() {
 		delete this.suggestionsRequest;
 	}
@@ -70,18 +79,22 @@ class URLInput extends Component {
 		};
 	}
 
-	updateSuggestions( value ) {
+	updateSuggestions( value, {
+		isManualSearch = false,
+	} = {} ) {
 		const {
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
 			__experimentalHandleURLSuggestions: handleURLSuggestions,
+			manualSearch,
 		} = this.props;
-		if ( ! fetchLinkSuggestions ) {
+
+		if ( ! fetchLinkSuggestions || ! manualSearch ) {
 			return;
 		}
 
 		// Show the suggestions after typing at least 2 characters
 		// and also for URLs
-		if ( value.length < 2 || ( ! handleURLSuggestions && isURL( value ) ) ) {
+		if ( ! isManualSearch && ( value.length < 2 || ( ! handleURLSuggestions && isURL( value ) ) ) ) {
 			this.setState( {
 				showSuggestions: false,
 				selectedSuggestion: null,
@@ -97,7 +110,7 @@ class URLInput extends Component {
 			loading: true,
 		} );
 
-		const request = fetchLinkSuggestions( value );
+		const request = isManualSearch ? manualSearch() : fetchLinkSuggestions( value );
 
 		request.then( ( suggestions ) => {
 			// A fetch Promise doesn't have an abort option. It's mimicked by
@@ -237,12 +250,12 @@ class URLInput extends Component {
 		this.inputRef.current.focus();
 	}
 
-	static getDerivedStateFromProps( { value, disableSuggestions }, { showSuggestions, selectedSuggestion } ) {
+	static getDerivedStateFromProps( { value, disableSuggestions, manualSearch }, { showSuggestions, selectedSuggestion } ) {
 		let shouldShowSuggestions = showSuggestions;
 
 		const hasValue = value && value.length;
 
-		if ( ! hasValue ) {
+		if ( ! manualSearch && ! hasValue ) {
 			shouldShowSuggestions = false;
 		}
 
@@ -275,6 +288,7 @@ class URLInput extends Component {
 			selectedSuggestion,
 			loading,
 		} = this.state;
+
 		const id = `url-input-control-${ instanceId }`;
 
 		const suggestionsListboxId = `block-editor-url-input-suggestions-${ instanceId }`;
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 9203239b55af60..a3de1c8af4d66c 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -169,6 +169,14 @@ function NavigationLinkEdit( {
 							<LinkControl
 								className="wp-block-navigation-link__inline-link-input"
 								value={ link }
+							manualSearch={ () => {
+								return Promise.resolve( [ {
+									id: '-1',
+									title: 'Manual result',
+									url: 'https://manual.result.com',
+									type: 'URL',
+								} ] );
+							} }
 								onChange={ ( {
 									title: newTitle = '',
 									url: newURL = '',

From a124c1bcec56da891557e6c1b325c98fce762505 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 7 Jan 2020 11:39:59 +0000
Subject: [PATCH 02/29] Update to prop to experimental and rename to
 initialSuggestions

---
 .../src/components/link-control/index.js      | 30 +++++++++----------
 .../components/link-control/search-input.js   |  4 +--
 .../src/components/url-input/index.js         | 14 ++++-----
 .../block-library/src/navigation-link/edit.js |  8 ++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index 8c467afa7a4d2b..580820a44becb6 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -36,7 +36,7 @@ export function LinkControl( {
 	value,
 	settings,
 	onChange = noop,
-	manualSearch,
+	initialSuggestions,
 } ) {
 	const instanceId = useInstanceId( LinkControl );
 	const [ inputValue, setInputValue ] = useState( '' );
@@ -189,20 +189,20 @@ export function LinkControl( {
 				</Fragment>
 			) }
 
-			{ isEditingLink && (
-				<LinkControlSearchInput
-					value={ inputValue }
-					onChange={ onInputChange }
-					onSelect={ ( suggestion ) => {
-						setIsEditingLink( false );
-						onChange( { ...value, ...suggestion } );
-					} }
-					renderSuggestions={ renderSearchResults }
-					fetchSuggestions={ getSearchHandler }
-					onReset={ resetInput }
-							manualSearch={ manualSearch }
-				/>
-			) }
+					{ isEditingLink && (
+						<LinkControlSearchInput
+							value={ inputValue }
+							onChange={ onInputChange }
+							onSelect={ ( suggestion ) => {
+								setIsEditingLink( false );
+								onChange( { ...value, ...suggestion } );
+							} }
+							renderSuggestions={ renderSearchResults }
+							fetchSuggestions={ getSearchHandler }
+							onReset={ resetInput }
+							initialSuggestions={ initialSuggestions }
+						/>
+					) }
 
 			{ ! isEditingLink && (
 				<LinkControlSettingsDrawer value={ value } settings={ settings } onChange={ onChange } />
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index 6d3b02ada05cd2..20f078b5e333f0 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -32,12 +32,12 @@ const handleLinkControlOnKeyPress = ( event ) => {
 
 const LinkControlSearchInput = ( {
 	value,
-	manualSearch,
 	onChange,
 	onSelect,
 	renderSuggestions,
 	fetchSuggestions,
 	onReset,
+	initialSuggestions,
 } ) => {
 	const selectItemHandler = ( selection, suggestion ) => {
 		onChange( selection );
@@ -69,7 +69,7 @@ const LinkControlSearchInput = ( {
 				__experimentalRenderSuggestions={ renderSuggestions }
 				__experimentalFetchLinkSuggestions={ fetchSuggestions }
 				__experimentalHandleURLSuggestions={ true }
-				manualSearch={ manualSearch }
+				__experimentalInitialSuggestions={ initialSuggestions }
 			/>
 
 			<Button
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 3566dd470a73f5..fdf8277f69e408 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -61,9 +61,9 @@ class URLInput extends Component {
 	}
 
 	componentDidMount() {
-		const { manualSearch = '' } = this.props;
-		if ( manualSearch ) {
-			this.updateSuggestions( 'sdfsdfsdf', {
+		const { __experimentalInitialSuggestions = '' } = this.props;
+		if ( __experimentalInitialSuggestions ) {
+			this.updateSuggestions( '', {
 				isManualSearch: true,
 			} );
 		}
@@ -85,10 +85,10 @@ class URLInput extends Component {
 		const {
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
 			__experimentalHandleURLSuggestions: handleURLSuggestions,
-			manualSearch,
+			__experimentalInitialSuggestions: initialSuggestions,
 		} = this.props;
 
-		if ( ! fetchLinkSuggestions || ! manualSearch ) {
+		if ( ! fetchLinkSuggestions || ! initialSuggestions ) {
 			return;
 		}
 
@@ -110,7 +110,7 @@ class URLInput extends Component {
 			loading: true,
 		} );
 
-		const request = isManualSearch ? manualSearch() : fetchLinkSuggestions( value );
+		const request = isManualSearch ? initialSuggestions() : fetchLinkSuggestions( value );
 
 		request.then( ( suggestions ) => {
 			// A fetch Promise doesn't have an abort option. It's mimicked by
@@ -250,7 +250,7 @@ class URLInput extends Component {
 		this.inputRef.current.focus();
 	}
 
-	static getDerivedStateFromProps( { value, disableSuggestions, manualSearch }, { showSuggestions, selectedSuggestion } ) {
+	static getDerivedStateFromProps( { value, disableSuggestions, __experimentalInitialSuggestions: manualSearch }, { showSuggestions, selectedSuggestion } ) {
 		let shouldShowSuggestions = showSuggestions;
 
 		const hasValue = value && value.length;
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index a3de1c8af4d66c..4eb99a5d801dc6 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -166,10 +166,10 @@ function NavigationLinkEdit( {
 					/>
 					{ isLinkOpen && (
 						<Popover position="bottom center">
-							<LinkControl
-								className="wp-block-navigation-link__inline-link-input"
-								value={ link }
-							manualSearch={ () => {
+						<LinkControl
+							className="wp-block-navigation-link__inline-link-input"
+							value={ link }
+							initialSuggestions={ () => {
 								return Promise.resolve( [ {
 									id: '-1',
 									title: 'Manual result',

From a94b1c38947cf2c415d3a848e3d838d2923690cd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 7 Jan 2020 12:07:25 +0000
Subject: [PATCH 03/29] Query for and display 5 most recently modified Pages

---
 .../block-library/src/navigation-link/edit.js | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 4eb99a5d801dc6..3670f0c7c84e4c 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -44,6 +44,7 @@ function NavigationLinkEdit( {
 	isParentOfSelectedBlock,
 	setAttributes,
 	insertLinkBlock,
+	recentPages = [],
 } ) {
 	const { label, opensInNewTab, title, url, nofollow, description } = attributes;
 	const link = {
@@ -170,12 +171,18 @@ function NavigationLinkEdit( {
 							className="wp-block-navigation-link__inline-link-input"
 							value={ link }
 							initialSuggestions={ () => {
-								return Promise.resolve( [ {
-									id: '-1',
-									title: 'Manual result',
-									url: 'https://manual.result.com',
-									type: 'URL',
-								} ] );
+								if ( ! recentPages ) {
+									return Promise.reject( recentPages );
+								}
+
+								return Promise.resolve( recentPages.map( ( page ) => {
+									return {
+										id: page.id,
+										url: page.link,
+										title: escape( page.title.raw ) || __( '(no title)' ),
+										type: 'Page',
+									};
+								} ) );
 							} }
 								onChange={ ( {
 									title: newTitle = '',
@@ -206,9 +213,20 @@ export default compose( [
 		const { getClientIdsOfDescendants, hasSelectedInnerBlock } = select( 'core/block-editor' );
 		const { clientId } = ownProps;
 
+		const queryForRecentPages = {
+			order: 'desc',
+			orderby: 'modified',
+			per_page: 5,
+		};
+
+		const pagesSelect = [ 'core', 'getEntityRecords', [ 'postType', 'page', queryForRecentPages ] ];
+
 		return {
 			isParentOfSelectedBlock: hasSelectedInnerBlock( clientId, true ),
 			hasDescendants: !! getClientIdsOfDescendants( [ clientId ] ).length,
+			recentPages: select( 'core' ).getEntityRecords( 'postType', 'page', queryForRecentPages ),
+			isRequestingPages: select( 'core/data' ).isResolving( ...pagesSelect ),
+			hasResolvedPages: select( 'core/data' ).hasFinishedResolution( ...pagesSelect ),
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, registry ) => {

From 56b8ff8bdf012b42204a8e1e95d193f539d5edcd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 8 Jan 2020 11:30:56 +0000
Subject: [PATCH 04/29] Update initial suggestions to be display whenever the
 input is empty and there are no current suggestions

This is needed to ensure that the async fulfillment of the initialSuggestions prop causes the component to re-render and display the initial suggestions. Without this the initial suggestions would only be available if the prop is fufilled on the initial component mount.
---
 .../block-editor/src/components/url-input/index.js   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index fdf8277f69e408..aacec6610e4e30 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -44,7 +44,8 @@ class URLInput extends Component {
 	}
 
 	componentDidUpdate() {
-		const { showSuggestions, selectedSuggestion } = this.state;
+		const { showSuggestions, selectedSuggestion, suggestions } = this.state;
+		const { __experimentalInitialSuggestions = '', value } = this.props;
 		// only have to worry about scrolling selected suggestion into view
 		// when already expanded
 		if ( showSuggestions && selectedSuggestion !== null && ! this.scrollingIntoView ) {
@@ -58,6 +59,15 @@ class URLInput extends Component {
 				this.scrollingIntoView = false;
 			}, 100 );
 		}
+
+		// If there is no search text and no current suggestions
+		// then display the initial suggesitons if provided
+		// (being careful to avoid infinite re-render loop).
+		if ( __experimentalInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
+			this.updateSuggestions( '', {
+				isManualSearch: true,
+			} );
+		}
 	}
 
 	componentDidMount() {

From a4e205ca9a81fc4e21913fb738a5a976677d08f6 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 8 Jan 2020 11:31:52 +0000
Subject: [PATCH 05/29] Fix to ensure initial suggestions are shown when pages
 request fulfills

Addresses issues noted in https://github.com/WordPress/gutenberg/pull/19458#issuecomment-571789573
---
 .../block-library/src/navigation-link/edit.js | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 3670f0c7c84e4c..fd625eb5e1d803 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -45,6 +45,7 @@ function NavigationLinkEdit( {
 	setAttributes,
 	insertLinkBlock,
 	recentPages = [],
+	hasResolvedPages,
 } ) {
 	const { label, opensInNewTab, title, url, nofollow, description } = attributes;
 	const link = {
@@ -170,18 +171,15 @@ function NavigationLinkEdit( {
 						<LinkControl
 							className="wp-block-navigation-link__inline-link-input"
 							value={ link }
-							initialSuggestions={ () => {
-								if ( ! recentPages ) {
-									return Promise.reject( recentPages );
+							initialSuggestions={ async () => {
+								if ( ! hasResolvedPages ) {
+									return [];
 								}
-
-								return Promise.resolve( recentPages.map( ( page ) => {
-									return {
-										id: page.id,
-										url: page.link,
-										title: escape( page.title.raw ) || __( '(no title)' ),
-										type: 'Page',
-									};
+								return recentPages.map( ( page ) => ( {
+									id: page.id,
+									url: page.link,
+									title: escape( page.title.raw ) || __( '(no title)' ),
+									type: 'Page',
 								} ) );
 							} }
 								onChange={ ( {
@@ -225,7 +223,6 @@ export default compose( [
 			isParentOfSelectedBlock: hasSelectedInnerBlock( clientId, true ),
 			hasDescendants: !! getClientIdsOfDescendants( [ clientId ] ).length,
 			recentPages: select( 'core' ).getEntityRecords( 'postType', 'page', queryForRecentPages ),
-			isRequestingPages: select( 'core/data' ).isResolving( ...pagesSelect ),
 			hasResolvedPages: select( 'core/data' ).hasFinishedResolution( ...pagesSelect ),
 		};
 	} ),

From 53849679ccd9168504f45484f1c2977878874457 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 8 Jan 2020 11:33:45 +0000
Subject: [PATCH 06/29] Updates to display 3 most recently modified pages
 instead of 5

Addresses https://github.com/WordPress/gutenberg/pull/19458#issuecomment-571722756
---
 packages/block-library/src/navigation-link/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index fd625eb5e1d803..e206cd20106100 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -214,7 +214,7 @@ export default compose( [
 		const queryForRecentPages = {
 			order: 'desc',
 			orderby: 'modified',
-			per_page: 5,
+			per_page: 3,
 		};
 
 		const pagesSelect = [ 'core', 'getEntityRecords', [ 'postType', 'page', queryForRecentPages ] ];

From eeacd7461b1f87901cabc87ccab09c70d56ed43a Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 8 Jan 2020 11:53:44 +0000
Subject: [PATCH 07/29] Fix to allow keyboard arrow to move focus into
 suggestions when present

Previously it was not possible to use the down arrow key to move the focus into the search suggestions when initialSuggestions were displayed. This was due to requirement for there to be a value in the `input` which is now no longer valid now that initial suggestions can be displayed.

Note that removing the derived setting of selectedSuggestion state is valid as selectedSuggestions are always reset on each new data fetch anyway.

Resolves issue noted in https://github.com/WordPress/gutenberg/pull/19458#issuecomment-571789573
---
 packages/block-editor/src/components/url-input/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index aacec6610e4e30..3f23912397251a 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -169,8 +169,7 @@ class URLInput extends Component {
 		// If the suggestions are not shown or loading, we shouldn't handle the arrow keys
 		// We shouldn't preventDefault to allow block arrow keys navigation
 		if (
-			( ! showSuggestions || ! suggestions.length || loading ) &&
-			this.props.value
+			( ! showSuggestions || ! suggestions.length || loading )
 		) {
 			// In the Windows version of Firefox the up and down arrows don't move the caret
 			// within an input field like they do for Mac Firefox/Chrome/Safari. This causes
@@ -260,7 +259,7 @@ class URLInput extends Component {
 		this.inputRef.current.focus();
 	}
 
-	static getDerivedStateFromProps( { value, disableSuggestions, __experimentalInitialSuggestions: manualSearch }, { showSuggestions, selectedSuggestion } ) {
+	static getDerivedStateFromProps( { value, disableSuggestions, __experimentalInitialSuggestions: manualSearch }, { showSuggestions } ) {
 		let shouldShowSuggestions = showSuggestions;
 
 		const hasValue = value && value.length;
@@ -274,7 +273,6 @@ class URLInput extends Component {
 		}
 
 		return {
-			selectedSuggestion: hasValue ? selectedSuggestion : null,
 			showSuggestions: shouldShowSuggestions,
 		};
 	}

From 2bf0d683c0ebfc7ad2b10e310ec8a040ebc09116 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 9 Jan 2020 11:14:03 +0000
Subject: [PATCH 08/29] Fix bug whereby not providing initialSuggestions to
 LinkControl disabled the ability to search at all
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test failures led to uncovering of a bug whereby the URLInput component’s `updateSuggestions` method would exit early it initialSuggestions wasn’t provided. As initialSuggestions is an optional prop this means that all fetching of search suggestions was disabled if the initialSuggestions wasn’t provided.

Fixed this bug and all tests by improving the conditionals.
---
 packages/block-editor/src/components/url-input/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 3f23912397251a..ca80d34acdb74d 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -98,7 +98,7 @@ class URLInput extends Component {
 			__experimentalInitialSuggestions: initialSuggestions,
 		} = this.props;
 
-		if ( ! fetchLinkSuggestions || ! initialSuggestions ) {
+		if ( ! fetchLinkSuggestions || ( isManualSearch && ! initialSuggestions ) ) {
 			return;
 		}
 
@@ -157,6 +157,7 @@ class URLInput extends Component {
 
 	onChange( event ) {
 		const inputValue = event.target.value;
+
 		this.props.onChange( inputValue );
 		if ( ! this.props.disableSuggestions ) {
 			this.updateSuggestions( inputValue );

From 39237954025aa2b1d531663105e81c380be094b5 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 9 Jan 2020 11:53:28 +0000
Subject: [PATCH 09/29] Adds tests to cover displaying initial suggestions

---
 .../link-control/test/fixtures/index.js       | 21 ++++++++++++-
 .../src/components/link-control/test/index.js | 30 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/link-control/test/fixtures/index.js b/packages/block-editor/src/components/link-control/test/fixtures/index.js
index fc974749c982b1..b9deaa985c9a42 100644
--- a/packages/block-editor/src/components/link-control/test/fixtures/index.js
+++ b/packages/block-editor/src/components/link-control/test/fixtures/index.js
@@ -34,7 +34,26 @@ export const fauxEntitySuggestions = [
 	},
 ];
 
-// export const fetchFauxEntitySuggestions = async () => fauxEntitySuggestions;
+export const fauxInitialSuggestions = [
+	{
+		id: uniqueId(),
+		title: 'Suggested Page 1',
+		type: 'Page',
+		url: `?p=${ uniqueId() }`,
+	},
+	{
+		id: uniqueId(),
+		title: 'Suggested Page 2',
+		type: 'Page',
+		url: `?p=${ uniqueId() }`,
+	},
+	{
+		id: uniqueId(),
+		title: 'Suggested Page 3',
+		type: 'Page',
+		url: `?p=${ uniqueId() }`,
+	},
+];
 
 export const fetchFauxEntitySuggestions = () => {
 	return Promise.resolve( fauxEntitySuggestions );
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 9b51123f3857f8..5ec0a3887f804b 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -309,6 +309,36 @@ describe( 'Manual link entry', () => {
 	} );
 } );
 
+describe( 'Default search suggestions', () => {
+	it( 'should display a list of initial search suggestions if provided', async () => {
+		const searchSuggestionsSpy = jest.fn();
+		const expectedResultsLength = fauxInitialSuggestions.length;
+
+		act( () => {
+			render(
+				<LinkControl
+					fetchSearchSuggestions={ searchSuggestionsSpy }
+					initialSuggestions={ () => Promise.resolve( fauxInitialSuggestions ) }
+				/>, container
+			);
+		} );
+
+		await eventLoopTick();
+
+		// Search Input UI
+		const searchInput = container.querySelector( 'input[aria-label="URL"]' );
+
+		// TODO: select these by aria relationship to autocomplete rather than arbitary selector.
+		const initialSearchResultElements = container.querySelectorAll( '[role="listbox"] [role="option"]' );
+
+		expect( searchSuggestionsSpy ).not.toHaveBeenCalled(); // verify no search has occured
+		expect( searchInput.value ).toBe( '' ); // verify no search has occured
+
+		// Verify the search results already display the initial suggestions
+		expect( initialSearchResultElements ).toHaveLength( expectedResultsLength );
+	} );
+} );
+
 describe( 'Selecting links', () => {
 	it( 'should display a selected link corresponding to the provided "currentLink" prop', () => {
 		const selectedLink = first( fauxEntitySuggestions );

From 8b23050c90f455037325524c6b1d92563059c595 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 9 Jan 2020 11:54:40 +0000
Subject: [PATCH 10/29] Removes redundant const comment

---
 packages/block-editor/src/components/link-control/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index 580820a44becb6..42f44f0b87a89b 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -30,7 +30,6 @@ import LinkControlSearchItem from './search-item';
 import LinkControlSearchInput from './search-input';
 
 const MODE_EDIT = 'edit';
-// const MODE_SHOW = 'show';
 
 export function LinkControl( {
 	value,

From 7d34ed57b954de98f6c55bf563decf5c737c64e1 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 9 Jan 2020 14:01:21 +0000
Subject: [PATCH 11/29] Test fix to e2e tests

---
 packages/e2e-tests/config/setup-test-framework.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/e2e-tests/config/setup-test-framework.js b/packages/e2e-tests/config/setup-test-framework.js
index 329f316e310cb8..f0a650cb3cb323 100644
--- a/packages/e2e-tests/config/setup-test-framework.js
+++ b/packages/e2e-tests/config/setup-test-framework.js
@@ -163,6 +163,14 @@ function observeConsoleLogging() {
 			return;
 		}
 
+		// As of WordPress 5.3.2 in Chrome 79, navigating to the block editor
+		// (Posts > Add New) will display a console warning about
+		// non - unique IDs.
+		// See: https://core.trac.wordpress.org/ticket/23165
+		if ( text.includes( '[DOM] Found 2 elements with non-unique id #_wpnonce' ) ) {
+			return;
+		}
+
 		const logFunction = OBSERVED_CONSOLE_MESSAGE_TYPES[ type ];
 
 		// As of Puppeteer 1.6.1, `message.text()` wrongly returns an object of

From c37497e5ede0d7a7000bceace6745585665789e7 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 10 Jan 2020 11:08:38 +0000
Subject: [PATCH 12/29] Try looser mock request matching to fix e2e test
 failures

---
 packages/e2e-tests/specs/editor/blocks/navigation.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/navigation.test.js b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
index bf9efc81bdf0ec..2696622c3d9494 100644
--- a/packages/e2e-tests/specs/editor/blocks/navigation.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
@@ -41,7 +41,7 @@ async function mockSearchResponse( items ) {
 
 	await setUpResponseMocking( [
 		{
-			match: ( request ) => request.url().includes( `rest_route=${ encodeURIComponent( '/wp/v2/search' ) }` ),
+			match: ( request ) => request.url().includes( `rest_route` ) && request.url().includes( `search` ),
 			onRequestMatch: createJSONResponse( mappedItems ),
 		},
 	] );

From cf55b73c89e7245f73382f147a3236c38018551c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 10 Jan 2020 11:28:55 +0000
Subject: [PATCH 13/29] Try fix Travis e2e test failure by clearing request
 mocks

---
 packages/e2e-tests/specs/editor/blocks/navigation.test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/e2e-tests/specs/editor/blocks/navigation.test.js b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
index 2696622c3d9494..d1f6816d6bcb86 100644
--- a/packages/e2e-tests/specs/editor/blocks/navigation.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
@@ -74,6 +74,10 @@ describe( 'Navigation', () => {
 		await createNewPost();
 	} );
 
+	afterEach( () => {
+		setUpResponseMocking( [] );
+	} );
+
 	it( 'allows a navigation menu to be created using existing pages', async () => {
 		// Mock the response from the Pages endpoint. This is done so that the pages returned are always
 		// consistent and to test the feature more rigorously than the single default sample page.

From 573972f6d4fbd463641ff86a03d44b6b1fff16fa Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 10 Jan 2020 11:42:15 +0000
Subject: [PATCH 14/29] Fix not awaiting mock setup

---
 packages/e2e-tests/specs/editor/blocks/navigation.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/navigation.test.js b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
index d1f6816d6bcb86..ffd77d44b87921 100644
--- a/packages/e2e-tests/specs/editor/blocks/navigation.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/navigation.test.js
@@ -74,8 +74,8 @@ describe( 'Navigation', () => {
 		await createNewPost();
 	} );
 
-	afterEach( () => {
-		setUpResponseMocking( [] );
+	afterEach( async () => {
+		await setUpResponseMocking( [] );
 	} );
 
 	it( 'allows a navigation menu to be created using existing pages', async () => {

From ee6c5b8bfee589cef7e71c05b0e13df88e68529c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 10 Jan 2020 14:45:00 +0000
Subject: [PATCH 15/29] Fix inadvertant revert of e2e test fix

---
 packages/e2e-tests/config/setup-test-framework.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-tests/config/setup-test-framework.js b/packages/e2e-tests/config/setup-test-framework.js
index f0a650cb3cb323..ee4bbf1ea41881 100644
--- a/packages/e2e-tests/config/setup-test-framework.js
+++ b/packages/e2e-tests/config/setup-test-framework.js
@@ -167,7 +167,7 @@ function observeConsoleLogging() {
 		// (Posts > Add New) will display a console warning about
 		// non - unique IDs.
 		// See: https://core.trac.wordpress.org/ticket/23165
-		if ( text.includes( '[DOM] Found 2 elements with non-unique id #_wpnonce' ) ) {
+		if ( text.includes( 'elements with non-unique id #_wpnonce' ) ) {
 			return;
 		}
 

From c96409ceaaffddee233d75afd06d4a573dde0968 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 13 Jan 2020 16:36:33 +0000
Subject: [PATCH 16/29] Refactor to remove seperate initialSuggestions query

As per the GH thread below, this refactors the code to avoid the need to introduce a new fetch API around `__experimentalInitialSuggestions`. Now instead we simply reuse the existing fetchSuggestions handler to get the initial results. The only different being we introduce an arguments object to queries to restrict the number of results displayed for initial Suggestions.

See https://github.com/WordPress/gutenberg/pull/19458#issuecomment-573151163
---
 .../src/components/link-control/index.js      | 12 ++++---
 .../components/link-control/search-input.js   |  2 +-
 .../link-control/test/fixtures/index.js       | 32 +++++--------------
 .../src/components/link-control/test/index.js | 11 ++++---
 .../src/components/url-input/index.js         | 27 +++++++++-------
 .../block-library/src/navigation-link/edit.js | 25 ++-------------
 .../editor/src/components/provider/index.js   |  6 ++--
 7 files changed, 44 insertions(+), 71 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index 42f44f0b87a89b..b9fc253ae884cc 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -101,9 +101,11 @@ export function LinkControl( {
 		);
 	};
 
-	const handleEntitySearch = async ( val ) => {
+	const handleEntitySearch = async ( val, args ) => {
 		const results = await Promise.all( [
-			fetchSearchSuggestions( val ),
+			fetchSearchSuggestions( val, {
+				...( args.isInitialSuggestions ? { perPage: 3 } : {} ),
+			} ),
 			handleDirectEntry( val ),
 		] );
 
@@ -112,11 +114,11 @@ export function LinkControl( {
 		// If it's potentially a URL search then concat on a URL search suggestion
 		// just for good measure. That way once the actual results run out we always
 		// have a URL option to fallback on.
-		return couldBeURL ? results[ 0 ].concat( results[ 1 ] ) : results[ 0 ];
+		return couldBeURL && ! args.isInitialSuggestions ? results[ 0 ].concat( results[ 1 ] ) : results[ 0 ];
 	};
 
 	// Effects
-	const getSearchHandler = useCallback( ( val ) => {
+	const getSearchHandler = useCallback( ( val, args ) => {
 		const protocol = getProtocol( val ) || '';
 		const isMailto = protocol.includes( 'mailto' );
 		const isInternal = startsWith( val, '#' );
@@ -124,7 +126,7 @@ export function LinkControl( {
 
 		const handleManualEntry = isInternal || isMailto || isTel || isURL( val ) || ( val && val.includes( 'www.' ) );
 
-		return ( handleManualEntry ) ? handleDirectEntry( val ) : handleEntitySearch( val );
+		return ( handleManualEntry ) ? handleDirectEntry( val, args ) : handleEntitySearch( val, args );
 	}, [ handleDirectEntry, fetchSearchSuggestions ] );
 
 	// Render Components
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index 20f078b5e333f0..0b3fe7cca1fdf1 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -69,7 +69,7 @@ const LinkControlSearchInput = ( {
 				__experimentalRenderSuggestions={ renderSuggestions }
 				__experimentalFetchLinkSuggestions={ fetchSuggestions }
 				__experimentalHandleURLSuggestions={ true }
-				__experimentalInitialSuggestions={ initialSuggestions }
+				__experimentalShowInitialSuggestions={ initialSuggestions }
 			/>
 
 			<Button
diff --git a/packages/block-editor/src/components/link-control/test/fixtures/index.js b/packages/block-editor/src/components/link-control/test/fixtures/index.js
index b9deaa985c9a42..9c926a8f629cbe 100644
--- a/packages/block-editor/src/components/link-control/test/fixtures/index.js
+++ b/packages/block-editor/src/components/link-control/test/fixtures/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { uniqueId } from 'lodash';
+import { uniqueId, take } from 'lodash';
 
 export const fauxEntitySuggestions = [
 	{
@@ -34,27 +34,11 @@ export const fauxEntitySuggestions = [
 	},
 ];
 
-export const fauxInitialSuggestions = [
-	{
-		id: uniqueId(),
-		title: 'Suggested Page 1',
-		type: 'Page',
-		url: `?p=${ uniqueId() }`,
-	},
-	{
-		id: uniqueId(),
-		title: 'Suggested Page 2',
-		type: 'Page',
-		url: `?p=${ uniqueId() }`,
-	},
-	{
-		id: uniqueId(),
-		title: 'Suggested Page 3',
-		type: 'Page',
-		url: `?p=${ uniqueId() }`,
-	},
-];
-
-export const fetchFauxEntitySuggestions = () => {
-	return Promise.resolve( fauxEntitySuggestions );
+/* eslint-disable no-unused-vars */
+export const fetchFauxEntitySuggestions = ( val = '', {
+	perPage = null,
+} = {} ) => {
+	const suggestions = perPage ? take( fauxEntitySuggestions, perPage ) : fauxEntitySuggestions;
+	return Promise.resolve( suggestions );
 };
+/* eslint-enable no-unused-vars */
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 5ec0a3887f804b..a32192273d3659 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -311,14 +311,14 @@ describe( 'Manual link entry', () => {
 
 describe( 'Default search suggestions', () => {
 	it( 'should display a list of initial search suggestions if provided', async () => {
-		const searchSuggestionsSpy = jest.fn();
-		const expectedResultsLength = fauxInitialSuggestions.length;
+		const searchSuggestionsSpy = jest.fn( fetchFauxEntitySuggestions );
+		const expectedResultsLength = 3; // set within `LinkControl`
 
 		act( () => {
 			render(
 				<LinkControl
 					fetchSearchSuggestions={ searchSuggestionsSpy }
-					initialSuggestions={ () => Promise.resolve( fauxInitialSuggestions ) }
+					initialSuggestions={ true }
 				/>, container
 			);
 		} );
@@ -331,8 +331,9 @@ describe( 'Default search suggestions', () => {
 		// TODO: select these by aria relationship to autocomplete rather than arbitary selector.
 		const initialSearchResultElements = container.querySelectorAll( '[role="listbox"] [role="option"]' );
 
-		expect( searchSuggestionsSpy ).not.toHaveBeenCalled(); // verify no search has occured
-		expect( searchInput.value ).toBe( '' ); // verify no search has occured
+		// Verify input has no value has default suggestions should only show
+		// when this does not have a value
+		expect( searchInput.value ).toBe( '' );
 
 		// Verify the search results already display the initial suggestions
 		expect( initialSearchResultElements ).toHaveLength( expectedResultsLength );
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index ca80d34acdb74d..4db5e20cba9473 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -45,7 +45,7 @@ class URLInput extends Component {
 
 	componentDidUpdate() {
 		const { showSuggestions, selectedSuggestion, suggestions } = this.state;
-		const { __experimentalInitialSuggestions = '', value } = this.props;
+		const { __experimentalShowInitialSuggestions = false, value } = this.props;
 		// only have to worry about scrolling selected suggestion into view
 		// when already expanded
 		if ( showSuggestions && selectedSuggestion !== null && ! this.scrollingIntoView ) {
@@ -63,7 +63,7 @@ class URLInput extends Component {
 		// If there is no search text and no current suggestions
 		// then display the initial suggesitons if provided
 		// (being careful to avoid infinite re-render loop).
-		if ( __experimentalInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
+		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
 			this.updateSuggestions( '', {
 				isManualSearch: true,
 			} );
@@ -71,8 +71,8 @@ class URLInput extends Component {
 	}
 
 	componentDidMount() {
-		const { __experimentalInitialSuggestions = '' } = this.props;
-		if ( __experimentalInitialSuggestions ) {
+		const { __experimentalShowInitialSuggestions = false } = this.props;
+		if ( __experimentalShowInitialSuggestions ) {
 			this.updateSuggestions( '', {
 				isManualSearch: true,
 			} );
@@ -95,15 +95,16 @@ class URLInput extends Component {
 		const {
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
 			__experimentalHandleURLSuggestions: handleURLSuggestions,
-			__experimentalInitialSuggestions: initialSuggestions,
 		} = this.props;
 
-		if ( ! fetchLinkSuggestions || ( isManualSearch && ! initialSuggestions ) ) {
+		if ( ! fetchLinkSuggestions ) {
 			return;
 		}
 
-		// Show the suggestions after typing at least 2 characters
-		// and also for URLs
+		// Allow a suggestions request if:
+		// - there are at least 2 characters in the search input (except manual searches where
+		//   search input length is not required to trigger a fetch)
+		// - this is a direct entry (eg: a URL)
 		if ( ! isManualSearch && ( value.length < 2 || ( ! handleURLSuggestions && isURL( value ) ) ) ) {
 			this.setState( {
 				showSuggestions: false,
@@ -120,7 +121,9 @@ class URLInput extends Component {
 			loading: true,
 		} );
 
-		const request = isManualSearch ? initialSuggestions() : fetchLinkSuggestions( value );
+		const request = fetchLinkSuggestions( value, {
+			isInitialSuggestions: isManualSearch,
+		} );
 
 		request.then( ( suggestions ) => {
 			// A fetch Promise doesn't have an abort option. It's mimicked by
@@ -152,6 +155,8 @@ class URLInput extends Component {
 			}
 		} );
 
+		// Note that this assignment is handled *before* the async search request
+		// as a Promise always resolves on the next tick of the event loop.
 		this.suggestionsRequest = request;
 	}
 
@@ -260,12 +265,12 @@ class URLInput extends Component {
 		this.inputRef.current.focus();
 	}
 
-	static getDerivedStateFromProps( { value, disableSuggestions, __experimentalInitialSuggestions: manualSearch }, { showSuggestions } ) {
+	static getDerivedStateFromProps( { value, disableSuggestions, __experimentalShowInitialSuggestions = false }, { showSuggestions } ) {
 		let shouldShowSuggestions = showSuggestions;
 
 		const hasValue = value && value.length;
 
-		if ( ! manualSearch && ! hasValue ) {
+		if ( ! __experimentalShowInitialSuggestions && ! hasValue ) {
 			shouldShowSuggestions = false;
 		}
 
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index e206cd20106100..d50c0c0c8fdffd 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -44,8 +44,6 @@ function NavigationLinkEdit( {
 	isParentOfSelectedBlock,
 	setAttributes,
 	insertLinkBlock,
-	recentPages = [],
-	hasResolvedPages,
 } ) {
 	const { label, opensInNewTab, title, url, nofollow, description } = attributes;
 	const link = {
@@ -171,17 +169,7 @@ function NavigationLinkEdit( {
 						<LinkControl
 							className="wp-block-navigation-link__inline-link-input"
 							value={ link }
-							initialSuggestions={ async () => {
-								if ( ! hasResolvedPages ) {
-									return [];
-								}
-								return recentPages.map( ( page ) => ( {
-									id: page.id,
-									url: page.link,
-									title: escape( page.title.raw ) || __( '(no title)' ),
-									type: 'Page',
-								} ) );
-							} }
+							initialSuggestions={ true }
 								onChange={ ( {
 									title: newTitle = '',
 									url: newURL = '',
@@ -211,19 +199,10 @@ export default compose( [
 		const { getClientIdsOfDescendants, hasSelectedInnerBlock } = select( 'core/block-editor' );
 		const { clientId } = ownProps;
 
-		const queryForRecentPages = {
-			order: 'desc',
-			orderby: 'modified',
-			per_page: 3,
-		};
-
-		const pagesSelect = [ 'core', 'getEntityRecords', [ 'postType', 'page', queryForRecentPages ] ];
-
 		return {
 			isParentOfSelectedBlock: hasSelectedInnerBlock( clientId, true ),
 			hasDescendants: !! getClientIdsOfDescendants( [ clientId ] ).length,
-			recentPages: select( 'core' ).getEntityRecords( 'postType', 'page', queryForRecentPages ),
-			hasResolvedPages: select( 'core/data' ).hasFinishedResolution( ...pagesSelect ),
+
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, registry ) => {
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 13bf0f09c2bf9c..521fde4409e6d1 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -25,11 +25,13 @@ import { mediaUpload } from '../../utils';
 import ReusableBlocksButtons from '../reusable-blocks-buttons';
 import ConvertToGroupButtons from '../convert-to-group-buttons';
 
-const fetchLinkSuggestions = async ( search ) => {
+const fetchLinkSuggestions = async ( search, {
+	perPage = 20,
+} = {} ) => {
 	const posts = await apiFetch( {
 		path: addQueryArgs( '/wp/v2/search', {
 			search,
-			per_page: 20,
+			per_page: perPage,
 			type: 'post',
 		} ),
 	} );

From 5eef3ddc250b565c132066c07f18678bb1c9ffb1 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 09:21:44 +0000
Subject: [PATCH 17/29] Refactor to use empty value as condition for
 initialSuggestions request

Addresses https://github.com/WordPress/gutenberg/pull/19458#discussion_r365965790
---
 .../src/components/url-input/index.js          | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 4db5e20cba9473..b74c6b272ed1c2 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -64,18 +64,14 @@ class URLInput extends Component {
 		// then display the initial suggesitons if provided
 		// (being careful to avoid infinite re-render loop).
 		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
-			this.updateSuggestions( '', {
-				isManualSearch: true,
-			} );
+			this.updateSuggestions( '' );
 		}
 	}
 
 	componentDidMount() {
 		const { __experimentalShowInitialSuggestions = false } = this.props;
 		if ( __experimentalShowInitialSuggestions ) {
-			this.updateSuggestions( '', {
-				isManualSearch: true,
-			} );
+			this.updateSuggestions( '' );
 		}
 	}
 
@@ -89,9 +85,7 @@ class URLInput extends Component {
 		};
 	}
 
-	updateSuggestions( value, {
-		isManualSearch = false,
-	} = {} ) {
+	updateSuggestions( value = '' ) {
 		const {
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
 			__experimentalHandleURLSuggestions: handleURLSuggestions,
@@ -101,11 +95,13 @@ class URLInput extends Component {
 			return;
 		}
 
+		const isInitialSuggestions = ! value || ! value.length;
+
 		// Allow a suggestions request if:
 		// - there are at least 2 characters in the search input (except manual searches where
 		//   search input length is not required to trigger a fetch)
 		// - this is a direct entry (eg: a URL)
-		if ( ! isManualSearch && ( value.length < 2 || ( ! handleURLSuggestions && isURL( value ) ) ) ) {
+		if ( ! isInitialSuggestions && ( value.length < 2 || ( ! handleURLSuggestions && isURL( value ) ) ) ) {
 			this.setState( {
 				showSuggestions: false,
 				selectedSuggestion: null,
@@ -122,7 +118,7 @@ class URLInput extends Component {
 		} );
 
 		const request = fetchLinkSuggestions( value, {
-			isInitialSuggestions: isManualSearch,
+			isInitialSuggestions,
 		} );
 
 		request.then( ( suggestions ) => {

From f500fe4a889bebbf7dbb24969ce38d41d7edf21f Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 09:23:17 +0000
Subject: [PATCH 18/29] =?UTF-8?q?Fix=20=E2=80=9Csuggestions=E2=80=9D=20typ?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/block-editor/src/components/url-input/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index b74c6b272ed1c2..4376a79d54a581 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -61,7 +61,7 @@ class URLInput extends Component {
 		}
 
 		// If there is no search text and no current suggestions
-		// then display the initial suggesitons if provided
+		// then display the initial suggestions if provided
 		// (being careful to avoid infinite re-render loop).
 		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
 			this.updateSuggestions( '' );

From 0208bc6e4c1afa1fdf205fe3030b5bb8b699473e Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 10:29:38 +0000
Subject: [PATCH 19/29] Update to reuse existing edit constant

---
 packages/block-editor/src/components/link-control/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index b9fc253ae884cc..ca66c9da6295cf 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -65,7 +65,7 @@ export function LinkControl( {
 
 		// Populate input searcher whether
 		// the current link has a title.
-		if ( value && value.title && mode === 'edit' ) {
+		if ( value && value.title && MODE_EDIT === mode ) {
 			setInputValue( value.title );
 		}
 	};

From 2244e33299745bd8a86e7f87f5d548834682a0dc Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 10:56:05 +0000
Subject: [PATCH 20/29] Fix initial suggestions showing when input has value

---
 .../src/components/link-control/test/index.js | 64 ++++++++++++++++++-
 .../src/components/url-input/index.js         | 12 ++--
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index a32192273d3659..70bbf94522fd67 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -310,7 +310,7 @@ describe( 'Manual link entry', () => {
 } );
 
 describe( 'Default search suggestions', () => {
-	it( 'should display a list of initial search suggestions if provided', async () => {
+	it( 'should display a list of initial search suggestions when there is no search value or suggestions', async () => {
 		const searchSuggestionsSpy = jest.fn( fetchFauxEntitySuggestions );
 		const expectedResultsLength = 3; // set within `LinkControl`
 
@@ -335,9 +335,69 @@ describe( 'Default search suggestions', () => {
 		// when this does not have a value
 		expect( searchInput.value ).toBe( '' );
 
+		expect( searchSuggestionsSpy ).toHaveBeenCalled();
+
 		// Verify the search results already display the initial suggestions
 		expect( initialSearchResultElements ).toHaveLength( expectedResultsLength );
 	} );
+
+	it( 'should not display initial suggestions when input value is present', async () => {
+		const searchSuggestionsSpy = jest.fn( fetchFauxEntitySuggestions );
+		let searchResultElements;
+		//
+		// Render with an initial value an ensure that no initial suggestions
+		// are shown.
+		//
+		act( () => {
+			render(
+				<LinkControl
+					fetchSearchSuggestions={ searchSuggestionsSpy }
+					initialSuggestions={ true }
+					value={ fauxEntitySuggestions[ 0 ] }
+				/>, container
+			);
+		} );
+
+		await eventLoopTick();
+
+		expect( searchSuggestionsSpy ).not.toHaveBeenCalled();
+
+		//
+		// Click the "Edit/Change" button and check initial suggestions are not
+		// shown.
+		//
+		const currentLinkUI = container.querySelector( '.block-editor-link-control__search-item.is-current' );
+		const currentLinkBtn = currentLinkUI.querySelector( 'button' );
+
+		act( () => {
+			Simulate.click( currentLinkBtn );
+		} );
+
+		await eventLoopTick();
+
+		searchResultElements = container.querySelectorAll( '[role="listbox"] [role="option"]' );
+
+		expect( searchResultElements ).toHaveLength( 0 );
+
+		expect( searchSuggestionsSpy ).not.toHaveBeenCalled();
+
+		//
+		// Reset the search to empty and check the initial suggestions are now shown.
+		//
+		const resetUI = container.querySelector( '[aria-label="Reset"]' );
+
+		act( () => {
+			Simulate.click( resetUI );
+		} );
+
+		await eventLoopTick();
+
+		searchResultElements = container.querySelectorAll( '[role="listbox"] [role="option"]' );
+
+		expect( searchResultElements ).toHaveLength( 3 );
+
+		expect( searchSuggestionsSpy ).toHaveBeenCalled();
+	} );
 } );
 
 describe( 'Selecting links', () => {
@@ -587,8 +647,6 @@ describe( 'Addition Settings UI', () => {
 			);
 		} );
 
-		// console.log( container.innerHTML );
-
 		const newTabSettingLabel = Array.from( container.querySelectorAll( 'label' ) ).find( ( label ) => label.innerHTML && label.innerHTML.includes( expectedSettingText ) );
 		expect( newTabSettingLabel ).not.toBeUndefined(); // find() returns "undefined" if not found
 
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 4376a79d54a581..da2ad340fbe43f 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -46,6 +46,7 @@ class URLInput extends Component {
 	componentDidUpdate() {
 		const { showSuggestions, selectedSuggestion, suggestions } = this.state;
 		const { __experimentalShowInitialSuggestions = false, value } = this.props;
+
 		// only have to worry about scrolling selected suggestion into view
 		// when already expanded
 		if ( showSuggestions && selectedSuggestion !== null && ! this.scrollingIntoView ) {
@@ -64,14 +65,15 @@ class URLInput extends Component {
 		// then display the initial suggestions if provided
 		// (being careful to avoid infinite re-render loop).
 		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
-			this.updateSuggestions( '' );
+			this.updateSuggestions();
 		}
 	}
 
 	componentDidMount() {
-		const { __experimentalShowInitialSuggestions = false } = this.props;
-		if ( __experimentalShowInitialSuggestions ) {
-			this.updateSuggestions( '' );
+		const { suggestions } = this.state;
+		const { __experimentalShowInitialSuggestions = false, value } = this.props;
+		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
+			this.updateSuggestions();
 		}
 	}
 
@@ -95,7 +97,7 @@ class URLInput extends Component {
 			return;
 		}
 
-		const isInitialSuggestions = ! value || ! value.length;
+		const isInitialSuggestions = ! ( value && value.length );
 
 		// Allow a suggestions request if:
 		// - there are at least 2 characters in the search input (except manual searches where

From a31f65107440abab141bcf6500d345fd9931f50c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 11:07:25 +0000
Subject: [PATCH 21/29] Fix potential infinite render using flag to
 conditionalise updating suggestions on update or mount

---
 .../src/components/url-input/index.js         | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index da2ad340fbe43f..34f934a9cd2fdb 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -36,6 +36,8 @@ class URLInput extends Component {
 
 		this.suggestionNodes = [];
 
+		this.isUpdatingSuggestions = false;
+
 		this.state = {
 			suggestions: [],
 			showSuggestions: false,
@@ -44,8 +46,7 @@ class URLInput extends Component {
 	}
 
 	componentDidUpdate() {
-		const { showSuggestions, selectedSuggestion, suggestions } = this.state;
-		const { __experimentalShowInitialSuggestions = false, value } = this.props;
+		const { showSuggestions, selectedSuggestion } = this.state;
 
 		// only have to worry about scrolling selected suggestion into view
 		// when already expanded
@@ -61,18 +62,13 @@ class URLInput extends Component {
 			}, 100 );
 		}
 
-		// If there is no search text and no current suggestions
-		// then display the initial suggestions if provided
-		// (being careful to avoid infinite re-render loop).
-		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
+		if ( this.shouldShowInitialSuggestions() ) {
 			this.updateSuggestions();
 		}
 	}
 
 	componentDidMount() {
-		const { suggestions } = this.state;
-		const { __experimentalShowInitialSuggestions = false, value } = this.props;
-		if ( __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length ) ) {
+		if ( this.shouldShowInitialSuggestions() ) {
 			this.updateSuggestions();
 		}
 	}
@@ -87,6 +83,12 @@ class URLInput extends Component {
 		};
 	}
 
+	shouldShowInitialSuggestions() {
+		const { suggestions } = this.state;
+		const { __experimentalShowInitialSuggestions = false, value } = this.props;
+		return ! this.isUpdatingSuggestions && __experimentalShowInitialSuggestions && ! ( value && value.length ) && ! ( suggestions && suggestions.length );
+	}
+
 	updateSuggestions( value = '' ) {
 		const {
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
@@ -113,6 +115,8 @@ class URLInput extends Component {
 			return;
 		}
 
+		this.isUpdatingSuggestions = true;
+
 		this.setState( {
 			showSuggestions: true,
 			selectedSuggestion: null,
@@ -145,11 +149,13 @@ class URLInput extends Component {
 			} else {
 				this.props.debouncedSpeak( __( 'No results.' ), 'assertive' );
 			}
+			this.isUpdatingSuggestions = false;
 		} ).catch( () => {
 			if ( this.suggestionsRequest === request ) {
 				this.setState( {
 					loading: false,
 				} );
+				this.isUpdatingSuggestions = false;
 			}
 		} );
 

From 3b8b6eac7a8cb88eeee6dd8df019801b5431e39c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 11:12:25 +0000
Subject: [PATCH 22/29] Add test to cover inifinite re-render loop.

---
 .../src/components/link-control/test/index.js          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 70bbf94522fd67..903d374ef327ef 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -335,7 +335,10 @@ describe( 'Default search suggestions', () => {
 		// when this does not have a value
 		expect( searchInput.value ).toBe( '' );
 
-		expect( searchSuggestionsSpy ).toHaveBeenCalled();
+		// Ensure only called once as a guard against potential infinite
+		// re-render loop within `componentDidUpdate` calling `updateSuggestions`
+		// which has calls to `setState` within it.
+		expect( searchSuggestionsSpy ).toHaveBeenCalledTimes( 1 );
 
 		// Verify the search results already display the initial suggestions
 		expect( initialSearchResultElements ).toHaveLength( expectedResultsLength );
@@ -396,7 +399,10 @@ describe( 'Default search suggestions', () => {
 
 		expect( searchResultElements ).toHaveLength( 3 );
 
-		expect( searchSuggestionsSpy ).toHaveBeenCalled();
+		// Ensure only called once as a guard against potential infinite
+		// re-render loop within `componentDidUpdate` calling `updateSuggestions`
+		// which has calls to `setState` within it.
+		expect( searchSuggestionsSpy ).toHaveBeenCalledTimes( 1 );
 	} );
 } );
 

From 1ca624b14c24a54e38f960810cb470dc5d6fba48 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 14:54:55 +0000
Subject: [PATCH 23/29] Fixes typo in WordPress ORG link in e2e tests

---
 .../specs/editor/blocks/__snapshots__/buttons.test.js.snap      | 2 +-
 packages/e2e-tests/specs/editor/blocks/buttons.test.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
index 4b27f486f66f10..2aa7f3585f221a 100644
--- a/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
+++ b/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Buttons can jump to the link editor using the keyboard shortcut 1`] = `
 "<!-- wp:buttons -->
 <div class=\\"wp-block-buttons\\"><!-- wp:button -->
-<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\">WordPress</a></div>
+<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\" href=\\"https://www.wordpress.org/\\" title=\\"https://www.wordpress.org/\\">WordPress</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
diff --git a/packages/e2e-tests/specs/editor/blocks/buttons.test.js b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
index 2917e89b2c26da..f0bba197cc9117 100644
--- a/packages/e2e-tests/specs/editor/blocks/buttons.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
@@ -26,7 +26,7 @@ describe( 'Buttons', () => {
 		await insertBlock( 'Buttons' );
 		await page.keyboard.type( 'WordPress' );
 		await pressKeyWithModifier( 'primary', 'k' );
-		await page.keyboard.type( 'https://wwww.wordpress.org/' );
+		await page.keyboard.type( 'https://www.wordpress.org/' );
 		await page.keyboard.press( 'Enter' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();

From b6d6c2693280c10b017b10477d69907c119cfc8c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 14:56:10 +0000
Subject: [PATCH 24/29] Fix e2e test failure due to console warning in
 LinkControl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a temp fix and I’ve raised an Issue to solve the core issue which will then make this fix redundant.

https://github.com/WordPress/gutenberg/issues/19634
---
 packages/e2e-tests/specs/editor/blocks/buttons.test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/e2e-tests/specs/editor/blocks/buttons.test.js b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
index f0bba197cc9117..5f9d3e35bef942 100644
--- a/packages/e2e-tests/specs/editor/blocks/buttons.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
@@ -30,5 +30,11 @@ describe( 'Buttons', () => {
 		await page.keyboard.press( 'Enter' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
+		// TODO - this is needed currently because when adding a link using the suggestion list,
+		// a submit button is used. The form that the submit button is in is unmounted when submission
+		// occurs, resulting in a warning 'Form submission canceled because the form is not connected'
+		// in Chrome.
+		// Ideally, the suggestions wouldn't be implemented using submit buttons.
+		expect( console ).toHaveWarned();
 	} );
 } );

From abe616cf2dd67c95512dd706ab2e4652e8a70fd4 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 14 Jan 2020 16:40:03 +0000
Subject: [PATCH 25/29] Revise snapshots

---
 .../specs/editor/blocks/__snapshots__/buttons.test.js.snap  | 2 +-
 packages/e2e-tests/specs/editor/blocks/buttons.test.js      | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
index 2aa7f3585f221a..4b27f486f66f10 100644
--- a/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
+++ b/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Buttons can jump to the link editor using the keyboard shortcut 1`] = `
 "<!-- wp:buttons -->
 <div class=\\"wp-block-buttons\\"><!-- wp:button -->
-<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\" href=\\"https://www.wordpress.org/\\" title=\\"https://www.wordpress.org/\\">WordPress</a></div>
+<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\">WordPress</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
diff --git a/packages/e2e-tests/specs/editor/blocks/buttons.test.js b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
index 5f9d3e35bef942..f0bba197cc9117 100644
--- a/packages/e2e-tests/specs/editor/blocks/buttons.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
@@ -30,11 +30,5 @@ describe( 'Buttons', () => {
 		await page.keyboard.press( 'Enter' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
-		// TODO - this is needed currently because when adding a link using the suggestion list,
-		// a submit button is used. The form that the submit button is in is unmounted when submission
-		// occurs, resulting in a warning 'Form submission canceled because the form is not connected'
-		// in Chrome.
-		// Ideally, the suggestions wouldn't be implemented using submit buttons.
-		expect( console ).toHaveWarned();
 	} );
 } );

From 259938aa38c579fc362e4b8c1f58f1151bc9c32a Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 15 Jan 2020 09:43:47 +0000
Subject: [PATCH 26/29] Restore missing `fetchSearchSuggestions` prop following
 rebase

---
 .../src/components/link-control/index.js      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index ca66c9da6295cf..c851c6f1a5871d 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -36,6 +36,7 @@ export function LinkControl( {
 	settings,
 	onChange = noop,
 	initialSuggestions,
+	fetchSearchSuggestions,
 } ) {
 	const instanceId = useInstanceId( LinkControl );
 	const [ inputValue, setInputValue ] = useState( '' );
@@ -190,20 +191,20 @@ export function LinkControl( {
 				</Fragment>
 			) }
 
-					{ isEditingLink && (
-						<LinkControlSearchInput
-							value={ inputValue }
-							onChange={ onInputChange }
-							onSelect={ ( suggestion ) => {
-								setIsEditingLink( false );
-								onChange( { ...value, ...suggestion } );
-							} }
-							renderSuggestions={ renderSearchResults }
-							fetchSuggestions={ getSearchHandler }
-							onReset={ resetInput }
-							initialSuggestions={ initialSuggestions }
-						/>
-					) }
+			{ isEditingLink && (
+				<LinkControlSearchInput
+					value={ inputValue }
+					onChange={ onInputChange }
+					onSelect={ ( suggestion ) => {
+						setIsEditingLink( false );
+						onChange( { ...value, ...suggestion } );
+					} }
+					renderSuggestions={ renderSearchResults }
+					fetchSuggestions={ getSearchHandler }
+					onReset={ resetInput }
+					initialSuggestions={ initialSuggestions }
+				/>
+			) }
 
 			{ ! isEditingLink && (
 				<LinkControlSettingsDrawer value={ value } settings={ settings } onChange={ onChange } />

From 385d04fa8920a376b06b03dafab64a41009c1705 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 15 Jan 2020 10:21:02 +0000
Subject: [PATCH 27/29] Fix lint indentation error

---
 packages/block-library/src/navigation-link/edit.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index d50c0c0c8fdffd..be73cd8d966fce 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -166,10 +166,10 @@ function NavigationLinkEdit( {
 					/>
 					{ isLinkOpen && (
 						<Popover position="bottom center">
-						<LinkControl
-							className="wp-block-navigation-link__inline-link-input"
-							value={ link }
-							initialSuggestions={ true }
+							<LinkControl
+								className="wp-block-navigation-link__inline-link-input"
+								value={ link }
+								initialSuggestions={ true }
 								onChange={ ( {
 									title: newTitle = '',
 									url: newURL = '',

From 5dc5716bd48b856817048cdc71b9c3f7ae385486 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 15 Jan 2020 10:32:54 +0000
Subject: [PATCH 28/29] Rename prop

---
 .../block-editor/src/components/link-control/index.js  |  4 ++--
 .../src/components/link-control/search-input.js        | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index c851c6f1a5871d..6be843ea5b4b4c 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -35,7 +35,7 @@ export function LinkControl( {
 	value,
 	settings,
 	onChange = noop,
-	initialSuggestions,
+	showInitialSuggestions,
 	fetchSearchSuggestions,
 } ) {
 	const instanceId = useInstanceId( LinkControl );
@@ -202,7 +202,7 @@ export function LinkControl( {
 					renderSuggestions={ renderSearchResults }
 					fetchSuggestions={ getSearchHandler }
 					onReset={ resetInput }
-					initialSuggestions={ initialSuggestions }
+					showInitialSuggestions={ showInitialSuggestions }
 				/>
 			) }
 
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index 0b3fe7cca1fdf1..0d72bc0444fad3 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -27,7 +27,13 @@ const handleLinkControlOnKeyDown = ( event ) => {
 };
 
 const handleLinkControlOnKeyPress = ( event ) => {
+	const { keyCode } = event;
+
 	event.stopPropagation();
+
+	if ( keyCode === ENTER ) {
+
+	}
 };
 
 const LinkControlSearchInput = ( {
@@ -37,7 +43,7 @@ const LinkControlSearchInput = ( {
 	renderSuggestions,
 	fetchSuggestions,
 	onReset,
-	initialSuggestions,
+	showInitialSuggestions,
 } ) => {
 	const selectItemHandler = ( selection, suggestion ) => {
 		onChange( selection );
@@ -69,7 +75,7 @@ const LinkControlSearchInput = ( {
 				__experimentalRenderSuggestions={ renderSuggestions }
 				__experimentalFetchLinkSuggestions={ fetchSuggestions }
 				__experimentalHandleURLSuggestions={ true }
-				__experimentalShowInitialSuggestions={ initialSuggestions }
+				__experimentalShowInitialSuggestions={ showInitialSuggestions }
 			/>
 
 			<Button

From 8c648a3026896c25126fdb2c0c6e28b74d7da283 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 15 Jan 2020 10:57:04 +0000
Subject: [PATCH 29/29] Fix test broken due to prop rename

---
 .../block-editor/src/components/link-control/test/index.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 903d374ef327ef..d0f174c25b4c2e 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -318,7 +318,7 @@ describe( 'Default search suggestions', () => {
 			render(
 				<LinkControl
 					fetchSearchSuggestions={ searchSuggestionsSpy }
-					initialSuggestions={ true }
+					showInitialSuggestions={ true }
 				/>, container
 			);
 		} );
@@ -355,7 +355,7 @@ describe( 'Default search suggestions', () => {
 			render(
 				<LinkControl
 					fetchSearchSuggestions={ searchSuggestionsSpy }
-					initialSuggestions={ true }
+					showInitialSuggestions={ true }
 					value={ fauxEntitySuggestions[ 0 ] }
 				/>, container
 			);