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

Timestamp:

12/06/2021 06:18:27 AM (4 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Gallery block: turn on auto-migration of v1 Gallery blocks to v2 format when edited
• Add accessible labelling to submenu buttons.
• Improve performance of wp_navigation lookup.
• Various inline docblock corrections
• Use core version of template and template part post types and REST endpoints for WP 5.9, with back compat for 5.8
• Gradients: Enable adding custom gradient when gradients are disabled
• Custom color palette: add default color name
• Color Picker: Re-instate debounce and controlled value to fix issue with gradient picker
• Add aria-current="page" to active navigation item
• Site Editor: Templat list fallback to slug
• Fix: Custom color picker popover position
• Fix: php 5.6 error in theme JSON class.
• Update the WP_Theme_JSON_Gutenberg class to be like the core one
• Update the WP_Theme_JSON_Resolver_Gutenberg class to be like the core one
• Move Global Styles code to lib/compat/wordpress-5.9 folder
• E2E Tests: Fix failing image e2e test by waiting for required element
• Navigation: Try removing absorb toolbar prop.
• Navigation: Fix navigation justifications.
• Fix wordbreak for URLs
• Polish unset color indicator.
• Template revert flow: Make label description source agnostic
• [Block Library - Navigation]: Fix vertical layout
• Add: Corners to custom color picker popover
• Add: Missing margin to the color picker clear button
• Gradient: Fix clearing a custom gradient from throwing a React warning
• [Block Library]: Rename Query Pagination blocks
• PHP Unit Tests: Use global transients
• Remove CSS that causes conflict with theme.json
• Add actions which fire during the loading process of block template parts
• Fix usage of useSetting('color.palette')
• Update micromodal, include click-through fix
• Site Editor: Remove unused PHP code
• Don't try and render unstable location if Nav block has ID
• Fix gutenberg prefixed function references in core
• Card: support the extraSmall option for the size prop
• Gallery block: enable the new gallery block by default if running in core
• Block fixtures: Change port to 8889 to placate KSES
• Full Site Editing: Remove block template resolution unit tests
• Site Editor: Sync export API

See #54487.

File:

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

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

@@ -5 +5 @@
  * @package WordPress
  */
+
+// These functions are used for the __unstableLocation feature and only active
+// when the gutenberg plugin is active.
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+    /**
+     * Returns the menu items for a WordPress menu location.
+     *
+     * @param string $location The menu location.
+     * @return array Menu items for the location.
+     */
+    function block_core_navigation_get_menu_items_at_location( $location ) {
+        if ( empty( $location ) ) {
+            return;
+        }
+
+        // Build menu data. The following approximates the code in
+        // `wp_nav_menu()` and `gutenberg_output_block_nav_menu`.
+
+        // Find the location in the list of locations, returning early if the
+        // location can't be found.
+        $locations = get_nav_menu_locations();
+        if ( ! isset( $locations[ $location ] ) ) {
+            return;
+        }
+
+        // Get the menu from the location, returning early if there is no
+        // menu or there was an error.
+        $menu = wp_get_nav_menu_object( $locations[ $location ] );
+        if ( ! $menu || is_wp_error( $menu ) ) {
+            return;
+        }
+
+        $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+        _wp_menu_item_classes_by_context( $menu_items );
+
+        return $menu_items;
+    }
+
+
+    /**
+     * Sorts a standard array of menu items into a nested structure keyed by the
+     * id of the parent menu.
+     *
+     * @param array $menu_items Menu items to sort.
+     * @return array An array keyed by the id of the parent menu where each element
+     *               is an array of menu items that belong to that parent.
+     */
+    function block_core_navigation_sort_menu_items_by_parent_id( $menu_items ) {
+        $sorted_menu_items = array();
+        foreach ( (array) $menu_items as $menu_item ) {
+            $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
+        }
+        unset( $menu_items, $menu_item );
+
+        $menu_items_by_parent_id = array();
+        foreach ( $sorted_menu_items as $menu_item ) {
+            $menu_items_by_parent_id[ $menu_item->menu_item_parent ][] = $menu_item;
+        }
+
+        return $menu_items_by_parent_id;
+    }
+
+    /**
+     * Turns menu item data into a nested array of parsed blocks
+     *
+     * @param array $menu_items               An array of menu items that represent
+     *                                        an individual level of a menu.
+     * @param array $menu_items_by_parent_id  An array keyed by the id of the
+     *                                        parent menu where each element is an
+     *                                        array of menu items that belong to
+     *                                        that parent.
+     * @return array An array of parsed block data.
+     */
+    function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
+        if ( empty( $menu_items ) ) {
+            return array();
+        }
+
+        $blocks = array();
+
+        foreach ( $menu_items as $menu_item ) {
+            $class_name       = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
+            $id               = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
+            $opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
+            $rel              = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
+            $kind             = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
+
+            $block = array(
+                'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
+                'attrs'     => array(
+                    'className'     => $class_name,
+                    'description'   => $menu_item->description,
+                    'id'            => $id,
+                    'kind'          => $kind,
+                    'label'         => $menu_item->title,
+                    'opensInNewTab' => $opens_in_new_tab,
+                    'rel'           => $rel,
+                    'title'         => $menu_item->attr_title,
+                    'type'          => $menu_item->object,
+                    'url'           => $menu_item->url,
+                ),
+            );
+
+            $block['innerBlocks']  = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
+                ? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
+                : array();
+            $block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
+
+            $blocks[] = $block;
+        }
+
+        return $blocks;
+    }
+}
 
 /**
@@ -146 +260 @@
     // - https://github.com/WordPress/wordpress-develop/blob/ba943e113d3b31b121f77a2d30aebe14b047c69d/src/wp-includes/nav-menu.php#L613-L619.
     // - https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters.
-    $navigation_posts = get_posts(
-        array(
-            'post_type'      => 'wp_navigation',
-            'order'          => 'ASC',
-            'orderby'        => 'name',
-            'posts_per_page' => 1, // only the first post.
-            's'              => '<!-- wp:', // look for block indicators to ensure we only include non-empty Navigations.
-        )
-    );
-    return count( $navigation_posts ) ? $navigation_posts[0] : null;
-
+    $parsed_args = array(
+        'post_type'      => 'wp_navigation',
+        'no_found_rows'  => true,
+        'order'          => 'ASC',
+        'orderby'        => 'name',
+        'post_status'    => 'publish',
+        'posts_per_page' => 20, // Try the first 20 posts.
+    );
+
+    $navigation_posts = new WP_Query( $parsed_args );
+    foreach ( $navigation_posts->posts as $navigation_post ) {
+        if ( has_blocks( $navigation_post ) ) {
+            return $navigation_post;
+        }
+    }
+
+    return null;
 }
 
@@ -273 +393 @@
     $inner_blocks = $block->inner_blocks;
 
-    // If `__unstableLocation` is defined, create inner blocks from the classic menu assigned to that location.
-    if ( empty( $inner_blocks ) && array_key_exists( '__unstableLocation', $attributes ) ) {
-        $menu_items = gutenberg_get_menu_items_at_location( $attributes['__unstableLocation'] );
-        if ( empty( $menu_items ) ) {
-            return '';
-        }
-
-        $menu_items_by_parent_id = gutenberg_sort_menu_items_by_parent_id( $menu_items );
-        $parsed_blocks           = gutenberg_parse_blocks_from_menu_items( $menu_items_by_parent_id[0], $menu_items_by_parent_id );
-        $inner_blocks            = new WP_Block_List( $parsed_blocks, $attributes );
-    }
-
     // Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
     if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
         $attributes['ref'] = $attributes['navigationMenuId'];
     }
+
+    // If:
+    // - the gutenberg plugin is active
+    // - `__unstableLocation` is defined
+    // - we have menu items at the defined location
+    // - we don't have a relationship to a `wp_navigation` Post (via `ref`).
+    // ...then create inner blocks from the classic menu assigned to that location.
+    if (
+        defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN &&
+        array_key_exists( '__unstableLocation', $attributes ) &&
+        ! array_key_exists( 'ref', $attributes ) &&
+        ! empty( block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] ) )
+    ) {
+        $menu_items = block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] );
+        if ( empty( $menu_items ) ) {
+            return '';
+        }
+
+        $menu_items_by_parent_id = block_core_navigation_sort_menu_items_by_parent_id( $menu_items );
+        $parsed_blocks           = block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[0], $menu_items_by_parent_id );
+        $inner_blocks            = new WP_Block_List( $parsed_blocks, $attributes );
+    }
+
     // Load inner blocks from the navigation post.
     if ( array_key_exists( 'ref', $attributes ) ) {