From fbc0695307553fd64cd23dac3615c88cd1fae64d Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Fri, 3 Jul 2020 12:01:56 +1000
Subject: [PATCH] Navigation: Remove .has-submenu-icon

---
 packages/block-library/src/navigation-link/edit.js | 2 +-
 packages/block-library/src/navigation/edit.js      | 1 -
 packages/block-library/src/navigation/index.php    | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index f76f2f4db74f0..29d30643acb8f 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -47,6 +47,7 @@ function NavigationLinkEdit( {
 	isImmediateParentOfSelectedBlock,
 	isParentOfSelectedBlock,
 	setAttributes,
+	showSubmenuIcon,
 	insertLinkBlock,
 	textColor,
 	backgroundColor,
@@ -54,7 +55,6 @@ function NavigationLinkEdit( {
 	rgbBackgroundColor,
 	saveEntityRecord,
 	selectedBlockHasDescendants,
-	showSubmenuIcon,
 	userCanCreatePages = false,
 	insertBlocksAfter,
 	mergeBlocks,
diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
index a8b11a0e0128c..9663d471788c9 100644
--- a/packages/block-library/src/navigation/edit.js
+++ b/packages/block-library/src/navigation/edit.js
@@ -117,7 +117,6 @@ function Navigation( {
 		[ `items-justified-${ attributes.itemsJustification }` ]: attributes.itemsJustification,
 		[ fontSize.class ]: fontSize.class,
 		'is-vertical': attributes.orientation === 'vertical',
-		'has-submenu-icon': attributes.showSubmenuIcon,
 	} );
 
 	// UI State: rendered Block UI
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index a065be0386138..e28c521667101 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -134,8 +134,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		isset( $attributes['className'] ) ? array( $attributes['className'] ) : array(),
 		( isset( $attributes['orientation'] ) && 'vertical' === $attributes['orientation'] ) ? array( 'is-vertical' ) : array(),
 		isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
-		isset( $attributes['align'] ) ? array( 'align' . $attributes['align'] ) : array(),
-		isset( $attributes['showSubmenuIcon'] ) && $attributes['showSubmenuIcon'] ? array( 'has-submenu-icon' ) : array()
+		isset( $attributes['align'] ) ? array( 'align' . $attributes['align'] ) : array()
 	);
 	$class_attribute = sprintf( ' class="%s"', esc_attr( implode( ' ', $classes ) ) );
 	$style_attribute = ( $colors['inline_styles'] || $font_sizes['inline_styles'] )