Terms Query: Show nested terms toggle when inheriting (#72510)

Co-authored-by: mikachan <mikachan@git.wordpress.org>
Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org>
Co-authored-by: cr0ybot <cr0ybot@git.wordpress.org>

Author: 3 people

packages/block-library/src/term-template/index.php

@@ -38,10 +38,16 @@ function render_block_core_term_template( $attributes, $content, $block ) {
 		// Get the current term and taxonomy from the queried object.
 		$queried_object = get_queried_object();
 
-		// For hierarchical taxonomies, show direct children of the current term.
+		// For hierarchical taxonomies, show children of the current term.
 		// For non-hierarchical taxonomies, show all terms (don't set parent).
 		if ( is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
-			$query_args['parent'] = $queried_object->term_id;
+			// If showNested is true, use child_of to include nested terms.
+			// Otherwise, use parent to show only direct children.
+			if ( ! empty( $query['showNested'] ) ) {
+				$query_args['child_of'] = $queried_object->term_id;
+			} else {
+				$query_args['parent'] = $queried_object->term_id;
+			}
 		}
 		$query_args['taxonomy'] = $queried_object->taxonomy;
 	} else {

packages/block-library/src/terms-query/edit/inspector-controls/index.js

@@ -55,8 +55,8 @@ export default function TermsQueryInspectorControls( {
 		templateSlug?.startsWith( 'taxonomy-' ) ||
 		templateSlug?.startsWith( 'category-' ) ||
 		templateSlug?.startsWith( 'tag-' );
-	// Only display the showNested control if the taxonomy is hierarchical and not inheriting.
-	const displayShowNestedControl = isTaxonomyHierarchical && ! inheritQuery;
+	// Display the showNested control if the taxonomy is hierarchical.
+	const displayShowNestedControl = isTaxonomyHierarchical;
 	const hasIncludeFilter = !! include?.length;
 
 	// Labels shared between ToolsPanelItem and its child control.

packages/block-library/src/terms-query/edit/inspector-controls/inherit-control.js

@@ -17,14 +17,12 @@ export default function InheritControl( { value, onChange, label } ) {
 			onChange={ ( newValue ) => {
 				onChange( {
 					inherit: newValue === 'default',
-					// When enabling inherit, hierarchical is not supported.
-					...( newValue === 'default' ? { showNested: false } : {} ),
 				} );
 			} }
 			help={
 				value
 					? __(
-							'Display terms based on the current taxonomy archive. For hierarchical taxonomies, shows direct children of the current term. For non-hierarchical taxonomies, shows all terms.'
+							'Display terms based on the current taxonomy archive. For hierarchical taxonomies, shows children of the current term. For non-hierarchical taxonomies, shows all terms.'
 					  )
 					: __( 'Display terms based on specific criteria.' )
 			}