@wordpress/block-library 7.4.0 → 7.7.0

package/src/comments-title/block.json

@@ -12,12 +12,6 @@
 		"textAlign": {
 			"type": "string"
 		},
-		"singleCommentLabel": {
-			"type": "string"
-		},
-		"multipleCommentsLabel": {
-			"type": "string"
-		},
 		"showPostTitle": {
 			"type": "boolean",
 			"default": true

package/src/comments-title/deprecated.js

@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+
+const { attributes, supports } = metadata;
+
+export default [
+	{
+		attributes: {
+			...attributes,
+			singleCommentLabel: {
+				type: 'string',
+			},
+			multipleCommentsLabel: {
+				type: 'string',
+			},
+		},
+		supports,
+		migrate: ( oldAttributes ) => {
+			/* eslint-disable no-unused-vars */
+			const {
+				singleCommentLabel,
+				multipleCommentsLabel,
+				...newAttributes
+			} = oldAttributes;
+			/* eslint-enable no-unused-vars */
+			return newAttributes;
+		},
+		isEligible: ( { multipleCommentsLabel, singleCommentLabel } ) =>
+			multipleCommentsLabel || singleCommentLabel,
+		save: () => null,
+	},
+];

package/src/comments-title/edit.js

@@ -10,17 +10,11 @@ import {
 	AlignmentControl,
 	BlockControls,
 	useBlockProps,
-	PlainText,
 	InspectorControls,
 } from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
+import { __, _n, sprintf } from '@wordpress/i18n';
 import { useEntityProp } from '@wordpress/core-data';
-import {
-	PanelBody,
-	ToggleControl,
-	__experimentalToggleGroupControl as ToggleGroupControl,
-	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
-} from '@wordpress/components';
+import { PanelBody, ToggleControl } from '@wordpress/components';
 import { useState, useEffect } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
@@ -31,20 +25,12 @@ import { addQueryArgs } from '@wordpress/url';
 import HeadingLevelDropdown from '../heading/heading-level-dropdown';
 
 export default function Edit( {
-	attributes: {
-		textAlign,
-		singleCommentLabel,
-		multipleCommentsLabel,
-		showPostTitle,
-		showCommentsCount,
-		level,
-	},
+	attributes: { textAlign, showPostTitle, showCommentsCount, level },
 	setAttributes,
 	context: { postType, postId },
 } ) {
 	const TagName = 'h' + level;
 	const [ commentsCount, setCommentsCount ] = useState();
-	const [ editingMode, setEditingMode ] = useState( 'plural' );
 	const [ rawTitle ] = useEntityProp( 'postType', postType, 'title', postId );
 	const isSiteEditor = typeof postId === 'undefined';
 	const blockProps = useBlockProps( {
@@ -100,22 +86,6 @@ export default function Edit( {
 	const inspectorControls = (
 		<InspectorControls>
 			<PanelBody title={ __( 'Settings' ) }>
-				{ isSiteEditor && (
-					<ToggleGroupControl
-						label={ __( 'Editing mode' ) }
-						onChange={ setEditingMode }
-						value={ editingMode }
-					>
-						<ToggleGroupControlOption
-							label={ __( 'Singular' ) }
-							value="singular"
-						/>
-						<ToggleGroupControlOption
-							label={ __( 'Plural' ) }
-							value="plural"
-						/>
-					</ToggleGroupControl>
-				) }
 				<ToggleControl
 					label={ __( 'Show post title' ) }
 					checked={ showPostTitle }
@@ -136,62 +106,52 @@ export default function Edit( {
 
 	const postTitle = isSiteEditor ? __( '"Post Title"' ) : `"${ rawTitle }"`;
 
-	const singlePlaceholder = showPostTitle
-		? __( 'One response to ' )
-		: __( 'One response' );
-
-	const multiplePlaceholder = showPostTitle
-		? __( 'Responses to ' )
-		: __( 'Responses' );
+	let placeholder;
+	if ( showCommentsCount && commentsCount !== undefined ) {
+		if ( showPostTitle ) {
+			if ( commentsCount === 1 ) {
+				/* translators: %s: Post title. */
+				placeholder = sprintf( __( 'One response to %s' ), postTitle );
+			} else {
+				placeholder = sprintf(
+					/* translators: 1: Number of comments, 2: Post title. */
+					_n(
+						'%1$s response to %2$s',
+						'%1$s responses to %2$s',
+						commentsCount
+					),
+					commentsCount,
+					postTitle
+				);
+			}
+		} else if ( commentsCount === 1 ) {
+			placeholder = __( 'One response' );
+		} else {
+			placeholder = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s responses', '%s responses', commentsCount ),
+				commentsCount
+			);
+		}
+	} else if ( showPostTitle ) {
+		if ( commentsCount === 1 ) {
+			/* translators: %s: Post title. */
+			placeholder = sprintf( __( 'Response to %s' ), postTitle );
+		} else {
+			/* translators: %s: Post title. */
+			placeholder = sprintf( __( 'Responses to %s' ), postTitle );
+		}
+	} else if ( commentsCount === 1 ) {
+		placeholder = __( 'Response' );
+	} else {
+		placeholder = __( 'Responses' );
+	}
 
 	return (
 		<>
 			{ blockControls }
 			{ inspectorControls }
-			<TagName { ...blockProps }>
-				{ editingMode === 'singular' || commentsCount === 1 ? (
-					<>
-						<PlainText
-							__experimentalVersion={ 2 }
-							tagName="span"
-							aria-label={ singlePlaceholder }
-							placeholder={ singlePlaceholder }
-							value={ singleCommentLabel }
-							onChange={ ( newLabel ) =>
-								setAttributes( {
-									singleCommentLabel: newLabel,
-								} )
-							}
-						/>
-						{ showPostTitle ? postTitle : null }
-					</>
-				) : (
-					<>
-						{ showCommentsCount ? commentsCount : null }
-						<PlainText
-							__experimentalVersion={ 2 }
-							tagName="span"
-							aria-label={
-								showCommentsCount
-									? ` ${ multiplePlaceholder }`
-									: multiplePlaceholder
-							}
-							placeholder={
-								showCommentsCount
-									? ` ${ multiplePlaceholder }`
-									: multiplePlaceholder
-							}
-							value={ multipleCommentsLabel }
-							onChange={ ( newLabel ) =>
-								setAttributes( {
-									multipleCommentsLabel: newLabel,
-								} )
-							}
-						/>
-						{ showPostTitle ? postTitle : null }
-					</>
-				) }
-			</TagName>
+			<TagName { ...blockProps }>{ placeholder }</TagName>
 		</>
 	);
 }

package/src/comments-title/index.js

@@ -1,13 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { commentTitle as icon } from '@wordpress/icons';
+import { title as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import metadata from './block.json';
 import edit from './edit';
+import deprecated from './deprecated';
 
 const { name } = metadata;
 export { metadata, name };
@@ -15,4 +16,5 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	deprecated,
 };

package/src/comments-title/index.php

@@ -14,13 +14,18 @@
  */
 function render_block_core_comments_title( $attributes ) {
 
+	if ( post_password_required() ) {
+		return;
+	}
+
 	$align_class_name    = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
 	$show_post_title     = ! empty( $attributes['showPostTitle'] ) && $attributes['showPostTitle'];
 	$show_comments_count = ! empty( $attributes['showCommentsCount'] ) && $attributes['showCommentsCount'];
 	$wrapper_attributes  = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
-	$post_title          = $show_post_title ? sprintf( '"%1$s"', get_the_title() ) : null;
-	$comments_count      = number_format_i18n( get_comments_number() );
-	$tag_name            = 'h2';
+	$comments_count      = get_comments_number();
+	/* translators: %s: Post title. */
+	$post_title = sprintf( __( '“%s”' ), get_the_title() );
+	$tag_name   = 'h2';
 	if ( isset( $attributes['level'] ) ) {
 		$tag_name = 'h' . $attributes['level'];
 	}
@@ -29,21 +34,45 @@ function render_block_core_comments_title( $attributes ) {
 		return;
 	}
 
-	$single_default_comment_label = $show_post_title ? __( 'One response to' ) : __( 'One response' );
-	$single_comment_label         = ! empty( $attributes['singleCommentLabel'] ) ? $attributes['singleCommentLabel'] : $single_default_comment_label;
-
-	$multiple_default_comment_label = $show_post_title ? __( 'Responses to' ) : __( 'Responses' );
-	$multiple_comment_label         = ! empty( $attributes['multipleCommentsLabel'] ) ? $attributes['multipleCommentsLabel'] : $multiple_default_comment_label;
-
-	$comments_title = '%1$s %2$s %3$s';
-
-	$comments_title = sprintf(
-		$comments_title,
-		// If there is only one comment, only display the label.
-		'1' !== $comments_count && $show_comments_count ? $comments_count : null,
-		'1' === $comments_count ? $single_comment_label : $multiple_comment_label,
-		$post_title
-	);
+	if ( $show_comments_count ) {
+		if ( $show_post_title ) {
+			if ( '1' === $comments_count ) {
+				/* translators: %s: Post title. */
+				$comments_title = sprintf( __( 'One response to %s' ), $post_title );
+			} else {
+				$comments_title = sprintf(
+					/* translators: 1: Number of comments, 2: Post title. */
+					_n(
+						'%1$s response to %2$s',
+						'%1$s responses to %2$s',
+						$comments_count
+					),
+					number_format_i18n( $comments_count ),
+					$post_title
+				);
+			}
+		} elseif ( '1' === $comments_count ) {
+			$comments_title = __( 'One response' );
+		} else {
+			$comments_title = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s responses', '%s responses', $comments_count ),
+				number_format_i18n( $comments_count )
+			);
+		}
+	} elseif ( $show_post_title ) {
+		if ( '1' === $comments_count ) {
+			/* translators: %s: Post title. */
+			$comments_title = sprintf( __( 'Response to %s' ), $post_title );
+		} else {
+			/* translators: %s: Post title. */
+			$comments_title = sprintf( __( 'Responses to %s' ), $post_title );
+		}
+	} elseif ( '1' === $comments_count ) {
+		$comments_title = __( 'Response' );
+	} else {
+		$comments_title = __( 'Responses' );
+	}
 
 	return sprintf(
 		'<%1$s id="comments" %2$s>%3$s</%1$s>',
@@ -53,9 +82,9 @@ function render_block_core_comments_title( $attributes ) {
 	);
 }
 
-	/**
-	 * Registers the `core/comments-title` block on the server.
-	 */
+/**
+ * Registers the `core/comments-title` block on the server.
+ */
 function register_block_core_comments_title() {
 	register_block_type_from_metadata(
 		__DIR__ . '/comments-title',
@@ -65,4 +94,4 @@ function register_block_core_comments_title() {
 	);
 }
 
-	add_action( 'init', 'register_block_core_comments_title' );
+add_action( 'init', 'register_block_core_comments_title' );

package/src/cover/controls.native.js

@@ -167,7 +167,6 @@ function Controls( {
 							styles.mediaPreview,
 							mediaBackground,
 						] }
-						onLongPress={ openMediaOptions }
 					>
 						<View style={ styles.mediaInner }>
 							{ IMAGE_BACKGROUND_TYPE === backgroundType && (
@@ -217,7 +216,7 @@ function Controls( {
 										} );
 										setDisplayPlaceholder( false );
 										// Avoid invisible, paused video on Android, presumably
-										// related to https://git.io/Jt6Dr
+										// related to https://github.com/react-native-video/react-native-video/issues/1979
 										videoRef?.current.seek( 0 );
 									} }
 									ref={ videoRef }