@wordpress/editor 14.35.2-next.dc3f6d3c1.0 → 14.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.35.2-next.dc3f6d3c1.0",
+	"version": "14.36.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -53,44 +53,44 @@
 	],
 	"dependencies": {
 		"@floating-ui/react-dom": "2.0.8",
-		"@wordpress/a11y": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/api-fetch": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/base-styles": "^6.11.1-next.dc3f6d3c1.0",
-		"@wordpress/blob": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/block-editor": "^15.8.1-next.dc3f6d3c1.0",
-		"@wordpress/blocks": "^15.8.1-next.dc3f6d3c1.0",
-		"@wordpress/commands": "^1.35.1-next.dc3f6d3c1.0",
-		"@wordpress/components": "^30.8.2-next.dc3f6d3c1.0",
-		"@wordpress/compose": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/core-data": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/data": "^10.35.1-next.dc3f6d3c1.0",
-		"@wordpress/dataviews": "^10.4.1-next.dc3f6d3c1.0",
-		"@wordpress/date": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/deprecated": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/dom": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/element": "^6.35.1-next.dc3f6d3c1.0",
-		"@wordpress/fields": "^0.27.1-next.dc3f6d3c1.0",
-		"@wordpress/global-styles-engine": "^1.2.1-next.dc3f6d3c1.0",
-		"@wordpress/global-styles-ui": "^1.2.1-next.dc3f6d3c1.0",
-		"@wordpress/hooks": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/html-entities": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/i18n": "^6.8.1-next.dc3f6d3c1.0",
-		"@wordpress/icons": "^11.2.1-next.dc3f6d3c1.0",
-		"@wordpress/interface": "^9.20.1-next.dc3f6d3c1.0",
-		"@wordpress/keyboard-shortcuts": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/keycodes": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/media-utils": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/notices": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/patterns": "^2.35.1-next.dc3f6d3c1.0",
-		"@wordpress/plugins": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/preferences": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/private-apis": "^1.35.1-next.dc3f6d3c1.0",
-		"@wordpress/reusable-blocks": "^5.35.1-next.dc3f6d3c1.0",
-		"@wordpress/rich-text": "^7.35.1-next.dc3f6d3c1.0",
-		"@wordpress/server-side-render": "^6.11.1-next.dc3f6d3c1.0",
-		"@wordpress/url": "^4.35.1-next.dc3f6d3c1.0",
-		"@wordpress/warning": "^3.35.1-next.dc3f6d3c1.0",
-		"@wordpress/wordcount": "^4.35.1-next.dc3f6d3c1.0",
+		"@wordpress/a11y": "^4.36.0",
+		"@wordpress/api-fetch": "^7.36.0",
+		"@wordpress/base-styles": "^6.12.0",
+		"@wordpress/blob": "^4.36.0",
+		"@wordpress/block-editor": "^15.9.0",
+		"@wordpress/blocks": "^15.9.0",
+		"@wordpress/commands": "^1.36.0",
+		"@wordpress/components": "^30.9.0",
+		"@wordpress/compose": "^7.36.0",
+		"@wordpress/core-data": "^7.36.0",
+		"@wordpress/data": "^10.36.0",
+		"@wordpress/dataviews": "^11.0.0",
+		"@wordpress/date": "^5.36.0",
+		"@wordpress/deprecated": "^4.36.0",
+		"@wordpress/dom": "^4.36.0",
+		"@wordpress/element": "^6.36.0",
+		"@wordpress/fields": "^0.28.0",
+		"@wordpress/global-styles-engine": "^1.3.0",
+		"@wordpress/global-styles-ui": "^1.3.0",
+		"@wordpress/hooks": "^4.36.0",
+		"@wordpress/html-entities": "^4.36.0",
+		"@wordpress/i18n": "^6.9.0",
+		"@wordpress/icons": "^11.3.0",
+		"@wordpress/interface": "^9.21.0",
+		"@wordpress/keyboard-shortcuts": "^5.36.0",
+		"@wordpress/keycodes": "^4.36.0",
+		"@wordpress/media-utils": "^5.36.0",
+		"@wordpress/notices": "^5.36.0",
+		"@wordpress/patterns": "^2.36.0",
+		"@wordpress/plugins": "^7.36.0",
+		"@wordpress/preferences": "^4.36.0",
+		"@wordpress/private-apis": "^1.36.0",
+		"@wordpress/reusable-blocks": "^5.36.0",
+		"@wordpress/rich-text": "^7.36.0",
+		"@wordpress/server-side-render": "^6.12.0",
+		"@wordpress/url": "^4.36.0",
+		"@wordpress/warning": "^3.36.0",
+		"@wordpress/wordcount": "^4.36.0",
 		"change-case": "^4.1.2",
 		"client-zip": "^2.4.5",
 		"clsx": "^2.1.1",
@@ -108,5 +108,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "f73b5e69b34fbaccfb8c47783f4f993059ff1a41"
+	"gitHead": "b35cf1a2dce04665e99fd6b9c2891c0b336361b9"
 }

