@automattic/newspack-blocks 3.0.4 → 3.0.5-alpha.1

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

@@ -44,34 +44,6 @@ const POST_QUERY_ATTRIBUTES = [
 	'showCredit',
 ];
 
-type HomepageArticlesAttributes = {
-	postsToShow: number;
-	authors: AuthorId[];
-	categories: CategoryId[];
-	includeSubcategories: boolean;
-	excerptLength: number;
-	postType: PostType[];
-	showExcerpt: boolean;
-	tags: TagId[];
-	customTaxonomies: Taxonomy[];
-	specificPosts: string[];
-	specificMode: boolean;
-	tagExclusions: TagId[];
-	categoryExclusions: CategoryId[];
-	customTaxonomyExclusions: Taxonomy[];
-	showCaption: boolean;
-	showCredit: boolean;
-};
-
-type HomepageArticlesProps = {
-	attributes: HomepageArticlesAttributes;
-	topBlocksClientIdsInOrder: Block[ 'clientId' ][];
-	latestPosts: Post[];
-	isEditorBlock: boolean;
-	isUIDisabled: boolean;
-	error: undefined | string;
-};
-
 /**
  * Does the props change necessitate a reflow?
  * A reflow should happen if:
@@ -184,12 +156,16 @@ const generatePreviewPost = ( id: PostId ) => {
 		content: {
 			rendered: '<p>' + __( 'The post content.', 'newspack-blocks' ) + '</p>',
 		},
-		date_gmt: now.toISOString(),
+		date: now.toISOString(),
+		date_formatted: now.toLocaleString(),
+		article_meta_footer: '',
 		excerpt: {
 			rendered: '<p>' + __( 'The post excerpt.', 'newspack-blocks' ) + '</p>',
 		},
+		post_link: '/',
 		featured_media: '1',
 		id,
+		post_type: 'post',
 		meta: {
 			newspack_post_subtitle: __( 'Post Subtitle', 'newspack-blocks' ),
 		},
@@ -215,7 +191,8 @@ const generatePreviewPost = ( id: PostId ) => {
 			uncropped: `${ PREVIEW_IMAGE_BASE }/newspack-1024x536.jpg`,
 		},
 		newspack_has_custom_excerpt: false,
-		newspack_post_sponsors: false,
+		newspack_sponsors_show_categories: false,
+		newspack_sponsors_show_author: false,
 	};
 };
 
@@ -244,7 +221,7 @@ export const postsBlockSelector = (
 		clientId,
 		attributes,
 	}: { clientId: Block[ 'clientId' ]; attributes: HomepageArticlesAttributes }
-): Omit< HomepageArticlesProps, 'attributes' > => {
+): HomepageArticlesPropsFromDataSelector => {
 	const { getEditedPostAttribute } = select( 'core/editor' );
 	const editorBlocks = getEditedPostAttribute( 'blocks' ) || [];
 	const { getBlocks } = select( 'core/block-editor' );

package/src/components/editor-panels.js

@@ -31,10 +31,21 @@ const CheckboxesGroup = ( { options, values, onChange } ) => {
 export const PostTypesPanel = ( { attributes, setAttributes } ) => {
 	const { availablePostTypes } = useSelect( select => {
 		const { getPostTypes } = select( 'core' );
+		const listingsLabel = __( 'Listings', 'newspack-blocks' );
 		return {
-			availablePostTypes: getPostTypes( { per_page: -1 } )?.filter(
-				( { supports: { newspack_blocks: newspackBlocks } } ) => newspackBlocks
-			),
+			availablePostTypes: getPostTypes( { per_page: -1 } )
+				?.filter( ( { supports: { newspack_blocks: newspackBlocks } } ) => newspackBlocks )
+				?.map( postType => {
+					// Disambiguate the "Listings" post types.
+					if (
+						postType.slug.indexOf( 'newspack_lst' ) === 0 &&
+						postType.slug !== 'newspack_lst_generic' &&
+						postType.name.indexOf( listingsLabel ) === -1
+					) {
+						postType.name = `${ postType.name } ${ listingsLabel }`;
+					}
+					return postType;
+				} ),
 		};
 	} );
 

package/src/types/index.d.ts

@@ -8,6 +8,7 @@ declare global {
 			supports_recaptcha: boolean;
 			has_recaptcha: boolean;
 			recaptcha_url: string;
+			post_subtitle: boolean;
 			can_use_name_your_price: boolean;
 			tier_amounts_template: string;
 		};
@@ -54,6 +55,114 @@ declare global {
 
 	type Post = {
 		id: number;
+		title: {
+			rendered: string;
+		};
+		post_type: string;
+		date: string;
+		date_formatted: string;
+		article_meta_footer: string;
+		excerpt: {
+			rendered: string;
+		};
+		meta: {
+			newspack_post_subtitle: string;
+		};
+		post_link: string;
+		newspack_author_info: {
+			id: number;
+			author_link: string;
+			avatar: string;
+		}[];
+		newspack_article_classes: string;
+		newspack_featured_image_caption: string;
+		newspack_featured_image_src: {
+			large: string;
+			landscape: string;
+			portrait: string;
+			square: string;
+			uncropped: string;
+		};
+		newspack_category_info: string;
+		newspack_sponsors_show_categories: boolean;
+		newspack_sponsors_show_author: boolean;
+		newspack_post_sponsors?:
+		| {
+			flag: string;
+		}[]
+		| false;
+		newspack_listings_hide_author?: boolean;
+		newspack_listings_hide_publish_date?: boolean;
+	};
+
+	type HomepageArticlesAttributes = {
+		postsToShow: number;
+		authors: AuthorId[];
+		categories: CategoryId[];
+		includeSubcategories: boolean;
+		excerptLength: number;
+		postType: PostType[];
+		showImage: boolean;
+		showExcerpt: boolean;
+		tags: TagId[];
+		customTaxonomies: Taxonomy[];
+		specificPosts: string[];
+		specificMode: boolean;
+		tagExclusions: TagId[];
+		categoryExclusions: CategoryId[];
+		customTaxonomyExclusions: Taxonomy[];
+		className: string;
+		showExcerpt: boolean;
+		excerptLength: number;
+		showReadMore: boolean;
+		readMoreLabel: string;
+		showDate: boolean;
+		showImage: boolean;
+		showCaption: boolean;
+		showCredit: boolean;
+		disableImageLazyLoad: boolean;
+		fetchPriority: string;
+		imageShape: string;
+		minHeight: integer;
+		moreButton: boolean;
+		moreButtonText: string;
+		showAuthor: boolean;
+		showAvatar: boolean;
+		showCategory: boolean;
+		postLayout: string;
+		columns: integer;
+		colGap: integer;
+		postsToShow: integer;
+		mediaPosition: string;
+		showSubtitle: boolean;
+		sectionHeader: string;
+		imageScale: number;
+		mobileStack: boolean;
+		typeScale: number;
+		textAlign: string;
+		deduplicate: boolean;
+	};
+
+	type HomepageArticlesAttributesKey = keyof HomepageArticlesAttributes;
+
+	type HomepageArticlesPropsFromDataSelector = {
+		topBlocksClientIdsInOrder: Block['clientId'][];
+		latestPosts: Post[];
+		isEditorBlock: boolean;
+		isUIDisabled: boolean;
+		error: undefined | string;
+	};
+
+	type HomepageArticlesProps = HomepageArticlesPropsFromDataSelector & {
+		attributes: HomepageArticlesAttributes;
+		setAttributes: (attributes: Partial<HomepageArticlesAttributes>) => void;
+		textColor: {
+			color: string;
+		};
+		setTextColor: (color: string) => void;
+		triggerReflow: () => void;
+		className: string;
+		isSelected: boolean;
 	};
 }
 

package/vendor/autoload.php

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

package/vendor/composer/autoload_real.php

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

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitbf41db5fd90f71daf81a6c15709bfd19
+class ComposerStaticInit06ec7c7a70a7eef8363b26d9e1fd4ba8
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitbf41db5fd90f71daf81a6c15709bfd19
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitbf41db5fd90f71daf81a6c15709bfd19::$classMap;
+            $loader->classMap = ComposerStaticInit06ec7c7a70a7eef8363b26d9e1fd4ba8::$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' => '92a7bd33dd1b8a41ecd85a62a748e743015d634a',
+        'reference' => 'c21c8f7a3424be79aa4f31628cdfa80f3245e297',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '92a7bd33dd1b8a41ecd85a62a748e743015d634a',
+            'reference' => 'c21c8f7a3424be79aa4f31628cdfa80f3245e297',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),