Pass block name to render callback

Author: mattheu

lib/blocks.php

@@ -104,7 +104,7 @@ function gutenberg_render_block( $block ) {
 	if ( $block_name ) {
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 		if ( null !== $block_type && $block_type->is_dynamic() ) {
-			return $block_type->render( $attributes, $raw_content );
+			return $block_type->render( $attributes, $raw_content, $block_name );
 		}
 	}
 
@@ -194,7 +194,7 @@ function do_blocks( $content ) {
 		}
 
 		// Replace dynamic block with server-rendered output.
-		$rendered_content .= $block_type->render( $attributes, $block_content );
+		$rendered_content .= $block_type->render( $attributes, $block_content, $block_name );
 
 		if ( ! $is_self_closing ) {
 			$content = substr( $content, $end_offset + strlen( $end_tag ) );

lib/class-wp-block-type.php

@@ -95,17 +95,18 @@ public function __construct( $block_type, $args = array() ) {
 	 * @since 0.6.0
 	 *
 	 * @param array  $attributes Optional. Block attributes. Default empty array.
-	 * @param string $content Optional. Block content. Default empty string.
+	 * @param string $content    Optional. Block content. Default empty string.
+	 * @param string $block_name Optional. Block Name. The name of the block.
 	 * @return string Rendered block type output.
 	 */
-	public function render( $attributes = array(), $content = '' ) {
+	public function render( $attributes = array(), $content = '', $block_name = null ) {
 		if ( ! $this->is_dynamic() ) {
 			return '';
 		}
 
 		$attributes = $this->prepare_attributes_for_render( $attributes );
 
-		return (string) call_user_func( $this->render_callback, $attributes, $content );
+		return (string) call_user_func( $this->render_callback, $attributes, $content, $block_name );
 	}
 
 	/**

phpunit/class-block-type-test.php

@@ -61,8 +61,9 @@ function test_dynamic_block_with_content() {
 		$block_type = new WP_Block_Type( 'core/dummy', array(
 			'render_callback' => array( $this, 'render_dummy_block_with_content' ),
 		) );
-		$output     = json_decode( $block_type->render( array(), 'hello world' ), true );
+		$output     = json_decode( $block_type->render( array(), 'hello world', 'core/dummy' ), true );
 		$this->assertEquals( 'hello world', $output['_content'] );
+		$this->assertEquals( 'core/dummy', $output['_block_name'] );
 	}
 
 	function test_prepare_attributes() {
@@ -107,8 +108,9 @@ function render_dummy_block( $attributes ) {
 		return json_encode( $attributes );
 	}
 
-	function render_dummy_block_with_content( $attributes, $content ) {
-		$attributes['_content'] = $content;
+	function render_dummy_block_with_content( $attributes, $content, $block_name ) {
+		$attributes['_content']    = $content;
+		$attributes['_block_name'] = $block_name;
 
 		return json_encode( $attributes );
 	}