navigation-menu-item: anchor LinkControl at item text

WordPress · Oct 28, 2019 · a88b994 · a88b994
1 parent f8f1290
commit a88b994
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/packages/block-library/src/navigation-menu-item/edit.js b/packages/block-library/src/navigation-menu-item/edit.js
@@ -93,15 +93,31 @@ function NavigationMenuItemEdit( {
 	let content;
 	if ( isSelected ) {
 		content = (
-			<TextControl
-				ref={ plainTextRef }
-				className="wp-block-navigation-menu-item__field"
-				value={ label }
-				onChange={ () => setIsLinkOpen( false ) }
-				label={ __( 'Navigation Label' ) }
-				hideLabelFromVision={ true }
-			/>
+			<div className="wp-block-navigation-menu-item__field-container">
+				<TextControl
+					ref={ plainTextRef }
+					className="wp-block-navigation-menu-item__field"
+					value={ label }
+					onChange={ () => setIsLinkOpen( false ) }
+					label={ __( 'Navigation Label' ) }
+					hideLabelFromVision={ true }
+				/>
+				{ isLinkOpen &&
+					<LinkControl
+						className="wp-block-navigation-menu-item__inline-link-input"
+						onKeyDown={ handleLinkControlOnKeyDown }
+						onKeyPress={ ( event ) => event.stopPropagation() }
+						currentLink={ link }
+						onLinkChange={ updateLink }
+						onClose={ () => setIsLinkOpen( false ) }
+						currentSettings={ linkSettings }
+						onSettingsChange={ updateLinkSetting }
+						fetchSearchSuggestions={ fetchSearchSuggestions }
+					/>
+				}
+			</div>
 		);
+
 	} else {
 		content = <div className="wp-block-navigation-menu-item__container">
 			{ label }
@@ -118,19 +134,6 @@ function NavigationMenuItemEdit( {
 						title={ __( 'Link' ) }
 						onClick={ () => setIsLinkOpen( ! isLinkOpen ) }
 					/>
-					{ isLinkOpen &&
-						<LinkControl
-							className="wp-block-navigation-menu-item__inline-link-input"
-							onKeyDown={ handleLinkControlOnKeyDown }
-							onKeyPress={ ( event ) => event.stopPropagation() }
-							currentLink={ link }
-							onLinkChange={ updateLink }
-							onClose={ () => setIsLinkOpen( false ) }
-							currentSettings={ linkSettings }
-							onSettingsChange={ updateLinkSetting }
-							fetchSearchSuggestions={ fetchSearchSuggestions }
-						/>
-					}
 				</Toolbar>
 			</BlockControls>
 			<InspectorControls>