From 9235c5e99a06899fb5e9071643bd76820e9af2bb Mon Sep 17 00:00:00 2001
From: shimotmk <shimotmk1104@gmail.com>
Date: Sat, 25 Jan 2025 16:30:01 +0900
Subject: [PATCH 1/2] Fix trailing spaces on navigation submenu block
 classnames

---
 .../src/navigation-submenu/index.php          | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 0f560e2849fac2..6a739b857088b7 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -82,7 +82,6 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	$font_sizes      = block_core_navigation_submenu_build_css_font_sizes( $block->context );
 	$style_attribute = $font_sizes['inline_styles'];
 
-	$css_classes = trim( implode( ' ', $font_sizes['css_classes'] ) );
 	$has_submenu = count( $block->inner_blocks ) > 0;
 	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
 	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
@@ -99,11 +98,29 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	$open_on_hover_and_click = isset( $block->context['openSubmenusOnClick'] ) && ! $block->context['openSubmenusOnClick'] &&
 		$show_submenu_indicators;
 
+	$classes = array(
+		'wp-block-navigation-item'
+	);
+	$classes = array_merge(
+		$classes,
+		$font_sizes['css_classes'],
+	);
+	if ( $has_submenu ) {
+		$classes[] = 'has-child';
+	}
+	if ( $open_on_click ) {
+		$classes[] = 'open-on-click';
+	}
+	if ( $open_on_hover_and_click ) {
+		$classes[] = 'open-on-hover-click';
+	}
+	if ( $is_active ) {
+		$classes[] = 'current-menu-item';
+	}
+
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
-			'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) .
-			( $open_on_click ? ' open-on-click' : '' ) . ( $open_on_hover_and_click ? ' open-on-hover-click' : '' ) .
-			( $is_active ? ' current-menu-item' : '' ),
+			'class' => implode( ' ', $classes ),
 			'style' => $style_attribute,
 		)
 	);

From 49d6a87bd608f46cdfa098d603082794870681a4 Mon Sep 17 00:00:00 2001
From: shimotmk <shimotmk1104@gmail.com>
Date: Sat, 25 Jan 2025 20:30:33 +0900
Subject: [PATCH 2/2] phpcs

---
 packages/block-library/src/navigation-submenu/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 6a739b857088b7..016e708c3256e6 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -99,11 +99,11 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		$show_submenu_indicators;
 
 	$classes = array(
-		'wp-block-navigation-item'
+		'wp-block-navigation-item',
 	);
 	$classes = array_merge(
 		$classes,
-		$font_sizes['css_classes'],
+		$font_sizes['css_classes']
 	);
 	if ( $has_submenu ) {
 		$classes[] = 'has-child';