Fix support for blockquote

alleyinteractive · Jul 25, 2024 · 469f349 · 469f349
1 parent d5c8c0e
commit 469f349
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/class-block-converter.php b/src/class-block-converter.php
@@ -148,8 +148,33 @@ protected function h( DOMNode $node ): ?Block {
 	 * @return Block|null
 	 */
 	protected function blockquote( DOMNode $node ): ?Block {
+		// Set the class on the node equal to wp-block-quote.
+		if ( $node instanceof DOMElement && empty( $node->getAttribute( 'class' ) ) ) {
+			$node->setAttribute( 'class', 'wp-block-quote' );
+		}
+
+		$children = '';
+
+		// Recursively convert the children of the blockquote to blocks.
+		foreach ( $node->childNodes as $child ) {
+			$child_block = $this->{$child->nodeName}( $child );
+
+			if ( ! empty( $child_block ) ) {
+				$children .= $this->minify_block( (string) $child_block );
+			}
+		}
+
+		// Replace the children with a placeholder that will be replaced with
+		// the children after the blockquote is converted to block.
+		if ( ! empty( $node->nodeValue ) ) {
+			$node->nodeValue = '__CHILDREN__';
+		}
+
 		$content = static::get_node_html( $node );
 
+		// Replace the closing blockquote tag with the children.
+		$content = str_replace( '__CHILDREN__', $children, $content );
+
 		if ( empty( $content ) ) {
 			return null;
 		}

diff --git a/tests/feature/BlockConverterTest.php b/tests/feature/BlockConverterTest.php
@@ -82,10 +82,10 @@ public static function converter_data_provider() {
 				'<ul><li>Random content</li><li>Another random content</li></ul>',
 				'<!-- wp:list --><ul><li>Random content</li><li>Another random content</li></ul><!-- /wp:list -->',
 			],
-			// 'blockquote' => [
-			// 	'<blockquote><p>Lorem ipsum</p></blockquote>',
-			// 	'<!-- wp:quote --><blockquote class="wp-block-quote"><!-- wp:paragraph --><p>Lorem ipsum</p><!-- /wp:paragraph --></blockquote><!-- /wp:quote -->',
-			// ],
+			'blockquote' => [
+				'<blockquote><p>Lorem ipsum</p></blockquote>',
+				'<!-- wp:quote --><blockquote class="wp-block-quote"><!-- wp:paragraph --><p>Lorem ipsum</p><!-- /wp:paragraph --></blockquote><!-- /wp:quote -->',
+			],
 			'non-oembed-embed' => [
 				'<embed type="video/webm" src="/media/mr-arnold.mp4" width="250" height="200" />',
 				'<!-- wp:html --><embed type="video/webm" src="/media/mr-arnold.mp4" width="250" height="200"></embed><!-- /wp:html -->',