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

Timestamp:

04/12/2022 03:10:30 PM (4 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages based based on Gutenberg v13.0 RC3

This is the last step of backports from the Gutenberg plugin for WordPress 6.0 Beta 1 release. It includes all updates WordPress packages published to npm based on the Gutenberg plugin v13.0 RC3 release. This patch also includes all the necessary changes applied to core blocks. New blocks included:

• Avatar
• Comment Author Name
• Comment Content
• Comment Date
• Comment Edit Link
• Comment Rely Link
• Comment Template
• Comments Pagination
• Comments Pagination Next
• Comments Pagination Previous
• Comments Query Loop
• Home Link
• Post Author Biography
• Query No Results
• Read More

See more details in ​https://github.com/WordPress/wordpress-develop/pull/2564.

Props zieladam, ramonopoly, ocean90.
Fixes #55505.

File:

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

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

@@ -111 +111 @@
  */
 function block_core_navigation_submenu_render_submenu_icon() {
-        return '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
+        return '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
 }
 
@@ -117 +117 @@
  * Renders the `core/navigation-submenu` block.
  *
- * @param array  $attributes The block attributes.
- * @param string $content The saved content.
- * @param object $block The parsed block.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The saved content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string Returns the post content with the legacy widget added.
@@ -168 +168 @@
 
         if ( isset( $attributes['label'] ) ) {
-                $label .= wp_kses(
-                        $attributes['label'],
-                        array(
-                                'code'   => array(),
-                                'em'     => array(),
-                                'img'    => array(
-                                        'scale' => array(),
-                                        'class' => array(),
-                                        'style' => array(),
-                                        'src'   => array(),
-                                        'alt'   => array(),
-                                ),
-                                's'      => array(),
-                                'span'   => array(
-                                        'style' => array(),
-                                ),
-                                'strong' => array(),
-                        )
-                );
+                $label .= wp_kses_post( $attributes['label'] );
         }
 
@@ -200 +182 @@
         // If submenu icons are set to show, we also render a submenu button, so the submenu can be opened on click.
         if ( ! $open_on_click ) {
-                $item_url = isset( $attributes['url'] ) ? esc_url( $attributes['url'] ) : '';
+                $item_url = isset( $attributes['url'] ) ? $attributes['url'] : '';
                 // Start appending HTML attributes to anchor tag.
-                $html .= '<a class="wp-block-navigation-item__content" href="' . $item_url . '"';
+                $html .= '<a class="wp-block-navigation-item__content" href="' . esc_url( $item_url ) . '"';
 
                 if ( $is_active ) {
@@ -233 +215 @@
                         // The submenu icon is rendered in a button here
                         // so that there's a clickable element to open the submenu.
-                        $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
+                        $html .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
                 }
         } else {
                 // If menus open on click, we render the parent as a button.
-                $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
+                $html .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
 
                 // Wrap title with span to isolate it from submenu icon.
@@ -246 +228 @@
                 $html .= '</span>';
 
+                $html .= '</button>';
+
                 $html .= '<span class="wp-block-navigation__submenu-icon">' . block_core_navigation_submenu_render_submenu_icon() . '</span>';
-
-                $html .= '</button>';
 
         }