@automattic/newspack-blocks 4.24.1 → 4.25.0

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.24.1
+ * Version:         4.25.0
  *
  * @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.24.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.25.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
@@ -81,9 +81,9 @@ function newspack_iframe_block_register_rest_routes() { // phpcs:ignore WordPres
 add_action( 'rest_api_init', 'newspack_iframe_block_register_rest_routes' );
 
 Newspack_Blocks::manage_view_scripts();
-add_action( 'enqueue_block_editor_assets', array( 'Newspack_Blocks', 'enqueue_block_editor_assets' ) );
-add_action( 'enqueue_block_editor_assets', array( 'Newspack_Blocks', 'enqueue_placeholder_blocks_assets' ), 9999 );
-add_action( 'wp_enqueue_scripts', array( 'Newspack_Blocks', 'enqueue_block_styles_assets' ) );
+add_action( 'enqueue_block_assets', array( 'Newspack_Blocks', 'enqueue_block_assets' ) );
+add_action( 'enqueue_block_assets', array( 'Newspack_Blocks', 'enqueue_placeholder_blocks_assets' ), 9999 );
+add_action( 'enqueue_block_assets', array( 'Newspack_Blocks', 'enqueue_block_styles_assets' ) );
 
 /**
  * Load language files

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.24.1",
+	"version": "4.25.0",
 	"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": {

package/src/blocks/author-list/block.json

@@ -1,7 +1,8 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
 	"name": "author-list",
 	"category": "newspack",
-	"apiVersion": 3,
 	"attributes": {
 		"className": {
 			"type": "string",
@@ -80,4 +81,4 @@
 			"default": false
 		}
 	}
-}
+}

package/src/blocks/author-list/edit.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import apiFetch from '@wordpress/api-fetch';
-import { BlockControls, InspectorControls } from '@wordpress/block-editor';
+import { BlockControls, InspectorControls, useBlockProps } from '@wordpress/block-editor';
 import {
 	BaseControl,
 	CheckboxControl,
@@ -21,6 +21,8 @@ import {
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
+	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { Fragment, useEffect, useState } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -46,8 +48,9 @@ const AuthorList = ( { attributes, clientId, setAttributes } ) => {
 	const [ error, setError ] = useState( null );
 	const [ isLoading, setIsLoading ] = useState( false );
 	const [ maxItemsToSuggest, setMaxItemsToSuggest ] = useState( 0 );
-	const canUseCAP = Boolean( window.newspack_blocks_data?.can_use_cap );
-	const editableRoles = window.newspack_blocks_data?.editable_roles;
+	const canUseCAP = Boolean( window?.newspack_blocks_data?.can_use_cap );
+	const editableRoles = window?.newspack_blocks_data?.editable_roles || [];
+
 	const separators = [];
 	const {
 		authorRoles,
@@ -71,6 +74,10 @@ const AuthorList = ( { attributes, clientId, setAttributes } ) => {
 		getAuthors();
 	}, [ authorRoles, authorType, avatarHideDefault, exclude, excludeEmpty ] );
 
+	const blockProps = useBlockProps( {
+		className: classnames( attributes.className, 'wp-block-newspack-blocks-author-list' ),
+	} );
+
 	const getAuthors = async () => {
 		setError( null );
 		setIsLoading( true );
@@ -361,7 +368,7 @@ const AuthorList = ( { attributes, clientId, setAttributes } ) => {
 					/>
 				</BlockControls>
 			) }
-			<div className={ classnames( attributes.className, 'wp-block-newspack-blocks-author-list' ) }>
+			<div { ...blockProps }>
 				{ ! isLoading && ! error && authors && Array.isArray( authors ) && (
 					<>
 						{ isColumns && showSeparators && separatorSections ? (
@@ -434,10 +441,10 @@ const AuthorList = ( { attributes, clientId, setAttributes } ) => {
 							</Notice>
 						) }
 						{ isLoading && (
-							<div className="is-loading">
-								{ __( 'Fetching authors…', 'newspack-blocks' ) }
-								<Spinner />
-							</div>
+							<VStack alignment="center" style={ { width: '100%' } }>
+								<Spinner style={ { margin: '0' } } />
+								<span style={ { fontWeight: '500' } }>{ __( 'Fetching authors…', 'newspack-blocks' ) }</span>
+							</VStack>
 						) }
 					</Placeholder>
 				) }

package/src/blocks/author-list/index.js

@@ -20,7 +20,7 @@ import edit from './edit';
 import './editor.scss';
 import './view.scss';
 import metadata from './block.json';
-const { name, attributes, category } = metadata;
+const { name, attributes, apiVersion, category } = metadata;
 
 // Name must be exported separately.
 export { name };
@@ -37,19 +37,20 @@ authorCustomFields.forEach( field => {
 } );
 
 export const settings = {
+	apiVersion,
 	title,
 	icon: {
 		src: listView,
 		foreground: colors[ 'primary-400' ],
 	},
+	attributes,
+	category,
 	keywords: [ __( 'author', 'newspack-blocks' ), __( 'profile', 'newspack-blocks' ) ],
 	description: __( 'Display a list of author profile cards.', 'newspack-blocks' ),
 	styles: [
 		{ name: 'default', label: _x( 'Default', 'block style', 'newspack-blocks' ), isDefault: true },
 		{ name: 'center', label: _x( 'Centered', 'block style', 'newspack-blocks' ) },
 	],
-	attributes,
-	category,
 	supports: {
 		html: false,
 		default: '',

package/src/blocks/author-list/view.php

@@ -27,6 +27,7 @@ function newspack_blocks_register_author_list() {
 	register_block_type(
 		'newspack-blocks/' . $block_json['name'],
 		[
+			'api_version'     => $block_json['apiVersion'],
 			'attributes'      => $block_json['attributes'],
 			'render_callback' => 'newspack_blocks_render_block_author_list',
 		]

package/src/blocks/author-profile/block.json

@@ -1,7 +1,9 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
 	"name": "author-profile",
 	"category": "newspack",
-	"apiVersion": 3,
+	"usesContext": [ "postId", "postType" ],
 	"attributes": {
 		"className": {
 			"type": "string",
@@ -11,6 +13,18 @@
 			"type": "number",
 			"default": 0
 		},
+		"isContextual": {
+			"type": "boolean",
+			"default": false
+		},
+		"layoutVersion": {
+			"type": "number",
+			"default": 1
+		},
+		"showEmptyBio": {
+			"type": "boolean",
+			"default": true
+		},
 		"isGuestAuthor": {
 			"type": "boolean",
 			"default": true
@@ -56,4 +70,4 @@
 			"default": false
 		}
 	}
-}
+}

package/src/blocks/author-profile/class-wp-rest-newspack-authors-controller.php

@@ -58,6 +58,9 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 						'fields'              => [
 							'sanitize_callback' => 'sanitize_text_field',
 						],
+						'post_id'             => [
+							'sanitize_callback' => 'absint',
+						],
 					],
 					'permission_callback' => function() {
 						return current_user_can( 'edit_posts' );
@@ -79,9 +82,15 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 		$search              = ! empty( $request->get_param( 'search' ) ) ? $request->get_param( 'search' ) : null; // Fetch authors by search string.
 		$offset              = ! empty( $request->get_param( 'offset' ) ) ? $request->get_param( 'offset' ) : 0; // Offset results (for pagination).
 		$per_page            = ! empty( $request->get_param( 'perPage' ) ) ? $request->get_param( 'perPage' ) : 10; // Number of results to return per page. This is applied to each query, so the actual number of results returned may be up to 2x this number.
-		$avatar_hide_default = ! empty( $request->get_param( 'avatarHideDefault' ) ) ? true : false; // Hide the default avatar if the user has no custom avatar.
+		$avatar_hide_default = ! empty( $request->get_param( 'avatar_hide_default' ) ) ? true : false; // Hide the default avatar if the user has no custom avatar.
 		$fields              = ! empty( $request->get_param( 'fields' ) ) ? explode( ',', $request->get_param( 'fields' ) ) : [ 'id' ]; // Fields to get. Will return at least id.
 		$include             = ! empty( $request->get_param( 'include' ) ) ? explode( ',', $request->get_param( 'include' ) ) : null; // Fetch authors by multiple IDs.
+		$post_id             = ! empty( $request->get_param( 'post_id' ) ) ? $request->get_param( 'post_id' ) : 0; // Fetch authors for a specific post (contextual mode).
+
+		// If post_id is provided, get authors for that specific post.
+		if ( $post_id ) {
+			return $this->get_post_authors( $post_id, $fields, $avatar_hide_default );
+		}
 
 		// Total number of users and guest authors.
 		$guest_author_total = 0;
@@ -300,8 +309,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 					$value = [
 						'url' => 'tel:' . $value,
 					];
-					if ( class_exists( 'Newspack_SVG_Icons' ) ) {
-						$value['svg'] = Newspack_SVG_Icons::get_social_link_svg( $value['url'], 24 );
+					if ( class_exists( '\Newspack\Social_Icons' ) ) {
+						$value['svg'] = \Newspack\Social_Icons::get_svg( 'phone' );
 					}
 				}
 				$guest_author_data[ $custom_field['name'] ] = $value;
@@ -349,8 +358,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 					$value = [
 						'url' => 'tel:' . $value,
 					];
-					if ( class_exists( 'Newspack_SVG_Icons' ) ) {
-						$value['svg'] = Newspack_SVG_Icons::get_social_link_svg( $value['url'], 24 );
+					if ( class_exists( '\Newspack\Social_Icons' ) ) {
+						$value['svg'] = \Newspack\Social_Icons::get_svg( 'phone' );
 					}
 				}
 				$user_data[ $custom_field['name'] ] = $value;
@@ -394,8 +403,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 		if ( $email_address ) {
 			$email_data = [ 'url' => 'mailto:' . $email_address ];
 
-			if ( class_exists( 'Newspack_SVG_Icons' ) ) {
-				$email_data['svg'] = Newspack_SVG_Icons::get_social_link_svg( 'mailto:' . $email_address, 24 );
+			if ( class_exists( '\Newspack\Social_Icons' ) ) {
+				$email_data['svg'] = \Newspack\Social_Icons::get_svg( 'email' );
 			}
 		}
 
@@ -434,8 +443,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 					$url             = 'twitter' === $profile ? esc_url( 'https://x.com/' . $handle ) : esc_url( $handle );
 					$acc[ $profile ] = [ 'url' => $url ];
 
-					if ( class_exists( 'Newspack_SVG_Icons' ) ) {
-						$acc[ $profile ]['svg'] = $is_website ? Newspack_SVG_Icons::get_svg( 'ui', 'link', 24 ) : Newspack_SVG_Icons::get_social_link_svg( $url, 24 );
+					if ( class_exists( '\Newspack\Social_Icons' ) && ! $is_website ) {
+						$acc[ $profile ]['svg'] = \Newspack\Social_Icons::get_svg( $profile );
 					}
 				}
 
@@ -444,4 +453,166 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			[]
 		);
 	}
+
+	/**
+	 * Get authors for a specific post (contextual mode).
+	 *
+	 * Uses Co-Authors Plus if available, otherwise falls back to the default post author.
+	 *
+	 * @param int   $post_id Post ID.
+	 * @param array $fields Fields to include in response.
+	 * @param bool  $avatar_hide_default Whether to hide default avatars.
+	 * @return WP_REST_Response
+	 */
+	protected function get_post_authors( $post_id, $fields, $avatar_hide_default ) {
+		$post = get_post( $post_id );
+		if ( ! $post ) {
+			return rest_ensure_response( [] );
+		}
+
+		$authors = [];
+
+		// Try Co-Authors Plus first. When CAP is active, always return its result
+		// and never fall back to post_author, which could show the wrong person.
+		if ( function_exists( 'get_coauthors' ) ) {
+			$coauthors = get_coauthors( $post_id );
+			foreach ( $coauthors as $coauthor ) {
+				$author_data = $this->format_coauthor( $coauthor, $fields, $avatar_hide_default );
+				if ( $author_data ) {
+					$authors[] = $author_data;
+				}
+			}
+
+			$response = new WP_REST_Response( $authors );
+			$response->header( 'x-wp-total', count( $authors ) );
+			return rest_ensure_response( $response );
+		}
+
+		// Fallback to default post author.
+		$author_id = $post->post_author;
+		if ( $author_id ) {
+			$user = get_user_by( 'id', $author_id );
+			if ( $user ) {
+				$user_data = [
+					'id'         => intval( $user->data->ID ),
+					'registered' => $user->data->user_registered,
+					'is_guest'   => false,
+					'slug'       => $user->data->user_login,
+				];
+
+				if ( in_array( 'avatar', $fields, true ) ) {
+					$avatar = get_avatar( $user->data->ID, 256 );
+					if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $avatar_hide_default ) ) {
+						$user_data['avatar'] = $avatar;
+					}
+				}
+
+				$user_data = self::fill_user_data( $user_data, $user, $fields );
+				$authors[] = $user_data;
+			}
+		}
+
+		$response = new WP_REST_Response( $authors );
+		$response->header( 'x-wp-total', count( $authors ) );
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * Format a co-author object for the REST response.
+	 *
+	 * Co-Authors Plus returns stdClass objects from get_coauthors().
+	 * These can be either guest authors or linked WP users.
+	 *
+	 * @param object $coauthor Co-author object from get_coauthors().
+	 * @param array  $fields Fields to include in response.
+	 * @param bool   $avatar_hide_default Whether to hide default avatars.
+	 * @return array|null Formatted author data or null if invalid.
+	 */
+	protected function format_coauthor( $coauthor, $fields, $avatar_hide_default ) {
+		if ( ! is_object( $coauthor ) || ! isset( $coauthor->ID ) ) {
+			return null;
+		}
+
+		// Check if this is a guest author.
+		$is_guest = isset( $coauthor->type ) && 'guest-author' === $coauthor->type;
+
+		if ( $is_guest && class_exists( 'CoAuthors_Guest_Authors' ) ) {
+			$guest_author = ( new CoAuthors_Guest_Authors() )->get_guest_author_by( 'id', $coauthor->ID );
+
+			if ( ! $guest_author ) {
+				return null;
+			}
+
+			$author_data = [
+				'id'         => intval( $coauthor->ID ),
+				'registered' => isset( $coauthor->post_date ) ? $coauthor->post_date : '',
+				'is_guest'   => true,
+				'slug'       => isset( $coauthor->user_nicename ) ? $coauthor->user_nicename : '',
+			];
+
+			if ( in_array( 'avatar', $fields, true ) && function_exists( 'coauthors_get_avatar' ) ) {
+				$avatar = coauthors_get_avatar( $guest_author, 256 );
+				if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $avatar_hide_default ) ) {
+					$author_data['avatar'] = $avatar;
+				}
+			}
+
+			return self::fill_guest_author_data( $author_data, $guest_author, $fields );
+		}
+
+		// It's a linked WP user.
+		$user = get_user_by( 'id', $coauthor->ID );
+		if ( ! $user ) {
+			// Try to get by login if ID doesn't work.
+			if ( isset( $coauthor->user_login ) ) {
+				$user = get_user_by( 'login', $coauthor->user_login );
+			}
+		}
+
+		if ( ! $user ) {
+			return null;
+		}
+
+		// Check if this user has a linked guest author for additional data.
+		$linked_guest_author = self::get_linked_guest_author( $user->user_login );
+
+		if ( $linked_guest_author && class_exists( 'CoAuthors_Guest_Authors' ) ) {
+			$guest_author = ( new CoAuthors_Guest_Authors() )->get_guest_author_by( 'id', $linked_guest_author->ID );
+
+			if ( $guest_author ) {
+				$author_data = [
+					'id'         => intval( $linked_guest_author->ID ),
+					'registered' => $linked_guest_author->post_date,
+					'is_guest'   => true,
+					'slug'       => $linked_guest_author->post_name,
+				];
+
+				if ( in_array( 'avatar', $fields, true ) && function_exists( 'coauthors_get_avatar' ) ) {
+					$avatar = coauthors_get_avatar( $guest_author, 256 );
+					if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $avatar_hide_default ) ) {
+						$author_data['avatar'] = $avatar;
+					}
+				}
+
+				return self::fill_guest_author_data( $author_data, $guest_author, $fields );
+			}
+		}
+
+		// Return as regular WP user.
+		$user_data = [
+			'id'         => intval( $user->data->ID ),
+			'registered' => $user->data->user_registered,
+			'is_guest'   => false,
+			'slug'       => $user->data->user_login,
+		];
+
+		if ( in_array( 'avatar', $fields, true ) ) {
+			$avatar = get_avatar( $user->data->ID, 256 );
+			if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $avatar_hide_default ) ) {
+				$user_data['avatar'] = $avatar;
+			}
+		}
+
+		return self::fill_user_data( $user_data, $user, $fields );
+	}
 }

package/src/blocks/author-profile/context.js

@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+/**
+ * React context for author data in the editor.
+ *
+ * This context is used to pass author data to inner blocks in nested mode.
+ * It avoids serializing author data into post content by using React context
+ * instead of block attributes/context.
+ *
+ * For PHP render, inner blocks use block context via `usesContext: ['newspack-blocks/author']`
+ * which is injected at runtime via `new WP_Block()`.
+ */
+export const AuthorContext = createContext( null );
+
+/**
+ * Expose AuthorContext globally so that blocks from other packages (like newspack-plugin's
+ * avatar block) can consume it when nested inside the Author Profile block.
+ *
+ * This creates a loose coupling without hard package dependencies.
+ */
+if ( typeof window !== 'undefined' ) {
+	window.NewspackAuthorContext = AuthorContext;
+}