Merge pull request #517 from Automattic/master

Release 09/06/2020

Author: adekbadek

class-newspack-blocks.php

@@ -195,7 +195,7 @@ public static function block_classes( $type, $attributes = array(), $extra = arr
 			$classes = array_merge( $classes, $extra );
 		}
 
-		return implode( $classes, ' ' );
+		return implode( ' ', $classes );
 	}
 
 	/**
@@ -320,6 +320,31 @@ public static function build_articles_query( $attributes ) {
 		if ( ! $newspack_blocks_post_id ) {
 			$newspack_blocks_post_id = array();
 		}
+
+		// Get all blocks and gather specificPosts ids of all Homepage Articles blocks.
+		global $newspack_blocks_all_specific_posts_ids;
+		if ( ! is_array( $newspack_blocks_all_specific_posts_ids ) ) {
+			$blocks                                 = parse_blocks( get_the_content() );
+			$block_name                             = apply_filters( 'newspack_blocks_block_name', 'newspack-blocks/homepage-articles' );
+			$newspack_blocks_all_specific_posts_ids = array_reduce(
+				$blocks,
+				function ( $acc, $block ) use ( $block_name ) {
+					if (
+						$block_name === $block['blockName'] &&
+						isset( $block['attrs']['specificMode'], $block['attrs']['specificPosts'] ) &&
+						count( $block['attrs']['specificPosts'] )
+					) {
+						return array_merge(
+							$block['attrs']['specificPosts'],
+							$acc
+						);
+					}
+					return $acc;
+				},
+				[]
+			);
+		}
+
 		$authors        = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
 		$categories     = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
 		$tags           = isset( $attributes['tags'] ) ? $attributes['tags'] : array();
@@ -337,6 +362,9 @@ public static function build_articles_query( $attributes ) {
 			$args['orderby']  = 'post__in';
 		} else {
 			$args['posts_per_page'] = $posts_to_show + count( $newspack_blocks_post_id );
+			if ( count( $newspack_blocks_all_specific_posts_ids ) ) {
+				$args['post__not_in'] = $newspack_blocks_all_specific_posts_ids;
+			}
 			if ( $authors && count( $authors ) ) {
 				$args['author__in'] = $authors;
 			}

src/blocks/homepage-articles/edit.js

@@ -266,34 +266,33 @@ class Edit extends Component {
 		return (
 			<Fragment>
 				<PanelBody title={ __( 'Display Settings', 'newspack-blocks' ) } initialOpen={ true }>
-					{ postsToShow && (
-						<QueryControls
-							numberOfItems={ postsToShow }
-							onNumberOfItemsChange={ _postsToShow =>
-								setAttributes( { postsToShow: _postsToShow } )
-							}
-							specificMode={ specificMode }
-							onSpecificModeChange={ _specificMode =>
-								setAttributes( { specificMode: _specificMode } )
-							}
-							specificPosts={ specificPosts }
-							onSpecificPostsChange={ _specificPosts =>
-								setAttributes( { specificPosts: _specificPosts } )
-							}
-							authors={ authors }
-							onAuthorsChange={ _authors => setAttributes( { authors: _authors } ) }
-							categories={ categories }
-							onCategoriesChange={ _categories => setAttributes( { categories: _categories } ) }
-							tags={ tags }
-							onTagsChange={ _tags => {
-								setAttributes( { tags: _tags } );
-							} }
-							tagExclusions={ tagExclusions }
-							onTagExclusionsChange={ _tagExclusions =>
-								setAttributes( { tagExclusions: _tagExclusions } )
-							}
-						/>
-					) }
+					<QueryControls
+						numberOfItems={ postsToShow }
+						onNumberOfItemsChange={ _postsToShow =>
+							setAttributes( { postsToShow: _postsToShow || 1 } )
+						}
+						specificMode={ specificMode }
+						onSpecificModeChange={ _specificMode =>
+							setAttributes( { specificMode: _specificMode } )
+						}
+						specificPosts={ specificPosts }
+						onSpecificPostsChange={ _specificPosts =>
+							setAttributes( { specificPosts: _specificPosts } )
+						}
+						authors={ authors }
+						onAuthorsChange={ _authors => setAttributes( { authors: _authors } ) }
+						categories={ categories }
+						onCategoriesChange={ _categories => setAttributes( { categories: _categories } ) }
+						tags={ tags }
+						onTagsChange={ _tags => {
+							setAttributes( { tags: _tags } );
+						} }
+						tagExclusions={ tagExclusions }
+						onTagExclusionsChange={ _tagExclusions =>
+							setAttributes( { tagExclusions: _tagExclusions } )
+						}
+					/>
+
 					{ postLayout === 'grid' && (
 						<RangeControl
 							label={ __( 'Columns', 'newspack-blocks' ) }

src/blocks/homepage-articles/templates/articles-loop.php

@@ -10,8 +10,15 @@
 
 call_user_func(
 	function( $data ) {
+		global $wp_query;
+		$main_query = $wp_query;
+		wp_reset_postdata();
+
 		$attributes    = $data['attributes'];
 		$article_query = $data['article_query'];
+
+		$wp_query = $article_query; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
 		global $newspack_blocks_post_id;
 		$post_counter = 0;
 		while ( $article_query->have_posts() ) {
@@ -23,6 +30,7 @@ function( $data ) {
 			$post_counter++;
 			echo Newspack_Blocks::template_inc( __DIR__ . '/article.php', array( 'attributes' => $attributes ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
+		$wp_query = $main_query; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 		wp_reset_postdata();
 	},
 	$data // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable

src/blocks/homepage-articles/view.scss

@@ -36,10 +36,7 @@
 			flex-basis: 100%;
 
 			@include media( tablet ) {
-				&:last-child,
-				& {
-					margin-bottom: 1em;
-				}
+				margin-bottom: 1em;
 			}
 		}
 	}