From e42b20e4c5421a59d3e189214162d105ce290f91 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 17 Mar 2021 11:03:23 -0400
Subject: [PATCH] Navigation Link: Match Editor Markup to Rendered

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

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 0f95d473ce39b0..768e0b425aa812 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -428,7 +428,9 @@ export default function NavigationLinkEdit( {
 				</PanelBody>
 			</InspectorControls>
 			<li { ...blockProps }>
-				<div className={ classes }>
+				{/* eslint-disable jsx-a11y/anchor-is-valid */}
+				<a className={ classes }>
+				{/* eslint-enable */}
 					{ ! url ? (
 						<div className="wp-block-navigation-link__placeholder-text">
 							<KeyboardShortcuts
@@ -550,7 +552,7 @@ export default function NavigationLinkEdit( {
 							/>
 						</Popover>
 					) }
-				</div>
+				</a>
 				{ hasDescendants && showSubmenuIcon && (
 					<span className="wp-block-navigation-link__submenu-icon">
 						<ItemSubmenuIcon />
diff --git a/packages/block-library/src/navigation-link/editor.scss b/packages/block-library/src/navigation-link/editor.scss
index f707565704c3ba..b96087eb652006 100644
--- a/packages/block-library/src/navigation-link/editor.scss
+++ b/packages/block-library/src/navigation-link/editor.scss
@@ -39,6 +39,10 @@
 		display: block;
 	}
 
+	.wp-block-navigation-link__content {
+		cursor: text;
+	}
+
 	&.is-editing,
 	&.is-selected {
 		min-width: 20px;