From 009db949cbdc6c16374b0e26ce2a9d418198bff6 Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Thu, 16 Jan 2020 18:51:19 +0100
Subject: [PATCH] Don't use <span> for RichText element

---
 packages/block-library/src/navigation-link/edit.js     | 8 +++-----
 packages/block-library/src/navigation-link/editor.scss | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index cf6d0f5ebda05..b5f993ffc87d0 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -156,10 +156,8 @@ function NavigationLinkEdit( {
 					'has-link': !! url,
 				} ) }
 			>
-				<div>
+				<div className="wp-block-navigation-link__content">
 					<RichText
-						tagName="span"
-						className="wp-block-navigation-link__content"
 						value={ label }
 						onChange={ ( labelValue ) => setAttributes( { label: labelValue } ) }
 						placeholder={ itemLabelPlaceholder }
@@ -172,9 +170,9 @@ function NavigationLinkEdit( {
 						] }
 					/>
 					{ showSubmenuIcon &&
-						<span className="wp-block-navigation-link__submenu-icon">
+						<div className="wp-block-navigation-link__submenu-icon">
 							{ submenuIcon }
-						</span>
+						</div>
 					}
 					{ isLinkOpen && (
 						<Popover position="bottom center">
diff --git a/packages/block-library/src/navigation-link/editor.scss b/packages/block-library/src/navigation-link/editor.scss
index c7d73837d57f4..7f7ed5169abd6 100644
--- a/packages/block-library/src/navigation-link/editor.scss
+++ b/packages/block-library/src/navigation-link/editor.scss
@@ -70,6 +70,8 @@
 	}
 
 	&.has-link .wp-block-navigation-link__content {
+		display: flex;
+		align-items: center;
 		text-decoration: underline;
 	}