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

Timestamp:

06/27/2023 02:20:18 PM (16 months ago)

Author:

Bernhard Reiter

Message:

Editor: update Wordpress npm packages.

Updates the wordpress npm packages and their dependencies to the latest versions, as well as auto-updates to relevant core PHP files.

Props youknowriad, joemcgill, spacedmonkey, ramonopoly, peterwilsoncc, bernhard-reiter, tyxla, dmsnell.
Fixes #58623.

File:

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

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

@@ -15 +15 @@
  * @return array Colors CSS classes and inline styles.
  */
-function block_core_navigation_submenu_build_css_colors( $context, $attributes, $is_sub_menu = false ) {
-    $colors = array(
-        'css_classes'   => array(),
-        'inline_styles' => '',
-    );
-
-    // Text color.
-    $named_text_color  = null;
-    $custom_text_color = null;
-
-    if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) {
-        $custom_text_color = $context['customOverlayTextColor'];
-    } elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) {
-        $named_text_color = $context['overlayTextColor'];
-    } elseif ( array_key_exists( 'customTextColor', $context ) ) {
-        $custom_text_color = $context['customTextColor'];
-    } elseif ( array_key_exists( 'textColor', $context ) ) {
-        $named_text_color = $context['textColor'];
-    } elseif ( isset( $context['style']['color']['text'] ) ) {
-        $custom_text_color = $context['style']['color']['text'];
-    }
-
-    // If has text color.
-    if ( ! is_null( $named_text_color ) ) {
-        // Add the color class.
-        array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) );
-    } elseif ( ! is_null( $custom_text_color ) ) {
-        // Add the custom color inline style.
-        $colors['css_classes'][]  = 'has-text-color';
-        $colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color );
-    }
-
-    // Background color.
-    $named_background_color  = null;
-    $custom_background_color = null;
-
-    if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) {
-        $custom_background_color = $context['customOverlayBackgroundColor'];
-    } elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) {
-        $named_background_color = $context['overlayBackgroundColor'];
-    } elseif ( array_key_exists( 'customBackgroundColor', $context ) ) {
-        $custom_background_color = $context['customBackgroundColor'];
-    } elseif ( array_key_exists( 'backgroundColor', $context ) ) {
-        $named_background_color = $context['backgroundColor'];
-    } elseif ( isset( $context['style']['color']['background'] ) ) {
-        $custom_background_color = $context['style']['color']['background'];
-    }
-
-    // If has background color.
-    if ( ! is_null( $named_background_color ) ) {
-        // Add the background-color class.
-        array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) );
-    } elseif ( ! is_null( $custom_background_color ) ) {
-        // Add the custom background-color inline style.
-        $colors['css_classes'][]  = 'has-background';
-        $colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color );
-    }
-
-    return $colors;
-}
 
 /**
@@ -130 +70 @@
  */
 function render_block_core_navigation_submenu( $attributes, $content, $block ) {
-
     $navigation_link_has_id = isset( $attributes['id'] ) && is_numeric( $attributes['id'] );
     $is_post_type           = isset( $attributes['kind'] ) && 'post-type' === $attributes['kind'];
@@ -145 +84 @@
     }
 
-    $colors          = block_core_navigation_submenu_build_css_colors( $block->context, $attributes );
     $font_sizes      = block_core_navigation_submenu_build_css_font_sizes( $block->context );
-    $classes         = array_merge(
-        $colors['css_classes'],
-        $font_sizes['css_classes']
-    );
-    $style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
-
-    $css_classes = trim( implode( ' ', $classes ) );
+    $style_attribute = $font_sizes['inline_styles'];
+
+    $css_classes = trim( implode( ' ', $font_sizes['css_classes'] ) );
     $has_submenu = count( $block->inner_blocks ) > 0;
-    $is_active   = ! empty( $attributes['id'] ) && ( get_queried_object_id() === (int) $attributes['id'] );
+    $kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
+    $is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
     $show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'];
@@ -250 +185 @@
 
     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'];
+        // Copy some attributes from the parent block to this one.
+        // Ideally this would happen in the client when the block is created.
+        if ( array_key_exists( 'overlayTextColor', $block->context ) ) {
+            $attributes['textColor'] = $block->context['overlayTextColor'];
+        }
+        if ( array_key_exists( 'overlayBackgroundColor', $block->context ) ) {
+            $attributes['backgroundColor'] = $block->context['overlayBackgroundColor'];
+        }
+        if ( array_key_exists( 'customOverlayTextColor', $block->context ) ) {
+            $attributes['style']['color']['text'] = $block->context['customOverlayTextColor'];
+        }
+        if ( array_key_exists( 'customOverlayBackgroundColor', $block->context ) ) {
+            $attributes['style']['color']['background'] = $block->context['customOverlayBackgroundColor'];
+        }
+
+        // This allows us to be able to get a response from gutenberg_apply_colors_support.
+        $block->block_type->supports['color'] = true;
+        $colors_supports                      = gutenberg_apply_colors_support( $block->block_type, $attributes );
+        $css_classes                          = 'wp-block-navigation__submenu-container';
+        if ( array_key_exists( 'class', $colors_supports ) ) {
+            $css_classes .= ' ' . $colors_supports['class'];
+        }
+
+        $style_attribute = '';
+        if ( array_key_exists( 'style', $colors_supports ) ) {
+            $style_attribute = $colors_supports['style'];
+        }
 
         $inner_blocks_html = '';