Redo RSVP Empty feature as a block.

GatherPress · Dec 25, 2024 · 4df96fa · 4df96fa
1 parent 1cc969b
commit 4df96fa
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 109 deletions.
diff --git a/build/blocks/rsvp-response-v2/block.json b/build/blocks/rsvp-response-v2/block.json
@@ -8,12 +8,7 @@
   "icon": "groups",
   "example": {},
   "description": "Displays a list of members who have confirmed their attendance for an event.",
-  "attributes": {
-    "emptyRsvpMessage": {
-      "type": "string",
-      "default": "No one is attending this event yet."
-    }
-  },
+  "attributes": {},
   "supports": {
     "align": [
       "wide",
@@ -22,11 +17,6 @@
     "interactivity": true,
     "html": false
   },
-  "allowedBlocks": [
-    "core/group",
-    "core/comment-author-name",
-    "core/avatar"
-  ],
   "providesContext": {
     "commentId": "commentId"
   },

diff --git a/build/blocks/rsvp-response-v2/index.asset.php b/build/blocks/rsvp-response-v2/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '2201207c7bbc3cfad47e');
+<?php return array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'a1a7e7ae20945bbd7d12');
diff --git a/build/blocks/rsvp-response-v2/index.js b/build/blocks/rsvp-response-v2/index.js
diff --git a/build/blocks/rsvp-template/view.asset.php b/build/blocks/rsvp-template/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '1691210014ab76aac638', 'type' => 'module');
+<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '7b668610c20f0dddfa3b', 'type' => 'module');
diff --git a/build/blocks/rsvp-template/view.js b/build/blocks/rsvp-template/view.js
diff --git a/build/utility_style-rtl.css b/build/utility_style-rtl.css
diff --git a/build/utility_style.asset.php b/build/utility_style.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'eaf74a388a7076b33c99');
+<?php return array('dependencies' => array(), 'version' => '5b6cb9b271535a842021');
diff --git a/build/utility_style.css b/build/utility_style.css
diff --git a/includes/core/classes/blocks/class-rsvp-response.php b/includes/core/classes/blocks/class-rsvp-response.php
@@ -82,30 +82,43 @@ protected function setup_hooks(): void {
 	 */
 	public function transform_block_content( string $block_content, array $block ): string {
 		if ( self::BLOCK_NAME === $block['blockName'] ) {
-			$event              = new Event( get_the_ID() );
-			$tag                = new WP_HTML_Tag_Processor( $block_content );
-			$empty_rsvp_message = $block['attrs']['emptyRsvpMessage'] ?? __( 'No one is attending this event yet.', 'gatherpress' );
+			$event = new Event( get_the_ID() );
+			$tag   = new WP_HTML_Tag_Processor( $block_content );
 
 			if ( ! $event->rsvp ) {
 				return $block_content;
 			}
 
 			if ( $tag->next_tag() ) {
-				$tag->set_attribute(
-					'data-wp-interactive',
-					'gatherpress/rsvp'
-				);
-				$responses        = (int) $event->rsvp->responses()['attending']['count'];
-				$visibility_class = empty( $responses ) ? 'gatherpress--is-visible' : '';
-				$block_content    = $tag->get_updated_html();
-
-				// @todo: Replace this workaround with a method to properly update inner blocks
-				// when https://github.com/WordPress/gutenberg/issues/60397 is resolved.
-				$block_content = preg_replace(
-					'/(<\/div>)\s*$/',
-					sprintf( '<p class="gatherpress--empty-rsvp-message %s">' . wp_kses_post( $empty_rsvp_message ) . '</p>$1', esc_attr( $visibility_class ) ),
-					$block_content
-				);
+				$tag->set_attribute( 'data-wp-interactive', 'gatherpress/rsvp' );
+
+				$responses = (int) $event->rsvp->responses()['attending']['count'];
+
+				while ( $tag->next_tag() ) {
+					$class_attr = $tag->get_attribute( 'class' );
+
+					if ( $class_attr && false !== strpos( $class_attr, 'gatherpress--empty-rsvp' ) ) {
+						if ( ! empty( $responses ) ) {
+							$updated_class  = str_replace(
+								'gatherpress--is-visible',
+								'',
+								$class_attr
+							);
+							$updated_class .= ' gatherpress--is-not-visible';
+						} else {
+							$updated_class  = str_replace(
+								'gatherpress--is-not-visible',
+								'',
+								$class_attr
+							);
+							$updated_class .= ' gatherpress--is-visible';
+						}
+
+						$tag->set_attribute( 'class', trim( $updated_class ) );
+					}
+				}
+
+				$block_content = $tag->get_updated_html();
 			}
 		}
 

diff --git a/src/blocks/rsvp-response-v2/block.json b/src/blocks/rsvp-response-v2/block.json
@@ -8,23 +8,12 @@
 	"icon": "groups",
 	"example": {},
 	"description": "Displays a list of members who have confirmed their attendance for an event.",
-	"attributes": {
-		"emptyRsvpMessage": {
-			"type": "string",
-			"default": "No one is attending this event yet."
-
-		}
-	},
+	"attributes": {},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"interactivity": true,
 		"html": false
 	},
-	"allowedBlocks": [
-		"core/group",
-		"core/comment-author-name",
-		"core/avatar"
-	],
 	"providesContext": {
 		"commentId": "commentId"
 	},
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '2201207c7bbc3cfad47e');
		<?php return array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'a1a7e7ae20945bbd7d12');