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

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

@@ -10,7 +10,10 @@ import { renderHook, act } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import { useEntityBinding } from '../use-entity-binding';
+import {
+	useEntityBinding,
+	buildNavigationLinkEntityBinding,
+} from '../use-entity-binding';
 
 // Mock the entire @wordpress/block-editor module
 jest.mock( '@wordpress/block-editor', () => ( {
@@ -49,17 +52,18 @@ describe( 'useEntityBinding', () => {
 			expect( result.current.hasUrlBinding ).toBe( false );
 		} );
 
-		it( 'should return true when core/entity binding exists with id', () => {
+		it( 'should return true when core/post-data binding exists with id for post-type', () => {
 			const attributes = {
 				metadata: {
 					bindings: {
 						url: {
-							source: 'core/entity',
-							args: { key: 'url' },
+							source: 'core/post-data',
+							args: { field: 'link' },
 						},
 					},
 				},
 				id: 123,
+				kind: 'post-type',
 			};
 
 			const { result } = renderHook( () =>
@@ -72,17 +76,42 @@ describe( 'useEntityBinding', () => {
 			expect( result.current.hasUrlBinding ).toBe( true );
 		} );
 
-		it( 'should return false when source is not core/entity', () => {
+		it( 'should return true when core/term-data binding exists with id for taxonomy', () => {
+			const attributes = {
+				metadata: {
+					bindings: {
+						url: {
+							source: 'core/term-data',
+							args: { field: 'link' },
+						},
+					},
+				},
+				id: 123,
+				kind: 'taxonomy',
+			};
+
+			const { result } = renderHook( () =>
+				useEntityBinding( {
+					clientId: 'test-client-id',
+					attributes,
+				} )
+			);
+
+			expect( result.current.hasUrlBinding ).toBe( true );
+		} );
+
+		it( 'should return false when source is not core/post-data or core/term-data', () => {
 			const attributes = {
 				metadata: {
 					bindings: {
 						url: {
 							source: 'some-other-source',
-							args: { key: 'url' },
+							args: { field: 'url' },
 						},
 					},
 				},
 				id: 123,
+				kind: 'post-type',
 			};
 
 			const { result } = renderHook( () =>
@@ -95,17 +124,18 @@ describe( 'useEntityBinding', () => {
 			expect( result.current.hasUrlBinding ).toBe( false );
 		} );
 
-		it( 'should return false when core/entity binding exists but no id', () => {
+		it( 'should return false when core/post-data binding exists but no id', () => {
 			const attributes = {
 				metadata: {
 					bindings: {
 						url: {
-							source: 'core/entity',
-							args: { key: 'url' },
+							source: 'core/post-data',
+							args: { field: 'link' },
 						},
 					},
 				},
 				id: null,
+				kind: 'post-type',
 			};
 
 			const { result } = renderHook( () =>
@@ -147,12 +177,13 @@ describe( 'useEntityBinding', () => {
 			metadata: {
 				bindings: {
 					url: {
-						source: 'core/entity',
-						args: { key: 'url' },
+						source: 'core/post-data',
+						args: { field: 'link' },
 					},
 				},
 			},
 			id: 123,
+			kind: 'post-type',
 		};
 
 		const { result } = renderHook( () =>
@@ -171,7 +202,7 @@ describe( 'useEntityBinding', () => {
 		} );
 	} );
 
-	it( 'should NOT clear binding when clearBinding is called and no binding exists', () => {
+	it( 'should NOT call updateBlockBindings when clearBinding is called and no binding exists', () => {
 		const attributes = {
 			metadata: {},
 			id: null,
@@ -191,7 +222,7 @@ describe( 'useEntityBinding', () => {
 		expect( mockUpdateBlockBindings ).not.toHaveBeenCalled();
 	} );
 
-	it( 'should NOT clear binding when binding metadata exists but source is null', () => {
+	it( 'should call updateBlockBindings when clearBinding is called and binding exists even with null source', () => {
 		const attributes = {
 			metadata: {
 				bindings: {
@@ -215,13 +246,16 @@ describe( 'useEntityBinding', () => {
 			result.current.clearBinding();
 		} );
 
-		expect( mockUpdateBlockBindings ).not.toHaveBeenCalled();
+		expect( mockUpdateBlockBindings ).toHaveBeenCalledWith( {
+			url: undefined,
+		} );
 	} );
 
-	it( 'should create binding when createBinding is called', () => {
+	it( 'should create core/post-data binding when createBinding is called for post-type', () => {
 		const attributes = {
 			metadata: {},
 			id: null,
+			kind: 'post-type',
 		};
 
 		const { result } = renderHook( () =>
@@ -237,11 +271,92 @@ describe( 'useEntityBinding', () => {
 
 		expect( mockUpdateBlockBindings ).toHaveBeenCalledWith( {
 			url: {
-				source: 'core/entity',
+				source: 'core/post-data',
 				args: {
-					key: 'url',
+					field: 'link',
 				},
 			},
 		} );
 	} );
+
+	describe( 'buildNavigationLinkEntityBinding', () => {
+		it( 'returns correct binding for post-type', () => {
+			const binding = buildNavigationLinkEntityBinding( 'post-type' );
+			expect( binding ).toEqual( {
+				url: {
+					source: 'core/post-data',
+					args: { field: 'link' },
+				},
+			} );
+		} );
+
+		it( 'returns correct binding for taxonomy', () => {
+			const binding = buildNavigationLinkEntityBinding( 'taxonomy' );
+			expect( binding ).toEqual( {
+				url: {
+					source: 'core/term-data',
+					args: { field: 'link' },
+				},
+			} );
+		} );
+
+		it( 'throws error when called without parameter', () => {
+			expect( () => {
+				buildNavigationLinkEntityBinding();
+			} ).toThrow(
+				'buildNavigationLinkEntityBinding requires a kind parameter'
+			);
+		} );
+
+		it( 'throws error for invalid kind', () => {
+			expect( () => {
+				buildNavigationLinkEntityBinding( 'invalid-kind' );
+			} ).toThrow( 'Invalid kind "invalid-kind"' );
+		} );
+
+		it( 'throws error for null kind', () => {
+			expect( () => {
+				buildNavigationLinkEntityBinding( null );
+			} ).toThrow( 'Invalid kind "null"' );
+		} );
+
+		it( 'throws error for empty string', () => {
+			expect( () => {
+				buildNavigationLinkEntityBinding( '' );
+			} ).toThrow( 'Invalid kind ""' );
+		} );
+
+		it( 'handles invalid kind gracefully in createBinding', () => {
+			const consoleSpy = jest
+				.spyOn( console, 'warn' )
+				.mockImplementation();
+
+			const attributes = {
+				metadata: {},
+				id: null,
+				kind: 'invalid-kind',
+			};
+
+			const { result } = renderHook( () =>
+				useEntityBinding( {
+					clientId: 'test-client-id',
+					attributes,
+				} )
+			);
+
+			act( () => {
+				result.current.createBinding();
+			} );
+
+			expect( consoleSpy ).toHaveBeenCalledWith(
+				'Failed to create entity binding:',
+				expect.stringContaining( 'Invalid kind "invalid-kind"' )
+			);
+
+			// Should not call updateBlockBindings when validation fails
+			expect( mockUpdateBlockBindings ).not.toHaveBeenCalled();
+
+			consoleSpy.mockRestore();
+		} );
+	} );
 } );

package/src/navigation-link/shared/update-attributes.js

@@ -222,5 +222,6 @@ export const updateAttributes = (
 
 	return {
 		isEntityLink: !! finalId && finalKind !== 'custom',
+		attributes, // Return the computed attributes object
 	};
 };

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, metadata, id ] );
+
+	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,9 +445,9 @@ 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();
+									clearBinding( updatedAttributes );
 								}
 							} }
 						/>

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 } );