Reactions: Fix fallback for blocks with default title (#1705)

Author: obenland

.github/changelog/1705-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed a bug where Reaction blocks without modified titles did not get displayed correctly.

build/reactions/block.json

@@ -2,7 +2,7 @@
   "$schema": "https://schemas.wp.org/trunk/block.json",
   "name": "activitypub/reactions",
   "apiVersion": 2,
-  "version": "1.0.0",
+  "version": "2.0.0",
   "title": "Fediverse Reactions",
   "category": "widgets",
   "icon": "heart",

build/reactions/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '13c017000d37a3025875');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '3a159dbba14b00d4163c');

build/reactions/index.js

@@ -186,8 +186,21 @@ public static function render_post_reactions_block( $attrs, $content ) {
 		}
 
 		$args = array( 'data-attrs' => wp_json_encode( $attrs ) );
-		if ( isset( $attrs['title'] ) ) {
-			$args['class'] = 'activitypub-reactions-block';
+		if ( empty( $content ) ) {
+			if ( isset( $attrs['title'] ) ) {
+				$content = '<div class="activitypub-reactions"><div class="activitypub-reactions-block" ' . \get_block_wrapper_attributes( $args ) . '></div></div>';
+			} else {
+				$has_comments = \get_comments(
+					array(
+						'post_id' => $attrs['postId'],
+						'fields'  => 'ids',
+						'type'    => Comment::get_comment_type_slugs(),
+					)
+				);
+				if ( $has_comments ) {
+					$content = '<div class="activitypub-reactions"><h6>' . \__( 'Fediverse Reactions', 'activitypub' ) . '</h6><div class="activitypub-reactions-block" ' . \get_block_wrapper_attributes( $args ) . '></div></div>';
+				}
+			}
 		}
 
 		return sprintf(

includes/class-blocks.php

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"name": "activitypub/reactions",
 	"apiVersion": 2,
-	"version": "1.0.0",
+	"version": "2.0.0",
 	"title": "Fediverse Reactions",
 	"category": "widgets",
 	"icon": "heart",

src/reactions/block.json

@@ -155,14 +155,13 @@ export default function Edit( { attributes, __unstableLayoutClassNames } ) {
 		],
 	];
 
-	const ALLOWED_BLOCKS = [ 'core/heading' ];
-
 	return (
 		<div { ...blockProps }>
 			<InnerBlocks
 				template={ TEMPLATE }
-				allowedBlocks={ ALLOWED_BLOCKS }
-				templateLock={ false }
+				allowedBlocks={ [ 'core/heading' ] }
+				templateLock={ 'all' }
+				renderAppender={ false }
 			/>
 			<Reactions reactions={ dummyReactions } />
 		</div>