@wordpress/block-library 9.33.1-next.ff1cebbba.0 → 9.33.2-next.36001005c.0

package/src/navigation-link/shared/use-entity-binding.js

@@ -4,6 +4,46 @@
 import { useCallback } from '@wordpress/element';
 import { useBlockBindingsUtils } from '@wordpress/block-editor';
 
+/**
+ * Builds entity binding configuration for navigation link URLs.
+ * This function generates the structure used to bind navigation link URLs to their entity sources.
+ *
+ * Using a function instead of a constant allows for future enhancements where the binding
+ * might need dynamic data (e.g., entity ID, context-specific arguments).
+ *
+ * @param {('post-type'|'taxonomy')} kind - The kind of entity. Only 'post-type' and 'taxonomy' are supported.
+ * @return {Object} Entity binding configuration object
+ * @throws {Error} If kind is not 'post-type' or 'taxonomy'
+ */
+export function buildNavigationLinkEntityBinding( kind ) {
+	// Validate kind parameter exists
+	if ( kind === undefined ) {
+		throw new Error(
+			'buildNavigationLinkEntityBinding requires a kind parameter. ' +
+				'Only "post-type" and "taxonomy" are supported.'
+		);
+	}
+
+	// Validate kind parameter value
+	if ( kind !== 'post-type' && kind !== 'taxonomy' ) {
+		throw new Error(
+			`Invalid kind "${ kind }" provided to buildNavigationLinkEntityBinding. ` +
+				`Only 'post-type' and 'taxonomy' are supported.`
+		);
+	}
+
+	const source = kind === 'taxonomy' ? 'core/term-data' : 'core/post-data';
+
+	return {
+		url: {
+			source,
+			args: {
+				field: 'link',
+			},
+		},
+	};
+}
+
 /**
  * Shared hook for entity binding functionality in Navigation blocks.
  *
@@ -17,33 +57,48 @@ import { useBlockBindingsUtils } from '@wordpress/block-editor';
  */
 export function useEntityBinding( { clientId, attributes } ) {
 	const { updateBlockBindings } = useBlockBindingsUtils( clientId );
-	const { metadata, id } = attributes;
+	const { metadata, id, kind } = attributes;
 
-	// Check if there's a URL binding with the core/entity source
-	const hasUrlBinding =
-		metadata?.bindings?.url?.source === 'core/entity' && !! id;
+	const hasUrlBinding = !! metadata?.bindings?.url && !! id;
+	const expectedSource =
+		kind === 'post-type' ? 'core/post-data' : 'core/term-data';
+	const hasCorrectBinding =
+		hasUrlBinding && metadata?.bindings?.url?.source === expectedSource;
 
 	const clearBinding = useCallback( () => {
-		// Only clear if there's actually a valid binding to clear
 		if ( hasUrlBinding ) {
-			// Remove the URL binding by setting it to undefined
 			updateBlockBindings( { url: undefined } );
 		}
-	}, [ hasUrlBinding, updateBlockBindings ] );
-
-	const createBinding = useCallback( () => {
-		updateBlockBindings( {
-			url: {
-				source: 'core/entity',
-				args: {
-					key: 'url',
-				},
-			},
-		} );
-	}, [ updateBlockBindings ] );
+	}, [ updateBlockBindings, hasUrlBinding ] );
+
+	const createBinding = useCallback(
+		( updatedAttributes ) => {
+			// Use updated attributes if provided, otherwise fall back to closure attributes
+			// updatedAttributes needed to access the most up-to-date data when called synchronously
+			const kindToUse = updatedAttributes?.kind ?? kind;
+
+			// Avoid creating binding if no kind is provided
+			if ( ! kindToUse ) {
+				return;
+			}
+
+			try {
+				const binding = buildNavigationLinkEntityBinding( kindToUse );
+				updateBlockBindings( binding );
+			} catch ( error ) {
+				// eslint-disable-next-line no-console
+				console.warn(
+					'Failed to create entity binding:',
+					error.message
+				);
+				// Don't create binding if validation fails
+			}
+		},
+		[ updateBlockBindings, kind, id ]
+	);
 
 	return {
-		hasUrlBinding,
+		hasUrlBinding: hasCorrectBinding,
 		clearBinding,
 		createBinding,
 	};

