@wordpress/block-library 7.9.0 → 7.12.0

package/src/comments/{edit.js → edit/template.js}

@@ -1,13 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import CommentsInspectorControls from './edit/comments-inspector-controls';
-
 const TEMPLATE = [
 	[ 'core/comments-title' ],
 	[
@@ -88,21 +78,4 @@ const TEMPLATE = [
 	[ 'core/post-comments-form' ],
 ];
 
-export default function CommentsEdit( { attributes, setAttributes } ) {
-	const { tagName: TagName } = attributes;
-
-	const blockProps = useBlockProps();
-	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		template: TEMPLATE,
-	} );
-
-	return (
-		<>
-			<CommentsInspectorControls
-				attributes={ attributes }
-				setAttributes={ setAttributes }
-			/>
-			<TagName { ...innerBlocksProps } />
-		</>
-	);
-}
+export default TEMPLATE;

package/src/comments/editor.scss

@@ -1,3 +1,12 @@
+@import "./style.scss";
+
 .block-library-comments-toolbar__popover .components-popover__content {
 	min-width: 230px;
 }
+
+.wp-block-comments__legacy-placeholder {
+	@extend .wp-block-post-comments;
+	* {
+		pointer-events: none;
+	}
+}

package/src/comments/index.js

@@ -7,6 +7,7 @@ import { postComments as icon } from '@wordpress/icons';
  * Internal dependencies
  */
 import metadata from './block.json';
+import deprecated from './deprecated';
 import edit from './edit';
 import save from './save';
 
@@ -17,4 +18,5 @@ export const settings = {
 	icon,
 	edit,
 	save,
+	deprecated,
 };

package/src/comments/index.php

