Changeset 57578 for trunk/src/wp-includes/blocks/query.php

Timestamp:

02/09/2024 06:20:12 PM (10 months ago)

Author:

youknowriad

Message:

Editor: Update the WordPress packages to Gutenberg 17.7RC1.

This brings the latest and greatest from Gutenberg.
The full changelog is available here
​https://github.com/WordPress/gutenberg/releases/tag/v17.7.0-rc.1

Props youknowriad, get_dave.
See #60315.

File:

• trunk/src/wp-includes/blocks/query.php (modified) (6 diffs)

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

@@ -18 +18 @@
  */
 function render_block_core_query( $attributes, $content, $block ) {
-    $is_interactive = isset( $attributes['enhancedPagination'] ) && true === $attributes['enhancedPagination'] && isset( $attributes['queryId'] );
+    $is_interactive = isset( $attributes['enhancedPagination'] )
+        && true === $attributes['enhancedPagination']
+        && isset( $attributes['queryId'] );
 
     // Enqueue the script module and add the necessary directives if the block is
     // interactive.
     if ( $is_interactive ) {
+        $suffix = wp_scripts_get_suffix();
+        if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+            $module_url = gutenberg_url( '/build/interactivity/query.min.js' );
+        }
+
+        wp_register_script_module(
+            '@wordpress/block-library/query',
+            isset( $module_url ) ? $module_url : includes_url( "blocks/query/view{$suffix}.js" ),
+            array(
+                array(
+                    'id'     => '@wordpress/interactivity',
+                    'import' => 'static',
+                ),
+                array(
+                    'id'     => '@wordpress/interactivity-router',
+                    'import' => 'dynamic',
+                ),
+            ),
+            defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+        );
         wp_enqueue_script_module( '@wordpress/block-library/query' );
 
@@ -31 +53 @@
             $p->set_attribute( 'data-wp-router-region', 'query-' . $attributes['queryId'] );
             $p->set_attribute( 'data-wp-init', 'callbacks.setQueryRef' );
-            // Use context to send translated strings.
-            $p->set_attribute(
-                'data-wp-context',
-                wp_json_encode(
-                    array(
-                        'loadingText' => __( 'Loading page, please wait.' ),
-                        'loadedText'  => __( 'Page Loaded.' ),
-                    ),
-                    JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
-                )
-            );
+            $p->set_attribute( 'data-wp-context', '{}' );
             $content = $p->get_updated_html();
-
-            // Mark the block as interactive.
-            $block->block_type->supports['interactivity'] = true;
-
-            // Add a div to announce messages using `aria-live`.
-            $html_tag = 'div';
-            if ( ! empty( $attributes['tagName'] ) ) {
-                $html_tag = esc_attr( $attributes['tagName'] );
-            }
-            $last_tag_position = strripos( $content, '</' . $html_tag . '>' );
-            $content           = substr_replace(
-                $content,
-                '<div
-                    class="screen-reader-text"
-                    aria-live="polite"
-                    data-wp-text="context.message"
-                ></div>
-                <div
-                    class="wp-block-query__enhanced-pagination-animation"
-                    data-wp-class--start-animation="state.startAnimation"
-                    data-wp-class--finish-animation="state.finishAnimation"
-                ></div>',
-                $last_tag_position,
-                0
-            );
         }
     }
@@ -99 +86 @@
         )
     );
-
-    wp_register_script_module(
-        '@wordpress/block-library/query',
-        defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ? gutenberg_url( '/build/interactivity/query.min.js' ) : includes_url( 'blocks/query/view.min.js' ),
-        array(
-            array(
-                'id'     => '@wordpress/interactivity',
-                'import' => 'static',
-            ),
-            array(
-                'id'     => '@wordpress/interactivity-router',
-                'import' => 'dynamic',
-            ),
-        ),
-        defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-    );
 }
 add_action( 'init', 'register_block_core_query' );
@@ -134 +105 @@
     static $render_query_callback  = null;
 
-    $is_interactive = isset( $parsed_block['attrs']['enhancedPagination'] ) && true === $parsed_block['attrs']['enhancedPagination'] && isset( $parsed_block['attrs']['queryId'] );
-    $block_name     = $parsed_block['blockName'];
+    $block_name              = $parsed_block['blockName'];
+    $block_type              = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+    $has_enhanced_pagination = isset( $parsed_block['attrs']['enhancedPagination'] ) && true === $parsed_block['attrs']['enhancedPagination'] && isset( $parsed_block['attrs']['queryId'] );
+    /*
+     * Client side navigation can be true in two states:
+     *  - supports.interactivity = true;
+     *  - supports.interactivity.clientNavigation = true;
+     */
+    $supports_client_navigation = ( isset( $block_type->supports['interactivity']['clientNavigation'] ) && true === $block_type->supports['interactivity']['clientNavigation'] )
+        || ( isset( $block_type->supports['interactivity'] ) && true === $block_type->supports['interactivity'] );
 
-    if ( 'core/query' === $block_name && $is_interactive ) {
+    if ( 'core/query' === $block_name && $has_enhanced_pagination ) {
         $enhanced_query_stack[] = $parsed_block['attrs']['queryId'];
 
@@ -152 +131 @@
              */
             $render_query_callback = static function ( $content, $block ) use ( &$enhanced_query_stack, &$dirty_enhanced_queries, &$render_query_callback ) {
-                $is_interactive = isset( $block['attrs']['enhancedPagination'] ) && true === $block['attrs']['enhancedPagination'] && isset( $block['attrs']['queryId'] );
+                $has_enhanced_pagination = isset( $block['attrs']['enhancedPagination'] ) && true === $block['attrs']['enhancedPagination'] && isset( $block['attrs']['queryId'] );
 
-                if ( ! $is_interactive ) {
+                if ( ! $has_enhanced_pagination ) {
                     return $content;
                 }
 
                 if ( isset( $dirty_enhanced_queries[ $block['attrs']['queryId'] ] ) ) {
-                    $p = new WP_HTML_Tag_Processor( $content );
-                    if ( $p->next_tag() ) {
-                        $p->set_attribute( 'data-wp-navigation-disabled', 'true' );
-                    }
-                    $content = $p->get_updated_html();
+                    // Disable navigation in the router store config.
+                    wp_interactivity_config( 'core/router', array( 'clientNavigationDisabled' => true ) );
                     $dirty_enhanced_queries[ $block['attrs']['queryId'] ] = null;
                 }
@@ -182 +158 @@
         ! empty( $enhanced_query_stack ) &&
         isset( $block_name ) &&
-        ( ! str_starts_with( $block_name, 'core/' ) || 'core/post-content' === $block_name )
+        ( ! $supports_client_navigation )
     ) {
         foreach ( $enhanced_query_stack as $query_id ) {