package/src/navigation-submenu/edit.js

@@ -432,7 +432,10 @@ export default function NavigationSubmenuEdit( {
 							} }
 							onChange={ ( updatedValue ) => {
 								// updateAttributes determines the final state and returns metadata
-								const { isEntityLink } = updateAttributes(
+								const {
+									isEntityLink,
+									attributes: updatedAttributes,
+								} = updateAttributes(
 									updatedValue,
 									setAttributes,
 									attributes
@@ -442,7 +445,7 @@ export default function NavigationSubmenuEdit( {
 								// Only create bindings for entity links (posts, pages, taxonomies)
 								// Never create bindings for custom links (manual URLs)
 								if ( isEntityLink ) {
-									createBinding();
+									createBinding( updatedAttributes );
 								} else {
 									clearBinding();
 								}

package/src/navigation-submenu/index.php

@@ -79,20 +79,6 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		return '';
 	}
 
-	// Resolve URL binding if present
-	$url = $attributes['url'] ?? '';
-	if ( isset( $attributes['metadata']['bindings']['url']['source'] ) ) {
-		$binding = $attributes['metadata']['bindings']['url'];
-		$source  = get_block_bindings_source( $binding['source'] );
-		if ( $source ) {
-			$source_args  = $binding['args'] ?? array();
-			$resolved_url = $source->get_value( $source_args, $block, 'url' );
-			if ( $resolved_url ) {
-				$url = $resolved_url;
-			}
-		}
-	}
-
 	$font_sizes      = block_core_navigation_submenu_build_css_font_sizes( $block->context );
 	$style_attribute = $font_sizes['inline_styles'];
 
@@ -100,9 +86,9 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
 	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
-	if ( is_post_type_archive() && ! empty( $url ) ) {
+	if ( is_post_type_archive() && ! empty( $attributes['url'] ) ) {
 		$queried_archive_link = get_post_type_archive_link( get_queried_object()->name );
-		if ( $url === $queried_archive_link ) {
+		if ( $attributes['url'] === $queried_archive_link ) {
 			$is_active = true;
 		}
 	}
@@ -156,7 +142,7 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	// If Submenus open on hover, we render an anchor tag with attributes.
 	// If submenu icons are set to show, we also render a submenu button, so the submenu can be opened on click.
 	if ( ! $open_on_click ) {
-		$item_url = $url;
+		$item_url = isset( $attributes['url'] ) ? $attributes['url'] : '';
 		// Start appending HTML attributes to anchor tag.
 		$html .= '<a class="wp-block-navigation-item__content"';
 

package/src/page-list/test/{convert-to-links-modal.js → convert-to-navigation-links.js}

@@ -4,6 +4,16 @@
 
 import { convertToNavigationLinks } from '../use-convert-to-navigation-links';
 
+// Expected entity binding structure for navigation links
+const EXPECTED_ENTITY_BINDING = {
+	url: {
+		source: 'core/post-data',
+		args: {
+			field: 'link',
+		},
+	},
+};
+
 // Mock createBlock to avoid creating the blocks in test environment
 // as convertToNavigationLinks calls this method internally.
 jest.mock( '@wordpress/blocks', () => {
@@ -117,6 +127,9 @@ describe( 'page list convert to links', () => {
 						label: 'Sample Page',
 						type: 'page',
 						url: 'http://wordpress.local/sample-page/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -128,6 +141,9 @@ describe( 'page list convert to links', () => {
 						label: 'About',
 						type: 'page',
 						url: 'http://wordpress.local/about/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [
 						{
@@ -137,6 +153,9 @@ describe( 'page list convert to links', () => {
 								label: 'About Sub 1',
 								type: 'page',
 								url: 'http://wordpress.local/about/about-sub-1/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [],
 							name: 'core/navigation-link',
@@ -148,6 +167,9 @@ describe( 'page list convert to links', () => {
 								label: 'About Sub 2',
 								type: 'page',
 								url: 'http://wordpress.local/about/about-sub-2/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [],
 							name: 'core/navigation-link',
@@ -162,6 +184,9 @@ describe( 'page list convert to links', () => {
 						label: 'Contact Page',
 						type: 'page',
 						url: 'http://wordpress.local/contact-page/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -173,6 +198,9 @@ describe( 'page list convert to links', () => {
 						label: 'Test',
 						type: 'page',
 						url: 'http://wordpress.local/test/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [
 						{
@@ -182,6 +210,9 @@ describe( 'page list convert to links', () => {
 								label: 'Test Sub',
 								type: 'page',
 								url: 'http://wordpress.local/test/test-sub/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [
 								{
@@ -191,6 +222,9 @@ describe( 'page list convert to links', () => {
 										label: 'Test Sub Sub',
 										type: 'page',
 										url: 'http://wordpress.local/test/test-sub/test-sub-sub/',
+										metadata: {
+											bindings: EXPECTED_ENTITY_BINDING,
+										},
 									},
 									innerBlocks: [],
 									name: 'core/navigation-link',
@@ -297,6 +331,9 @@ describe( 'page list convert to links', () => {
 						label: 'Sample Page',
 						type: 'page',
 						url: 'http://wordpress.local/sample-page/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -308,6 +345,9 @@ describe( 'page list convert to links', () => {
 						label: 'About',
 						type: 'page',
 						url: 'http://wordpress.local/about/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [
 						{
@@ -317,6 +357,9 @@ describe( 'page list convert to links', () => {
 								label: 'About Sub 1',
 								type: 'page',
 								url: 'http://wordpress.local/about/about-sub-1/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [],
 							name: 'core/navigation-link',
@@ -328,6 +371,9 @@ describe( 'page list convert to links', () => {
 								label: 'About Sub 2',
 								type: 'page',
 								url: 'http://wordpress.local/about/about-sub-2/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [],
 							name: 'core/navigation-link',
@@ -342,6 +388,9 @@ describe( 'page list convert to links', () => {
 						label: 'Contact Page',
 						type: 'page',
 						url: 'http://wordpress.local/contact-page/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -353,6 +402,9 @@ describe( 'page list convert to links', () => {
 						label: 'Test',
 						type: 'page',
 						url: 'http://wordpress.local/test/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [
 						{
@@ -362,6 +414,9 @@ describe( 'page list convert to links', () => {
 								label: 'Test Sub',
 								type: 'page',
 								url: 'http://wordpress.local/test/test-sub/',
+								metadata: {
+									bindings: EXPECTED_ENTITY_BINDING,
+								},
 							},
 							innerBlocks: [
 								{
@@ -371,6 +426,9 @@ describe( 'page list convert to links', () => {
 										label: 'Test Sub Sub',
 										type: 'page',
 										url: 'http://wordpress.local/test/test-sub/test-sub-sub/',
+										metadata: {
+											bindings: EXPECTED_ENTITY_BINDING,
+										},
 									},
 									innerBlocks: [],
 									name: 'core/navigation-link',
@@ -481,6 +539,9 @@ describe( 'page list convert to links', () => {
 						label: 'About Sub 1',
 						type: 'page',
 						url: 'http://wordpress.local/about/about-sub-1/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -492,6 +553,9 @@ describe( 'page list convert to links', () => {
 						label: 'About Sub 2',
 						type: 'page',
 						url: 'http://wordpress.local/about/about-sub-2/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',
@@ -511,6 +575,9 @@ describe( 'page list convert to links', () => {
 						label: 'Test Sub Sub',
 						type: 'page',
 						url: 'http://wordpress.local/test/test-sub/test-sub-sub/',
+						metadata: {
+							bindings: EXPECTED_ENTITY_BINDING,
+						},
 					},
 					innerBlocks: [],
 					name: 'core/navigation-link',

package/src/page-list/use-convert-to-navigation-links.js

@@ -5,6 +5,11 @@ import { createBlock } from '@wordpress/blocks';
 import { useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
+/**
+ * Internal dependencies
+ */
+import { buildNavigationLinkEntityBinding } from '../navigation-link/shared';
+
 /**
  * Converts an array of pages into a nested array of navigation link blocks.
  *
@@ -13,6 +18,7 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
  * @return {Array} A nested array of navigation link blocks.
  */
 function createNavigationLinks( pages = [] ) {
+	const POST_TYPE_KIND = 'post-type';
 	const linkMap = {};
 	const navigationLinks = [];
 	pages.forEach( ( { id, title, link: url, type, parent } ) => {
@@ -25,7 +31,11 @@ function createNavigationLinks( pages = [] ) {
 				label: title.rendered,
 				url,
 				type,
-				kind: 'post-type',
+				kind: POST_TYPE_KIND,
+				metadata: {
+					bindings:
+						buildNavigationLinkEntityBinding( POST_TYPE_KIND ),
+				},
 			},
 			innerBlocks
 		);

package/src/paragraph/index.js

@@ -13,7 +13,6 @@ import edit from './edit';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';
-import variations from './variations';
 
 const { name } = metadata;
 
@@ -55,7 +54,6 @@ export const settings = {
 	},
 	edit,
 	save,
-	variations,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );

package/src/post-date/deprecated.js

@@ -8,6 +8,108 @@ import clsx from 'clsx';
  */
 import migrateFontFamily from '../utils/migrate-font-family';
 
+const v3 = {
+	attributes: {
+		datetime: {
+			type: 'string',
+			role: 'content',
+		},
+		textAlign: {
+			type: 'string',
+		},
+		format: {
+			type: 'string',
+		},
+		isLink: {
+			type: 'boolean',
+			default: false,
+			role: 'content',
+		},
+	},
+	supports: {
+		html: false,
+		color: {
+			gradients: true,
+			link: true,
+			__experimentalDefaultControls: {
+				background: true,
+				text: true,
+				link: true,
+			},
+		},
+		spacing: {
+			margin: true,
+			padding: true,
+		},
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontWeight: true,
+			__experimentalFontStyle: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalLetterSpacing: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		interactivity: {
+			clientNavigation: true,
+		},
+		__experimentalBorder: {
+			radius: true,
+			color: true,
+			width: true,
+			style: true,
+			__experimentalDefaultControls: {
+				radius: true,
+				color: true,
+				width: true,
+				style: true,
+			},
+		},
+	},
+	save() {
+		return null;
+	},
+	migrate( {
+		metadata: {
+			bindings: {
+				datetime: {
+					source,
+					args: { key, ...otherArgs },
+				},
+				...otherBindings
+			},
+			...otherMetadata
+		},
+		...otherAttributes
+	} ) {
+		// Change the block bindings source argument name from "key" to "field".
+		return {
+			metadata: {
+				bindings: {
+					datetime: {
+						source,
+						args: { field: key, ...otherArgs },
+					},
+					...otherBindings,
+				},
+				...otherMetadata,
+			},
+			...otherAttributes,
+		};
+	},
+	isEligible( attributes ) {
+		return (
+			attributes?.metadata?.bindings?.datetime?.source ===
+				'core/post-data' &&
+			!! attributes?.metadata?.bindings?.datetime?.args?.key
+		);
+	},
+};
+
 const v2 = {
 	attributes: {
 		textAlign: {
@@ -90,7 +192,7 @@ const v2 = {
 					bindings: {
 						datetime: {
 							source: 'core/post-data',
-							args: { key: displayType },
+							args: { field: displayType },
 						},
 					},
 				},
@@ -152,4 +254,4 @@ const v1 = {
  *
  * See block-deprecation.md
  */
-export default [ v2, v1 ];
+export default [ v3, v2, v1 ];

package/src/post-date/edit.js

@@ -48,7 +48,7 @@ export default function PostDateEdit( {
 } ) {
 	const displayType =
 		metadata?.bindings?.datetime?.source === 'core/post-data' &&
-		metadata?.bindings?.datetime?.args?.key;
+		metadata?.bindings?.datetime?.args?.field;
 
 	const blockProps = useBlockProps( {
 		className: clsx( {

package/src/post-date/index.php

@@ -32,17 +32,17 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 		$source = get_block_bindings_source( 'core/post-data' );
 		if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
 			$source_args = array(
-				'key' => 'modified',
+				'field' => 'modified',
 			);
 		} else {
 			$source_args = array(
-				'key' => 'date',
+				'field' => 'date',
 			);
 		}
 		$attributes['datetime'] = $source->get_value( $source_args, $block, 'datetime' );
 	}
 
-	if ( isset( $source_args['key'] ) && 'modified' === $source_args['key'] ) {
+	if ( isset( $source_args['field'] ) && 'modified' === $source_args['field'] ) {
 		$classes[] = 'wp-block-post-date__modified-date';
 	}
 

package/src/post-date/variations.js

@@ -14,7 +14,7 @@ const variations = [
 				bindings: {
 					datetime: {
 						source: 'core/post-data',
-						args: { key: 'date' },
+						args: { field: 'date' },
 					},
 				},
 			},
@@ -23,7 +23,8 @@ const variations = [
 		isActive: ( blockAttributes ) =>
 			blockAttributes?.metadata?.bindings?.datetime?.source ===
 				'core/post-data' &&
-			blockAttributes?.metadata?.bindings?.datetime?.args?.key === 'date',
+			blockAttributes?.metadata?.bindings?.datetime?.args?.field ===
+				'date',
 		icon: postDate,
 	},
 	{
@@ -35,7 +36,7 @@ const variations = [
 				bindings: {
 					datetime: {
 						source: 'core/post-data',
-						args: { key: 'modified' },
+						args: { field: 'modified' },
 					},
 				},
 			},
@@ -45,7 +46,7 @@ const variations = [
 		isActive: ( blockAttributes ) =>
 			blockAttributes?.metadata?.bindings?.datetime?.source ===
 				'core/post-data' &&
-			blockAttributes?.metadata?.bindings?.datetime?.args?.key ===
+			blockAttributes?.metadata?.bindings?.datetime?.args?.field ===
 				'modified',
 		icon: postDate,
 	},

package/src/term-template/block.json

@@ -1,7 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
-	"__experimental": true,
 	"name": "core/term-template",
 	"title": "Term Template",
 	"category": "theme",

package/src/term-template/edit.js

@@ -93,7 +93,10 @@ export default function TermTemplateEdit( {
 		hide_empty: hideEmpty,
 		order,
 		orderby: orderBy,
-		per_page: perPage,
+		// There is a mismatch between `WP_Term_Query` and the REST API parameter default
+		// values to fetch all items. In `WP_Term_Query`, the default is `''|0` and in
+		// the REST API is `-1`.
+		per_page: perPage || -1,
 	};
 
 	// Nested terms are returned by default from REST API as long as parent is not set.

package/src/term-template/index.php

@@ -85,27 +85,25 @@ function render_block_core_term_template( $attributes, $content, $block ) {
 			return $context;
 		};
 
-		$block_content = '';
-
 		// Use an early priority to so that other 'render_block_context' filters have access to the values.
 		add_filter( 'render_block_context', $filter_block_context, 1 );
 
 		// Render the inner blocks of the Term Template block with `dynamic` set to `false` to prevent calling
 		// `render_callback` and ensure that no wrapper markup is included.
-		$block_content .= ( new WP_Block( $block_instance ) )->render( array( 'dynamic' => false ) );
+		$block_content = ( new WP_Block( $block_instance ) )->render( array( 'dynamic' => false ) );
 
 		remove_filter( 'render_block_context', $filter_block_context, 1 );
 
 		// Wrap the render inner blocks in a `li` element with the appropriate term classes.
-		$term_classes = implode( ' ', array( 'wp-block-term', "term-{$term->term_id}", $term->taxonomy, "taxonomy-{$term->taxonomy}" ) );
+		$term_classes = "wp-block-term term-{$term->term_id} {$term->taxonomy} taxonomy-{$term->taxonomy}";
 
 		$content .= '<li class="' . esc_attr( $term_classes ) . '">' . $block_content . '</li>';
 	}
 
-	$classnames = 'wp-block-term-template';
+	$classnames = '';
 
 	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
-		$classnames .= ' has-link-color';
+		$classnames .= 'has-link-color';
 	}
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classnames ) ) );

package/src/terms-query/block.json

@@ -1,7 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
-	"__experimental": true,
 	"name": "core/terms-query",
 	"title": "Terms Query",
 	"category": "theme",