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

package/src/breadcrumbs/edit.js

@@ -6,7 +6,7 @@ import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
 import {
 	ToggleControl,
 	TextControl,
-	SelectControl,
+	CheckboxControl,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	Spinner,
@@ -22,87 +22,72 @@ import { useServerSideRender } from '@wordpress/server-side-render';
 import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
 
 const separatorDefaultValue = '/';
-const typeDefaultValue = 'auto';
-
-const BREADCRUMB_TYPES = {
-	auto: {
-		help: __(
-			'Try to automatically determine the best type of breadcrumb for the template.'
-		),
-	},
-	postWithAncestors: {
-		help: __(
-			'Shows breadcrumbs based on post hierarchy. Only works for hierarchical post types.'
-		),
-		placeholderItems: [ __( 'Ancestor' ), __( 'Parent' ) ],
-	},
-	postWithTerms: {
-		help: __(
-			'Shows breadcrumbs based on taxonomy terms. Chooses the first taxonomy with assigned terms and includes ancestors if the taxonomy is hierarchical.'
-		),
-		placeholderItems: [ __( 'Category' ) ],
-	},
-};
 
 export default function BreadcrumbEdit( {
 	attributes,
 	setAttributes,
 	context: { postId, postType, templateSlug },
 } ) {
-	const { separator, showHomeLink, type } = attributes;
-	const { post, isPostTypeHierarchical, hasTermsAssigned, isLoading } =
-		useSelect(
-			( select ) => {
-				if ( ! postType ) {
-					return {};
-				}
-				const _post = select( coreStore ).getEntityRecord(
-					'postType',
-					postType,
-					postId
-				);
-				const postTypeObject =
-					select( coreStore ).getPostType( postType );
-				const postTypeHasTaxonomies =
-					postTypeObject && postTypeObject.taxonomies.length;
-				let taxonomies;
-				if ( postTypeHasTaxonomies ) {
-					taxonomies = select( coreStore ).getTaxonomies( {
-						type: postType,
-						per_page: -1,
-					} );
-				}
-				return {
-					post: _post,
-					isPostTypeHierarchical: postTypeObject?.hierarchical,
-					hasTermsAssigned:
-						_post &&
-						( taxonomies || [] )
-							.filter(
-								( { visibility } ) =>
-									visibility?.publicly_queryable
-							)
-							.some( ( taxonomy ) => {
-								return !! _post[ taxonomy.rest_base ]?.length;
-							} ),
-					isLoading:
-						! _post ||
-						! postTypeObject ||
-						( postTypeHasTaxonomies && ! taxonomies ),
-				};
-			},
-			[ postType, postId ]
-		);
+	const { separator, showHomeLink, prefersTaxonomy } = attributes;
+	const {
+		post,
+		isPostTypeHierarchical,
+		postTypeHasTaxonomies,
+		hasTermsAssigned,
+		isLoading,
+	} = useSelect(
+		( select ) => {
+			if ( ! postType ) {
+				return {};
+			}
+			const _post = select( coreStore ).getEntityRecord(
+				'postType',
+				postType,
+				postId
+			);
+			const postTypeObject = select( coreStore ).getPostType( postType );
+			const _postTypeHasTaxonomies =
+				postTypeObject && postTypeObject.taxonomies.length;
+			let taxonomies;
+			if ( _postTypeHasTaxonomies ) {
+				taxonomies = select( coreStore ).getTaxonomies( {
+					type: postType,
+					per_page: -1,
+				} );
+			}
+			return {
+				post: _post,
+				isPostTypeHierarchical: postTypeObject?.hierarchical,
+				postTypeHasTaxonomies: _postTypeHasTaxonomies,
+				hasTermsAssigned:
+					_post &&
+					( taxonomies || [] )
+						.filter(
+							( { visibility } ) => visibility?.publicly_queryable
+						)
+						.some( ( taxonomy ) => {
+							return !! _post[ taxonomy.rest_base ]?.length;
+						} ),
+				isLoading:
+					( postId && ! _post ) ||
+					! postTypeObject ||
+					( _postTypeHasTaxonomies && ! taxonomies ),
+			};
+		},
+		[ postType, postId ]
+	);
 
-	// Counter used to cache-bust `useServerSideRender`
-	//
-	// This is a catch-all signal to re-render the block when a post's title,
-	// parent ID, or terms change.
-	//
-	// This is fundamentally imperfect, because there are other entities which
-	// could change in the meantime (the titles of ancestor posts, or the
-	// labels of taxonomy terms), hence the choice to re-render systematically
-	// upon saving.
+	/**
+	 * Counter used to cache-bust `useServerSideRender`.
+	 *
+	 * This is a catch-all signal to re-render the block when a post's title,
+	 * parent ID, or terms change.
+	 *
+	 * This is fundamentally imperfect, because there are other entities which
+	 * could change in the meantime (the titles of ancestor posts, or the
+	 * labels of taxonomy terms), hence the choice to re-render systematically
+	 * upon saving.
+	 */
 	const [ invalidationKey, setInvalidationKey ] = useState( 0 );
 	useEffect( () => {
 		setInvalidationKey( ( c ) => c + 1 );
@@ -124,18 +109,17 @@ export default function BreadcrumbEdit( {
 			</div>
 		);
 	}
-	// TODO: this should be handled better when we add more types.
-	let breadcrumbsType;
-	const isSpecificSupportedTypeSet = [
-		'postWithAncestors',
-		'postWithTerms',
-	].includes( type );
-	if ( isSpecificSupportedTypeSet ) {
-		breadcrumbsType = type;
+
+	// Determine breadcrumb type for accurate previews (matching PHP logic).
+	let _showTerms;
+	if ( ! isPostTypeHierarchical ) {
+		_showTerms = true;
+	} else if ( ! postTypeHasTaxonomies ) {
+		// Hierarchical post type without taxonomies can only use ancestors.
+		_showTerms = false;
 	} else {
-		breadcrumbsType = isPostTypeHierarchical
-			? 'postWithAncestors'
-			: 'postWithTerms';
+		// For hierarchical post types with taxonomies, use the attribute.
+		_showTerms = prefersTaxonomy;
 	}
 	let placeholder = null;
 	// This is fragile because this block is server side rendered and we'll have to
@@ -147,17 +131,20 @@ export default function BreadcrumbEdit( {
 		// This is needed because when we are showing the template in post editor we
 		// want to show the real breadcrumbs if we have the post type.
 		( templateSlug && ! postType ) ||
-		( breadcrumbsType === 'postWithAncestors' &&
-			! isPostTypeHierarchical ) ||
-		( breadcrumbsType === 'postWithTerms' && ! hasTermsAssigned );
+		( ! _showTerms && ! isPostTypeHierarchical ) ||
+		( _showTerms && ! hasTermsAssigned );
 	if ( showPlaceholder ) {
-		const placeholderItems = [
-			showHomeLink && __( 'Home' ),
-			// For now if we are adding this in a template show a generic placeholder.
-			...( templateSlug && ! isSpecificSupportedTypeSet
-				? [ __( 'Page' ) ]
-				: BREADCRUMB_TYPES[ breadcrumbsType ].placeholderItems ),
-		].filter( Boolean );
+		const placeholderItems = [];
+		if ( showHomeLink ) {
+			placeholderItems.push( __( 'Home' ) );
+		}
+		if ( templateSlug && ! postId ) {
+			placeholderItems.push( __( 'Page' ) );
+		} else if ( _showTerms ) {
+			placeholderItems.push( __( 'Category' ) );
+		} else {
+			placeholderItems.push( __( 'Ancestor' ), __( 'Parent' ) );
+		}
 		placeholder = (
 			<nav
 				style={ {
@@ -189,46 +176,10 @@ export default function BreadcrumbEdit( {
 						setAttributes( {
 							separator: separatorDefaultValue,
 							showHomeLink: true,
-							type: typeDefaultValue,
 						} );
 					} }
 					dropdownMenuProps={ dropdownMenuProps }
 				>
-					<ToolsPanelItem
-						label={ __( 'Type' ) }
-						isShownByDefault
-						hasValue={ () => type !== typeDefaultValue }
-						onDeselect={ () =>
-							setAttributes( {
-								type: typeDefaultValue,
-							} )
-						}
-					>
-						<SelectControl
-							__nextHasNoMarginBottom
-							__next40pxDefaultSize
-							label={ __( 'Type' ) }
-							value={ type }
-							onChange={ ( value ) =>
-								setAttributes( { type: value } )
-							}
-							options={ [
-								{
-									label: __( 'Auto' ),
-									value: 'auto',
-								},
-								{
-									label: __( 'Post with ancestors' ),
-									value: 'postWithAncestors',
-								},
-								{
-									label: __( 'Post with terms' ),
-									value: 'postWithTerms',
-								},
-							] }
-							help={ BREADCRUMB_TYPES[ type ].help }
-						/>
-					</ToolsPanelItem>
 					<ToolsPanelItem
 						label={ __( 'Show home link' ) }
 						isShownByDefault
@@ -278,6 +229,19 @@ export default function BreadcrumbEdit( {
 					</ToolsPanelItem>
 				</ToolsPanel>
 			</InspectorControls>
+			<InspectorControls group="advanced">
+				<CheckboxControl
+					__nextHasNoMarginBottom
+					label={ __( 'Prefer taxonomy terms' ) }
+					checked={ prefersTaxonomy }
+					onChange={ ( value ) =>
+						setAttributes( { prefersTaxonomy: value } )
+					}
+					help={ __(
+						'The exact type of breadcrumbs shown will vary automatically depending on the page in which this block is displayed. In the specific case of a hierarchical post type with taxonomies, the breadcrumbs can either reflect its post hierarchy (default) or the hierarchy of its assigned taxonomy terms.'
+					) }
+				/>
+			</InspectorControls>
 			<div { ...blockProps }>
 				{ showPlaceholder ? (
 					placeholder

package/src/breadcrumbs/index.php

@@ -17,25 +17,14 @@
  * @return string Returns the post breadcrumb for hierarchical post types.
  */
 function render_block_core_breadcrumbs( $attributes, $content, $block ) {
-	// Exclude breadcrumbs from special contexts like archives, search, 404, etc.
+	// Exclude breadcrumbs from special contexts like search, 404, etc.
 	// until they are explicitly supported.
-	if ( is_archive() || is_search() || is_404() || is_home() || is_front_page() ) {
-		return '';
-	}
-	if ( ! isset( $block->context['postId'] ) || ! isset( $block->context['postType'] ) ) {
+	if ( is_search() || is_404() || is_home() || is_front_page() ) {
 		return '';
 	}
 
-	$post_id   = $block->context['postId'];
-	$post_type = $block->context['postType'];
-
-	$post = get_post( $post_id );
-	if ( ! $post ) {
-		return '';
-	}
-
-	$type             = $attributes['type'];
 	$breadcrumb_items = array();
+
 	if ( $attributes['showHomeLink'] ) {
 		$breadcrumb_items[] = sprintf(
 			'<a href="%s">%s</a>',
@@ -43,16 +32,52 @@ function render_block_core_breadcrumbs( $attributes, $content, $block ) {
 			esc_html__( 'Home' )
 		);
 	}
-	$supported_types = array( 'postWithAncestors', 'postWithTerms' );
-	// If `type` is not set to a specific breadcrumb type, determine it based on the block's default heuristics.
-	$breadcrumbs_type = in_array( $type, $supported_types, true ) ? $type : block_core_breadcrumbs_get_breadcrumbs_type( $post_type );
-	if ( 'postWithAncestors' === $breadcrumbs_type ) {
-		$breadcrumb_items = array_merge( $breadcrumb_items, block_core_breadcrumbs_get_hierarchical_post_type_breadcrumbs( $post_id ) );
+
+	// Handle archive pages (taxonomy, post type, date, author archives).
+	if ( is_archive() ) {
+		$archive_breadcrumbs = block_core_breadcrumbs_get_archive_breadcrumbs();
+		if ( ! empty( $archive_breadcrumbs ) ) {
+			$breadcrumb_items = array_merge( $breadcrumb_items, $archive_breadcrumbs );
+		}
 	} else {
-		$breadcrumb_items = array_merge( $breadcrumb_items, block_core_breadcrumbs_get_terms_breadcrumbs( $post_id, $post_type ) );
+		// Handle single post/page breadcrumbs.
+		if ( ! isset( $block->context['postId'] ) || ! isset( $block->context['postType'] ) ) {
+			return '';
+		}
+
+		$post_id   = $block->context['postId'];
+		$post_type = $block->context['postType'];
+
+		$post = get_post( $post_id );
+		if ( ! $post ) {
+			return '';
+		}
+
+		// Determine breadcrumb type for accurate rendering (matching JavaScript logic).
+		$show_terms = false;
+		if ( ! is_post_type_hierarchical( $post_type ) ) {
+			$show_terms = true;
+		} elseif ( empty( get_object_taxonomies( $post_type, 'objects' ) ) ) {
+			// Hierarchical post type without taxonomies can only use ancestors.
+			$show_terms = false;
+		} else {
+			// For hierarchical post types with taxonomies, use the attribute.
+			$show_terms = $attributes['prefersTaxonomy'];
+		}
+
+		if ( ! $show_terms ) {
+			$breadcrumb_items = array_merge( $breadcrumb_items, block_core_breadcrumbs_get_hierarchical_post_type_breadcrumbs( $post_id ) );
+		} else {
+			$breadcrumb_items = array_merge( $breadcrumb_items, block_core_breadcrumbs_get_terms_breadcrumbs( $post_id, $post_type ) );
+		}
+		// Add current post title (not linked).
+		$breadcrumb_items[] = sprintf( '<span aria-current="page">%s</span>', get_the_title( $post ) );
+	}
+
+	if ( empty( $breadcrumb_items ) ) {
+		return '';
 	}
-	// Add current post title (not linked).
-	$breadcrumb_items[] = sprintf( '<span aria-current="page">%s</span>', get_the_title( $post ) );
+
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
 			'style'      => '--separator: "' . addcslashes( $attributes['separator'], '\\"' ) . '";',
@@ -77,19 +102,6 @@ function render_block_core_breadcrumbs( $attributes, $content, $block ) {
 	return $breadcrumb_html;
 }
 
-/**
- * Determines the breadcrumb type based on the block's default heuristics.
- *
- * @since 6.9.0
- *
- * @param string $post_type The post type name.
- *
- * @return string The breadcrumb type.
- */
-function block_core_breadcrumbs_get_breadcrumbs_type( $post_type ) {
-	return is_post_type_hierarchical( $post_type ) ? 'postWithAncestors' : 'postWithTerms';
-}
-
 /**
  * Generates breadcrumb items from hierarchical post type ancestors.
  *
@@ -114,6 +126,157 @@ function block_core_breadcrumbs_get_hierarchical_post_type_breadcrumbs( $post_id
 	return $breadcrumb_items;
 }
 
+/**
+ * Generates breadcrumb items for hierarchical term ancestors.
+ *
+ * For hierarchical taxonomies, retrieves and formats ancestor terms as breadcrumb links.
+ *
+ * @since 6.9.0
+ *
+ * @param int    $term_id  The term ID.
+ * @param string $taxonomy The taxonomy name.
+ *
+ * @return array Array of breadcrumb HTML items for ancestors.
+ */
+function block_core_breadcrumbs_get_term_ancestors_items( $term_id, $taxonomy ) {
+	$breadcrumb_items = array();
+
+	// Check if taxonomy is hierarchical and add ancestor term links.
+	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+		$term_ancestors = get_ancestors( $term_id, $taxonomy, 'taxonomy' );
+		$term_ancestors = array_reverse( $term_ancestors );
+		foreach ( $term_ancestors as $ancestor_id ) {
+			$ancestor_term = get_term( $ancestor_id, $taxonomy );
+			if ( $ancestor_term && ! is_wp_error( $ancestor_term ) ) {
+				$breadcrumb_items[] = sprintf(
+					'<a href="%s">%s</a>',
+					esc_url( get_term_link( $ancestor_term ) ),
+					esc_html( $ancestor_term->name )
+				);
+			}
+		}
+	}
+
+	return $breadcrumb_items;
+}
+
+/**
+ * Generates breadcrumb items for archive pages.
+ *
+ * Handles taxonomy archives, post type archives, date archives, and author archives.
+ * For hierarchical taxonomies, includes ancestor terms in the breadcrumb trail.
+ *
+ * @since 6.9.0
+ *
+ * @return array Array of breadcrumb HTML items.
+ */
+function block_core_breadcrumbs_get_archive_breadcrumbs() {
+	$breadcrumb_items = array();
+
+	// Date archive (check first since it doesn't have a queried object).
+	if ( is_date() ) {
+		$year  = get_query_var( 'year' );
+		$month = get_query_var( 'monthnum' );
+		$day   = get_query_var( 'day' );
+
+		// Fallback to 'm' query var for plain permalinks.
+		// Plain permalinks use ?m=YYYYMMDD format instead of separate query vars.
+		if ( ! $year ) {
+			$m = get_query_var( 'm' );
+			if ( $m ) {
+				$year  = substr( $m, 0, 4 );
+				$month = substr( $m, 4, 2 );
+				$day   = (int) substr( $m, 6, 2 );
+			}
+		}
+
+		if ( $year ) {
+			if ( $month ) {
+				// Year is linked if we have month.
+				$breadcrumb_items[] = sprintf(
+					'<a href="%s">%s</a>',
+					esc_url( get_year_link( $year ) ),
+					esc_html( $year )
+				);
+
+				if ( $day ) {
+					// Month is linked if we have day.
+					$breadcrumb_items[] = sprintf(
+						'<a href="%s">%s</a>',
+						esc_url( get_month_link( $year, $month ) ),
+						esc_html( date_i18n( 'F', mktime( 0, 0, 0, $month, 1, $year ) ) )
+					);
+					// Current day.
+					$breadcrumb_items[] = sprintf(
+						'<span aria-current="page">%s</span>',
+						esc_html( $day )
+					);
+				} else {
+					// Current month.
+					$breadcrumb_items[] = sprintf(
+						'<span aria-current="page">%s</span>',
+						esc_html( date_i18n( 'F', mktime( 0, 0, 0, $month, 1, $year ) ) )
+					);
+				}
+			} else {
+				// Current year only.
+				$breadcrumb_items[] = sprintf(
+					'<span aria-current="page">%s</span>',
+					esc_html( $year )
+				);
+			}
+		}
+
+		return $breadcrumb_items;
+	}
+
+	// For other archive types, we need a queried object.
+	$queried_object = get_queried_object();
+
+	if ( ! $queried_object ) {
+		return array();
+	}
+
+	// Taxonomy archive (category, tag, custom taxonomy).
+	if ( $queried_object instanceof WP_Term ) {
+		$term     = $queried_object;
+		$taxonomy = $term->taxonomy;
+
+		// Add hierarchical term ancestors if applicable.
+		$breadcrumb_items = array_merge(
+			$breadcrumb_items,
+			block_core_breadcrumbs_get_term_ancestors_items( $term->term_id, $taxonomy )
+		);
+
+		// Add current term.
+		$breadcrumb_items[] = sprintf(
+			'<span aria-current="page">%s</span>',
+			esc_html( $term->name )
+		);
+	} elseif ( is_post_type_archive() ) {
+		// Post type archive.
+		$post_type = get_query_var( 'post_type' );
+		if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+		}
+		$post_type_object = get_post_type_object( $post_type );
+		if ( $post_type_object ) {
+			$breadcrumb_items[] = sprintf(
+				'<span aria-current="page">%s</span>',
+				esc_html( $post_type_object->labels->name )
+			);
+		}
+	} elseif ( is_author() ) {
+		// Author archive.
+		$author             = $queried_object;
+		$breadcrumb_items[] = sprintf(
+			'<span aria-current="page">%s</span>',
+			esc_html( $author->display_name )
+		);
+	}
+
+	return $breadcrumb_items;
+}
 
 /**
  * Generates breadcrumb items from taxonomy terms.
@@ -158,21 +321,11 @@ function block_core_breadcrumbs_get_terms_breadcrumbs( $post_id, $post_type ) {
 	if ( ! empty( $terms ) ) {
 		// Use the first term (if multiple are assigned).
 		$term = reset( $terms );
-		// Check if taxonomy is hierarchical also add ancestor term links
-		if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-			$term_ancestors = get_ancestors( $term->term_id, $taxonomy_name, 'taxonomy' );
-			$term_ancestors = array_reverse( $term_ancestors );
-			foreach ( $term_ancestors as $ancestor_id ) {
-				$ancestor_term = get_term( $ancestor_id, $taxonomy_name );
-				if ( $ancestor_term && ! is_wp_error( $ancestor_term ) ) {
-					$breadcrumb_items[] = sprintf(
-						'<a href="%s">%s</a>',
-						esc_url( get_term_link( $ancestor_term ) ),
-						esc_html( $ancestor_term->name )
-					);
-				}
-			}
-		}
+		// Add hierarchical term ancestors if applicable.
+		$breadcrumb_items   = array_merge(
+			$breadcrumb_items,
+			block_core_breadcrumbs_get_term_ancestors_items( $term->term_id, $taxonomy_name )
+		);
 		$breadcrumb_items[] = sprintf(
 			'<a href="%s">%s</a>',
 			esc_url( get_term_link( $term ) ),

package/src/buttons/transforms.js

@@ -47,6 +47,7 @@ const transforms = {
 						const url = link?.getAttribute( 'href' );
 						// Create singular button in the buttons block.
 						return createBlock( 'core/button', {
+							...attributes,
 							...getTransformedAttributes(
 								attributes,
 								'core/button',

package/src/categories/edit.js

@@ -189,12 +189,16 @@ export default function CategoriesEdit( {
 			? 'ul'
 			: 'div';
 
-	const classes = clsx( className, {
-		'wp-block-categories-list':
-			!! categories?.length && ! displayAsDropdown && ! isResolving,
-		'wp-block-categories-dropdown':
-			!! categories?.length && displayAsDropdown && ! isResolving,
-	} );
+	const classes = clsx(
+		className,
+		`wp-block-categories-taxonomy-${ taxonomySlug }`,
+		{
+			'wp-block-categories-list':
+				!! categories?.length && ! displayAsDropdown && ! isResolving,
+			'wp-block-categories-dropdown':
+				!! categories?.length && displayAsDropdown && ! isResolving,
+		}
+	);
 
 	const blockProps = useBlockProps( {
 		className: classes,

package/src/categories/index.php

@@ -79,7 +79,7 @@ function render_block_core_categories( $attributes, $content, $block ) {
 		}
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type}" ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type} wp-block-categories-taxonomy-{$attributes['taxonomy']}" ) );
 
 	return sprintf(
 		$wrapper_markup,

package/src/code/transforms.js

@@ -22,6 +22,7 @@ const transforms = {
 			transform: ( attributes ) => {
 				const { content } = attributes;
 				return createBlock( 'core/code', {
+					...attributes,
 					...getTransformedAttributes( attributes, 'core/code' ),
 					content,
 				} );
@@ -33,6 +34,7 @@ const transforms = {
 			transform: ( attributes ) => {
 				const { content: text } = attributes;
 				return createBlock( 'core/code', {
+					...attributes,
 					...getTransformedAttributes( attributes, 'core/code' ),
 					// The HTML is plain text (with plain line breaks), so
 					// convert it to rich text.

package/src/editor.scss

@@ -24,6 +24,7 @@
 @use "./html/editor.scss" as *;
 @use "./image/editor.scss" as *;
 @use "./latest-posts/editor.scss" as *;
+@use "./math/editor.scss" as *;
 @use "./media-text/editor.scss" as *;
 @use "./more/editor.scss" as *;
 @use "./navigation/editor.scss" as *;

package/src/home-link/block.json

@@ -9,7 +9,8 @@
 	"textdomain": "default",
 	"attributes": {
 		"label": {
-			"type": "string"
+			"type": "string",
+			"role": "content"
 		}
 	},
 	"usesContext": [