Changeset 54478

Timestamp:

10/11/2022 02:02:55 PM (2 years ago)

Author:

audrasjb

Message:

Menus: Remove .menu-item-has-children on wp_nav_menu last level menu items when $depth arg is used.

This changeset prevents wp_nav_menu last level menu items from having the .menu-item-has-children class when the $depth argument is used. It adds a loop in wp_nav_menu() to calculate the depth of each menu item with children to make sure the class is added only when applicable.

Props slobodanmanic, kucrut, iCaspar, mdgl, petitphp, audrasjb, costdev.
Fixes #28620.

Location:

trunk

Files:

• src/wp-includes/nav-menu-template.php (modified) (3 diffs)
• tests/phpunit/tests/menu/wp-nav-menu.php (added)

trunk/src/wp-includes/nav-menu-template.php

@@ -197 +197 @@
 
     $sorted_menu_items        = array();
+    $menu_items_tree          = array();
     $menu_items_with_children = array();
     foreach ( (array) $menu_items as $menu_item ) {
         $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
+        $menu_items_tree[ $menu_item->ID ]           = $menu_item->menu_item_parent;
         if ( $menu_item->menu_item_parent ) {
-            $menu_items_with_children[ $menu_item->menu_item_parent ] = true;
+            $menu_items_with_children[ $menu_item->menu_item_parent ] = 1;
+        }
+
+        // Calculate the depth of each menu item with children
+        foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
+            $menu_item_parent = $menu_items_tree[ $menu_item_key ];
+            while ( $menu_item_parent ) {
+                $menu_item_depth  = $menu_item_depth + 1;
+                $menu_item_parent = $menu_items_tree[ $menu_item_parent ];
+            }
         }
     }
@@ -208 +219 @@
     if ( $menu_items_with_children ) {
         foreach ( $sorted_menu_items as &$menu_item ) {
-            if ( isset( $menu_items_with_children[ $menu_item->ID ] ) ) {
+            if (
+                isset( $menu_items_with_children[ $menu_item->ID ] ) &&
+                ( $args->depth <= 0 || $menu_items_with_children[ $menu_item->ID ] < $args->depth )
+            ) {
                 $menu_item->classes[] = 'menu-item-has-children';
             }
@@ -214 +228 @@
     }
 
-    unset( $menu_items, $menu_item );
+    unset( $menu_items_tree, $menu_items_with_children, $menu_items, $menu_item );
 
     /**