Changeset 55246 for trunk/src/wp-includes/blocks/page-list.php

Timestamp:

02/07/2023 07:01:56 AM (3 years ago)

Author:

youknowriad

Message:

Block Editor: Updated the WordPress packages to include Gutenberg 15.1.0 changes.

In addition to all the packages being updated to the latest versions,
this commit also includes some mandatory changes to avoid editor breakage:

• Update React to to 18.2.0.
• Add the right stylesheets to support iframed block editors.

Props ntsekouras, mamaduka, flixos90, desrosj, peterwilsoncc.
See #57471.

File:

• trunk/src/wp-includes/blocks/page-list.php (modified) (9 diffs)

trunk/src/wp-includes/blocks/page-list.php

@@ -140 +140 @@
  * @param boolean $is_navigation_child If block is a child of Navigation block.
  * @param array   $nested_pages The array of nested pages.
+ * @param boolean $is_nested Whether the submenu is nested or not.
  * @param array   $active_page_ancestor_ids An array of ancestor ids for active page.
  * @param array   $colors Color information for overlay styles.
@@ -146 +147 @@
  * @return string List markup.
  */
-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 ) {
+function block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $is_nested, $active_page_ancestor_ids = array(), $colors = array(), $depth = 0 ) {
     if ( empty( $nested_pages ) ) {
         return;
@@ -174 +175 @@
 
         // If this is the first level of submenus, include the overlay colors.
-        if ( 1 === $depth && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) {
+        if ( ( ( 0 < $depth && ! $is_nested ) || $is_nested ) && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) {
             $css_class .= ' ' . trim( implode( ' ', $colors['overlay_css_classes'] ) );
             if ( '' !== $colors['overlay_inline_styles'] ) {
@@ -197 +198 @@
         if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
             $markup .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="' . esc_attr( $navigation_child_content_class ) . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . esc_html( $title ) .
-            '</button>' . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><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></span>';
+            '</button><span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><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></span>';
         } else {
             $markup .= '<a class="wp-block-pages-list__item__link' . esc_attr( $navigation_child_content_class ) . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
@@ -208 +209 @@
                 $markup .= '</button>';
             }
-            $markup .= '<ul class="submenu-container';
-            // Extra classname is added when the block is a child of Navigation.
-            if ( $is_navigation_child ) {
-                $markup .= ' wp-block-navigation__submenu-container';
-            }
-            $markup .= '">' . block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $page['children'], $active_page_ancestor_ids, $colors, $depth + 1 ) . '</ul>';
+            $markup .= '<ul class="wp-block-navigation__submenu-container">';
+            $markup .= block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $page['children'], $is_nested, $active_page_ancestor_ids, $colors, $depth + 1 );
+            $markup .= '</ul>';
         }
         $markup .= '</li>';
@@ -251 +249 @@
 function render_block_core_page_list( $attributes, $content, $block ) {
     static $block_id = 0;
-    $block_id++;
+    ++$block_id;
+
+    $parent_page_id = $attributes['parentPageID'];
+    $is_nested      = $attributes['isNested'];
 
     $all_pages = get_pages(
@@ -272 +273 @@
 
     foreach ( (array) $all_pages as $page ) {
-        $is_active = ! empty( $page->ID ) && ( get_the_ID() === $page->ID );
+        $is_active = ! empty( $page->ID ) && ( get_queried_object_id() === $page->ID );
 
         if ( $is_active ) {
@@ -307 +308 @@
     $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
 
+    if ( 0 !== $parent_page_id ) {
+        // If the parent page has no child pages, there is nothing to show.
+        if ( ! array_key_exists( $parent_page_id, $pages_with_children ) ) {
+            return;
+        }
+
+        $nested_pages = block_core_page_list_nest_pages(
+            $pages_with_children[ $parent_page_id ],
+            $pages_with_children
+        );
+    }
+
     $is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context );
 
@@ -313 +326 @@
     $show_submenu_icons = array_key_exists( 'showSubmenuIcon', $block->context ) ? $block->context['showSubmenuIcon'] : false;
 
-    $wrapper_markup = '<ul %1$s>%2$s</ul>';
-
-    $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_markup = $is_nested ? '%2$s' : '<ul %1$s>%2$s</ul>';
+
+    $items_markup = block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $is_nested, $active_page_ancestor_ids, $colors );
 
     $wrapper_attributes = get_block_wrapper_attributes(