@wordpress/edit-site 5.26.0 → 5.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.26.0",
+	"version": "5.27.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,46 +27,46 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.49.0",
-		"@wordpress/api-fetch": "^6.46.0",
-		"@wordpress/blob": "^3.49.0",
-		"@wordpress/block-editor": "^12.17.0",
-		"@wordpress/block-library": "^8.26.0",
-		"@wordpress/blocks": "^12.26.0",
-		"@wordpress/commands": "^0.20.0",
-		"@wordpress/components": "^25.15.0",
-		"@wordpress/compose": "^6.26.0",
-		"@wordpress/core-commands": "^0.18.0",
-		"@wordpress/core-data": "^6.26.0",
-		"@wordpress/data": "^9.19.0",
-		"@wordpress/dataviews": "^0.3.0",
-		"@wordpress/date": "^4.49.0",
-		"@wordpress/deprecated": "^3.49.0",
-		"@wordpress/dom": "^3.49.0",
-		"@wordpress/editor": "^13.26.0",
-		"@wordpress/element": "^5.26.0",
-		"@wordpress/escape-html": "^2.49.0",
-		"@wordpress/hooks": "^3.49.0",
-		"@wordpress/html-entities": "^3.49.0",
-		"@wordpress/i18n": "^4.49.0",
-		"@wordpress/icons": "^9.40.0",
-		"@wordpress/interface": "^5.26.0",
-		"@wordpress/keyboard-shortcuts": "^4.26.0",
-		"@wordpress/keycodes": "^3.49.0",
-		"@wordpress/media-utils": "^4.40.0",
-		"@wordpress/notices": "^4.17.0",
-		"@wordpress/patterns": "^1.10.0",
-		"@wordpress/plugins": "^6.17.0",
-		"@wordpress/preferences": "^3.26.0",
-		"@wordpress/primitives": "^3.47.0",
-		"@wordpress/private-apis": "^0.31.0",
-		"@wordpress/reusable-blocks": "^4.26.0",
-		"@wordpress/router": "^0.18.0",
-		"@wordpress/style-engine": "^1.32.0",
-		"@wordpress/url": "^3.50.0",
-		"@wordpress/viewport": "^5.26.0",
-		"@wordpress/widgets": "^3.26.0",
-		"@wordpress/wordcount": "^3.49.0",
+		"@wordpress/a11y": "^3.50.0",
+		"@wordpress/api-fetch": "^6.47.0",
+		"@wordpress/blob": "^3.50.0",
+		"@wordpress/block-editor": "^12.18.0",
+		"@wordpress/block-library": "^8.27.0",
+		"@wordpress/blocks": "^12.27.0",
+		"@wordpress/commands": "^0.21.0",
+		"@wordpress/components": "^25.16.0",
+		"@wordpress/compose": "^6.27.0",
+		"@wordpress/core-commands": "^0.19.0",
+		"@wordpress/core-data": "^6.27.0",
+		"@wordpress/data": "^9.20.0",
+		"@wordpress/dataviews": "^0.4.0",
+		"@wordpress/date": "^4.50.0",
+		"@wordpress/deprecated": "^3.50.0",
+		"@wordpress/dom": "^3.50.0",
+		"@wordpress/editor": "^13.27.0",
+		"@wordpress/element": "^5.27.0",
+		"@wordpress/escape-html": "^2.50.0",
+		"@wordpress/hooks": "^3.50.0",
+		"@wordpress/html-entities": "^3.50.0",
+		"@wordpress/i18n": "^4.50.0",
+		"@wordpress/icons": "^9.41.0",
+		"@wordpress/interface": "^5.27.0",
+		"@wordpress/keyboard-shortcuts": "^4.27.0",
+		"@wordpress/keycodes": "^3.50.0",
+		"@wordpress/media-utils": "^4.41.0",
+		"@wordpress/notices": "^4.18.0",
+		"@wordpress/patterns": "^1.11.0",
+		"@wordpress/plugins": "^6.18.0",
+		"@wordpress/preferences": "^3.27.0",
+		"@wordpress/primitives": "^3.48.0",
+		"@wordpress/private-apis": "^0.32.0",
+		"@wordpress/reusable-blocks": "^4.27.0",
+		"@wordpress/router": "^0.19.0",
+		"@wordpress/style-engine": "^1.33.0",
+		"@wordpress/url": "^3.51.0",
+		"@wordpress/viewport": "^5.27.0",
+		"@wordpress/widgets": "^3.27.0",
+		"@wordpress/wordcount": "^3.50.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
@@ -85,5 +85,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5e6f9caa205d3bfdbac131952b7bf9c6ec60569b"
+	"gitHead": "45de2cb4212fed7f2763e95f10300d1ff9d0ec08"
 }

