@automattic/newspack-blocks 4.30.4 → 4.31.0-alpha.2

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.30.4
+ * Version:         4.31.0-alpha.2
  *
  * @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.30.4' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.31.0-alpha.2' );
 
 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": "4.30.4",
+	"version": "4.31.0-alpha.2",
 	"author": "Automattic",
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"repository": {
@@ -33,7 +33,8 @@
 		"format:scss": "newspack-scripts wp-scripts lint-style '**/{src,includes}/**/*.scss' --customSyntax postcss-scss --fix",
 		"i18n": "NODE_ENV=production npm run build; bash ./bin/update-translations.sh",
 		"release": "npm run build && npm run semantic-release",
-		"release:archive": "rm -rf release && mkdir -p release && rsync -r . ./release/newspack-blocks --exclude-from='./.distignore' && cd release && zip -r newspack-blocks.zip newspack-blocks"
+		"release:archive": "rm -rf release && mkdir -p release && rsync -r . ./release/newspack-blocks --exclude-from='./.distignore' && cd release && zip -r newspack-blocks.zip newspack-blocks",
+		"typescript:check": "newspack-scripts typescript-check"
 	},
 	"lint-staged": {
 		"*.{js,jsx,ts,tsx}": "npm run lint:js:staged",
@@ -46,8 +47,8 @@
 	"dependencies": {
 		"classnames": "^2.5.1",
 		"lodash": "^4.17.21",
-		"newspack-colors": "1.1.3",
-		"newspack-icons": "1.1.1",
+		"newspack-colors": "1.1.4-alpha.1",
+		"newspack-icons": "1.1.2-alpha.1",
 		"redux": "^5.0.0",
 		"redux-saga": "^1.5.0",
 		"regenerator-runtime": "^0.14.1",
@@ -55,7 +56,7 @@
 	},
 	"devDependencies": {
 		"@types/lodash": "^4.17.23",
-		"newspack-components": "4.6.3",
+		"newspack-components": "4.7.0-alpha.2",
 		"newspack-scripts": "5.11.0"
 	},
 	"overrides": {

package/src/blocks/carousel/block.json

@@ -72,6 +72,10 @@
 			"type": "boolean",
 			"default": false
 		},
+		"showTagLabels": {
+			"type": "boolean",
+			"default": true
+		},
 		"showTitle": {
 			"type": "boolean",
 			"default": true

package/src/blocks/carousel/edit.js

@@ -148,6 +148,7 @@ class Edit extends Component {
 			postsToShow,
 			postType,
 			showCategory,
+			showTagLabels,
 			showDate,
 			showAuthor,
 			showAvatar,
@@ -334,6 +335,11 @@ class Edit extends Component {
 							checked={ showCategory }
 							onChange={ () => setAttributes( { showCategory: ! showCategory } ) }
 						/>
+						<ToggleControl
+							label={ __( 'Show tag labels', 'newspack-blocks' ) }
+							checked={ showTagLabels }
+							onChange={ () => setAttributes( { showTagLabels: ! showTagLabels } ) }
+						/>
 						<ToggleControl
 							label={ __( 'Show author', 'newspack-blocks' ) }
 							checked={ showAuthor }
@@ -388,6 +394,7 @@ class Edit extends Component {
 										</figure>
 										{ ( post.newspack_post_sponsors ||
 											showCategory ||
+											( showTagLabels && post.newspack_tag_labels ) ||
 											showTitle ||
 											showAuthor ||
 											showDate ||
@@ -405,6 +412,21 @@ class Edit extends Component {
 															) }
 													</div>
 												) }
+												{ showTagLabels && post.newspack_tag_labels && (
+													<div className="cat-links tag-labels">
+														{ post.newspack_tag_labels.map( ( newspack_tag_label, index ) => {
+															return newspack_tag_label.link ? (
+																<a key={ index } href="#" className="tag-label flag">
+																	{ newspack_tag_label.flag }
+																</a>
+															) : (
+																<span key={ index } className="tag-label flag">
+																	{ newspack_tag_label.flag }
+																</span>
+															);
+														} ) }
+													</div>
+												) }
 												{ showTitle && (
 													<h3 className="entry-title">
 														<a href="#">{ decodeEntities( post.title.rendered.trim() ) }</a>

package/src/blocks/carousel/view.php

@@ -66,6 +66,10 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 			// Get sponsors for this post.
 			$sponsors = Newspack_Blocks::get_all_sponsors( $post_id );
 
+			// Get tag labels for this post, but only when the block is set to show them
+			// (avoids a per-post taxonomy lookup when tag labels are disabled).
+			$tag_labels = ( $attributes['showTagLabels'] ?? true ) ? Newspack_Blocks::get_tag_labels( $post_id ) : null;
+
 			$counter++;
 			$has_featured_image = has_post_thumbnail();
 			$post_type          = get_post_type();
@@ -110,7 +114,7 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 					<?php endif; ?>
 				</figure>
 
-				<?php if ( ! empty( $sponsors ) || $attributes['showCategory'] || $attributes['showTitle'] || $show_author || $show_date || $show_caption || $show_credit ) : ?>
+				<?php if ( ! empty( $sponsors ) || $attributes['showCategory'] || ! empty( $tag_labels ) || $attributes['showTitle'] || $show_author || $show_date || $show_caption || $show_credit ) : ?>
 					<div class="entry-wrapper">
 						<?php if ( ! empty( $sponsors ) || $attributes['showCategory'] ) : ?>
 							<div class="cat-links <?php if ( ! empty( $sponsors ) ) : ?>sponsor-label<?php endif; // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>">
@@ -129,6 +133,10 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 							<?php
 						endif;
 
+						if ( ! empty( $tag_labels ) ) {
+							Newspack_Blocks::display_tag_labels( $tag_labels );
+						}
+
 						if ( $attributes['showTitle'] ) {
 							the_title( '<h3 class="entry-title"><a href="' . esc_url( $post_link ) . '" rel="bookmark">', '</a></h3>' );
 						}
@@ -382,6 +390,10 @@ function newspack_blocks_register_carousel() {
 						'type'    => 'boolean',
 						'default' => false,
 					),
+					'showTagLabels'    => array(
+						'type'    => 'boolean',
+						'default' => true,
+					),
 					'showDate'         => array(
 						'type'    => 'boolean',
 						'default' => true,

package/src/blocks/checkout-button/view.php

@@ -220,7 +220,7 @@ function render_callback( $attributes ) {
 	);
 	return sprintf(
 		'<div class="%1$s">%2$s</div>',
-		$container_classes,
+		esc_attr( $container_classes ),
 		$form
 	);
 }

package/src/blocks/donate/edit/index.tsx

@@ -40,18 +40,28 @@ import RedirectAfterSuccess from '../../../components/redirect-after-success';
 
 const TIER_LABELS = [ __( 'Low-tier', 'newspack-blocks' ), __( 'Mid-tier', 'newspack-blocks' ), __( 'High-tier', 'newspack-blocks' ) ];
 
+// Placeholders for the keys the settings fetch fills in. They are a complete
+// EditState so every read is defined even if the fetch fails or returns a
+// partial payload; the loading and error guards below mean they never reach
+// the rendered output.
+const INITIAL_SETTINGS: EditState = {
+	amounts: {
+		once: [ 0, 0, 0, 0 ],
+		month: [ 0, 0, 0, 0 ],
+		year: [ 0, 0, 0, 0 ],
+	},
+	currencySymbol: '$',
+	tiered: false,
+	disabledFrequencies: { once: false, month: false, year: false },
+	minimumDonation: 5,
+	platform: '',
+};
+
 const Edit = ( { attributes, setAttributes }: EditProps ) => {
 	const [ isLoading, setIsLoading ] = useState( true );
 	const [ error, setError ] = useState( '' );
 
-	const [ settings, setSettings ] = hooks.useObjectState< EditState >( {
-		amounts: {},
-		currencySymbol: '$',
-		tiered: false,
-		disabledFrequencies: {},
-		minimumDonation: 5,
-		platform: '',
-	} );
+	const [ settings, setSettings ] = hooks.useObjectState< EditState >( INITIAL_SETTINGS );
 
 	interface AudienceDonations {
 		donation_data: DonationSettings;
@@ -95,7 +105,9 @@ const Edit = ( { attributes, setAttributes }: EditProps ) => {
 					setAttributes( { amounts: { ...donationSettings.amounts, ...attributes.amounts } } );
 				}
 			} )
-			.catch( setError )
+			// apiFetch rejects with the REST error object, not a string — take its
+			// message so the error Placeholder below actually renders.
+			.catch( ( e: { message?: string } ) => setError( e?.message || __( 'Could not fetch the donation settings.', 'newspack-blocks' ) ) )
 			.finally( () => setIsLoading( false ) );
 	}, [] );
 
@@ -187,7 +199,7 @@ const Edit = ( { attributes, setAttributes }: EditProps ) => {
 
 	const minimumDonation = isManual ? attributes.minimumDonation : settings.minimumDonation;
 	const displayedAmounts = { ...amounts };
-	Object.keys( amounts ).forEach( frequency => {
+	( Object.keys( amounts ) as DonationFrequencySlug[] ).forEach( frequency => {
 		const amountsWithMinimum = amounts[ frequency ].map( amount => Math.max( amount, minimumDonation ) ) as DonationAmountsArray;
 		displayedAmounts[ frequency ] = amountsWithMinimum;
 	} );
@@ -433,8 +445,8 @@ const Edit = ( { attributes, setAttributes }: EditProps ) => {
 					<FrequencyBasedLayout
 						isTiered={ isTiered }
 						canUseNameYourPrice={ canUseNameYourPrice }
-						amounts={ displayedAmounts }
 						{ ...componentProps }
+						amounts={ displayedAmounts }
 					/>
 				</div>
 			) }

package/src/blocks/homepage-articles/class-wp-rest-newspack-articles-controller.php

@@ -223,17 +223,36 @@ class WP_REST_Newspack_Articles_Controller extends WP_REST_Controller {
 	}
 
 	/**
-	 * Restrict a list of post types to those that are publicly viewable.
+	 * Restrict a list of post types to those the public articles endpoint may serve:
+	 * publicly-viewable types, plus any explicitly allow-listed via the
+	 * `newspack_blocks_articles_allowed_post_types` filter.
 	 *
-	 * Used to keep the public articles endpoint from exposing post types that
-	 * WordPress would not surface on the front end. Non-viewable types are dropped;
-	 * the returned list may be empty when none qualify (the caller then returns no results).
+	 * Keeps the endpoint from exposing post types WordPress would not surface on the
+	 * front end, while letting a plugin deliberately opt a specific non-viewable CPT
+	 * in. Disallowed types are dropped; the returned list may be empty when none
+	 * qualify (the caller then returns no results).
 	 *
 	 * @param array|string $post_types Requested post type(s).
-	 * @return array Viewable post types (may be empty).
+	 * @return array Allowed post types (may be empty).
 	 */
 	private static function filter_viewable_post_types( $post_types ) {
-		return array_values( array_filter( (array) $post_types, 'is_post_type_viewable' ) );
+		/**
+		 * Post types the public articles endpoint may serve in addition to the
+		 * publicly-viewable ones. Each entry is an explicit, per-CPT decision to
+		 * expose that type's published posts to unauthenticated callers — do not
+		 * add types whose published content should stay off the public REST surface.
+		 *
+		 * @param string[] $allowed Post type slugs to allow. Default empty.
+		 */
+		$allowed = (array) apply_filters( 'newspack_blocks_articles_allowed_post_types', [] );
+		return array_values(
+			array_filter(
+				(array) $post_types,
+				function ( $type ) use ( $allowed ) {
+					return is_post_type_viewable( $type ) || in_array( $type, $allowed, true );
+				}
+			)
+		);
 	}
 
 	/**

package/src/blocks/homepage-articles/edit.tsx

@@ -747,6 +747,11 @@ const EditWithBlockProps = ( props: any ) => {
 	return <Edit { ...props } blockProps={ blockProps } />;
 };
 
-export default compose( [ withColors( { textColor: 'color' } ), withSelect( postsBlockSelector ), withDispatch( postsBlockDispatch ) ] as any )(
-	EditWithBlockProps
-);
+// withSelect/withDispatch type their map functions against the registry's own
+// loose signatures; the casts stay at this call site so the exported selector
+// and dispatcher keep their precise parameter types.
+export default compose( [
+	withColors( { textColor: 'color' } ),
+	withSelect( postsBlockSelector as any ),
+	withDispatch( postsBlockDispatch as any ),
+] as any )( EditWithBlockProps );

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

@@ -7,7 +7,6 @@ import { times, isEqual, isNull, isUndefined, pick, pickBy } from 'lodash';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { dispatch as wpDataDispatch } from '@wordpress/data';
 
 import { STORE_NAMESPACE } from './store';
 
@@ -244,13 +243,17 @@ export const postsBlockSelector = (
 	return props;
 };
 
+// STORE_NAMESPACE - TODO: move this to src/blocks/homepage-articles/store.js once it's TS.
+type Dispatch = ( namespace: string ) => {
+	reflow: () => void;
+};
+
 /**
  * wordpress/data dispatch for blocks using this custom store.
  */
-export const postsBlockDispatch = ( dispatch: typeof wpDataDispatch, { isEditorBlock }: { isEditorBlock: boolean } ) => {
+export const postsBlockDispatch = ( dispatch: Dispatch, { isEditorBlock }: { isEditorBlock: boolean } ) => {
 	return {
 		// Only editor blocks can trigger reflows.
-		// @ts-expect-error It's a string.
 		triggerReflow: isEditorBlock ? dispatch( STORE_NAMESPACE ).reflow : () => undefined,
 	};
 };

package/src/types/index.d.ts

@@ -166,6 +166,8 @@ declare global {
 		triggerReflow: () => void;
 		className: string;
 		isSelected: boolean;
+		// Injected by the EditWithBlockProps wrapper via useBlockProps().
+		blockProps: { className?: string; [key: string]: unknown };
 	};
 }
 

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '06cd0a95946703497a8f2bba0ecfd06c69a09718',
+        'reference' => 'b5d11514be96c60bb2b4698b38f8f5f35940fb84',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '06cd0a95946703497a8f2bba0ecfd06c69a09718',
+            'reference' => 'b5d11514be96c60bb2b4698b38f8f5f35940fb84',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),