@automattic/newspack-blocks 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.2.4](https://github.com/Automattic/newspack-blocks/compare/v2.2.3...v2.2.4) (2023-12-06)
+
+
+### Bug Fixes
+
+* **homepage-posts:** handle empty block when printing inline styles ([#1621](https://github.com/Automattic/newspack-blocks/issues/1621)) ([c3aa957](https://github.com/Automattic/newspack-blocks/commit/c3aa9577c2284f2139c8fa1170785db9fe4edfe9))
+
 ## [2.2.3](https://github.com/Automattic/newspack-blocks/compare/v2.2.2...v2.2.3) (2023-12-04)
 
 

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         2.2.3
+ * Version:         2.2.4
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '2.2.3' );
+define( 'NEWSPACK_BLOCKS__VERSION', '2.2.4' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "2.2.3",
+	"version": "2.2.4",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.5.1",

package/src/blocks/homepage-articles/view.php

@@ -227,6 +227,10 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 	}
 
 	$block_name = apply_filters( 'newspack_blocks_block_name', 'newspack-blocks/homepage-articles' );
+	$article_query = new WP_Query( Newspack_Blocks::build_articles_query( $attributes, $block_name ) );
+	if ( ! $article_query->have_posts() ) {
+		return;
+	}
 
 	// Gather all Homepage Articles blocks on the page and output only the needed CSS.
 	// This CSS will be printed along with the first found block markup.
@@ -249,8 +253,6 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 	// This will let the FSE plugin know we need CSS/JS now.
 	do_action( 'newspack_blocks_render_homepage_articles' );
 
-	$article_query = new WP_Query( Newspack_Blocks::build_articles_query( $attributes, $block_name ) );
-
 	$classes = Newspack_Blocks::block_classes( 'homepage-articles', $attributes, [ 'wpnbha' ] );
 
 	if ( isset( $attributes['postLayout'] ) && 'grid' === $attributes['postLayout'] ) {
@@ -352,55 +354,53 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 
 	ob_start();
 
-	if ( $article_query->have_posts() ) :
-		?>
-		<div
-			class="<?php echo esc_attr( $classes ); ?>"
-			style="<?php echo esc_attr( $styles ); ?>"
-			>
-			<?php echo $inline_style_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-			<div data-posts data-current-post-id="<?php the_ID(); ?>">
-				<?php if ( '' !== $attributes['sectionHeader'] ) : ?>
-					<h2 class="article-section-title">
-						<span><?php echo wp_kses_post( $attributes['sectionHeader'] ); ?></span>
-					</h2>
-				<?php endif; ?>
-				<?php
-				echo Newspack_Blocks::template_inc( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					__DIR__ . '/templates/articles-list.php',
-					[
-						'articles_rest_url' => $articles_rest_url, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-						'article_query'     => $article_query, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-						'attributes'        => $attributes, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					]
-				);
-				?>
-			</div>
-			<?php
-
-			if ( $has_more_button ) :
-				?>
-				<button type="button" class="wp-block-button__link" data-next="<?php echo esc_url( $articles_rest_url ); ?>">
-				<?php
-				if ( ! empty( $attributes['moreButtonText'] ) ) {
-					echo esc_html( $attributes['moreButtonText'] );
-				} else {
-					esc_html_e( 'Load more posts', 'newspack-blocks' );
-				}
-				?>
-				</button>
-				<p class="loading">
-					<?php esc_html_e( 'Loading...', 'newspack-blocks' ); ?>
-				</p>
-				<p class="error">
-					<?php esc_html_e( 'Something went wrong. Please refresh the page and/or try again.', 'newspack-blocks' ); ?>
-				</p>
-
+	?>
+	<div
+		class="<?php echo esc_attr( $classes ); ?>"
+		style="<?php echo esc_attr( $styles ); ?>"
+		>
+		<?php echo $inline_style_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+		<div data-posts data-current-post-id="<?php the_ID(); ?>">
+			<?php if ( '' !== $attributes['sectionHeader'] ) : ?>
+				<h2 class="article-section-title">
+					<span><?php echo wp_kses_post( $attributes['sectionHeader'] ); ?></span>
+				</h2>
 			<?php endif; ?>
-
+			<?php
+			echo Newspack_Blocks::template_inc( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				__DIR__ . '/templates/articles-list.php',
+				[
+					'articles_rest_url' => $articles_rest_url, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					'article_query'     => $article_query, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					'attributes'        => $attributes, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				]
+			);
+			?>
 		</div>
 		<?php
-	endif;
+
+		if ( $has_more_button ) :
+			?>
+			<button type="button" class="wp-block-button__link" data-next="<?php echo esc_url( $articles_rest_url ); ?>">
+			<?php
+			if ( ! empty( $attributes['moreButtonText'] ) ) {
+				echo esc_html( $attributes['moreButtonText'] );
+			} else {
+				esc_html_e( 'Load more posts', 'newspack-blocks' );
+			}
+			?>
+			</button>
+			<p class="loading">
+				<?php esc_html_e( 'Loading...', 'newspack-blocks' ); ?>
+			</p>
+			<p class="error">
+				<?php esc_html_e( 'Something went wrong. Please refresh the page and/or try again.', 'newspack-blocks' ); ?>
+			</p>
+
+		<?php endif; ?>
+
+	</div>
+	<?php
 
 	$content = ob_get_clean();
 	Newspack_Blocks::enqueue_view_assets( 'homepage-articles' );

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc6f59d07545419e251f831c83df7a09a::getLoader();
+return ComposerAutoloaderInitf559f43ea8b3d30d4a1ab15d2fd6928b::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc6f59d07545419e251f831c83df7a09a
+class ComposerAutoloaderInitf559f43ea8b3d30d4a1ab15d2fd6928b
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitc6f59d07545419e251f831c83df7a09a
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc6f59d07545419e251f831c83df7a09a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitf559f43ea8b3d30d4a1ab15d2fd6928b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitc6f59d07545419e251f831c83df7a09a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitf559f43ea8b3d30d4a1ab15d2fd6928b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitc6f59d07545419e251f831c83df7a09a::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitf559f43ea8b3d30d4a1ab15d2fd6928b::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitc6f59d07545419e251f831c83df7a09a
+class ComposerStaticInitf559f43ea8b3d30d4a1ab15d2fd6928b
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitc6f59d07545419e251f831c83df7a09a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitc6f59d07545419e251f831c83df7a09a::$classMap;
+            $loader->classMap = ComposerStaticInitf559f43ea8b3d30d4a1ab15d2fd6928b::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '8a9a76fb970ffac6f00f67f83a17a931a169c103',
+        'reference' => 'c3aa9577c2284f2139c8fa1170785db9fe4edfe9',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '8a9a76fb970ffac6f00f67f83a17a931a169c103',
+            'reference' => 'c3aa9577c2284f2139c8fa1170785db9fe4edfe9',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),