From 0279135519cb48f7ab7e6646de2adb9e0612b004 Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <andrei.draganescu@automattic.com>
Date: Wed, 17 Jul 2019 17:13:58 +0300
Subject: [PATCH] adds nofollow and blank target

---
 .../src/navigation-menu-item/block.json       |  4 +++
 .../src/navigation-menu-item/edit.js          | 31 ++++++++++++++-----
 .../src/navigation-menu-item/save.js          |  2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/block-library/src/navigation-menu-item/block.json b/packages/block-library/src/navigation-menu-item/block.json
index 915c63931cb2be..e2862e15ac15f9 100644
--- a/packages/block-library/src/navigation-menu-item/block.json
+++ b/packages/block-library/src/navigation-menu-item/block.json
@@ -8,6 +8,10 @@
 		"destination": {
 			"type": "string"
 		},
+		"rel": {
+			"type": "string",
+			"default": ""
+		},
 		"nofollow": {
 			"type": "boolean",
 			"default": false
diff --git a/packages/block-library/src/navigation-menu-item/edit.js b/packages/block-library/src/navigation-menu-item/edit.js
index ce5db4b33d0ce1..c7d8d267944242 100644
--- a/packages/block-library/src/navigation-menu-item/edit.js
+++ b/packages/block-library/src/navigation-menu-item/edit.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { invoke } from 'lodash';
+import classnames from 'classnames/dedupe';
 
 /**
  * WordPress dependencies
@@ -39,13 +40,30 @@ function NavigationMenuItemEdit( {
 	setAttributes,
 } ) {
 	const plainTextRef = useRef( null );
-	const onEditLableClicked = useCallback(
+	const onEditLabelClicked = useCallback(
 		( onClose ) => () => {
 			onClose();
 			invoke( plainTextRef, [ 'current', 'textarea', 'focus' ] );
 		},
 		[ plainTextRef ]
 	);
+
+	const setTarget = ( opensInNewTab ) => {
+		const { rel } = attributes;
+
+		const updatedRel = classnames( rel, { noopener: opensInNewTab, noreferrer: opensInNewTab } );
+
+		setAttributes( { opensInNewTab, rel: updatedRel } );
+	};
+
+	const setNofollow = ( nofollow ) => {
+		const { rel } = attributes;
+
+		const updatedRel = classnames( rel, { nofollow } );
+
+		setAttributes( { nofollow, rel: updatedRel } );
+	};
+
 	let content;
 	if ( isSelected ) {
 		content = (
@@ -74,7 +92,7 @@ function NavigationMenuItemEdit( {
 						<MenuItemActions
 							clientId={ clientId }
 							destination={ attributes.destination }
-							onEditLableClicked={ onEditLableClicked( onClose ) }
+							onEditLableClicked={ onEditLabelClicked( onClose ) }
 						/>
 					) }
 				/>
@@ -83,6 +101,7 @@ function NavigationMenuItemEdit( {
 	} else {
 		content = attributes.label;
 	}
+
 	return (
 		<Fragment>
 			<InspectorControls>
@@ -91,9 +110,7 @@ function NavigationMenuItemEdit( {
 				>
 					<ToggleControl
 						checked={ attributes.opensInNewTab }
-						onChange={ ( opensInNewTab ) => {
-							setAttributes( { opensInNewTab } );
-						} }
+						onChange={ setTarget }
 						label={ __( 'Open in new tab' ) }
 					/>
 					<TextareaControl
@@ -117,9 +134,7 @@ function NavigationMenuItemEdit( {
 					/>
 					<ToggleControl
 						checked={ attributes.nofollow }
-						onChange={ ( nofollow ) => {
-							setAttributes( { nofollow } );
-						} }
+						onChange={ setNofollow }
 						label={ __( 'Add nofollow to menu item' ) }
 						help={ (
 							<Fragment>
diff --git a/packages/block-library/src/navigation-menu-item/save.js b/packages/block-library/src/navigation-menu-item/save.js
index 66649929c4ac30..9c5d889bd23f5d 100644
--- a/packages/block-library/src/navigation-menu-item/save.js
+++ b/packages/block-library/src/navigation-menu-item/save.js
@@ -2,7 +2,7 @@ export default function save( { attributes } ) {
 	return (
 		<a
 			href={ attributes.destination }
-			rel={ attributes.nofollow && 'nofollow' }
+			rel={ attributes.rel }
 			title={ attributes.title }
 			target={ attributes.opensInNewTab && '_blank' }
 		>