@@ -0,0 +1,219 @@
+<?php
+/**
+ * Server-side rendering of the `core/comments` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/comments` block on the server.
+ *
+ * This render callback is mainly for rendering a dynamic, legacy version of
+ * this block (the old `core/post-comments`). It uses the `comments_template()`
+ * function to generate the output, in the same way as classic PHP themes.
+ *
+ * As this callback will always run during SSR, first we need to check whether
+ * the block is in legacy mode. If not, the HTML generated in the editor is
+ * returned instead.
+ *
+ * @param array    $attributes Block attributes.
+ * @param string   $content    Block default content.
+ * @param WP_Block $block      Block instance.
+ * @return string Returns the filtered post comments for the current post wrapped inside "p" tags.
+ */
+function render_block_core_comments( $attributes, $content, $block ) {
+	global $post;
+
+	$is_legacy = 'core/post-comments' === $block->name || ! empty( $attributes['legacy'] );
+	if ( ! $is_legacy ) {
+		return $block->render( array( 'dynamic' => false ) );
+	}
+
+	$post_id = $block->context['postId'];
+	if ( ! isset( $post_id ) ) {
+		return '';
+	}
+
+	$comment_args = array(
+		'post_id' => $post_id,
+		'count'   => true,
+		'status'  => 'approve',
+	);
+	// Return early if there are no comments and comments are closed.
+	if ( ! comments_open( $post_id ) && get_comments( $comment_args ) === 0 ) {
+		return '';
+	}
+
+	$post_before = $post;
+	$post        = get_post( $post_id );
+	setup_postdata( $post );
+
+	ob_start();
+
+	/*
+	 * There's a deprecation warning generated by WP Core.
+	 * Ideally this deprecation is removed from Core.
+	 * In the meantime, this removes it from the output.
+	 */
+	add_filter( 'deprecated_file_trigger_error', '__return_false' );
+	comments_template();
+	remove_filter( 'deprecated_file_trigger_error', '__return_false' );
+
+	$output = ob_get_clean();
+	$post   = $post_before;
+
+	$classnames = array();
+	// Adds the old class name for styles' backwards compatibility.
+	if ( isset( $attributes['legacy'] ) ) {
+		$classnames[] = 'wp-block-post-comments';
+	}
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classnames[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+
+	$wrapper_attributes = get_block_wrapper_attributes(
+		array( 'class' => implode( ' ', $classnames ) )
+	);
+
+	/*
+	 * Enqueues scripts and styles required only for the legacy version. That is
+	 * why they are not defined in `block.json`.
+	 */
+	wp_enqueue_script( 'comment-reply' );
+	enqueue_legacy_post_comments_block_styles( $block->name );
+
+	return sprintf( '<div %1$s>%2$s</div>', $wrapper_attributes, $output );
+}
+
+/**
+ * Registers the `core/comments` block on the server.
+ */
+function register_block_core_comments() {
+	register_block_type_from_metadata(
+		__DIR__ . '/comments',
+		array(
+			'render_callback'   => 'render_block_core_comments',
+			'skip_inner_blocks' => true,
+		)
+	);
+}
+add_action( 'init', 'register_block_core_comments' );
+
+/**
+ * Use the button block classes for the form-submit button.
+ *
+ * @param array $fields The default comment form arguments.
+ *
+ * @return array Returns the modified fields.
+ */
+function comments_block_form_defaults( $fields ) {
+	if ( wp_is_block_theme() ) {
+		$fields['submit_button'] = '<input name="%1$s" type="submit" id="%2$s" class="%3$s wp-block-button__link ' . WP_Theme_JSON_Gutenberg::get_element_class_name( 'button' ) . '" value="%4$s" />';
+		$fields['submit_field']  = '<p class="form-submit wp-block-button">%1$s %2$s</p>';
+	}
+
+	return $fields;
+}
+add_filter( 'comment_form_defaults', 'comments_block_form_defaults' );
+
+/**
+ * Enqueues styles from the legacy `core/post-comments` block. These styles are
+ * required only by the block's fallback.
+ *
+ * @param string $block_name Name of the new block type.
+ */
+function enqueue_legacy_post_comments_block_styles( $block_name ) {
+	static $are_styles_enqueued = false;
+
+	if ( ! $are_styles_enqueued ) {
+		$handles = array(
+			'wp-block-post-comments',
+			'wp-block-buttons',
+			'wp-block-button',
+		);
+		foreach ( $handles as $handle ) {
+			wp_enqueue_block_style( $block_name, array( 'handle' => $handle ) );
+		}
+		$are_styles_enqueued = true;
+	}
+}
+
+/**
+ * Ensures backwards compatibility for any users running the Gutenberg plugin
+ * who have used Post Comments before it was merged into Comments Query Loop.
+ *
+ * The same approach was followed when core/query-loop was renamed to
+ * core/post-template.
+ *
+ * @see https://github.com/WordPress/gutenberg/pull/41807
+ * @see https://github.com/WordPress/gutenberg/pull/32514
+ */
+function register_legacy_post_comments_block() {
+	$registry = WP_Block_Type_Registry::get_instance();
+
+	/*
+	 * Remove the old `post-comments` block if it was already registered, as it
+	 * is about to be replaced by the type defined below.
+	 */
+	if ( $registry->is_registered( 'core/post-comments' ) ) {
+		unregister_block_type( 'core/post-comments' );
+	}
+
+	// Recreate the legacy block metadata.
+	$metadata = array(
+		'name'              => 'core/post-comments',
+		'category'          => 'theme',
+		'attributes'        => array(
+			'textAlign' => array(
+				'type' => 'string',
+			),
+		),
+		'uses_context'      => array(
+			'postId',
+			'postType',
+		),
+		'supports'          => array(
+			'html'       => false,
+			'align'      => array( 'wide', 'full' ),
+			'typography' => array(
+				'fontSize'                      => true,
+				'lineHeight'                    => true,
+				'__experimentalFontStyle'       => true,
+				'__experimentalFontWeight'      => true,
+				'__experimentalLetterSpacing'   => true,
+				'__experimentalTextTransform'   => true,
+				'__experimentalDefaultControls' => array(
+					'fontSize' => true,
+				),
+			),
+			'color'      => array(
+				'gradients'                     => true,
+				'link'                          => true,
+				'__experimentalDefaultControls' => array(
+					'background' => true,
+					'text'       => true,
+				),
+			),
+			'inserter'   => false,
+		),
+		'style'             => array(
+			'wp-block-post-comments',
+			'wp-block-buttons',
+			'wp-block-button',
+		),
+		'editorStyle'       => 'wp-block-post-comments-editor',
+		'render_callback'   => 'render_block_core_comments',
+		'skip_inner_blocks' => true,
+	);
+
+	/*
+	 * Filters the metadata object, the same way it's done inside
+	 * `register_block_type_from_metadata()`. This applies some default filters,
+	 * like `_wp_multiple_block_styles`, which is required in this case because
+	 * the block has multiple styles.
+	 */
+	$metadata = apply_filters( 'block_type_metadata', $metadata );
+
+	register_block_type( 'core/post-comments', $metadata );
+}
+add_action( 'init', 'register_legacy_post_comments_block', 21 );

package/src/comments/save.js

@@ -1,12 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 
-export default function CommentsSave( { attributes: { tagName: Tag } } ) {
-	return (
-		<Tag { ...useBlockProps.save() }>
-			<InnerBlocks.Content />
-		</Tag>
-	);
+export default function save( { attributes: { tagName: Tag, legacy } } ) {
+	const blockProps = useBlockProps.save();
+	const innerBlocksProps = useInnerBlocksProps.save( blockProps );
+
+	// The legacy version is dynamic (i.e. PHP rendered) and doesn't allow inner
+	// blocks, so nothing is saved in that case.
+	return legacy ? null : <Tag { ...innerBlocksProps } />;
 }

package/src/{post-comments → comments}/style.scss

@@ -1,4 +1,6 @@
+/* Styles for backwards compatibility with the legacy `post-comments` block */
 .wp-block-post-comments {
+
 	/* utility classes */
 	.alignleft {
 		float: left;
@@ -7,6 +9,7 @@
 	.alignright {
 		float: right;
 	}
+
 	/* end utility classes */
 
 	.navigation {
@@ -62,9 +65,11 @@
 	.comment-meta {
 		font-size: 0.875em;
 		line-height: 1.5;
+
 		b {
 			font-weight: normal;
 		}
+
 		.comment-awaiting-moderation {
 			margin-top: 1em;
 			margin-bottom: 1em;
@@ -87,6 +92,7 @@
 	}
 
 	.comment-form {
+
 		textarea,
 		input:not([type="submit"]):not([type="checkbox"]) {
 			display: block;
@@ -106,6 +112,7 @@
 
 	.comment-reply-title {
 		margin-bottom: 0;
+
 		:where(small) {
 			font-size: var(--wp--preset--font-size--medium, smaller);
 			margin-left: 0.5em;

package/src/comments-pagination/block.json

@@ -4,7 +4,7 @@
 	"name": "core/comments-pagination",
 	"title": "Comments Pagination",
 	"category": "theme",
-	"parent": [ "core/comments-query-loop" ],
+	"parent": [ "core/comments" ],
 	"description": "Displays a paginated navigation to next/previous set of comments, when applicable.",
 	"textdomain": "default",
 	"attributes": {

package/src/comments-title/block.json

@@ -4,7 +4,7 @@
 	"name": "core/comments-title",
 	"title": "Comments Title",
 	"category": "theme",
-	"ancestor": [ "core/comments-query-loop" ],
+	"ancestor": [ "core/comments" ],
 	"description": "Displays a title with the number of comments",
 	"textdomain": "default",
 	"usesContext": [ "postId", "postType" ],

package/src/common.scss

@@ -1,3 +1,5 @@
+@import "./elements.scss";
+
 // The following selectors have increased specificity (using the :root prefix)
 // to assure colors take effect over another base class color, mainly to let
 // the colors override the added specificity by link states such as :hover.

package/src/cover/edit/block-controls.js

@@ -14,22 +14,17 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { ALLOWED_MEDIA_TYPES, IMAGE_BACKGROUND_TYPE } from '../shared';
+import { ALLOWED_MEDIA_TYPES } from '../shared';
 
 export default function CoverBlockControls( {
 	attributes,
 	setAttributes,
 	onSelectMedia,
 	currentSettings,
+	toggleUseFeaturedImage,
 } ) {
-	const {
-		contentPosition,
-		id,
-		useFeaturedImage,
-		dimRatio,
-		minHeight,
-		minHeightUnit,
-	} = attributes;
+	const { contentPosition, id, useFeaturedImage, minHeight, minHeightUnit } =
+		attributes;
 	const { hasInnerBlocks, url } = currentSettings;
 
 	const [ prevMinHeightValue, setPrevMinHeightValue ] = useState( minHeight );
@@ -63,17 +58,6 @@ export default function CoverBlockControls( {
 		} );
 	};
 
-	const toggleUseFeaturedImage = () => {
-		setAttributes( {
-			id: undefined,
-			url: undefined,
-			useFeaturedImage: ! useFeaturedImage,
-			dimRatio: dimRatio === 100 ? 50 : dimRatio,
-			backgroundType: useFeaturedImage
-				? IMAGE_BACKGROUND_TYPE
-				: undefined,
-		} );
-	};
 	return (
 		<>
 			<BlockControls group="block">

package/src/cover/edit/cover-placeholder.js

@@ -16,6 +16,7 @@ export default function CoverPlaceholder( {
 	onSelectMedia,
 	onError,
 	style,
+	toggleUseFeaturedImage,
 } ) {
 	return (
 		<MediaPlaceholder
@@ -30,6 +31,7 @@ export default function CoverPlaceholder( {
 			accept="image/*,video/*"
 			allowedTypes={ ALLOWED_MEDIA_TYPES }
 			disableMediaButtons={ disableMediaButtons }
+			onToggleFeaturedImage={ toggleUseFeaturedImage }
 			onError={ onError }
 			style={ style }
 		>

package/src/cover/edit/index.js

@@ -211,12 +211,25 @@ function CoverEdit( {
 		overlayColor,
 	};
 
+	const toggleUseFeaturedImage = () => {
+		setAttributes( {
+			id: undefined,
+			url: undefined,
+			useFeaturedImage: ! useFeaturedImage,
+			dimRatio: dimRatio === 100 ? 50 : dimRatio,
+			backgroundType: useFeaturedImage
+				? IMAGE_BACKGROUND_TYPE
+				: undefined,
+		} );
+	};
+
 	const blockControls = (
 		<CoverBlockControls
 			attributes={ attributes }
 			setAttributes={ setAttributes }
 			onSelectMedia={ onSelectMedia }
 			currentSettings={ currentSettings }
+			toggleUseFeaturedImage={ toggleUseFeaturedImage }
 		/>
 	);
 
@@ -228,6 +241,7 @@ function CoverEdit( {
 			setOverlayColor={ setOverlayColor }
 			coverRef={ ref }
 			currentSettings={ currentSettings }
+			toggleUseFeaturedImage={ toggleUseFeaturedImage }
 		/>
 	);
 
@@ -249,6 +263,7 @@ function CoverEdit( {
 						style={ {
 							minHeight: minHeightWithUnit || undefined,
 						} }
+						toggleUseFeaturedImage={ toggleUseFeaturedImage }
 					>
 						<div className="wp-block-cover__placeholder-background-options">
 							<ColorPalette
@@ -384,6 +399,7 @@ function CoverEdit( {
 					disableMediaButtons
 					onSelectMedia={ onSelectMedia }
 					onError={ onUploadError }
+					toggleUseFeaturedImage={ toggleUseFeaturedImage }
 				/>
 				<div { ...innerBlocksProps } />
 			</div>

package/src/cover/edit/resizable-cover.js

@@ -49,6 +49,12 @@ export default function ResizableCover( {
 				onResizeStop( elt.clientHeight );
 				setIsResizing( false );
 			} }
+			__experimentalShowTooltip
+			__experimentalTooltipProps={ {
+				axis: 'y',
+				position: 'bottom',
+				isVisible: isResizing,
+			} }
 			{ ...props }
 		/>
 	);

package/src/cover/index.php

@@ -8,8 +8,8 @@
 /**
  * Renders the `core/cover` block on server.
  *
- * @param array $attributes The block attributes.
- * @param array $content    The block rendered content.
+ * @param array  $attributes The block attributes.
+ * @param string $content    The block rendered content.
  *
  * @return string Returns the cover block markup, if useFeaturedImage is true.
  */

package/src/cover/style.scss

@@ -1,10 +1,8 @@
 .wp-block-cover-image,
 .wp-block-cover {
 	position: relative;
-	background-size: cover;
 	background-position: center center;
 	min-height: 430px;
-	width: 100%;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -201,6 +199,8 @@
 video.wp-block-cover__video-background {
 	&.has-parallax {
 		background-attachment: fixed;
+		background-size: cover;
+		background-repeat: no-repeat;
 
 		// Mobile Safari does not support fixed background attachment properly.
 		// See also https://stackoverflow.com/questions/24154666/background-size-cover-not-working-on-ios

package/src/cover/transforms.js

@@ -206,10 +206,10 @@ const transforms = {
 		{
 			type: 'block',
 			blocks: [ 'core/group' ],
-			isMatch: ( { url } ) => {
+			isMatch: ( { url, useFeaturedImage } ) => {
 				// If the Cover block uses background media, skip this transform,
 				// and instead use the Group block's default transform.
-				if ( url ) {
+				if ( url || useFeaturedImage ) {
 					return false;
 				}
 				return true;

package/src/editor-elements.scss

@@ -0,0 +1,10 @@
+/**
+ * Element styles for the editor
+ */
+.wp-element-button {
+	cursor: revert;
+
+	&[role="textbox"] {
+		cursor: text;
+	}
+}

package/src/editor.scss

@@ -49,9 +49,10 @@
 @import "./query-pagination/editor.scss";
 @import "./query-pagination-numbers/editor.scss";
 @import "./post-featured-image/editor.scss";
-@import "./post-comments/editor.scss";
 @import "./post-comments-form/editor.scss";
 
+@import "./editor-elements.scss";
+
 :root .editor-styles-wrapper {
 	@include background-colors-deprecated();
 	@include foreground-colors-deprecated();

package/src/elements.scss

@@ -0,0 +1,6 @@
+/**
+ * Element styles.
+ */
+.wp-element-button {
+	cursor: pointer;
+}

package/src/embed/embed-placeholder.native.js

@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { View, Text, TouchableWithoutFeedback } from 'react-native';
-import { compact } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -68,11 +67,11 @@ const EmbedPlaceholder = ( {
 		},
 	};
 
-	const options = compact( [
+	const options = [
 		cannotEmbed && errorPickerOptions.retry,
 		cannotEmbed && errorPickerOptions.convertToLink,
 		cannotEmbed && errorPickerOptions.editLink,
-	] );
+	].filter( Boolean );
 
 	function onPickerSelect( value ) {
 		const selectedItem = options.find( ( item ) => item.value === value );

package/src/file/test/__snapshots__/edit.native.js.snap

@@ -54,7 +54,14 @@ exports[`File block renders file error state without crashing 1`] = `
         }
       }
     >
-      <View>
+      <View
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+      >
         <RCTAztecView
           accessible={true}
           activeFormats={Array []}
@@ -144,7 +151,14 @@ exports[`File block renders file error state without crashing 1`] = `
         ]
       }
     >
-      <View>
+      <View
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+      >
         <RCTAztecView
           accessible={true}
           activeFormats={Array []}
@@ -262,7 +276,14 @@ exports[`File block renders file without crashing 1`] = `
         }
       }
     >
-      <View>
+      <View
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+      >
         <RCTAztecView
           accessible={true}
           activeFormats={Array []}
@@ -334,7 +355,14 @@ exports[`File block renders file without crashing 1`] = `
         ]
       }
     >
-      <View>
+      <View
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+      >
         <RCTAztecView
           accessible={true}
           activeFormats={Array []}