From d2022e062b59dbe195281865dccfbf1166f8e881 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Tue, 2 Jul 2024 16:58:08 -0400
Subject: [PATCH] Global header, Local navigation: Add aria label to the main,
 search, and local nav blocks (#634)

* Global header: Add aria label to the main and search nav blocks

Fixes #622

* Local navigation: Add aria label to menu inside block
---
 mu-plugins/blocks/global-header-footer/header.php | 4 ++--
 mu-plugins/blocks/local-navigation-bar/index.php  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mu-plugins/blocks/global-header-footer/header.php b/mu-plugins/blocks/global-header-footer/header.php
index 1f858008f..79e2aa026 100644
--- a/mu-plugins/blocks/global-header-footer/header.php
+++ b/mu-plugins/blocks/global-header-footer/header.php
@@ -81,7 +81,7 @@ function recursive_menu( $menu_item, $top_level = true ) {
 <!-- /wp:paragraph -->
 <?php endif; ?>
 
-<!-- wp:navigation {"openSubmenusOnClick":true,"className":"global-header__navigation","layout":{"type":"flex","orientation":"horizontal"}} -->
+<!-- wp:navigation {"openSubmenusOnClick":true,"className":"global-header__navigation","ariaLabel":"<?php echo esc_attr_x( 'Main', 'main navigation label', 'wporg' ); ?>","layout":{"type":"flex","orientation":"horizontal"}} -->
 	<?php
 	/*
 	* Loop though menu items and create navigation item blocks. Recurses through any submenu items to output dropdowns.
@@ -99,7 +99,7 @@ function recursive_menu( $menu_item, $top_level = true ) {
 	calls for. It also provides a consistent experience with the primary navigation menu, with respect to
 	keyboard navigation, ARIA states, etc. It also saves having to write custom code for all the interactions.
 -->
-<!-- wp:navigation {"className":"global-header__search","layout":{"type":"flex","orientation":"vertical"},"overlayMenu":"always"} -->
+<!-- wp:navigation {"className":"global-header__search","ariaLabel":"<?php echo esc_attr_x( 'Search', 'search toggle navigation label', 'wporg' ); ?>","layout":{"type":"flex","orientation":"vertical"},"overlayMenu":"always"} -->
 	<!-- wp:search <?php echo wp_json_encode( $search_args ); ?> /-->
 <!-- /wp:navigation -->
 <?php endif; ?>
diff --git a/mu-plugins/blocks/local-navigation-bar/index.php b/mu-plugins/blocks/local-navigation-bar/index.php
index 7318af8d5..6cd8d1ae7 100644
--- a/mu-plugins/blocks/local-navigation-bar/index.php
+++ b/mu-plugins/blocks/local-navigation-bar/index.php
@@ -98,6 +98,7 @@ function update_child_block_attributes( $parsed_block, $source_block, $parent_bl
 			'type' => 'flex',
 			'orientation' => 'horizontal',
 		);
+		$parsed_block['attrs']['ariaLabel'] = _x( 'Section', 'local navigation label', 'wporg' );
 
 		// Add an extra navigation block which is always collapsed, so that it
 		// can be swapped out when the section title + nav menu collide.