aria-label equal to a menu name added to navigation block

WordPress · Jan 30, 2021 · faa079a · faa079a
1 parent e5a966b
commit faa079a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
@@ -45,6 +45,7 @@ function Navigation( {
 	hasSubmenuIndicatorSetting = true,
 	hasItemJustificationControls = attributes.orientation === 'horizontal',
 	hasListViewModal = true,
+	menuName,
 } ) {
 	const navIcons = {
 		left: justifyLeft,
@@ -200,7 +201,7 @@ function Navigation( {
 					</PanelBody>
 				) }
 			</InspectorControls>
-			<nav { ...blockProps }>
+			<nav { ...blockProps } aria-label={ menuName }>
 				<ul { ...innerBlocksProps } />
 			</nav>
 		</>

diff --git a/packages/edit-navigation/src/components/layout/use-navigation-block-with-name.js b/packages/edit-navigation/src/components/layout/use-navigation-block-with-name.js
@@ -17,6 +17,7 @@ export default function useNavigationBlockWithName( menuId ) {
 	] );
 
 	const { saveMenu } = useDispatch( 'core' );
+	const menuName = menu?.name ?? '(untitled menu)';
 
 	useEffect( () => {
 		if ( menu ) {
@@ -27,15 +28,16 @@ export default function useNavigationBlockWithName( menuId ) {
 					}
 					return (
 						<>
-							<BlockEdit { ...props } />
+							<BlockEdit { ...props } menuName={ menuName } />
 							<BlockControls>
 								<ToolbarGroup>
 									<EditInPlaceControl
-										label={ menu?.name ?? '(untitled menu)' }
+										label={ menuName }
 										onUpdate={ ( value ) => {
 											saveMenu( {
 												...menu,
-												name: value || '(untitled menu)',
+												name:
+													value || '(untitled menu)',
 											} );
 										} }
 									/>
@@ -51,9 +53,12 @@ export default function useNavigationBlockWithName( menuId ) {
 				'core/edit-navigation/with-menu-name',
 				withMenuName
 			);
-			return () => removeFilter( 'editor.BlockEdit', 'core/edit-navigation/with-menu-name',  withMenuName );
+			return () =>
+				removeFilter(
+					'editor.BlockEdit',
+					'core/edit-navigation/with-menu-name',
+					withMenuName
+				);
 		}
 	}, [ menuId ] );
-
-
 }