@wordpress/edit-site 5.9.0 → 5.11.0

package/src/components/add-new-template/new-template.js

@@ -1,41 +1,30 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
 import {
-	DropdownMenu,
-	MenuGroup,
-	MenuItem,
-	Tooltip,
-	VisuallyHidden,
+	Button,
+	Modal,
+	__experimentalGrid as Grid,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
-import {
-	archive,
-	blockMeta,
-	category,
-	home,
-	list,
-	media,
-	notFound,
-	page,
-	plus,
-	post,
-	postAuthor,
-	postDate,
-	postList,
-	search,
-	tag,
-	layout as customGenericTemplateIcon,
-} from '@wordpress/icons';
+import { plus } from '@wordpress/icons';
 import { __, sprintf } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import AddCustomTemplateModal from './add-custom-template-modal';
+import AddCustomTemplateModalContent from './add-custom-template-modal-content';
 import {
 	useExistingTemplates,
 	useDefaultTemplateTypes,
@@ -44,12 +33,13 @@ import {
 	useAuthorMenuItem,
 	usePostTypeArchiveMenuItems,
 } from './utils';
-import AddCustomGenericTemplateModal from './add-custom-generic-template-modal';
+import AddCustomGenericTemplateModalContent from './add-custom-generic-template-modal-content';
 import TemplateActionsLoadingScreen from './template-actions-loading-screen';
-import { useHistory } from '../routes';
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../private-apis';
 
+const { useHistory } = unlock( routerPrivateApis );
+
 const DEFAULT_TEMPLATE_SLUGS = [
 	'front-page',
 	'home',
@@ -66,21 +56,35 @@ const DEFAULT_TEMPLATE_SLUGS = [
 	'404',
 ];
 
-const TEMPLATE_ICONS = {
-	'front-page': home,
-	home: postList,
-	single: post,
-	page,
-	archive,
-	search,
-	404: notFound,
-	index: list,
-	category,
-	author: postAuthor,
-	taxonomy: blockMeta,
-	date: postDate,
-	tag,
-	attachment: media,
+function TemplateListItem( { title, description, onClick } ) {
+	return (
+		<Button onClick={ onClick }>
+			<VStack
+				as="span"
+				spacing={ 2 }
+				justify="flex-start"
+				style={ { width: '100%' } }
+			>
+				<Text
+					weight={ 500 }
+					lineHeight={ 1.53846153846 } // 20px
+				>
+					{ title }
+				</Text>
+				<Text
+					lineHeight={ 1.53846153846 } // 20px
+				>
+					{ description }
+				</Text>
+			</VStack>
+		</Button>
+	);
+}
+
+const modalContentMap = {
+	templatesList: 1,
+	customTemplate: 2,
+	customGenericTemplate: 3,
 };
 
 export default function NewTemplate( {
@@ -88,12 +92,10 @@ export default function NewTemplate( {
 	toggleProps,
 	showIcon = true,
 } ) {
-	const [ showCustomTemplateModal, setShowCustomTemplateModal ] =
-		useState( false );
-	const [
-		showCustomGenericTemplateModal,
-		setShowCustomGenericTemplateModal,
-	] = useState( false );
+	const [ showModal, setShowModal ] = useState( false );
+	const [ modalContent, setModalContent ] = useState(
+		modalContentMap.templatesList
+	);
 	const [ entityForSuggestions, setEntityForSuggestions ] = useState( {} );
 	const [ isCreatingTemplate, setIsCreatingTemplate ] = useState( false );
 
@@ -157,130 +159,116 @@ export default function NewTemplate( {
 			setIsCreatingTemplate( false );
 		}
 	}
+	const onModalClose = () => {
+		setShowModal( false );
+		setModalContent( modalContentMap.templatesList );
+	};
 
-	const missingTemplates = useMissingTemplates(
-		setEntityForSuggestions,
-		setShowCustomTemplateModal
+	const missingTemplates = useMissingTemplates( setEntityForSuggestions, () =>
+		setModalContent( modalContentMap.customTemplate )
 	);
 	if ( ! missingTemplates.length ) {
 		return null;
 	}
+	const { as: Toggle = Button, ...restToggleProps } = toggleProps ?? {};
 
-	const customTemplateDescription = __(
-		'A custom template can be manually applied to any post or page.'
-	);
-
+	let modalTitle = __( 'Add template' );
+	if ( modalContent === modalContentMap.customTemplate ) {
+		modalTitle = sprintf(
+			// translators: %s: Name of the post type e.g: "Post".
+			__( 'Add template: %s' ),
+			entityForSuggestions.labels.singular_name
+		);
+	} else if ( modalContent === modalContentMap.customGenericTemplate ) {
+		modalTitle = __( 'Create custom template' );
+	}
 	return (
 		<>
-			<DropdownMenu
-				className="edit-site-new-template-dropdown"
+			{ isCreatingTemplate && <TemplateActionsLoadingScreen /> }
+			<Toggle
+				{ ...restToggleProps }
+				onClick={ () => setShowModal( true ) }
 				icon={ showIcon ? plus : null }
-				text={ showIcon ? null : postType.labels.add_new }
 				label={ postType.labels.add_new_item }
-				popoverProps={ {
-					noArrow: false,
-				} }
-				toggleProps={ toggleProps }
 			>
-				{ () => (
-					<>
-						{ isCreatingTemplate && (
-							<TemplateActionsLoadingScreen />
-						) }
-						<div className="edit-site-new-template-dropdown__menu-groups">
-							<MenuGroup label={ postType.labels.add_new_item }>
-								{ missingTemplates.map( ( template ) => {
-									const {
-										title,
-										description,
-										slug,
-										onClick,
-										icon,
-									} = template;
-									return (
-										<Tooltip
-											key={ slug }
-											position="top right"
-											text={ description }
-											className="edit-site-new-template-dropdown__menu-item-tooltip"
-										>
-											<MenuItem
-												icon={
-													icon ||
-													TEMPLATE_ICONS[ slug ] ||
-													post
-												}
-												iconPosition="left"
-												onClick={ () =>
-													onClick
-														? onClick( template )
-														: createTemplate(
-																template
-														  )
-												}
-											>
-												{ title }
-												{ /* TODO: This probably won't be needed if the <Tooltip> component is accessible.
-												 * @see https://github.com/WordPress/gutenberg/issues/48222 */ }
-												<VisuallyHidden>
-													{ description }
-												</VisuallyHidden>
-											</MenuItem>
-										</Tooltip>
-									);
-								} ) }
-							</MenuGroup>
-							<MenuGroup>
-								<Tooltip
-									position="top right"
-									text={ customTemplateDescription }
-									className="edit-site-new-template-dropdown__menu-item-tooltip"
-								>
-									<MenuItem
-										icon={ customGenericTemplateIcon }
-										iconPosition="left"
+				{ showIcon ? null : postType.labels.add_new_item }
+			</Toggle>
+			{ showModal && (
+				<Modal
+					title={ modalTitle }
+					className={ classnames(
+						'edit-site-add-new-template__modal',
+						{
+							'edit-site-add-new-template__modal_template_list':
+								modalContent === modalContentMap.templatesList,
+							'edit-site-custom-template-modal':
+								modalContent === modalContentMap.customTemplate,
+						}
+					) }
+					onRequestClose={ onModalClose }
+					overlayClassName={
+						modalContent === modalContentMap.customGenericTemplate
+							? 'edit-site-custom-generic-template__modal'
+							: undefined
+					}
+				>
+					{ modalContent === modalContentMap.templatesList && (
+						<Grid
+							columns={ 3 }
+							gap={ 4 }
+							align="flex-start"
+							justify="center"
+							className="edit-site-add-new-template__template-list__contents"
+						>
+							{ missingTemplates.map( ( template ) => {
+								const { title, description, slug, onClick } =
+									template;
+								return (
+									<TemplateListItem
+										key={ slug }
+										title={ title }
+										description={ description }
 										onClick={ () =>
-											setShowCustomGenericTemplateModal(
-												true
-											)
+											onClick
+												? onClick( template )
+												: createTemplate( template )
 										}
-									>
-										{ __( 'Custom template' ) }
-										{ /* TODO: This probably won't be needed if the <Tooltip> component is accessible.
-										 * @see https://github.com/WordPress/gutenberg/issues/48222 */ }
-										<VisuallyHidden>
-											{ customTemplateDescription }
-										</VisuallyHidden>
-									</MenuItem>
-								</Tooltip>
-							</MenuGroup>
-						</div>
-					</>
-				) }
-			</DropdownMenu>
-			{ showCustomTemplateModal && (
-				<AddCustomTemplateModal
-					onClose={ () => setShowCustomTemplateModal( false ) }
-					onSelect={ createTemplate }
-					entityForSuggestions={ entityForSuggestions }
-					isCreatingTemplate={ isCreatingTemplate }
-				/>
-			) }
-			{ showCustomGenericTemplateModal && (
-				<AddCustomGenericTemplateModal
-					onClose={ () => setShowCustomGenericTemplateModal( false ) }
-					createTemplate={ createTemplate }
-					isCreatingTemplate={ isCreatingTemplate }
-				/>
+									/>
+								);
+							} ) }
+							<TemplateListItem
+								title={ __( 'Custom template' ) }
+								description={ __(
+									'A custom template can be manually applied to any post or page.'
+								) }
+								onClick={ () =>
+									setModalContent(
+										modalContentMap.customGenericTemplate
+									)
+								}
+							/>
+						</Grid>
+					) }
+					{ modalContent === modalContentMap.customTemplate && (
+						<AddCustomTemplateModalContent
+							onSelect={ createTemplate }
+							entityForSuggestions={ entityForSuggestions }
+						/>
+					) }
+					{ modalContent ===
+						modalContentMap.customGenericTemplate && (
+						<AddCustomGenericTemplateModalContent
+							onClose={ onModalClose }
+							createTemplate={ createTemplate }
+						/>
+					) }
+				</Modal>
 			) }
 		</>
 	);
 }
 
-function useMissingTemplates(
-	setEntityForSuggestions,
-	setShowCustomTemplateModal
-) {
+function useMissingTemplates( setEntityForSuggestions, onClick ) {
 	const existingTemplates = useExistingTemplates();
 	const defaultTemplateTypes = useDefaultTemplateTypes();
 	const existingTemplateSlugs = ( existingTemplates || [] ).map(
@@ -292,7 +280,7 @@ function useMissingTemplates(
 			! existingTemplateSlugs.includes( template.slug )
 	);
 	const onClickMenuItem = ( _entityForSuggestions ) => {
-		setShowCustomTemplateModal( true );
+		onClick?.();
 		setEntityForSuggestions( _entityForSuggestions );
 	};
 	// We need to replace existing default template types with

package/src/components/add-new-template/style.scss

@@ -1,64 +1,23 @@
-.edit-site-new-template-dropdown {
-	.edit-site-new-template-dropdown__menu-groups {
-		@include break-small() {
-			min-width: 300px;
+.edit-site-custom-template-modal {
+	&__contents-wrapper {
+		height: 100%;
+		justify-content: flex-start !important; // Required as topLeft alignment isn't working on VStack
+
+		> * {
+			width: 100%;
 		}
-	}
 
-	// The specificity is needed to override the default tooltip styles.
-	&__menu-item-tooltip.components-tooltip .components-popover__content {
-		max-width: 320px;
-		padding: $grid-unit-10 $grid-unit-15;
-		border-radius: 2px;
-		white-space: pre-wrap;
-		min-width: 0;
-		width: auto;
-		text-align: left;
+		&__suggestions_list {
+			margin-left: - $grid-unit-15;
+			margin-right: - $grid-unit-15;
+			width: calc(100% + #{$grid-unit-15 * 2});
+		}
 	}
-}
 
-.edit-site-custom-template-modal {
 	&__contents {
 		> .components-button {
-			padding: $grid-unit-30;
-			box-shadow: inset 0 0 0 $border-width $gray-600;
-			border-radius: $radius-block-ui;
-			width: 256px;
 			height: auto;
-			display: flex;
-			flex-direction: column;
-			gap: $grid-unit;
-
-			// Show the boundary of the button, in High Contrast Mode.
-			outline: 1px solid transparent;
-
-			span:first-child {
-				color: $gray-900;
-			}
-
-			span {
-				color: $gray-700;
-			}
-
-			&:hover {
-				color: var(--wp-admin-theme-color-darker-10);
-				box-shadow: inset 0 0 0 $border-width var(--wp-admin-theme-color-darker-10);
-
-				span:first-child {
-					color: var(--wp-admin-theme-color);
-				}
-			}
-
-			&:focus {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-				// Windows High Contrast mode will show this outline, but not the box-shadow.
-				outline: 3px solid transparent;
-
-				span:first-child {
-					color: var(--wp-admin-theme-color);
-				}
-			}
+			justify-content: center;
 		}
 	}
 
@@ -77,60 +36,57 @@
 	@include break-medium() {
 		width: 456px;
 	}
-}
-
-.edit-site-custom-template-modal__suggestions_list {
-	@include break-small() {
-		height: 232px;
-		overflow: scroll;
-	}
 
-	&__list-item {
-		display: block;
-		width: 100%;
-		text-align: left;
-		white-space: pre-wrap;
-		overflow-wrap: break-word;
-		height: auto;
-
-		mark {
-			font-weight: 700;
-			background: none;
+	.edit-site-custom-template-modal__suggestions_list {
+		@include break-small() {
+			overflow: scroll;
 		}
 
-		&:hover {
-			background-color: $gray-100;
+		&__list-item {
+			display: block;
+			width: 100%;
+			text-align: left;
+			white-space: pre-wrap;
+			overflow-wrap: break-word;
+			height: auto;
+			padding: $grid-unit-10 $grid-unit-15;
 
 			mark {
-				color: var(--wp-admin-theme-color);
+				font-weight: 700;
+				background: none;
 			}
-		}
 
-		&:focus {
-			background-color: $gray-100;
-		}
+			&:hover {
+				background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
 
-		&:focus:not(:disabled) {
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color) inset;
-		}
+				* {
+					color: var(--wp-admin-theme-color);
+				}
 
-		&__title,
-		&__info {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: block;
-		}
+				mark {
+					color: var(--wp-admin-theme-color);
+				}
+			}
 
-		&__title {
-			font-weight: 500;
-			margin-bottom: 0.2em;
-		}
+			&:focus {
+				background-color: $gray-100;
+			}
 
-		&__info {
-			color: $gray-700;
-			font-size: 0.9em;
-			line-height: 1.3;
-			word-break: break-all;
+			&:focus:not(:disabled) {
+				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color) inset;
+			}
+
+			&__title,
+			&__info {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: block;
+			}
+
+			&__info {
+				word-break: break-all;
+				color: $gray-700;
+			}
 		}
 	}
 }
@@ -142,12 +98,6 @@
 }
 
 .edit-site-custom-generic-template__modal {
-	.components-base-control {
-		@include break-medium() {
-			width: $grid-unit * 40;
-		}
-	}
-
 	.components-modal__header {
 		border-bottom: none;
 	}
@@ -173,5 +123,72 @@
 		align-items: center;
 		justify-content: center;
 		height: 100%;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+
+.edit-site-add-new-template__modal {
+	max-width: $grid-unit-80 * 13;
+	width: calc(100% - #{$grid-unit-80});
+	margin-top: $grid-unit-80;
+	max-height: calc(100% - #{$grid-unit-80 * 2});
+
+	@include break-large() {
+		width: calc(100% - #{$grid-unit-80 * 2});
+	}
+}
+
+.edit-site-custom-template-modal__contents,
+.edit-site-add-new-template__template-list__contents {
+	> .components-button {
+		padding: $grid-unit-30;
+		border-radius: $radius-block-ui;
+		display: flex;
+		flex-direction: column;
+		border: $border-width solid $gray-300;
+		min-height: $grid-unit-80 * 3;
+
+		// Show the boundary of the button, in High Contrast Mode.
+		outline: 1px solid transparent;
+
+		span:first-child {
+			color: $gray-900;
+		}
+
+		span {
+			color: $gray-700;
+		}
+
+		&:hover {
+			color: var(--wp-admin-theme-color-darker-10);
+			background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+			border-color: transparent;
+
+			span {
+				color: var(--wp-admin-theme-color);
+			}
+		}
+
+		&:focus {
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			border-color: transparent;
+
+			// Windows High Contrast mode will show this outline, but not the box-shadow.
+			outline: 3px solid transparent;
+
+			span:first-child {
+				color: var(--wp-admin-theme-color);
+			}
+		}
+	}
+}
+
+.edit-site-add-new-template__template-list__contents {
+	> .components-button {
+		height: 100%;
+		text-align: start;
+		align-items: flex-start;
 	}
 }

package/src/components/app/index.js

@@ -8,13 +8,16 @@ import { store as noticesStore } from '@wordpress/notices';
 import { useDispatch } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
 import { PluginArea } from '@wordpress/plugins';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import { Routes } from '../routes';
 import Layout from '../layout';
 import { GlobalStylesProvider } from '../global-styles/global-styles-provider';
+import { unlock } from '../../private-apis';
+
+const { RouterProvider } = unlock( routerPrivateApis );
 
 export default function App() {
 	const { createErrorNotice } = useDispatch( noticesStore );
@@ -37,10 +40,10 @@ export default function App() {
 				<GlobalStylesProvider>
 					<Popover.Slot />
 					<UnsavedChangesWarning />
-					<Routes>
+					<RouterProvider>
 						<Layout />
 						<PluginArea onError={ onPluginAreaError } />
-					</Routes>
+					</RouterProvider>
 				</GlobalStylesProvider>
 			</SlotFillProvider>
 		</ShortcutProvider>

package/src/components/block-editor/back-button.js

@@ -4,11 +4,14 @@
 import { Button } from '@wordpress/components';
 import { arrowLeft } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import { useLocation, useHistory } from '../routes';
+import { unlock } from '../../private-apis';
+
+const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 function BackButton() {
 	const location = useLocation();