package/src/bindings/post-data.js

@@ -35,23 +35,19 @@ const postDataFields = [
 export default {
 	name: 'core/post-data',
 	getValues( { select, context, bindings, clientId } ) {
-		const allowedFields = postDataFields.map(
-			( field ) => field.args.field
-		);
-
 		/*
 		 * BACKWARDS COMPATIBILITY: Hardcoded exception for navigation blocks.
 		 * Required for WordPress 6.9+ navigation blocks. DO NOT REMOVE.
 		 */
 		const { getBlockAttributes, getBlockName } = select( blockEditorStore );
-		const blockName = getBlockName?.( clientId );
+		const blockName = getBlockName( clientId );
 		const isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes( blockName );
 
 		let postId, postType;
 
 		if ( isNavigationBlock ) {
 			// Navigation blocks: read from block attributes
-			const blockAttributes = getBlockAttributes?.( clientId );
+			const blockAttributes = getBlockAttributes( clientId );
 			postId = blockAttributes?.id;
 			postType = blockAttributes?.type;
 		} else {
@@ -69,23 +65,28 @@ export default {
 
 		const newValues = {};
 		for ( const [ attributeName, binding ] of Object.entries( bindings ) ) {
-			if ( ! allowedFields.includes( binding.args.field ) ) {
-				newValues[ attributeName ] = {};
-				continue;
+			const postDataField = postDataFields.find(
+				( field ) => field.args.field === binding.args.field
+			);
+
+			if ( ! postDataField ) {
+				// If the field is unknown, return the field name.
+				newValues[ attributeName ] = binding.args.field;
+			} else if ( ! entityDataValues ) {
+				// If the entity data does not exist, return the field label.
+				newValues[ attributeName ] = postDataField.label;
+			} else {
+				// If the entity data exists, return the entity value.
+				newValues[ attributeName ] =
+					entityDataValues[ binding.args.field ];
 			}
-
-			newValues[ attributeName ] =
-				entityDataValues?.[ binding.args.field ] ??
-				postDataFields.find(
-					( field ) => field.args.field === binding.args.field
-				).label;
 		}
 		return newValues;
 	},
 	setValues( { dispatch, context, bindings, clientId, select } ) {
 		const { getBlockName } = select( blockEditorStore );
 
-		const blockName = getBlockName?.( clientId );
+		const blockName = getBlockName( clientId );
 
 		// Navigaton block types are read-only.
 		// See https://github.com/WordPress/gutenberg/pull/72165.
@@ -108,7 +109,7 @@ export default {
 		const { getBlockName, getSelectedBlockClientId } =
 			select( blockEditorStore );
 		const clientId = getSelectedBlockClientId();
-		const blockName = getBlockName?.( clientId );
+		const blockName = getBlockName( clientId );
 
 		// Navigaton block types are read-only.
 		// See https://github.com/WordPress/gutenberg/pull/72165.
@@ -138,13 +139,13 @@ export default {
 
 		return true;
 	},
-	getFieldsList( { select } ) {
+	getFieldsList( { context, select } ) {
 		const selectedBlock = select( blockEditorStore ).getSelectedBlock();
 		if ( selectedBlock?.name !== 'core/post-date' ) {
 			return [];
 		}
-		// Exit early for navigation blocks (read-only)
-		if ( NAVIGATION_BLOCK_TYPES.includes( selectedBlock?.name ) ) {
+
+		if ( ! context || ! context.postId || ! context.postType ) {
 			return [];
 		}
 

package/src/bindings/term-data.js

@@ -11,131 +11,43 @@ const NAVIGATION_BLOCK_TYPES = [
 	'core/navigation-submenu',
 ];
 
-/**
- * Creates the data fields object with the given term data values and ID value.
- *
- * @param {Object}        termDataValues The term data values.
- * @param {string|number} idValue        The ID value to use.
- * @return {Object} The data fields object.
- */
-function createDataFields( termDataValues, idValue ) {
-	return {
-		id: {
-			label: __( 'Term ID' ),
-			value: idValue,
-			type: 'string',
-		},
-		name: {
-			label: __( 'Name' ),
-			value: termDataValues?.name,
-			type: 'string',
-		},
-		slug: {
-			label: __( 'Slug' ),
-			value: termDataValues?.slug,
-			type: 'string',
-		},
-		link: {
-			label: __( 'Link' ),
-			value: termDataValues?.link,
-			type: 'string',
-		},
-		description: {
-			label: __( 'Description' ),
-			value: termDataValues?.description,
-			type: 'string',
-		},
-		parent: {
-			label: __( 'Parent ID' ),
-			value: termDataValues?.parent,
-			type: 'string',
-		},
-		count: {
-			label: __( 'Count' ),
-			value: `(${ termDataValues?.count ?? 0 })`,
-			type: 'string',
-		},
-	};
-}
-
-/**
- * Gets a list of term data fields with their values and labels
- * to be consumed in the needed callbacks.
- * If the value is not available based on context, like in templates,
- * it falls back to the default value, label, or key.
- *
- * @param {Object} select   The select function from the data store.
- * @param {Object} context  The context provided.
- * @param {string} clientId The block client ID used to read attributes.
- * @return {Object} List of term data fields with their value and label.
- *
- * @example
- * ```js
- * {
- *     name: {
- *         label: 'Term Name',
- *         value: 'Category Name',
- *     },
- *     count: {
- *         label: 'Term Count',
- *         value: 5,
- *     },
- *     ...
- * }
- * ```
- */
-function getTermDataFields( select, context, clientId ) {
-	const { getEntityRecord } = select( coreDataStore );
-	const { getBlockAttributes, getBlockName } = select( blockEditorStore );
-
-	let termDataValues, dataFields;
-
-	/*
-	 * BACKWARDS COMPATIBILITY: Hardcoded exception for navigation blocks.
-	 * Required for WordPress 6.9+ navigation blocks. DO NOT REMOVE.
-	 */
-	const blockName = getBlockName?.( clientId );
-	const isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes( blockName );
-
-	let termId, taxonomy;
-
-	if ( isNavigationBlock ) {
-		// Navigation blocks: read from block attributes
-		const blockAttributes = getBlockAttributes?.( clientId );
-		termId = blockAttributes?.id;
-		const typeFromAttributes = blockAttributes?.type;
-		taxonomy =
-			typeFromAttributes === 'tag' ? 'post_tag' : typeFromAttributes;
-	} else {
-		// All other blocks: use context
-		termId = context?.termId;
-		taxonomy = context?.taxonomy;
-	}
-
-	if ( taxonomy && termId ) {
-		termDataValues = getEntityRecord( 'taxonomy', taxonomy, termId );
-
-		if ( ! termDataValues && context?.termData ) {
-			termDataValues = context.termData;
-		}
-
-		if ( termDataValues ) {
-			dataFields = createDataFields( termDataValues, termId );
-		}
-	} else if ( context?.termData ) {
-		termDataValues = context.termData;
-		dataFields = createDataFields(
-			termDataValues,
-			termDataValues?.term_id
-		);
-	}
-
-	if ( ! dataFields || ! Object.keys( dataFields ).length ) {
-		return null;
-	}
-
-	return dataFields;
-}
+export const termDataFields = [
+	{
+		label: __( 'Term ID' ),
+		args: { field: 'id' },
+		type: 'string',
+	},
+	{
+		label: __( 'Name' ),
+		args: { field: 'name' },
+		type: 'string',
+	},
+	{
+		label: __( 'Slug' ),
+		args: { field: 'slug' },
+		type: 'string',
+	},
+	{
+		label: __( 'Link' ),
+		args: { field: 'link' },
+		type: 'string',
+	},
+	{
+		label: __( 'Description' ),
+		args: { field: 'description' },
+		type: 'string',
+	},
+	{
+		label: __( 'Parent ID' ),
+		args: { field: 'parent' },
+		type: 'string',
+	},
+	{
+		label: __( 'Count' ),
+		args: { field: 'count' },
+		type: 'string',
+	},
+];
 
 /**
  * @type {WPBlockBindingsSource}
@@ -144,15 +56,67 @@ export default {
 	name: 'core/term-data',
 	usesContext: [ 'taxonomy', 'termId', 'termData' ],
 	getValues( { select, context, bindings, clientId } ) {
-		const dataFields = getTermDataFields( select, context, clientId );
+		const { getEntityRecord } = select( coreDataStore );
+
+		/*
+		 * BACKWARDS COMPATIBILITY: Hardcoded exception for navigation blocks.
+		 * Required for WordPress 6.9+ navigation blocks. DO NOT REMOVE.
+		 */
+		const { getBlockAttributes, getBlockName } = select( blockEditorStore );
+		const blockName = getBlockName( clientId );
+		const isNavigationBlock = NAVIGATION_BLOCK_TYPES.includes( blockName );
+
+		let termDataValues;
+
+		if ( isNavigationBlock ) {
+			// Navigation blocks: read from block attributes
+			const blockAttributes = getBlockAttributes( clientId );
+			const typeFromAttributes = blockAttributes?.type;
+			const taxonomy =
+				typeFromAttributes === 'tag' ? 'post_tag' : typeFromAttributes;
+			termDataValues = getEntityRecord(
+				'taxonomy',
+				taxonomy,
+				blockAttributes?.id
+			);
+		} else if ( context.termId && context.taxonomy ) {
+			// All other blocks: use context
+			termDataValues = getEntityRecord(
+				'taxonomy',
+				context.taxonomy,
+				context.termId
+			);
+		}
+
+		// Fall back to context termData if available.
+		if ( ! termDataValues && context?.termData && ! isNavigationBlock ) {
+			termDataValues = context.termData;
+		}
 
 		const newValues = {};
-		for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
-			// Use the value, the field label, or the field key.
-			const fieldKey = source.args.field;
-			const { value: fieldValue, label: fieldLabel } =
-				dataFields?.[ fieldKey ] || {};
-			newValues[ attributeName ] = fieldValue ?? fieldLabel ?? fieldKey;
+		for ( const [ attributeName, binding ] of Object.entries( bindings ) ) {
+			const termDataField = termDataFields.find(
+				( field ) => field.args.field === binding.args.field
+			);
+
+			if ( ! termDataField ) {
+				// If the field is unknown, return the field name.
+				newValues[ attributeName ] = binding.args.field;
+			} else if (
+				! termDataValues ||
+				termDataValues[ binding.args.field ] === undefined
+			) {
+				// If the term data does not exist, return the field label.
+				newValues[ attributeName ] = termDataField.label;
+			} else if ( binding.args.field === 'count' ) {
+				// Return the term count value in parentheses.
+				newValues[ attributeName ] =
+					'(' + termDataValues[ binding.args.field ] + ')';
+			} else {
+				// If the term data exists, return the term data value.
+				newValues[ attributeName ] =
+					termDataValues[ binding.args.field ];
+			}
 		}
 		return newValues;
 	},
@@ -161,12 +125,12 @@ export default {
 		// Terms are typically not editable through block bindings in most contexts.
 		return false;
 	},
-	canUserEditValue( { select, context, args } ) {
+	canUserEditValue( { select, context } ) {
 		const { getBlockName, getSelectedBlockClientId } =
 			select( blockEditorStore );
 
 		const clientId = getSelectedBlockClientId();
-		const blockName = getBlockName?.( clientId );
+		const blockName = getBlockName( clientId );
 
 		// Navigaton block types are read-only.
 		// See https://github.com/WordPress/gutenberg/pull/72165.
@@ -184,26 +148,35 @@ export default {
 			return false;
 		}
 
-		const fieldValue = getTermDataFields( select, context, undefined )?.[
-			args.field
-		]?.value;
-		// Empty string or `false` could be a valid value, so we need to check if the field value is undefined.
-		if ( fieldValue === undefined ) {
-			return false;
-		}
-
 		return false;
 	},
-	getFieldsList( { select, context } ) {
-		const clientId = select( blockEditorStore ).getSelectedBlockClientId();
-		const termDataFields = getTermDataFields( select, context, clientId );
-		if ( ! termDataFields ) {
+	getFieldsList( { context, select } ) {
+		const { getBlockAttributes, getBlockName, getSelectedBlockClientId } =
+			select( blockEditorStore );
+		const clientId = getSelectedBlockClientId();
+		const blockName = getBlockName( clientId );
+
+		if ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {
+			// Navigation blocks: read from block attributes
+			const blockAttributes = getBlockAttributes( clientId );
+			if (
+				! blockAttributes ||
+				! blockAttributes.id ||
+				! blockAttributes.type
+			) {
+				return [];
+			}
+			return termDataFields;
+		}
+
+		if ( ! context ) {
 			return [];
 		}
-		return Object.entries( termDataFields ).map( ( [ key, field ] ) => ( {
-			label: field.label,
-			type: field.type,
-			args: { field: key },
-		} ) );
+
+		if ( ( context.taxonomy && context.termId ) || context.termData ) {
+			return termDataFields;
+		}
+
+		return [];
 	},
 };

package/src/bindings/test/post-data.js

@@ -32,12 +32,12 @@ describe( 'post-data bindings', () => {
 										link: 'https://example.com/post',
 										unknown: 'Unknown field value',
 								  }
-								: {},
+								: false,
 					};
 				};
 			} );
 
-			it( 'should return entity field values when they exist', () => {
+			it( 'should return entity field values when they exist, and field name for unknown fields', () => {
 				const values = postDataBindings.getValues( {
 					select,
 					context: { postId: 123, postType: 'post' },
@@ -54,6 +54,10 @@ describe( 'post-data bindings', () => {
 							source: 'core/post-date',
 							args: { field: 'link' },
 						},
+						content: {
+							source: 'core/post-date',
+							args: { field: 'unknown' },
+						},
 					},
 					clientId: '123abc456',
 				} );
@@ -62,10 +66,11 @@ describe( 'post-data bindings', () => {
 					datetime: '2024-03-02 00:00:00',
 					modified: '2025-06-07 00:00:00',
 					url: 'https://example.com/post',
+					content: 'unknown',
 				} );
 			} );
 
-			it( 'should fall back to field labels when entity value does not exist', () => {
+			it( 'should fall back to field labels when entity value does not exist, and to field name for unknown fields', () => {
 				const values = postDataBindings.getValues( {
 					select,
 					context: { postId: 456, postType: 'post' },
@@ -82,6 +87,10 @@ describe( 'post-data bindings', () => {
 							source: 'core/post-date',
 							args: { field: 'link' },
 						},
+						content: {
+							source: 'core/post-date',
+							args: { field: 'unknown' },
+						},
 					},
 					clientId: '123abc456',
 				} );
@@ -90,24 +99,9 @@ describe( 'post-data bindings', () => {
 					datetime: 'Post Date',
 					modified: 'Post Modified Date',
 					url: 'Post Link',
+					content: 'unknown',
 				} );
 			} );
-
-			it( 'should return empty object for unknown fields', () => {
-				const values = postDataBindings.getValues( {
-					select,
-					context: { postId: 123, postType: 'post' },
-					bindings: {
-						content: {
-							source: 'core/post-date',
-							args: { field: 'unknown' },
-						},
-					},
-					clientId: '123abc456',
-				} );
-
-				expect( values.content ).toEqual( {} );
-			} );
 		} );
 
 		describe( 'for navigation blocks using block attributes', () => {
@@ -152,7 +146,7 @@ describe( 'post-data bindings', () => {
 	} );
 
 	describe( 'getFieldsList', () => {
-		it( 'should return the list of available post data fields when the Date block is selected', () => {
+		it( 'should return the list of available post data fields when the Date block is selected, and postId and postType are provided via context', () => {
 			const select = () => ( {
 				getSelectedBlock: () => ( {
 					name: 'core/post-date',
@@ -160,6 +154,7 @@ describe( 'post-data bindings', () => {
 			} );
 
 			const fields = postDataBindings.getFieldsList( {
+				context: { postId: 123, postType: 'post' },
 				select,
 			} );
 
@@ -182,6 +177,21 @@ describe( 'post-data bindings', () => {
 			] );
 		} );
 
+		it( 'should return an empty array when the Date block is selected but no postId context is provided', () => {
+			const select = () => ( {
+				getSelectedBlock: () => ( {
+					name: 'core/post-date',
+				} ),
+			} );
+
+			const fields = postDataBindings.getFieldsList( {
+				context: { postType: 'post' },
+				select,
+			} );
+
+			expect( fields ).toEqual( [] );
+		} );
+
 		it( 'should return an empty array when any other block than the Date block is selected', () => {
 			const select = () => ( {
 				getSelectedBlock: () => ( {
@@ -190,6 +200,7 @@ describe( 'post-data bindings', () => {
 			} );
 
 			const fields = postDataBindings.getFieldsList( {
+				context: { postId: 123, postType: 'post' },
 				select,
 			} );