update: added early return if ariaLabel is provided

up1512001 · Nov 13, 2024 · 256a980 · 256a980
1 parent aa023dd
commit 256a980
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
@@ -473,7 +473,7 @@ A collection of blocks that allow visitors to get around your site. ([Source](ht
 -	**Category:** theme
 -	**Allowed Blocks:** core/navigation-link, core/search, core/social-links, core/page-list, core/spacer, core/home-link, core/site-title, core/site-logo, core/navigation-submenu, core/loginout, core/buttons
 -	**Supports:** align (full, wide), ariaLabel, inserter, interactivity, layout (allowSizingOnChildren, default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, units), typography (fontSize, lineHeight), ~~html~~, ~~renaming~~
--	**Attributes:** __unstableLocation, ariaLabel, backgroundColor, customBackgroundColor, customOverlayBackgroundColor, customOverlayTextColor, customTextColor, hasIcon, icon, maxNestingLevel, openSubmenusOnClick, overlayBackgroundColor, overlayMenu, overlayTextColor, ref, rgbBackgroundColor, rgbTextColor, showSubmenuIcon, templateLock, textColor
+-	**Attributes:** __unstableLocation, backgroundColor, customBackgroundColor, customOverlayBackgroundColor, customOverlayTextColor, customTextColor, hasIcon, icon, maxNestingLevel, openSubmenusOnClick, overlayBackgroundColor, overlayMenu, overlayTextColor, ref, rgbBackgroundColor, rgbTextColor, showSubmenuIcon, templateLock, textColor
 
 ## Custom Link
 

diff --git a/packages/block-editor/src/hooks/aria-label.js b/packages/block-editor/src/hooks/aria-label.js
@@ -22,6 +22,7 @@ const ARIA_LABEL_SCHEMA = {
 export function addAttribute( settings ) {
 	// Allow blocks to specify their own attribute definition with default values if needed.
 	if ( settings?.attributes?.ariaLabel?.type ) {
+		console.log( 'The ariaLabel', settings.attributes.ariaLabel );
 		return settings;
 	}
 	if ( hasBlockSupport( settings, 'ariaLabel' ) ) {

diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
@@ -84,10 +84,6 @@
 		"templateLock": {
 			"type": [ "string", "boolean" ],
 			"enum": [ "all", "insert", "contentOnly", false ]
-		},
-		"ariaLabel": {
-			"type": "string",
-			"default": ""
 		}
 	},
 	"providesContext": {

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -344,6 +344,10 @@ private static function get_navigation_name( $attributes ) {
 
 		$navigation_name = $attributes['ariaLabel'] ?? '';
 
+		if ( ! empty( $navigation_name ) ) {
+			return $navigation_name;
+		}
+
 		// Load the navigation post.
 		if ( array_key_exists( 'ref', $attributes ) ) {
 			$navigation_post = get_post( $attributes['ref'] );
@@ -559,7 +563,6 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 	 */
 	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
 		$nav_menu_name      = static::get_unique_navigation_name( $attributes );
-		$aria_label         = ( ! empty( $attributes['ariaLabel'] ) ) ? $attributes['ariaLabel'] : $nav_menu_name;
 		$is_interactive     = static::is_interactive( $attributes, $inner_blocks );
 		$is_responsive_menu = static::is_responsive( $attributes );
 		$style              = static::get_styles( $attributes );
@@ -568,7 +571,7 @@ private static function get_nav_wrapper_attributes( $attributes, $inner_blocks )
 			array(
 				'class'      => $class,
 				'style'      => $style,
-				'aria-label' => $aria_label,
+				'aria-label' => $nav_menu_name,
 			)
 		);
 

diff --git a/test/integration/fixtures/blocks/core__navigation.json b/test/integration/fixtures/blocks/core__navigation.json
@@ -8,8 +8,7 @@
 			"overlayMenu": "mobile",
 			"icon": "handle",
 			"hasIcon": true,
-			"maxNestingLevel": 5,
-			"ariaLabel": ""
+			"maxNestingLevel": 5
 		},
 		"innerBlocks": []
 	}