Changeset 59921

Timestamp:

03/03/2025 10:51:24 PM (7 weeks ago)

Author:

joedolson

Message:

Bundled Themes: Twenty Nineteen: Omit irrelevant ARIA in menus.

Don't set aria-expanded and aria-haspopup attributes outside of the primary menu. Secondary menus (social and footer) are set to a depth of 1, and have nothing to expand or popup.

Props bschneidewind, joedolson, mikinc860.
Fixes #62896.

File:

• trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php

@@ -168 +168 @@
  * @link https://www.w3.org/WAI/tutorials/menus/flyout/
  *
- * @param array   $atts {
+ * @param array    $atts {
  *     The HTML attributes applied to the menu item's `<a>` element, empty strings are ignored.
  *
@@ -177 +177 @@
  *     @type string $aria-current The aria-current attribute.
  * }
- * @param WP_Post $item The current menu item object.
+ * @param WP_Post  $item The current menu item object.
+ * @param stdClass $args An object of `wp_nav_menu()` arguments.
  * @return string[] Modified attributes.
  */
-function twentynineteen_nav_menu_link_attributes( $atts, $item ) {
-
-    // Add [aria-haspopup] and [aria-expanded] to menu items that have children.
-    $item_has_children = in_array( 'menu-item-has-children', $item->classes, true );
-    if ( $item_has_children ) {
-        $atts['aria-haspopup'] = 'true';
-        $atts['aria-expanded'] = 'false';
+function twentynineteen_nav_menu_link_attributes( $atts, $item, $args ) {
+
+    // Check that this is the primary menu.
+    if ( isset( $args->theme_location ) && 'menu-1' === $args->theme_location ) {
+        // Add [aria-haspopup] and [aria-expanded] to menu items that have children.
+        $item_has_children = in_array( 'menu-item-has-children', $item->classes, true );
+        if ( $item_has_children ) {
+            $atts['aria-haspopup'] = 'true';
+            $atts['aria-expanded'] = 'false';
+        }
     }
 
     return $atts;
 }
-add_filter( 'nav_menu_link_attributes', 'twentynineteen_nav_menu_link_attributes', 10, 2 );
+add_filter( 'nav_menu_link_attributes', 'twentynineteen_nav_menu_link_attributes', 10, 3 );
 
 /**