Start prefetching on first click to next/previous (#54781)

WordPress · Sep 25, 2023 · b99dab4 · b99dab4
1 parent dc2517e
commit b99dab4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/packages/block-library/src/query-pagination-next/index.php b/packages/block-library/src/query-pagination-next/index.php
@@ -74,6 +74,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
 			$p->set_attribute( 'data-wp-key', 'query-pagination-next' );
 			$p->set_attribute( 'data-wp-on--click', 'actions.core.query.navigate' );
 			$p->set_attribute( 'data-wp-on--mouseenter', 'actions.core.query.prefetch' );
+			$p->set_attribute( 'data-wp-effect', 'effects.core.query.prefetch' );
 			$content = $p->get_updated_html();
 		}
 	}

diff --git a/packages/block-library/src/query-pagination-previous/index.php b/packages/block-library/src/query-pagination-previous/index.php
@@ -62,6 +62,7 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
 			$p->set_attribute( 'data-wp-key', 'query-pagination-previous' );
 			$p->set_attribute( 'data-wp-on--click', 'actions.core.query.navigate' );
 			$p->set_attribute( 'data-wp-on--mouseenter', 'actions.core.query.prefetch' );
+			$p->set_attribute( 'data-wp-effect', 'effects.core.query.prefetch' );
 			$content = $p->get_updated_html();
 		}
 	}

diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
@@ -62,6 +62,7 @@ store( {
 								: '' );
 
 						context.core.query.animation = 'finish';
+						context.core.query.url = ref.href;
 
 						// Focus the first anchor of the Query block.
 						const firstAnchor = `[data-wp-navigation-id=${ id }] .wp-block-post-template a[href]`;
@@ -76,4 +77,15 @@ store( {
 			},
 		},
 	},
+	effects: {
+		core: {
+			query: {
+				prefetch: async ( { ref, context } ) => {
+					if ( context.core.query.url && isValidLink( ref ) ) {
+						await prefetch( ref.href );
+					}
+				},
+			},
+		},
+	},
 } );