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

Timestamp:

03/07/2023 03:29:47 PM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Update @wordpress packages for 6.2 Beta 5.

Updates the @wordpress packages to include the following changes:

• Add border radius to off canvas navigation menu items
• Remove border from quick inserter child elements
• Show variant patterns even if there are no patterns for the Query Loop block
• Order initial block items in Navigation with PrivateInserter
• Update: Add descriptions to all panels in the Site Editor's dark side
• Fix typo in template parts description
• Fix: Browse mode descriptions margin
• Fix: Show creation popover on empty page links in the navigation sidebar
• Make sure the directly inserted block in the Nav block is a Page link
• Fix browser history when synchronising state with urls
• Navigation Sidebar: Change the logic about which navigation gets selected for the sidebar
• Fixes extra UI in navigation block inspector
• Renames parent selection boolean param and improves docs
• Widget Importer: Fix Widget Group block imports
• Don't add Post Content layout styles to title in the post editor
• Site editor: Add hover animation to site editor canvas
• Prevent the saving button from showing when renaming templates
• Navigation Block: Fix big spinner
• Navigation: Don't save the level of the link in an attribute
• Focus 1st parent block on block remove, if no previous block is available
• Navigation: Performance: improve params in block_core_navigation_get_most_recently_published_navigation()
• Navigation Block inspector: fix link UI popover opening on links that have a url
• Fix for WP_Theme_JSON_Resolver::get_merged_data()
• Site Editor: Add page details when viewing a specific page.
• Fix site editor sidebar scrollbars
• Fix: Custom link UI does appears outside canvas on the sidebar navigation
• Fix: Make navigation page list load its items on navigation sidebar

References:

• ​Gutenberg's commit for publishing the packages
• ​Gutenberg's commit for `blocks/navigation-link.php` and `blocks/navigation-submenu.php`
• ​Gutenberg's commit for `blocks/navigation.php`

Follow-up to [55441], [55440].

Props ntsekouras, mamaduka, gziolo, costdev, hellofromTonya.
See #57471.

File:

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

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

@@ -10 +10 @@
  * which will be applied to the navigation markup in the front-end.
  *
- * @param  array $context    Navigation block context.
- * @param  array $attributes Block attributes.
+ * @param  array $context     Navigation block context.
+ * @param  array $attributes  Block attributes.
+ * @param  bool  $is_sub_menu Whether the block is a sub-menu.
  * @return array Colors CSS classes and inline styles.
  */
-function block_core_navigation_submenu_build_css_colors( $context, $attributes ) {
+function block_core_navigation_submenu_build_css_colors( $context, $attributes, $is_sub_menu = false ) {
     $colors = array(
         'css_classes'   => array(),
         'inline_styles' => '',
     );
-
-    $is_sub_menu = isset( $attributes['isTopLevelItem'] ) ? ( ! $attributes['isTopLevelItem'] ) : false;
 
     // Text color.
@@ -251 +250 @@
 
     if ( $has_submenu ) {
+        $colors      = block_core_navigation_submenu_build_css_colors( $block->context, $attributes, $has_submenu );
+        $classes     = array_merge(
+            array( 'wp-block-navigation__submenu-container' ),
+            $colors['css_classes']
+        );
+        $css_classes = trim( implode( ' ', $classes ) );
+
+        $style_attribute = $colors['inline_styles'];
+
         $inner_blocks_html = '';
         foreach ( $block->inner_blocks as $inner_block ) {
@@ -264 +272 @@
         }
 
+        $wrapper_attributes = get_block_wrapper_attributes(
+            array(
+                'class' => $css_classes,
+                'style' => $style_attribute,
+            )
+        );
+
         $html .= sprintf(
-            '<ul class="wp-block-navigation__submenu-container">%s</ul>',
+            '<ul %s>%s</ul>',
+            $wrapper_attributes,
             $inner_blocks_html
         );
+
     }