diff -r be944660c56a -r 3d72ae0968f4 wp/wp-includes/blocks/page-list.php
--- a/wp/wp-includes/blocks/page-list.php Wed Sep 21 18:19:35 2022 +0200
+++ b/wp/wp-includes/blocks/page-list.php Tue Sep 27 16:37:53 2022 +0200
@@ -9,28 +9,34 @@
* Build an array with CSS classes and inline styles defining the colors
* which will be applied to the pages markup in the front-end when it is a descendant of navigation.
*
- * @param array $context Navigation block context.
+ * @param array $attributes Block attributes.
+ * @param array $context Navigation block context.
* @return array Colors CSS classes and inline styles.
*/
-function block_core_page_list_build_css_colors( $context ) {
+function block_core_page_list_build_css_colors( $attributes, $context ) {
$colors = array(
- 'css_classes' => array(),
- 'inline_styles' => '',
+ 'css_classes' => array(),
+ 'inline_styles' => '',
+ 'overlay_css_classes' => array(),
+ 'overlay_inline_styles' => '',
);
// Text color.
$has_named_text_color = array_key_exists( 'textColor', $context );
+ $has_picked_text_color = array_key_exists( 'customTextColor', $context );
$has_custom_text_color = isset( $context['style']['color']['text'] );
// If has text color.
- if ( $has_custom_text_color || $has_named_text_color ) {
+ if ( $has_custom_text_color || $has_picked_text_color || $has_named_text_color ) {
// Add has-text-color class.
$colors['css_classes'][] = 'has-text-color';
}
if ( $has_named_text_color ) {
// Add the color class.
- $colors['css_classes'][] = sprintf( 'has-%s-color', $context['textColor'] );
+ $colors['css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['textColor'] ) );
+ } elseif ( $has_picked_text_color ) {
+ $colors['inline_styles'] .= sprintf( 'color: %s;', $context['customTextColor'] );
} elseif ( $has_custom_text_color ) {
// Add the custom color inline style.
$colors['inline_styles'] .= sprintf( 'color: %s;', $context['style']['color']['text'] );
@@ -38,22 +44,56 @@
// Background color.
$has_named_background_color = array_key_exists( 'backgroundColor', $context );
+ $has_picked_background_color = array_key_exists( 'customBackgroundColor', $context );
$has_custom_background_color = isset( $context['style']['color']['background'] );
// If has background color.
- if ( $has_custom_background_color || $has_named_background_color ) {
+ if ( $has_custom_background_color || $has_picked_background_color || $has_named_background_color ) {
// Add has-background class.
$colors['css_classes'][] = 'has-background';
}
if ( $has_named_background_color ) {
// Add the background-color class.
- $colors['css_classes'][] = sprintf( 'has-%s-background-color', $context['backgroundColor'] );
+ $colors['css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['backgroundColor'] ) );
+ } elseif ( $has_picked_background_color ) {
+ $colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['customBackgroundColor'] );
} elseif ( $has_custom_background_color ) {
// Add the custom background-color inline style.
$colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['style']['color']['background'] );
}
+ // Overlay text color.
+ $has_named_overlay_text_color = array_key_exists( 'overlayTextColor', $context );
+ $has_picked_overlay_text_color = array_key_exists( 'customOverlayTextColor', $context );
+
+ // If it has a text color.
+ if ( $has_named_overlay_text_color || $has_picked_overlay_text_color ) {
+ $colors['overlay_css_classes'][] = 'has-text-color';
+ }
+
+ // Give overlay colors priority, fall back to Navigation block colors, then global styles.
+ if ( $has_named_overlay_text_color ) {
+ $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['overlayTextColor'] ) );
+ } elseif ( $has_picked_overlay_text_color ) {
+ $colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $context['customOverlayTextColor'] );
+ }
+
+ // Overlay background colors.
+ $has_named_overlay_background_color = array_key_exists( 'overlayBackgroundColor', $context );
+ $has_picked_overlay_background_color = array_key_exists( 'customOverlayBackgroundColor', $context );
+
+ // If has background color.
+ if ( $has_named_overlay_background_color || $has_picked_overlay_background_color ) {
+ $colors['overlay_css_classes'][] = 'has-background';
+ }
+
+ if ( $has_named_overlay_background_color ) {
+ $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['overlayBackgroundColor'] ) );
+ } elseif ( $has_picked_overlay_background_color ) {
+ $colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $context['customOverlayBackgroundColor'] );
+ }
+
return $colors;
}
@@ -79,7 +119,7 @@
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
} elseif ( $has_custom_font_size ) {
// Add the custom font size inline style.
- $font_sizes['inline_styles'] = sprintf( 'font-size: %spx;', $context['style']['typography']['fontSize'] );
+ $font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
}
return $font_sizes;
@@ -88,28 +128,84 @@
/**
* Outputs Page list markup from an array of pages with nested children.
*
- * @param array $nested_pages The array of nested pages.
+ * @param boolean $open_submenus_on_click Whether to open submenus on click instead of hover.
+ * @param boolean $show_submenu_icons Whether to show submenu indicator icons.
+ * @param boolean $is_navigation_child If block is a child of Navigation block.
+ * @param array $nested_pages The array of nested pages.
+ * @param array $active_page_ancestor_ids An array of ancestor ids for active page.
+ * @param array $colors Color information for overlay styles.
+ * @param integer $depth The nesting depth.
*
* @return string List markup.
*/
-function block_core_page_list_render_nested_page_list( $nested_pages ) {
+function block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $active_page_ancestor_ids = array(), $colors = array(), $depth = 0 ) {
if ( empty( $nested_pages ) ) {
return;
}
$markup = '';
foreach ( (array) $nested_pages as $page ) {
- $css_class = 'wp-block-pages-list__item';
+ $css_class = $page['is_active'] ? ' current-menu-item' : '';
+ $aria_current = $page['is_active'] ? ' aria-current="page"' : '';
+ $style_attribute = '';
+
+ $css_class .= in_array( $page['page_id'], $active_page_ancestor_ids, true ) ? ' current-menu-ancestor' : '';
if ( isset( $page['children'] ) ) {
$css_class .= ' has-child';
}
- $markup .= '';
- $markup .= '' . wp_kses(
- $page['title'],
- wp_kses_allowed_html( 'post' )
- ) . '';
+
+ if ( $is_navigation_child ) {
+ $css_class .= ' wp-block-navigation-item';
+
+ if ( $open_submenus_on_click ) {
+ $css_class .= ' open-on-click';
+ } elseif ( $show_submenu_icons ) {
+ $css_class .= ' open-on-hover-click';
+ }
+ }
+
+ $navigation_child_content_class = $is_navigation_child ? ' wp-block-navigation-item__content' : '';
+
+ // If this is the first level of submenus, include the overlay colors.
+ if ( 1 === $depth && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) {
+ $css_class .= ' ' . trim( implode( ' ', $colors['overlay_css_classes'] ) );
+ if ( '' !== $colors['overlay_inline_styles'] ) {
+ $style_attribute = sprintf( ' style="%s"', esc_attr( $colors['overlay_inline_styles'] ) );
+ }
+ }
+
+ $front_page_id = (int) get_option( 'page_on_front' );
+ if ( (int) $page['page_id'] === $front_page_id ) {
+ $css_class .= ' menu-item-home';
+ }
+
+ $title = wp_kses_post( $page['title'] );
+ $aria_label = sprintf(
+ /* translators: Accessibility text. %s: Parent page title. */
+ __( '%s submenu' ),
+ wp_strip_all_tags( $title )
+ );
+
+ $markup .= '';
+
+ if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
+ $markup .= '' . '';
+ } else {
+ $markup .= '' . $title . '';
+ }
+
if ( isset( $page['children'] ) ) {
- $markup .= '';
- $markup .= '';
+ if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
+ $markup .= '';
+ }
+ $markup .= '';
}
$markup .= '';
}
@@ -139,9 +235,9 @@
/**
* Renders the `core/page-list` block on server.
*
- * @param array $attributes The block attributes.
- * @param array $content The saved content.
- * @param array $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 page list markup.
*/
@@ -149,44 +245,50 @@
static $block_id = 0;
$block_id++;
- // TODO: When https://core.trac.wordpress.org/ticket/39037 REST API support for multiple orderby values is resolved,
- // update 'sort_column' to 'menu_order, post_title'. Sorting by both menu_order and post_title ensures a stable sort.
- // Otherwise with pages that have the same menu_order value, we can see different ordering depending on how DB
- // queries are constructed internally. For example we might see a different order when a limit is set to <499
- // versus >= 500.
$all_pages = get_pages(
array(
- 'sort_column' => 'menu_order',
+ 'sort_column' => 'menu_order,post_title',
'order' => 'asc',
)
);
+ // If there are no pages, there is nothing to show.
+ if ( empty( $all_pages ) ) {
+ return;
+ }
+
$top_level_pages = array();
$pages_with_children = array();
+ $active_page_ancestor_ids = array();
+
foreach ( (array) $all_pages as $page ) {
+ $is_active = ! empty( $page->ID ) && ( get_the_ID() === $page->ID );
+
+ if ( $is_active ) {
+ $active_page_ancestor_ids = get_post_ancestors( $page->ID );
+ }
+
if ( $page->post_parent ) {
$pages_with_children[ $page->post_parent ][ $page->ID ] = array(
- 'title' => $page->post_title,
- 'link' => get_permalink( $page->ID ),
+ 'page_id' => $page->ID,
+ 'title' => $page->post_title,
+ 'link' => get_permalink( $page->ID ),
+ 'is_active' => $is_active,
);
} else {
$top_level_pages[ $page->ID ] = array(
- 'title' => $page->post_title,
- 'link' => get_permalink( $page->ID ),
+ 'page_id' => $page->ID,
+ 'title' => $page->post_title,
+ 'link' => get_permalink( $page->ID ),
+ 'is_active' => $is_active,
);
}
}
- $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
-
- $wrapper_markup = '';
-
- $items_markup = block_core_page_list_render_nested_page_list( $nested_pages );
-
- $colors = block_core_page_list_build_css_colors( $block->context );
+ $colors = block_core_page_list_build_css_colors( $attributes, $block->context );
$font_sizes = block_core_page_list_build_css_font_sizes( $block->context );
$classes = array_merge(
$colors['css_classes'],
@@ -195,10 +297,23 @@
$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
$css_classes = trim( implode( ' ', $classes ) );
- if ( $block->context && $block->context['showSubmenuIcon'] ) {
- $css_classes .= ' show-submenu-icons';
+ $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
+
+ // Limit the number of items to be visually displayed.
+ if ( ! empty( $attributes['__unstableMaxPages'] ) ) {
+ $nested_pages = array_slice( $nested_pages, 0, $attributes['__unstableMaxPages'] );
}
+ $is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context );
+
+ $open_submenus_on_click = array_key_exists( 'openSubmenusOnClick', $block->context ) ? $block->context['openSubmenusOnClick'] : false;
+
+ $show_submenu_icons = array_key_exists( 'showSubmenuIcon', $block->context ) ? $block->context['showSubmenuIcon'] : false;
+
+ $wrapper_markup = '';
+
+ $items_markup = block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $active_page_ancestor_ids, $colors );
+
$wrapper_attributes = get_block_wrapper_attributes(
array(
'class' => $css_classes,