diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
index 201ceed737a12..b6a5733632ff4 100644
--- a/packages/block-library/src/query/index.php
+++ b/packages/block-library/src/query/index.php
@@ -44,7 +44,11 @@ function render_block_core_query( $attributes, $content, $block ) {
$block->block_type->supports['interactivity'] = true;
// Add a div to announce messages using `aria-live`.
- $last_div_position = strripos( $content, '' );
+ $html_tag = 'div';
+ if ( ! empty( $attributes['tagName'] ) ) {
+ $html_tag = esc_attr( $attributes['tagName'] );
+ }
+ $last_tag_position = strripos( $content, '' );
$content = substr_replace(
$content,
'',
- $last_div_position,
+ $last_tag_position,
0
);
}
diff --git a/phpunit/blocks/render-query-test.php b/phpunit/blocks/render-query-test.php
index 8a148e89be87b..2d81bfdb513b3 100644
--- a/phpunit/blocks/render-query-test.php
+++ b/phpunit/blocks/render-query-test.php
@@ -131,6 +131,49 @@ public function test_rendering_query_with_enhanced_pagination_auto_disabled_when
$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
}
+
+ /**
+ * Tests that the `core/query` last tag is rendered with the tagName attribute
+ * if is defined, having a div as default.
+ */
+ public function test_enhanced_query_markup_rendering_at_bottom_on_custom_html_element_tags() {
+ global $wp_query, $wp_the_query;
+
+ $content = <<
+
+
+
+HTML;
+
+ // Set main query to single post.
+ $wp_query = new WP_Query(
+ array(
+ 'posts_per_page' => 1,
+ )
+ );
+
+ $wp_the_query = $wp_query;
+
+ $output = do_blocks( $content );
+
+ $p = new WP_HTML_Tag_Processor( $output );
+
+ $p->next_tag( 'span' );
+
+ // Test that there is a div added just after the last tag inside the aside.
+ $this->assertSame( $p->next_tag(), true );
+ // Test that that div is the accesibility one.
+ $this->assertSame( 'screen-reader-text', $p->get_attribute( 'class' ) );
+ $this->assertSame( 'context.core.query.message', $p->get_attribute( 'data-wp-text' ) );
+ $this->assertSame( 'polite', $p->get_attribute( 'aria-live' ) );
+ }
+
/**
* Tests that the `core/query` block adds an extra attribute to disable the
* enhanced pagination in the browser when a post content block is found inside.