Changeset 59775 for trunk/src/wp-includes/blocks/navigation-submenu.php

Timestamp:

02/07/2025 03:44:07 PM (10 months ago)

Author:

joemcgill

Message:

Editor: Update packages for 6.8 pre-Betas.

Syncs @wordpress/* packages to the 'latest' npm tag.

Props mamaduka, joemcgill, youknowriad, swissspidy, sergiomdgomes, gziolo.
See #62887.

File:

• trunk/src/wp-includes/blocks/navigation-submenu.php (modified) (5 diffs)

trunk/src/wp-includes/blocks/navigation-submenu.php

@@ -83 +83 @@
     $style_attribute = $font_sizes['inline_styles'];
 
-    $css_classes = trim( implode( ' ', $font_sizes['css_classes'] ) );
     $has_submenu = count( $block->inner_blocks ) > 0;
     $kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
@@ -100 +99 @@
         $show_submenu_indicators;
 
+    $classes = array(
+        'wp-block-navigation-item',
+    );
+    $classes = array_merge(
+        $classes,
+        $font_sizes['css_classes']
+    );
+    if ( $has_submenu ) {
+        $classes[] = 'has-child';
+    }
+    if ( $open_on_click ) {
+        $classes[] = 'open-on-click';
+    }
+    if ( $open_on_hover_and_click ) {
+        $classes[] = 'open-on-hover-click';
+    }
+    if ( $is_active ) {
+        $classes[] = 'current-menu-item';
+    }
+
     $wrapper_attributes = get_block_wrapper_attributes(
         array(
-            'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) .
-            ( $open_on_click ? ' open-on-click' : '' ) . ( $open_on_hover_and_click ? ' open-on-hover-click' : '' ) .
-            ( $is_active ? ' current-menu-item' : '' ),
+            'class' => implode( ' ', $classes ),
             'style' => $style_attribute,
         )
@@ -160 +177 @@
         // End appending HTML attributes to anchor tag.
 
+        $html .= '<span class="wp-block-navigation-item__label">';
         $html .= $label;
+        $html .= '</span>';
+
+        // Add description if available.
+        if ( ! empty( $attributes['description'] ) ) {
+            $html .= '<span class="wp-block-navigation-item__description">';
+            $html .= wp_kses_post( $attributes['description'] );
+            $html .= '</span>';
+        }
 
         $html .= '</a>';
@@ -180 +206 @@
 
         $html .= '</span>';
+
+        // Add description if available.
+        if ( ! empty( $attributes['description'] ) ) {
+            $html .= '<span class="wp-block-navigation-item__description">';
+            $html .= wp_kses_post( $attributes['description'] );
+            $html .= '</span>';
+        }
 
         $html .= '</button>';
@@ -223 +256 @@
         if ( strpos( $inner_blocks_html, 'current-menu-item' ) ) {
             $tag_processor = new WP_HTML_Tag_Processor( $html );
-            while ( $tag_processor->next_tag( array( 'class_name' => 'wp-block-navigation-item__content' ) ) ) {
+            while ( $tag_processor->next_tag( array( 'class_name' => 'wp-block-navigation-item' ) ) ) {
                 $tag_processor->add_class( 'current-menu-ancestor' );
             }