Move aria-label to dialog element

stokesman · stokesman · commit 01643fad63c3 · 2025-03-31T10:40:31.000-07:00
diff --git a/packages/block-library/src/navigation/edit/responsive-wrapper.js b/packages/block-library/src/navigation/edit/responsive-wrapper.js
@@ -132,15 +132,13 @@ export default function ResponsiveWrapper( {
 				style={ styles }
 				id={ modalId }
 				ref={ effectRootAndScrollContainer }
+				aria-label={ isOpen && __( 'Menu' ) }
 			>
 				<div
 					className="wp-block-navigation__responsive-close"
 					tabIndex="-1"
 				>
-					<div
-						className="wp-block-navigation__responsive-dialog"
-						aria-label={ isOpen && __( 'Menu' ) }
-					>
+					<div className="wp-block-navigation__responsive-dialog">
 						<Button
 							__next40pxDefaultSize
 							className="wp-block-navigation__responsive-container-close"
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -494,7 +494,6 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 		// Add Interactivity API directives to the markup if needed.
 		$open_button_directives                  = '';
 		$responsive_container_directives         = '';
-		$responsive_dialog_directives            = '';
 		$close_button_directives                 = '';
 		$responsive_container_content_directives = '';
 		if ( $is_interactive ) {
@@ -507,8 +506,6 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 				data-wp-class--is-menu-open="state.isMenuOpen"
 				data-wp-watch="callbacks.effectOpenClose"
 				data-wp-on-async--close="actions.closeMenu"
-			';
-			$responsive_dialog_directives            = '
 				data-wp-bind--aria-label="state.ariaLabel"
 			';
 			$close_button_directives                 = '
@@ -525,9 +522,9 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 			'<button aria-haspopup="dialog" %3$s class="%6$s" %10$s commandfor="%1$s" command="show-modal">%8$s</button>
 				<dialog class="%5$s" %7$s id="%1$s" %11$s>
 					<div class="wp-block-navigation__responsive-close" tabindex="-1">
-						<div class="wp-block-navigation__responsive-dialog" %12$s>
-							<button %4$s class="wp-block-navigation__responsive-container-close" %13$s commandfor="%1$s" command="close">%9$s</button>
-							<div class="wp-block-navigation__responsive-container-content" %14$s id="%1$s-content">
+						<div class="wp-block-navigation__responsive-dialog">
+							<button %4$s class="wp-block-navigation__responsive-container-close" %12$s commandfor="%1$s" command="close">%9$s</button>
+							<div class="wp-block-navigation__responsive-container-content" %13$s id="%1$s-content">
 								%2$s
 							</div>
 						</div>
@@ -544,7 +541,6 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 			$toggle_close_button_content,
 			$open_button_directives,
 			$responsive_container_directives,
-			$responsive_dialog_directives,
 			$close_button_directives,
 			$responsive_container_content_directives
 		);
