@wordpress/editor 14.32.1-next.ff1cebbba.0 → 14.33.1

package/src/bindings/post-data.js

@@ -3,6 +3,13 @@
  */
 import { __ } from '@wordpress/i18n';
 import { store as coreDataStore } from '@wordpress/core-data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+// Navigation block types that use special handling for backwards compatibility
+const NAVIGATION_BLOCK_TYPES = [
+	'core/navigation-link',
+	'core/navigation-submenu',
+];
 
 /**
  * Gets a list of post data fields with their values and labels
@@ -10,8 +17,9 @@ import { store as coreDataStore } from '@wordpress/core-data';
  * 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 {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 post data fields with their value and label.
  *
  * @example
@@ -29,16 +37,38 @@ import { store as coreDataStore } from '@wordpress/core-data';
  * }
  * ```
  */
-function getPostDataFields( select, context ) {
+function getPostDataFields( select, context, clientId ) {
 	const { getEditedEntityRecord } = select( coreDataStore );
+	const { getBlockAttributes, getBlockName } = select( blockEditorStore );
 
 	let entityDataValues, dataFields;
-	// Try to get the current entity data values.
-	if ( context?.postType && context?.postId ) {
+
+	/*
+	 * 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 postId, postType;
+
+	if ( isNavigationBlock ) {
+		// Navigation blocks: read from block attributes
+		const blockAttributes = getBlockAttributes?.( clientId );
+		postId = blockAttributes?.id;
+		postType = blockAttributes?.type;
+	} else {
+		// All other blocks: use context
+		postId = context?.postId;
+		postType = context?.postType;
+	}
+
+	// Try to get the current entity data values using resolved identifiers.
+	if ( postType && postId ) {
 		entityDataValues = getEditedEntityRecord(
 			'postType',
-			context?.postType,
-			context?.postId
+			postType,
+			postId
 		);
 		dataFields = {
 			date: {
@@ -51,6 +81,11 @@ function getPostDataFields( select, context ) {
 				value: entityDataValues?.modified,
 				type: 'string',
 			},
+			link: {
+				label: __( 'Post Link' ),
+				value: entityDataValues?.link,
+				type: 'string',
+			},
 		};
 	}
 
@@ -66,23 +101,32 @@ function getPostDataFields( select, context ) {
  */
 export default {
 	name: 'core/post-data',
-	getValues( { select, context, bindings } ) {
-		const dataFields = getPostDataFields( select, context );
+	getValues( { select, context, bindings, clientId } ) {
+		const dataFields = getPostDataFields( select, context, clientId );
 
 		const newValues = {};
 		for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
 			// Use the value, the field label, or the field key.
-			const fieldKey = source.args.key;
+			const fieldKey = source.args.field;
 			const { value: fieldValue, label: fieldLabel } =
 				dataFields?.[ fieldKey ] || {};
 			newValues[ attributeName ] = fieldValue ?? fieldLabel ?? fieldKey;
 		}
 		return newValues;
 	},
-	setValues( { dispatch, context, bindings } ) {
+	setValues( { dispatch, context, bindings, clientId, select } ) {
+		const { getBlockName } = select( blockEditorStore );
+
+		const blockName = getBlockName?.( clientId );
+
+		// Navigaton block types are read-only.
+		// See https://github.com/WordPress/gutenberg/pull/72165.
+		if ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {
+			return false;
+		}
 		const newData = {};
 		Object.values( bindings ).forEach( ( { args, newValue } ) => {
-			newData[ args.key ] = newValue;
+			newData[ args.field ] = newValue;
 		} );
 
 		dispatch( coreDataStore ).editEntityRecord(
@@ -93,6 +137,17 @@ export default {
 		);
 	},
 	canUserEditValue( { select, context, args } ) {
+		const { getBlockName, getSelectedBlockClientId } =
+			select( blockEditorStore );
+		const clientId = getSelectedBlockClientId();
+		const blockName = getBlockName?.( clientId );
+
+		// Navigaton block types are read-only.
+		// See https://github.com/WordPress/gutenberg/pull/72165.
+		if ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {
+			return false;
+		}
+
 		// Lock editing in query loop.
 		if ( context?.query || context?.queryId ) {
 			return false;
@@ -103,8 +158,9 @@ export default {
 			return false;
 		}
 
-		const fieldValue = getPostDataFields( select, context )?.[ args.key ]
-			?.value;
+		const fieldValue = getPostDataFields( 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;
@@ -123,20 +179,25 @@ export default {
 		return true;
 	},
 	getFieldsList( { select, context } ) {
+		const clientId = select( blockEditorStore ).getSelectedBlockClientId();
 		// Deprecated, will be removed after 6.9.
-		return getPostDataFields( select, context );
+		return getPostDataFields( select, context, clientId );
 	},
 	editorUI( { select, context } ) {
-		const selectedBlock = select( 'core/block-editor' ).getSelectedBlock();
+		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 ) ) {
+			return {};
+		}
 		const postDataFields = Object.entries(
 			getPostDataFields( select, context ) || {}
 		).map( ( [ key, field ] ) => ( {
 			label: field.label,
 			args: {
-				key,
+				field: key,
 			},
 			type: field.type,
 		} ) );

package/src/bindings/term-data.js

@@ -0,0 +1,224 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { store as coreDataStore } from '@wordpress/core-data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+// Navigation block types that use special handling for backwards compatibility
+const NAVIGATION_BLOCK_TYPES = [
+	'core/navigation-link',
+	'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;
+}
+
+/**
+ * @type {WPBlockBindingsSource}
+ */
+export default {
+	name: 'core/term-data',
+	usesContext: [ 'taxonomy', 'termId', 'termData' ],
+	getValues( { select, context, bindings, clientId } ) {
+		const dataFields = getTermDataFields( select, context, clientId );
+
+		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;
+		}
+		return newValues;
+	},
+	// eslint-disable-next-line no-unused-vars
+	setValues( { dispatch, context, bindings } ) {
+		// Terms are typically not editable through block bindings in most contexts.
+		return false;
+	},
+	canUserEditValue( { select, context, args } ) {
+		const { getBlockName, getSelectedBlockClientId } =
+			select( blockEditorStore );
+
+		const clientId = getSelectedBlockClientId();
+		const blockName = getBlockName?.( clientId );
+
+		// Navigaton block types are read-only.
+		// See https://github.com/WordPress/gutenberg/pull/72165.
+		if ( NAVIGATION_BLOCK_TYPES.includes( blockName ) ) {
+			return false;
+		}
+
+		// Terms are typically read-only when displayed.
+		if ( context?.termQuery ) {
+			return false;
+		}
+
+		// Lock editing when `taxonomy` or `termId` is not defined.
+		if ( ! context?.taxonomy || ! context?.termId ) {
+			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 } ) {
+		// Deprecated, will be removed after 6.9.
+		return getTermDataFields( select, context );
+	},
+	editorUI( { select, context } ) {
+		const selectedBlock = select( blockEditorStore ).getSelectedBlock();
+		// Exit early for navigation blocks (read-only)
+		if ( NAVIGATION_BLOCK_TYPES.includes( selectedBlock?.name ) ) {
+			return {};
+		}
+		const termDataFields = Object.entries(
+			getTermDataFields( select, context ) || {}
+		).map( ( [ key, field ] ) => ( {
+			label: field.label,
+			type: field.type,
+			args: {
+				field: key,
+			},
+		} ) );
+		/*
+		 * We need to define the data as [{ label: string, value: any, type: https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/#type-validation }]
+		 */
+		return {
+			mode: 'dropdown',
+			data: termDataFields,
+		};
+	},
+};

package/src/components/collab-sidebar/add-comment.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __, _x } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import {
 	__experimentalHStack as HStack,
@@ -11,7 +11,6 @@ import {
 	store as blockEditorStore,
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
-import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -29,28 +28,17 @@ export function AddComment( {
 	setShowCommentBoard,
 	commentSidebarRef,
 } ) {
-	const { clientId, blockCommentId, isEmptyDefaultBlock } = useSelect(
-		( select ) => {
-			const { getSelectedBlock } = select( blockEditorStore );
-			const selectedBlock = getSelectedBlock();
-			return {
-				clientId: selectedBlock?.clientId,
-				blockCommentId: selectedBlock?.attributes?.metadata?.commentId,
-				isEmptyDefaultBlock: selectedBlock
-					? isUnmodifiedDefaultBlock( selectedBlock )
-					: false,
-			};
-		},
-		[]
-	);
+	const { clientId, blockCommentId } = useSelect( ( select ) => {
+		const { getSelectedBlock } = select( blockEditorStore );
+		const selectedBlock = getSelectedBlock();
+		return {
+			clientId: selectedBlock?.clientId,
+			blockCommentId: selectedBlock?.attributes?.metadata?.noteId,
+		};
+	}, [] );
 	const blockElement = useBlockElement( clientId );
 
-	if (
-		! showCommentBoard ||
-		! clientId ||
-		undefined !== blockCommentId ||
-		isEmptyDefaultBlock
-	) {
+	if ( ! showCommentBoard || ! clientId || undefined !== blockCommentId ) {
 		return null;
 	}
 
@@ -68,12 +56,13 @@ export function AddComment( {
 				onSubmit={ async ( inputComment ) => {
 					const { id } = await onSubmit( { content: inputComment } );
 					focusCommentThread( id, commentSidebarRef.current );
+					setShowCommentBoard( false );
 				} }
 				onCancel={ () => {
 					setShowCommentBoard( false );
 					blockElement?.focus();
 				} }
-				submitButtonText={ _x( 'Note', 'Add note button' ) }
+				submitButtonText={ __( 'Add note' ) }
 				labelText={ __( 'New Note' ) }
 			/>
 		</VStack>

package/src/components/collab-sidebar/comment-menu-item.js

@@ -26,7 +26,7 @@ const AddCommentMenuItem = ( { onClick } ) => {
 					} }
 					aria-haspopup="dialog"
 				>
-					{ __( 'Note' ) }
+					{ __( 'Add note' ) }
 				</MenuItem>
 			) }
 		</CommentIconSlotFill.Fill>