Fix the Query block when navigating

WordPress · Jan 31, 2024 · e82e7c5 · e82e7c5
1 parent 249ce2e
commit e82e7c5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
@@ -31,7 +31,9 @@ store( 'core/query', {
 		*navigate( event ) {
 			const ctx = getContext();
 			const { ref } = getElement();
-			const { queryRef } = ctx;
+			const queryRef = ref.closest(
+				'.wp-block-query[data-wp-router-region]'
+			);
 			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
 
 			if ( isValidLink( ref ) && isValidEvent( event ) && ! isDisabled ) {
@@ -67,8 +69,10 @@ store( 'core/query', {
 			}
 		},
 		*prefetch() {
-			const { queryRef } = getContext();
 			const { ref } = getElement();
+			const queryRef = ref.closest(
+				'.wp-block-query[data-wp-router-region]'
+			);
 			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
 			if ( isValidLink( ref ) && ! isDisabled ) {
 				const { actions } = yield import(
@@ -89,10 +93,5 @@ store( 'core/query', {
 				yield actions.prefetch( ref.href );
 			}
 		},
-		setQueryRef() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			ctx.queryRef = ref;
-		},
 	},
 } );