package/src/components/actions/index.js

@@ -32,19 +32,28 @@ export const trashPostAction = {
 	isEligible( { status } ) {
 		return status !== 'trash';
 	},
+	supportsBulk: true,
 	hideModalHeader: true,
-	RenderModal: ( { item: post, closeModal } ) => {
+	RenderModal: ( { items: posts, closeModal, onPerform } ) => {
 		const { createSuccessNotice, createErrorNotice } =
 			useDispatch( noticesStore );
 		const { deleteEntityRecord } = useDispatch( coreStore );
 		return (
 			<VStack spacing="5">
 				<Text>
-					{ sprintf(
-						// translators: %s: The page's title.
-						__( 'Are you sure you want to delete "%s"?' ),
-						decodeEntities( post.title.rendered )
-					) }
+					{ posts.length === 1
+						? sprintf(
+								// translators: %s: The page's title.
+								__( 'Are you sure you want to delete "%s"?' ),
+								decodeEntities( posts[ 0 ].title.rendered )
+						  )
+						: sprintf(
+								// translators: %d: The number of pages (2 or more).
+								__(
+									'Are you sure you want to delete %d pages?'
+								),
+								posts.length
+						  ) }
 				</Text>
 				<HStack justify="right">
 					<Button variant="tertiary" onClick={ closeModal }>
@@ -53,38 +62,97 @@ export const trashPostAction = {
 					<Button
 						variant="primary"
 						onClick={ async () => {
-							try {
-								await deleteEntityRecord(
-									'postType',
-									post.type,
-									post.id,
-									{},
-									{ throwOnError: true }
-								);
-								createSuccessNotice(
-									sprintf(
-										/* translators: The page's title. */
+							const promiseResult = await Promise.allSettled(
+								posts.map( ( post ) => {
+									return deleteEntityRecord(
+										'postType',
+										post.type,
+										post.id,
+										{},
+										{ throwOnError: true }
+									);
+								} )
+							);
+							// If all the promises were fulfilled with success.
+							if (
+								promiseResult.every(
+									( { status } ) => status === 'fulfilled'
+								)
+							) {
+								let successMessage;
+								if ( promiseResult.length === 1 ) {
+									successMessage = sprintf(
+										/* translators: The posts's title. */
 										__( '"%s" moved to the Trash.' ),
-										decodeEntities( post.title.rendered )
-									),
-									{
-										type: 'snackbar',
-										id: 'edit-site-page-trashed',
-									}
-								);
-							} catch ( error ) {
-								const errorMessage =
-									error.message &&
-									error.code !== 'unknown_error'
-										? error.message
-										: __(
-												'An error occurred while moving the page to the trash.'
-										  );
-
-								createErrorNotice( errorMessage, {
+										decodeEntities(
+											posts[ 0 ].title.rendered
+										)
+									);
+								} else {
+									successMessage = __(
+										'Pages moved to the Trash.'
+									);
+								}
+								createSuccessNotice( successMessage, {
 									type: 'snackbar',
+									id: 'edit-site-page-trashed',
 								} );
+							} else {
+								// If there was at lease one failure.
+								let errorMessage;
+								// If we were trying to move a single post to the trash.
+								if ( promiseResult.length === 1 ) {
+									if ( promiseResult[ 0 ].reason?.message ) {
+										errorMessage =
+											promiseResult[ 0 ].reason.message;
+									} else {
+										errorMessage = __(
+											'An error occurred while moving the post to the trash.'
+										);
+									}
+									// If we were trying to move multiple posts to the trash
+								} else {
+									const errorMessages = new Set();
+									const failedPromises = promiseResult.filter(
+										( { status } ) => status === 'rejected'
+									);
+									for ( const failedPromise of failedPromises ) {
+										if ( failedPromise.reason?.message ) {
+											errorMessages.add(
+												failedPromise.reason.message
+											);
+										}
+									}
+									if ( errorMessages.size === 0 ) {
+										errorMessage = __(
+											'An error occurred while moving the posts to the trash.'
+										);
+									} else if ( errorMessages.size === 1 ) {
+										errorMessage = sprintf(
+											/* translators: %s: an error message */
+											__(
+												'An error occurred while moving the posts to the trash: %s'
+											),
+											[ ...errorMessages ][ 0 ]
+										);
+									} else {
+										errorMessage = sprintf(
+											/* translators: %s: a list of comma separated error messages */
+											__(
+												'Some errors occurred while moving the pages to the trash: %s'
+											),
+											[ ...errorMessages ].join( ',' )
+										);
+									}
+									createErrorNotice( errorMessage, {
+										type: 'snackbar',
+									} );
+								}
+							}
+							if ( onPerform ) {
+								onPerform();
 							}
+							closeModal();
 						} }
 					>
 						{ __( 'Delete' ) }
@@ -106,38 +174,94 @@ export function usePermanentlyDeletePostAction() {
 			label: __( 'Permanently delete' ),
 			isPrimary: true,
 			icon: trash,
+			supportsBulk: true,
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
-			async callback( post ) {
-				try {
-					await deleteEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ force: true },
-						{ throwOnError: true }
-					);
-					createSuccessNotice(
-						sprintf(
+			async callback( posts ) {
+				const promiseResult = await Promise.allSettled(
+					posts.map( ( post ) => {
+						return deleteEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{ force: true },
+							{ throwOnError: true }
+						);
+					} )
+				);
+				// If all the promises were fulfilled with success.
+				if (
+					promiseResult.every(
+						( { status } ) => status === 'fulfilled'
+					)
+				) {
+					let successMessage;
+					if ( promiseResult.length === 1 ) {
+						successMessage = sprintf(
 							/* translators: The posts's title. */
 							__( '"%s" permanently deleted.' ),
-							decodeEntities( post.title.rendered )
-						),
-						{
-							type: 'snackbar',
-							id: 'edit-site-post-permanently-deleted',
+							decodeEntities( posts[ 0 ].title.rendered )
+						);
+					} else {
+						successMessage = __(
+							'The posts were permanently deleted.'
+						);
+					}
+					createSuccessNotice( successMessage, {
+						type: 'snackbar',
+						id: 'edit-site-post-permanently-deleted',
+					} );
+				} else {
+					// If there was at lease one failure.
+					let errorMessage;
+					// If we were trying to permanently delete a single post.
+					if ( promiseResult.length === 1 ) {
+						if ( promiseResult[ 0 ].reason?.message ) {
+							errorMessage = promiseResult[ 0 ].reason.message;
+						} else {
+							errorMessage = __(
+								'An error occurred while permanently deleting the post.'
+							);
 						}
-					);
-				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while permanently deleting the post.'
-							  );
-
-					createErrorNotice( errorMessage, { type: 'snackbar' } );
+						// If we were trying to permanently delete multiple posts
+					} else {
+						const errorMessages = new Set();
+						const failedPromises = promiseResult.filter(
+							( { status } ) => status === 'rejected'
+						);
+						for ( const failedPromise of failedPromises ) {
+							if ( failedPromise.reason?.message ) {
+								errorMessages.add(
+									failedPromise.reason.message
+								);
+							}
+						}
+						if ( errorMessages.size === 0 ) {
+							errorMessage = __(
+								'An error occurred while permanently deleting the posts.'
+							);
+						} else if ( errorMessages.size === 1 ) {
+							errorMessage = sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while permanently deleting the posts: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+							);
+						} else {
+							errorMessage = sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while permanently deleting the posts: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+							);
+						}
+						createErrorNotice( errorMessage, {
+							type: 'snackbar',
+						} );
+					}
 				}
 			},
 		} ),
@@ -157,38 +281,63 @@ export function useRestorePostAction() {
 			label: __( 'Restore' ),
 			isPrimary: true,
 			icon: backup,
+			supportsBulk: true,
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
-			async callback( post ) {
-				await editEntityRecord( 'postType', post.type, post.id, {
-					status: 'draft',
-				} );
+			async callback( posts ) {
 				try {
-					await saveEditedEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ throwOnError: true }
-					);
+					for ( const post of posts ) {
+						await editEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{
+								status: 'draft',
+							}
+						);
+						await saveEditedEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{ throwOnError: true }
+						);
+					}
+
 					createSuccessNotice(
-						sprintf(
-							/* translators: The posts's title. */
-							__( '"%s" has been restored.' ),
-							decodeEntities( post.title.rendered )
-						),
+						posts.length > 1
+							? sprintf(
+									/* translators: The number of posts. */
+									__( '%d posts have been restored.' ),
+									posts.length
+							  )
+							: sprintf(
+									/* translators: The number of posts. */
+									__( '"%s" has been restored.' ),
+									decodeEntities( posts[ 0 ].title.rendered )
+							  ),
 						{
 							type: 'snackbar',
 							id: 'edit-site-post-restored',
 						}
 					);
 				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while restoring the post.'
-							  );
+					let errorMessage;
+					if (
+						error.message &&
+						error.code !== 'unknown_error' &&
+						error.message
+					) {
+						errorMessage = error.message;
+					} else if ( posts.length > 1 ) {
+						errorMessage = __(
+							'An error occurred while restoring the posts.'
+						);
+					} else {
+						errorMessage = __(
+							'An error occurred while restoring the post.'
+						);
+					}
 
 					createErrorNotice( errorMessage, { type: 'snackbar' } );
 				}
@@ -211,7 +360,8 @@ export const viewPostAction = {
 	isEligible( post ) {
 		return post.status !== 'trash';
 	},
-	callback( post ) {
+	callback( posts ) {
+		const post = posts[ 0 ];
 		document.location.href = post.link;
 	},
 };
@@ -225,7 +375,8 @@ export function useEditPostAction() {
 			isEligible( { status } ) {
 				return status !== 'trash';
 			},
-			callback( post ) {
+			callback( posts ) {
+				const post = posts[ 0 ];
 				history.push( {
 					postId: post.id,
 					postType: post.type,
@@ -250,7 +401,8 @@ export const postRevisionsAction = {
 			post?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
 		return lastRevisionId && revisionsCount > 1;
 	},
-	callback( post ) {
+	callback( posts ) {
+		const post = posts[ 0 ];
 		const href = addQueryArgs( 'revision.php', {
 			revision: post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id,
 		} );

package/src/components/editor-canvas-container/index.js

@@ -35,7 +35,7 @@ function getEditorCanvasContainerTitle( view ) {
 			return __( 'Style Book' );
 		case 'global-styles-revisions':
 		case 'global-styles-revisions:style-book':
-			return __( 'Global styles revisions' );
+			return __( 'Style Revisions' );
 		default:
 			return '';
 	}

package/src/components/global-styles/font-families.js

@@ -26,6 +26,8 @@ function FontFamilies() {
 	const { modalTabOpen, toggleModal, themeFonts, customFonts } =
 		useContext( FontLibraryContext );
 
+	const hasFonts = 0 < customFonts.length || 0 < themeFonts.length;
+
 	return (
 		<>
 			{ !! modalTabOpen && (
@@ -51,14 +53,18 @@ function FontFamilies() {
 						</Tooltip>
 					</HStack>
 				</HStack>
-				<ItemGroup isBordered isSeparated>
-					{ customFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-					{ themeFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-				</ItemGroup>
+				{ hasFonts ? (
+					<ItemGroup isBordered isSeparated>
+						{ customFonts.map( ( font ) => (
+							<FontFamilyItem key={ font.slug } font={ font } />
+						) ) }
+						{ themeFonts.map( ( font ) => (
+							<FontFamilyItem key={ font.slug } font={ font } />
+						) ) }
+					</ItemGroup>
+				) : (
+					<>{ __( 'No fonts installed.' ) }</>
+				) }
 			</VStack>
 		</>
 	);

package/src/components/global-styles/font-family-item.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { _n } from '@wordpress/i18n';
+import { _n, sprintf } from '@wordpress/i18n';
 import {
 	__experimentalHStack as HStack,
 	__experimentalItem as Item,
@@ -32,9 +32,12 @@ function FontFamilyItem( { font } ) {
 		<Item onClick={ handleClick }>
 			<HStack justify="space-between">
 				<FlexItem style={ previewStyle }>{ font.name }</FlexItem>
-				<FlexItem style={ { color: '#9e9e9e' } }>
-					{ variantsCount }{ ' ' }
-					{ _n( 'variant', 'variants', variantsCount ) }
+				<FlexItem className="edit-site-global-styles-screen-typography__font-variants-count">
+					{ sprintf(
+						/* translators: %d: Number of font variants. */
+						_n( '%d variant', '%d variants', variantsCount ),
+						variantsCount
+					) }
 				</FlexItem>
 			</HStack>
 		</Item>