fix(post-meta): use block registry for conditional content (#194)

Automattic · Jun 19, 2024 · 3e4c738 · 3e4c738
1 parent 8bf31f5
commit 3e4c738
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/patterns/post-meta-multiple-lines-avatar.php b/patterns/post-meta-multiple-lines-avatar.php
@@ -9,15 +9,16 @@
  * @package Newspack_Block_Theme
  */
 
+$registry = WP_Block_Type_Registry::get_instance();
 ?>
 <!-- wp:group {"metadata":{"name":"Post Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"className":"post-meta","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between","verticalAlignment":"bottom"}} -->
 <div class="wp-block-group post-meta">
-	
+
 <!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"center"}} -->
 <div class="wp-block-group">
 
-<?php if ( class_exists( 'CoAuthors_Guest_Authors' ) ) : ?>
-	
+<?php if ( $registry->get_registered( 'co-authors-plus/coauthors' ) ) : ?>
+
 	<!-- wp:co-authors-plus/coauthors {"layout":{"type":"flex","orientation":"horizontal","flexWrap":"nowrap"},"lock":{"move":true,"remove":true},"style":{"layout":{"selfStretch":"fit"},"spacing":{"blockGap":"0"}},"className":"cap-avatar"} -->
 	<div class="wp-block-co-authors-plus-coauthors cap-avatar"><!-- wp:co-authors-plus/avatar {"size":48} /--></div>
 	<!-- /wp:co-authors-plus/coauthors -->
@@ -31,7 +32,7 @@
 <!-- wp:group {"templateLock":"all","lock":{"move":true,"remove":true},"metadata":{"name":"Byline + Date"},"style":{"spacing":{"blockGap":"4px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group">
 
-<?php if ( class_exists( 'CoAuthors_Guest_Authors' ) ) : ?>
+<?php if ( $registry->get_registered( 'co-authors-plus/coauthors' ) ) : ?>
 
 	<!-- wp:co-authors-plus/coauthors -->
 	<div class="wp-block-co-authors-plus-coauthors"><!-- wp:co-authors-plus/name {"isLink":true} /--></div>
@@ -47,7 +48,7 @@
 <!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<?php if ( function_exists( 'sharing_display' ) ) : ?>
+<?php if ( $registry->get_registered( 'jetpack/sharing-buttons' ) ) : ?>
 
 	<!-- wp:jetpack/sharing-buttons {"styleType":"icon","layout":{"type":"flex","justifyContent":"left","flexWrap":"nowrap"}} -->
 	<ul class="wp-block-jetpack-sharing-buttons has-normal-icon-size jetpack-sharing-buttons__services-list" id="jetpack-sharing-serivces-list">

diff --git a/patterns/post-meta-multiple-lines.php b/patterns/post-meta-multiple-lines.php
@@ -9,14 +9,15 @@
  * @package Newspack_Block_Theme
  */
 
+$registry = WP_Block_Type_Registry::get_instance();
 ?>
 <!-- wp:group {"metadata":{"name":"Post Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"className":"post-meta","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between","verticalAlignment":"bottom"}} -->
 <div class="wp-block-group post-meta">
-	
+
 <!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Meta"},"style":{"spacing":{"blockGap":"4px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group">
 
-<?php if ( class_exists( 'CoAuthors_Guest_Authors' ) ) : ?>
+<?php if ( $registry->get_registered( 'co-authors-plus/coauthors' ) ) : ?>
 
 	<!-- wp:co-authors-plus/coauthors {"lock":{"move":true,"remove":true}} -->
 	<div class="wp-block-co-authors-plus-coauthors"><!-- wp:co-authors-plus/name {"isLink":true,"lock":{"move":true,"remove":true}} /--></div>
@@ -31,7 +32,7 @@
 <!-- wp:post-date {"format":"F j, Y","lock":{"move":true,"remove":true}} /--></div>
 <!-- /wp:group -->
 
-<?php if ( function_exists( 'sharing_display' ) ) : ?>
+<?php if ( $registry->get_registered( 'jetpack/sharing-buttons' ) ) : ?>
 
 	<!-- wp:jetpack/sharing-buttons {"styleType":"icon","layout":{"type":"flex","justifyContent":"left","flexWrap":"nowrap"}} -->
 	<ul class="wp-block-jetpack-sharing-buttons has-normal-icon-size jetpack-sharing-buttons__services-list" id="jetpack-sharing-serivces-list">

diff --git a/patterns/post-meta-single-line-avatar.php b/patterns/post-meta-single-line-avatar.php
@@ -9,18 +9,19 @@
  * @package Newspack_Block_Theme
  */
 
+$registry = WP_Block_Type_Registry::get_instance();
 ?>
 <!-- wp:group {"metadata":{"name":"Post Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"className":"post-meta","layout":{"type":"constrained"}} -->
 <div class="wp-block-group post-meta">
-	
+
 <!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"center","verticalAlignment":"center"}} -->
 <div class="wp-block-group">
-	
-<?php if ( class_exists( 'CoAuthors_Guest_Authors' ) ) : ?>
+
+<?php if ( $registry->get_registered( 'co-authors-plus/coauthors' ) ) : ?>
 
 	<!-- wp:group {"templateLock":"all","lock":{"move":true,"remove":true},"metadata":{"name":"Avatar + Byline"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 	<div class="wp-block-group">
-	
+
 	<!-- wp:co-authors-plus/coauthors {"layout":{"type":"flex","orientation":"horizontal"},"prefix":"","style":{"spacing":{"blockGap":"0"}},"className":"cap-avatar"} -->
 	<div class="wp-block-co-authors-plus-coauthors cap-avatar"><!-- wp:co-authors-plus/avatar /--></div>
 	<!-- /wp:co-authors-plus/coauthors -->
@@ -45,7 +46,7 @@
 <!-- wp:post-date {"lock":{"move":true,"remove":true}} /--></div>
 <!-- /wp:group -->
 
-<?php if ( function_exists( 'sharing_display' ) ) : ?>
+<?php if ( $registry->get_registered( 'jetpack/sharing-buttons' ) ) : ?>
 
 <!-- wp:jetpack/sharing-buttons {"styleType":"icon","layout":{"type":"flex","justifyContent":"center"}} -->
 <ul class="wp-block-jetpack-sharing-buttons has-normal-icon-size jetpack-sharing-buttons__services-list" id="jetpack-sharing-serivces-list">

diff --git a/patterns/post-meta-single-line.php b/patterns/post-meta-single-line.php
@@ -9,18 +9,19 @@
  * @package Newspack_Block_Theme
  */
 
+$registry = WP_Block_Type_Registry::get_instance();
 ?>
 <!-- wp:group {"metadata":{"name":"Post Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"className":"post-meta","layout":{"type":"constrained"}} -->
 <div class="wp-block-group post-meta">
-	
+
 <!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Meta"},"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"center","verticalAlignment":"center"}} -->
 <div class="wp-block-group">
 
-<?php if ( class_exists( 'CoAuthors_Guest_Authors' ) ) : ?>
+<?php if ( $registry->get_registered( 'co-authors-plus/coauthors' ) ) : ?>
 
 	<!-- wp:co-authors-plus/coauthors {"lock":{"move":true,"remove":true}} -->
 	<div class="wp-block-co-authors-plus-coauthors"><!-- wp:co-authors-plus/name {"isLink":true,"lock":{"move":true,"remove":true}} /--></div>
-	
+
 	<!-- /wp:co-authors-plus/coauthors -->
 
 <?php else : ?>
@@ -36,7 +37,7 @@
 <!-- wp:post-date {"lock":{"move":true,"remove":true}} /--></div>
 <!-- /wp:group -->
 
-<?php if ( function_exists( 'sharing_display' ) ) : ?>
+<?php if ( $registry->get_registered( 'jetpack/sharing-buttons' ) ) : ?>
 
 <!-- wp:jetpack/sharing-buttons {"styleType":"icon","layout":{"type":"flex","justifyContent":"center"}} -->
 <ul class="wp-block-jetpack-sharing-buttons has-normal-icon-size jetpack-sharing-buttons__services-list" id="jetpack-sharing-serivces-list">
@@ -49,4 +50,4 @@
 <?php endif; ?>
 
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->