Merge pull request #541 from Automattic/master

Release 30/06/2020

Author: dkoo

class-newspack-blocks.php

@@ -367,7 +367,8 @@ function ( $acc, $block ) use ( $block_name ) {
 			}
 			$args['post__not_in'] = array_merge(
 				$args['post__not_in'] ?? [],
-				array_keys( $newspack_blocks_post_id )
+				array_keys( $newspack_blocks_post_id ),
+				get_the_ID() ? [ get_the_ID() ] : []
 			);
 			if ( $authors && count( $authors ) ) {
 				$args['author__in'] = $authors;

src/blocks/donate/edit.js

@@ -18,6 +18,7 @@ import {
 	TextControl,
 	ToggleControl,
 } from '@wordpress/components';
+import { RichText } from '@wordpress/block-editor';
 
 class Edit extends Component {
 	constructor( props ) {
@@ -141,7 +142,8 @@ class Edit extends Component {
 	}
 
 	renderUntieredForm() {
-		const { className } = this.props;
+		const { attributes, className, setAttributes } = this.props;
+		const { buttonText } = attributes;
 		const { uid } = this.state;
 		const { currencySymbol, customDonationAmounts, selectedFrequency } = this.blockData();
 
@@ -196,15 +198,21 @@ class Edit extends Component {
 						{ __( 'Your contribution is appreciated.', 'newspack-blocks' ) }
 					</p>
 					<button type="submit" onClick={ evt => evt.preventDefault() }>
-						{ __( 'Donate now!', 'newspack-blocks' ) }
+						<RichText
+							onChange={ value => setAttributes( { buttonText: value } ) }
+							placeholder={ __( 'Button text…', 'newspack-blocks' ) }
+							value={ buttonText }
+							tagName="span"
+						/>
 					</button>
 				</form>
 			</div>
 		);
 	}
 
 	renderTieredForm() {
-		const { className } = this.props;
+		const { attributes, className, setAttributes } = this.props;
+		const { buttonText } = attributes;
 		const { uid } = this.state;
 		const {
 			activeTier,
@@ -301,7 +309,12 @@ class Edit extends Component {
 						{ __( 'Your contribution is appreciated.', 'newspack-blocks' ) }
 					</p>
 					<button type="submit" onClick={ evt => evt.preventDefault() }>
-						{ __( 'Donate now!', 'newspack-blocks' ) }
+						<RichText
+							onChange={ value => setAttributes( { buttonText: value } ) }
+							placeholder={ __( 'Button text…', 'newspack-blocks' ) }
+							value={ buttonText }
+							tagName="span"
+						/>
 					</button>
 				</form>
 			</div>

src/blocks/donate/index.js

@@ -58,6 +58,10 @@ export const settings = {
 		campaign: {
 			type: 'string',
 		},
+		buttonText: {
+			type: 'string',
+			default: __( 'Donate now!', 'newspack-blocks' ),
+		},
 	},
 	supports: {
 		html: false,

src/blocks/donate/view.php

@@ -40,7 +40,9 @@ function newspack_blocks_render_block_donate( $attributes ) {
 
 	$campaign = $attributes['campaign'] ?? false;
 
-	$uid = rand(); // Unique identifier to prevent labels colliding with other instances of Donate block.
+	$uid = wp_rand( 10000, 99999 ); // Unique identifier to prevent labels colliding with other instances of Donate block.
+
+	$button_text = $attributes['buttonText'];
 
 	ob_start();
 
@@ -102,7 +104,7 @@ class='donate-label'
 					<?php echo esc_html__( 'Your contribution is appreciated.', 'newspack-blocks' ); ?>
 				</p>
 				<button type='submit'>
-					<?php echo esc_html__( 'Donate now!', 'newspack-blocks' ); ?>
+					<?php echo wp_kses_post( $button_text ); ?>
 				</button>
 				<?php if ( $campaign ) : ?>
 					<input type='hidden' name='campaign' value='<?php echo esc_attr( $campaign ); ?>' />
@@ -202,15 +204,14 @@ class='other-donate-label'
 					<?php echo esc_html__( 'Your contribution is appreciated.', 'newspack-blocks' ); ?>
 				</p>
 				<button type='submit'>
-					<?php echo esc_html__( 'Donate now!', 'newspack-blocks' ); ?>
+					<?php echo wp_kses_post( $button_text ); ?>
 				</button>
 				<?php if ( $campaign ) : ?>
 					<input type='hidden' name='campaign' value='<?php echo esc_attr( $campaign ); ?>' />
 				<?php endif; ?>
 			</form>
 		</div>
 		<?php
-
 	endif;
 
 	return apply_filters( 'newspack_blocks_donate_block_html', ob_get_clean() );
@@ -232,6 +233,9 @@ function newspack_blocks_register_donate() {
 				],
 				'suggestedAmounts'        => [
 					'type'    => 'array',
+					'items'   => [
+						'type' => 'integer',
+					],
 					'default' => [ 0, 0, 0 ],
 				],
 				'suggestedAmountUntiered' => [
@@ -242,8 +246,12 @@ function newspack_blocks_register_donate() {
 					'default' => true,
 				],
 				'campaign'                => [
+					'type' => 'string',
+				],
+				'buttonText'              => [
 					'type'    => 'string',
-				]
+					'default' => __( 'Donate now!', 'newspack-blocks' ),
+				],
 			),
 			'render_callback' => 'newspack_blocks_render_block_donate',
 		)

src/blocks/homepage-articles/store.js

@@ -117,6 +117,7 @@ const createFetchPostsSaga = blockName => {
 		yield delay( 300 );
 
 		const { getBlocks } = select( 'core/block-editor' );
+		const { getCurrentPostId } = select( 'core/editor' );
 
 		yield put( { type: 'DISABLE_UI' } );
 
@@ -130,7 +131,7 @@ const createFetchPostsSaga = blockName => {
 			return acc;
 		}, [] );
 
-		let exclude = specificPostsId;
+		let exclude = [ ...specificPostsId, getCurrentPostId() ];
 		while ( blockQueries.length ) {
 			const nextBlock = blockQueries.shift();
 			nextBlock.postsQuery.exclude = exclude;

src/blocks/homepage-articles/view.js

@@ -108,6 +108,12 @@ function getRenderedPostsIds() {
 	);
 	const postIds = Array.from( postEls ).map( el => el.getAttribute( 'data-post-id' ) );
 
+	postIds.push(
+		document
+			.querySelector( '.wp-block-newspack-blocks-homepage-articles > div[data-current-post-id]' )
+			.getAttribute( 'data-current-post-id' )
+	);
+
 	return [ ...new Set( postIds ) ]; // Make values unique with Set
 }
 

src/blocks/homepage-articles/view.php

@@ -111,7 +111,7 @@ function( $attribute ) {
 			class="<?php echo esc_attr( $classes ); ?>"
 			style="<?php echo esc_attr( $styles ); ?>"
 			>
-			<div data-posts>
+			<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>
@@ -261,7 +261,7 @@ function newspack_blocks_inject_amp_state() {
 	if ( ! $newspack_blocks_post_id || ! count( $newspack_blocks_post_id ) ) {
 		return;
 	}
-	$post_ids = implode( ', ', array_keys( $newspack_blocks_post_id ) );
+	$post_ids = implode( ', ', array_merge( array_keys( $newspack_blocks_post_id ), [ get_the_ID() ] ) );
 	ob_start();
 	?>
 	<amp-state id='newspackHomepagePosts'>

src/blocks/homepage-articles/view.scss

@@ -329,7 +329,7 @@
 		display: none;
 	}
 
-	button {
+	> button {
 		margin-top: 1em;
 	}