Bail out in prefetch if clientNavigation is disabled

WordPress · Feb 7, 2024 · ca35dd7 · ca35dd7
1 parent c411dd6
commit ca35dd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
@@ -45,11 +45,7 @@ store(
 			},
 			*prefetch() {
 				const { ref } = getElement();
-				const queryRef = ref.closest(
-					'.wp-block-query[data-wp-router-region]'
-				);
-				const isDisabled = queryRef?.dataset.wpNavigationDisabled;
-				if ( isValidLink( ref ) && ! isDisabled ) {
+				if ( isValidLink( ref ) ) {
 					const { actions } = yield import(
 						'@wordpress/interactivity-router'
 					);

diff --git a/packages/interactivity-router/src/index.js b/packages/interactivity-router/src/index.js
@@ -225,6 +225,9 @@ export const { state, actions } = store( 'core/router', {
 		 *                                  fetching the requested URL.
 		 */
 		prefetch( url, options = {} ) {
+			const { clientNavigation = true } = getConfig( 'core/router' );
+			if ( ! clientNavigation ) return;
+
 			const pagePath = getPagePath( url );
 			if ( options.force || ! pages.has( pagePath ) ) {
 				pages.set( pagePath, fetchPage( pagePath, options ) );