@automattic/newspack-blocks 4.2.4-alpha.1 → 4.2.4

package/includes/class-modal-checkout.php

@@ -322,7 +322,7 @@ final class Modal_Checkout {
 		$products = array_keys( self::$products );
 		foreach ( $products as $product_id ) {
 			$product = wc_get_product( $product_id );
-			if ( ! $product || ! $product->is_type( 'variable' ) ) {
+			if ( ! $product->is_type( 'variable' ) ) {
 				continue;
 			}
 			?>
@@ -551,12 +551,13 @@ final class Modal_Checkout {
 		}
 
 		$custom_templates = [
-			'checkout/form-checkout.php' => 'src/modal-checkout/templates/checkout-form.php',
-			'checkout/form-billing.php'  => 'src/modal-checkout/templates/billing-form.php',
-			'checkout/thankyou.php'      => 'src/modal-checkout/templates/thankyou.php',
+			'checkout/form-checkout.php'  => 'src/modal-checkout/templates/checkout-form.php',
+			'checkout/form-billing.php'   => 'src/modal-checkout/templates/billing-form.php',
+			'checkout/payment-method.php' => 'src/modal-checkout/templates/payment-method.php',
+			'checkout/thankyou.php'       => 'src/modal-checkout/templates/thankyou.php',
 			// Replace the login form with the order summary if using the modal checkout. This is
 			// for the case where the reader used an existing email address.
-			'global/form-login.php'      => 'src/modal-checkout/templates/thankyou.php',
+			'global/form-login.php'       => 'src/modal-checkout/templates/thankyou.php',
 		];
 
 		foreach ( $custom_templates as $original_template => $custom_template ) {

package/includes/class-newspack-blocks.php

@@ -241,7 +241,6 @@ class Newspack_Blocks {
 				'custom_taxonomies'          => self::get_custom_taxonomies(),
 				'can_use_name_your_price'    => self::can_use_name_your_price(),
 				'tier_amounts_template'      => self::get_formatted_amount(),
-				'can_use_video_playlist'     => self::can_use_video_playlist_block(),
 			];
 
 			if ( class_exists( 'WP_REST_Newspack_Author_List_Controller' ) ) {
@@ -1644,29 +1643,5 @@ class Newspack_Blocks {
 
 		return $combined_caption;
 	}
-
-	/**
-	 * Check if the current site can use the Video Playlist block.
-	 * If the block doesn't already exist in site content, it won't be registered.
-	 */
-	public static function can_use_video_playlist_block() {
-		// Check if the block exists in any content on the site.
-		$existing_blocks = new WP_Query(
-			[
-				'fields'         => 'ids',
-				'post_type'      => 'any',
-				'post_status'    => 'publish',
-				's'              => 'newspack-blocks/youtube-video-playlist',
-				'posts_per_page' => 1,
-			]
-		);
-
-		// Don't register the block if it's not already on the site.
-		if ( 0 < $existing_blocks->found_posts ) {
-			return true;
-		}
-
-		return false;
-	}
 }
 Newspack_Blocks::init();

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.2.4-alpha.1
+ * Version:         4.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', '4.2.4-alpha.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.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,13 +1,13 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.2.4-alpha.1",
+	"version": "4.2.4",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",
 		"@testing-library/dom": "^10.4.0",
 		"@testing-library/user-event": "^14.5.2",
-		"@types/lodash": "^4.17.10",
-		"@wordpress/browserslist-config": "^6.9.0",
+		"@types/lodash": "^4.17.7",
+		"@wordpress/browserslist-config": "^6.7.0",
 		"eslint": "^8.57.0",
 		"fetch-mock-jest": "^1.5.1",
 		"html-entities": "^2.5.2",

package/src/blocks/homepage-articles/store.js

@@ -17,7 +17,7 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies
  */
 import metadata from './block.json';
-import { getBlockQueries, sanitizePostList, recursivelyGetBlocks } from './utils';
+import { getBlockQueries, sanitizePostList } from './utils';
 
 const { name } = metadata;
 export const STORE_NAMESPACE = `newspack-blocks/${ name }`;
@@ -138,7 +138,15 @@ const createFetchPostsSaga = blockNames => {
 
 		yield put( { type: 'DISABLE_UI' } );
 
-		const blocks = recursivelyGetBlocks( getBlocks );
+		// Ensure innerBlocks are populated for widget area blocks.
+		// See https://github.com/WordPress/gutenberg/issues/32607#issuecomment-890728216.
+		const blocks = getBlocks().map( block => {
+			const innerBlocks = select( 'core/block-editor' ).getBlocks( block.clientId );
+			return {
+				...block,
+				innerBlocks,
+			};
+		} );
 
 		const blockQueries = getBlockQueries( blocks, blockNames );
 

package/src/blocks/homepage-articles/utils.ts

@@ -272,23 +272,3 @@ export const postsBlockDispatch = (
 		triggerReflow: isEditorBlock ? dispatch( STORE_NAMESPACE ).reflow : () => undefined,
 	};
 };
-
-// Ensure innerBlocks are populated for some blocks (e.g. `widget-area` and `post-content`).
-// See https://github.com/WordPress/gutenberg/issues/32607#issuecomment-890728216.
-// See https://github.com/Automattic/wp-calypso/issues/91839.
-export const recursivelyGetBlocks = (
-	getBlocks: ( clientId?: string ) => Block[],
-	blocks: Block[] = getBlocks()
-) => {
-	return blocks.map( ( block ) => {
-		let innerBlocks =
-			block.innerBlocks.length === 0
-				? getBlocks( block.clientId )
-				: block.innerBlocks;
-		innerBlocks = recursivelyGetBlocks( getBlocks, innerBlocks );
-		return {
-			...block,
-			innerBlocks,
-		};
-	});
-};

package/src/blocks/video-playlist/edit.js

@@ -1,14 +1,19 @@
 /**
  * WordPress dependencies
  */
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import apiFetch from '@wordpress/api-fetch';
 import { Component, Fragment } from '@wordpress/element';
-import { Notice, Placeholder, Spinner, PanelBody } from '@wordpress/components';
+import { Placeholder, Spinner, PanelBody, RangeControl } from '@wordpress/components';
 import { InspectorControls } from '@wordpress/block-editor';
 import { addQueryArgs } from '@wordpress/url';
 import { decodeEntities } from '@wordpress/html-entities';
 
+/**
+ * Internal dependencies.
+ */
+import AutocompleteTokenField from '../../components/autocomplete-tokenfield';
+
 class Edit extends Component {
 	constructor( props ) {
 		super( props );
@@ -170,46 +175,55 @@ class Edit extends Component {
 		} );
 	};
 
+	/**
+	 * Hide the overlay so users can play the videos.
+	 */
+	hideOverlay() {
+		this.setState( { interactive: true } );
+	}
+
 	/**
 	 * Render.
 	 */
 	render() {
-		const { embed, isLoading } = this.state;
-
-		const Warning = () => (
-			<>
-				<h2>{ __( 'The YouTube Video Playlist block is deprecated', 'newspack-plugin' ) }</h2>
-				<p dangerouslySetInnerHTML={ {
-					__html: sprintf(
-						// translators: %1$s is the link to Google's help doc on creating YouTube playlists. %2$s is the link to the help doc on embedding playlists.
-						__( 'Consider using <a href="%1$s">YouTube Playlists</a> instead, which can be <a href="%2$s">embedded</a> into post or page content.', 'newspack-blocks' ),
-						'https://support.google.com/youtube/answer/57792',
-						'https://support.google.com/youtube/answer/171780'
-					),
-				} } />
-			</>
-		)
+		const { attributes, setAttributes } = this.props;
+		const { categories, videosToShow } = attributes;
+		const { embed, isLoading, interactive } = this.state;
 
 		return (
 			<Fragment>
-				<div>
-					{ ( isLoading || '' === embed ) && this.renderPlaceholder() }
-					{ ! ( isLoading || '' === embed ) && (
-						<div className="wpbnbvp-preview">
-							<div dangerouslySetInnerHTML={ { __html: embed } } />
-						</div>
-					) }
-					{ ! isLoading && (
-						<div className="wpbnbvp__overlay">
-							<Warning />
-						</div>
-					) }
-				</div>
+				{ ( isLoading || '' === embed ) && this.renderPlaceholder() }
+				{ ! ( isLoading || '' === embed ) && (
+					<div className="wpbnbvp-preview">
+						<div dangerouslySetInnerHTML={ { __html: embed } } />
+						{ ! interactive && (
+							// eslint-disable-next-line jsx-a11y/no-static-element-interactions
+							<div className="wpbnbvp__overlay" onMouseUp={ () => this.hideOverlay() } />
+						) }
+					</div>
+				) }
 				<InspectorControls>
 					<PanelBody title={ __( 'Settings', 'newspack-blocks' ) } initialOpen={ true }>
-						<Notice status="warning" isDismissible={ false }>
-							<Warning />
-						</Notice>
+						<Fragment>
+							<RangeControl
+								className="videosToShow"
+								label={ __( 'Videos', 'newspack-blocks' ) }
+								help={ __( 'The maximum number of videos to pull from posts.', 'newspack-blocks' ) }
+								value={ videosToShow }
+								onChange={ _videosToShow => setAttributes( { videosToShow: _videosToShow } ) }
+								min={ 1 }
+								max={ 30 }
+								required
+							/>
+							<AutocompleteTokenField
+								key="categories"
+								tokens={ categories || [] }
+								onChange={ _categories => setAttributes( { categories: _categories } ) }
+								fetchSuggestions={ this.fetchCategorySuggestions }
+								fetchSavedInfo={ this.fetchSavedCategories }
+								label={ __( 'Categories', 'newspack-blocks' ) }
+							/>
+						</Fragment>
 					</PanelBody>
 				</InspectorControls>
 			</Fragment>

package/src/blocks/video-playlist/editor.js

@@ -4,6 +4,4 @@
 import { registerBlockType } from '@wordpress/blocks';
 import { name, settings } from '.';
 
-if ( window.newspack_blocks_data?.can_use_video_playlist ) {
-	registerBlockType( `newspack-blocks/${ name }`, settings );
-}
+registerBlockType( `newspack-blocks/${ name }`, settings );

package/src/blocks/video-playlist/editor.scss

@@ -5,17 +5,8 @@
  * Prevents interaction with the player until the block is focused.
  */
 .wpbnbvp__overlay {
-	align-content: center;
-	background-color: rgba(255, 255, 255, 0.9);
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	left: 0;
-	height: 100%;
 	position: absolute;
-	text-align: center;
-	top: 0;
-	width: 100%;
+	inset: 0;
 }
 
 .wpbnbvp-preview {

package/src/blocks/video-playlist/index.js

@@ -15,7 +15,7 @@ import edit from './edit';
 import './editor.scss';
 
 export const name = 'youtube-video-playlist';
-export const title = __( 'YouTube Video Playlist (DEPRECATED)', 'newspack-blocks' );
+export const title = __( 'YouTube Video Playlist', 'newspack-blocks' );
 
 export const icon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">

package/src/blocks/video-playlist/view.php

@@ -23,10 +23,6 @@ function newspack_blocks_render_block_video_playlist( $attributes ) {
  * Registers the `newspack-blocks/donate` block on server.
  */
 function newspack_blocks_register_video_playlist() {
-	if ( ! Newspack_Blocks::can_use_video_playlist_block() ) {
-		return;
-	}
-
 	register_block_type(
 		'newspack-blocks/youtube-video-playlist',
 		array(

package/src/modal-checkout/templates/payment-method.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Payment method fields
+ *
+ * @see https://woo.com/document/template-structure/
+ * @package Newspack_Blocks
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+
+<li class="wc_payment_method payment_method_<?php echo esc_attr( $gateway->id ); ?>">
+	<input id="payment_method_<?php echo esc_attr( $gateway->id ); ?>" type="radio" class="input-radio" name="payment_method" value="<?php echo esc_attr( $gateway->id ); ?>" <?php checked( $gateway->chosen, true ); ?> data-order_button_text="<?php echo esc_attr( $gateway->order_button_text ); ?>" />
+
+	<label for="payment_method_<?php echo esc_attr( $gateway->id ); ?>">
+		<?php echo wp_kses_post( $gateway->get_title() ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?> <?php echo $gateway->get_icon(); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped, WordPress.Security.EscapeOutput.OutputNotEscaped */ ?>
+	</label>
+	<?php if ( $gateway->has_fields() || $gateway->get_description() ) : ?>
+		<div class="payment_box payment_method_<?php echo esc_attr( $gateway->id ); ?>" <?php if ( ! $gateway->chosen ) : /* phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace */ ?>style="display:none;"<?php endif; /* phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace */ ?>>
+			<?php $gateway->payment_fields(); ?>
+			<?php do_action( 'newspack_blocks_after_payment_fields', $gateway->id ); ?>
+		</div>
+	<?php endif; ?>
+</li>

package/vendor/autoload.php

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

package/vendor/composer/autoload_real.php

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

package/vendor/composer/autoload_static.php

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

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '074f05e9ad86e8a7241347b40fb34714b12007bc',
+        'reference' => '0a3da2eb38a9cd69bcd2a3348954b1fa3f9c9f59',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '074f05e9ad86e8a7241347b40fb34714b12007bc',
+            'reference' => '0a3da2eb38a9cd69bcd2a3348954b1fa3f9c9f59',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),