@wordpress/block-library 8.27.1 → 8.28.0

package/src/post-excerpt/block.json

@@ -50,6 +50,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-post-excerpt-editor",

package/src/post-featured-image/block.json

@@ -81,6 +81,9 @@
 		"spacing": {
 			"margin": true,
 			"padding": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-post-featured-image-editor",

package/src/post-navigation-link/block.json

@@ -29,9 +29,6 @@
 			"type": "string",
 			"default": "none"
 		},
-		"inSameTerm": {
-			"type": "boolean"
-		},
 		"taxonomy": {
 			"type": "string",
 			"default": ""
@@ -57,6 +54,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-navigation-link"

package/src/post-navigation-link/edit.js

@@ -66,7 +66,6 @@ export default function PostNavigationLinkEdit( {
 			const filteredTaxonomies = getTaxonomies( {
 				type: postType,
 				per_page: -1,
-				context: 'view',
 			} );
 			return filteredTaxonomies;
 		},
@@ -78,11 +77,7 @@ export default function PostNavigationLinkEdit( {
 			value: '',
 		};
 		const taxonomyOptions = ( taxonomies ?? [] )
-			.filter(
-				( tax ) =>
-					tax.slug !== 'nav_menu' &&
-					tax.slug !== 'wp_pattern_category'
-			)
+			.filter( ( { visibility } ) => !! visibility?.publicly_queryable )
 			.map( ( item ) => {
 				return {
 					value: item.slug,
@@ -168,7 +163,6 @@ export default function PostNavigationLinkEdit( {
 					onChange={ ( value ) =>
 						setAttributes( {
 							taxonomy: value,
-							inSameTerm: value === '' ? false : true,
 						} )
 					}
 					help={ __(

package/src/post-navigation-link/index.php

@@ -99,20 +99,17 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 		}
 	}
 
-	$in_same_term = isset( $attributes['inSameTerm'] ) ? $attributes['inSameTerm'] : false;
-	$taxonomy     = isset( $attributes['taxonomy'] ) && $in_same_term ? $attributes['taxonomy'] : '';
-
-	/**
+	/*
 	 * The dynamic portion of the function name, `$navigation_type`,
 	 * Refers to the type of adjacency, 'next' or 'previous'.
 	 *
-	 * @See https://developer.wordpress.org/reference/functions/get_previous_post_link/
-	 * @See https://developer.wordpress.org/reference/functions/get_next_post_link/
+	 * @see https://developer.wordpress.org/reference/functions/get_previous_post_link/
+	 * @see https://developer.wordpress.org/reference/functions/get_next_post_link/
 	 */
 	$get_link_function = "get_{$navigation_type}_post_link";
 
-	if ( $in_same_term ) {
-		$content = $get_link_function( $format, $link, $in_same_term, '', $taxonomy );
+	if ( ! empty( $attributes['taxonomy'] ) ) {
+		$content = $get_link_function( $format, $link, true, '', $attributes['taxonomy'] );
 	} else {
 		$content = $get_link_function( $format, $link );
 	}

package/src/post-template/block.json

@@ -48,6 +48,9 @@
 			"__experimentalDefaultControls": {
 				"blockGap": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-template",

package/src/post-template/edit.js

@@ -108,11 +108,6 @@ export default function PostTemplateEdit( {
 		( select ) => {
 			const { getEntityRecords, getTaxonomies } = select( coreStore );
 			const { getBlocks } = select( blockEditorStore );
-			const taxonomies = getTaxonomies( {
-				type: postType,
-				per_page: -1,
-				context: 'view',
-			} );
 			const templateCategory =
 				inherit &&
 				templateSlug?.startsWith( 'category-' ) &&
@@ -129,6 +124,11 @@ export default function PostTemplateEdit( {
 			};
 			// There is no need to build the taxQuery if we inherit.
 			if ( taxQuery && ! inherit ) {
+				const taxonomies = getTaxonomies( {
+					type: postType,
+					per_page: -1,
+					context: 'view',
+				} );
 				// We have to build the tax query for the REST API and use as
 				// keys the taxonomies `rest_base` with the `term ids` as values.
 				const builtTaxQuery = Object.entries( taxQuery ).reduce(

package/src/post-terms/block.json

@@ -54,6 +54,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-terms"

package/src/post-terms/index.php

@@ -63,7 +63,7 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
  *
  * @return array The available variations for the block.
  */
-function build_post_term_block_variations() {
+function block_core_post_terms_build_variations() {
 	$taxonomies = get_taxonomies(
 		array(
 			'publicly_queryable' => true,
@@ -116,7 +116,7 @@ function register_block_core_post_terms() {
 		__DIR__ . '/post-terms',
 		array(
 			'render_callback'    => 'render_block_core_post_terms',
-			'variation_callback' => 'build_post_term_block_variations',
+			'variation_callback' => 'block_core_post_terms_build_variations',
 		)
 	);
 }

package/src/post-time-to-read/block.json

@@ -42,6 +42,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }

package/src/post-title/block.json

@@ -57,6 +57,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-title"

package/src/preformatted/block.json

@@ -40,6 +40,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-preformatted"

package/src/pullquote/block.json

@@ -69,6 +69,9 @@
 				"fontSize": "1.5em",
 				"lineHeight": "1.6"
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-pullquote-editor",

package/src/query/block.json

@@ -49,8 +49,8 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
-		"layout": true
+		"layout": true,
+		"interactivity": true
 	},
-	"editorStyle": "wp-block-query-editor",
-	"style": "wp-block-query"
+	"editorStyle": "wp-block-query-editor"
 }

package/src/query/index.php

@@ -17,11 +17,33 @@
  * @return string Returns the modified output of the query block.
  */
 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' );
 
 		$p = new WP_HTML_Tag_Processor( $content );
@@ -30,43 +52,8 @@ function render_block_core_query( $attributes, $content, $block ) {
 			$p->set_attribute( 'data-wp-interactive', '{"namespace":"core/query"}' );
 			$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
-			);
 		}
 	}
 
@@ -98,22 +85,6 @@ function register_block_core_query() {
 			'render_callback' => 'render_block_core_query',
 		)
 	);
-
-	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' );
 
@@ -133,10 +104,18 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 	static $dirty_enhanced_queries = array();
 	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'];
-
-	if ( 'core/query' === $block_name && $is_interactive ) {
+	$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 && $has_enhanced_pagination ) {
 		$enhanced_query_stack[] = $parsed_block['attrs']['queryId'];
 
 		if ( ! isset( $render_query_callback ) ) {
@@ -151,18 +130,15 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 			 * @return string Returns the modified output of the query block.
 			 */
 			$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;
 				}
 
@@ -181,7 +157,7 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 	} elseif (
 		! 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 ) {
 			$dirty_enhanced_queries[ $query_id ] = true;

package/src/query/view.js

@@ -18,81 +18,53 @@ const isValidEvent = ( event ) =>
 	! event.shiftKey &&
 	! event.defaultPrevented;
 
-store( 'core/query', {
-	state: {
-		get startAnimation() {
-			return getContext().animation === 'start';
-		},
-		get finishAnimation() {
-			return getContext().animation === 'finish';
-		},
-	},
-	actions: {
-		*navigate( event ) {
-			const ctx = getContext();
-			const { ref } = getElement();
-			const { queryRef } = ctx;
-			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
-
-			if ( isValidLink( ref ) && isValidEvent( event ) && ! isDisabled ) {
-				event.preventDefault();
-
-				// Don't announce the navigation immediately, wait 400 ms.
-				const timeout = setTimeout( () => {
-					ctx.message = ctx.loadingText;
-					ctx.animation = 'start';
-				}, 400 );
-
-				const { actions } = yield import(
-					'@wordpress/interactivity-router'
+store(
+	'core/query',
+	{
+		actions: {
+			*navigate( event ) {
+				const ctx = getContext();
+				const { ref } = getElement();
+				const queryRef = ref.closest(
+					'.wp-block-query[data-wp-router-region]'
 				);
-				yield actions.navigate( ref.href );
 
-				// Dismiss loading message if it hasn't been added yet.
-				clearTimeout( timeout );
+				if ( isValidLink( ref ) && isValidEvent( event ) ) {
+					event.preventDefault();
 
-				// Announce that the page has been loaded. If the message is the
-				// same, we use a no-break space similar to the @wordpress/a11y
-				// package: https://github.com/WordPress/gutenberg/blob/c395242b8e6ee20f8b06c199e4fc2920d7018af1/packages/a11y/src/filter-message.js#L20-L26
-				ctx.message =
-					ctx.loadedText +
-					( ctx.message === ctx.loadedText ? '\u00A0' : '' );
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.navigate( ref.href );
+					ctx.url = ref.href;
 
-				ctx.animation = 'finish';
-				ctx.url = ref.href;
-
-				// Focus the first anchor of the Query block.
-				const firstAnchor = `.wp-block-post-template a[href]`;
-				queryRef.querySelector( firstAnchor )?.focus();
-			}
-		},
-		*prefetch() {
-			const { queryRef } = getContext();
-			const { ref } = getElement();
-			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
-			if ( isValidLink( ref ) && ! isDisabled ) {
-				const { actions } = yield import(
-					'@wordpress/interactivity-router'
-				);
-				yield actions.prefetch( ref.href );
-			}
-		},
-	},
-	callbacks: {
-		*prefetch() {
-			const { url } = getContext();
-			const { ref } = getElement();
-			if ( url && isValidLink( ref ) ) {
-				const { actions } = yield import(
-					'@wordpress/interactivity-router'
-				);
-				yield actions.prefetch( ref.href );
-			}
+					// Focus the first anchor of the Query block.
+					const firstAnchor = `.wp-block-post-template a[href]`;
+					queryRef.querySelector( firstAnchor )?.focus();
+				}
+			},
+			*prefetch() {
+				const { ref } = getElement();
+				if ( isValidLink( ref ) ) {
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.prefetch( ref.href );
+				}
+			},
 		},
-		setQueryRef() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			ctx.queryRef = ref;
+		callbacks: {
+			*prefetch() {
+				const { url } = getContext();
+				const { ref } = getElement();
+				if ( url && isValidLink( ref ) ) {
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.prefetch( ref.href );
+				}
+			},
 		},
 	},
-} );
+	{ lock: true }
+);

package/src/query-no-results/block.json

@@ -28,6 +28,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }

package/src/query-pagination/block.json

@@ -4,7 +4,12 @@
 	"name": "core/query-pagination",
 	"title": "Pagination",
 	"category": "theme",
-	"parent": [ "core/query" ],
+	"ancestor": [ "core/query" ],
+	"allowedBlocks": [
+		"core/query-pagination-previous",
+		"core/query-pagination-numbers",
+		"core/query-pagination-next"
+	],
 	"description": "Displays a paginated navigation to next/previous set of posts, when applicable.",
 	"textdomain": "default",
 	"attributes": {
@@ -54,6 +59,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-query-pagination-editor",

package/src/query-pagination/edit.js

@@ -23,11 +23,6 @@ const TEMPLATE = [
 	[ 'core/query-pagination-numbers' ],
 	[ 'core/query-pagination-next' ],
 ];
-const ALLOWED_BLOCKS = [
-	'core/query-pagination-previous',
-	'core/query-pagination-numbers',
-	'core/query-pagination-next',
-];
 
 export default function QueryPaginationEdit( {
 	attributes: { paginationArrow, showLabel },
@@ -54,7 +49,6 @@ export default function QueryPaginationEdit( {
 	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		template: TEMPLATE,
-		allowedBlocks: ALLOWED_BLOCKS,
 	} );
 	// Always show label text if paginationArrow is set to 'none'.
 	useEffect( () => {

package/src/query-pagination-next/block.json

@@ -41,6 +41,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }

package/src/query-pagination-numbers/block.json

@@ -36,6 +36,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-query-pagination-numbers-editor"

package/src/query-pagination-previous/block.json

@@ -41,6 +41,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }

package/src/query-title/block.json

@@ -52,6 +52,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-query-title"

package/src/quote/block.json

@@ -58,6 +58,9 @@
 		},
 		"spacing": {
 			"blockGap": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"styles": [

package/src/read-more/block.json

@@ -50,6 +50,9 @@
 			"__experimentalDefaultControls": {
 				"width": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-read-more"

package/src/rss/block.json

@@ -43,7 +43,10 @@
 	},
 	"supports": {
 		"align": true,
-		"html": false
+		"html": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-rss-editor",
 	"style": "wp-block-rss"