@wordpress/edit-site 5.3.6 → 5.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.3.6",
+	"version": "5.3.8",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,33 +29,33 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "^3.26.1",
 		"@wordpress/api-fetch": "^6.23.1",
-		"@wordpress/block-editor": "^11.3.6",
-		"@wordpress/block-library": "^8.3.6",
+		"@wordpress/block-editor": "^11.3.8",
+		"@wordpress/block-library": "^8.3.8",
 		"@wordpress/blocks": "^12.3.3",
-		"@wordpress/components": "^23.3.5",
+		"@wordpress/components": "^23.3.6",
 		"@wordpress/compose": "^6.3.3",
 		"@wordpress/core-data": "^6.3.3",
 		"@wordpress/data": "^8.3.3",
 		"@wordpress/deprecated": "^3.26.1",
-		"@wordpress/editor": "^13.3.6",
+		"@wordpress/editor": "^13.3.8",
 		"@wordpress/element": "^5.3.2",
 		"@wordpress/hooks": "^3.26.1",
 		"@wordpress/html-entities": "^3.26.1",
 		"@wordpress/i18n": "^4.26.1",
 		"@wordpress/icons": "^9.17.2",
-		"@wordpress/interface": "^5.3.6",
+		"@wordpress/interface": "^5.3.7",
 		"@wordpress/keyboard-shortcuts": "^4.3.3",
 		"@wordpress/keycodes": "^3.26.2",
 		"@wordpress/media-utils": "^4.17.2",
 		"@wordpress/notices": "^3.26.3",
 		"@wordpress/plugins": "^5.3.3",
-		"@wordpress/preferences": "^3.3.5",
+		"@wordpress/preferences": "^3.3.6",
 		"@wordpress/private-apis": "^0.8.1",
-		"@wordpress/reusable-blocks": "^4.3.6",
+		"@wordpress/reusable-blocks": "^4.3.8",
 		"@wordpress/style-engine": "^1.9.1",
 		"@wordpress/url": "^3.27.1",
 		"@wordpress/viewport": "^5.3.3",
-		"@wordpress/widgets": "^3.3.6",
+		"@wordpress/widgets": "^3.3.8",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -73,5 +73,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "35f10c183655e9196d4ea12b8fa499a8ecbb7b6a"
+	"gitHead": "446428841b54f47e5373d6e9723ef7ec24cf11b3"
 }

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

@@ -7,7 +7,8 @@ import {
 	DropdownMenu,
 	MenuGroup,
 	MenuItem,
-	NavigableMenu,
+	Tooltip,
+	VisuallyHidden,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
@@ -179,6 +180,11 @@ export default function NewTemplate( {
 	if ( ! missingTemplates.length ) {
 		return null;
 	}
+
+	const customTemplateDescription = __(
+		'A custom template can be manually applied to any post or page.'
+	);
+
 	return (
 		<>
 			<DropdownMenu
@@ -196,7 +202,7 @@ export default function NewTemplate( {
 						{ isCreatingTemplate && (
 							<TemplateActionsLoadingScreen />
 						) }
-						<NavigableMenu className="edit-site-new-template-dropdown__popover">
+						<div className="edit-site-new-template-dropdown__menu-groups">
 							<MenuGroup label={ postType.labels.add_new_item }>
 								{ missingTemplates.map( ( template ) => {
 									const {
@@ -207,44 +213,63 @@ export default function NewTemplate( {
 										icon,
 									} = template;
 									return (
-										<MenuItem
-											icon={
-												icon ||
-												TEMPLATE_ICONS[ slug ] ||
-												post
-											}
-											iconPosition="left"
-											info={ description }
+										<Tooltip
 											key={ slug }
-											onClick={ () =>
-												onClick
-													? onClick( template )
-													: createTemplate( template )
-											}
+											position="top right"
+											text={ description }
+											className="edit-site-new-template-dropdown__menu-item-tooltip"
 										>
-											{ title }
-										</MenuItem>
+											<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>
-								<MenuItem
-									icon={ customGenericTemplateIcon }
-									iconPosition="left"
-									info={ __(
-										'Custom templates can be applied to any post or page.'
-									) }
-									key="custom-template"
-									onClick={ () =>
-										setShowCustomGenericTemplateModal(
-											true
-										)
-									}
+								<Tooltip
+									position="top right"
+									text={ customTemplateDescription }
+									className="edit-site-new-template-dropdown__menu-item-tooltip"
 								>
-									{ __( 'Custom template' ) }
-								</MenuItem>
+									<MenuItem
+										icon={ customGenericTemplateIcon }
+										iconPosition="left"
+										onClick={ () =>
+											setShowCustomGenericTemplateModal(
+												true
+											)
+										}
+									>
+										{ __( '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>
-						</NavigableMenu>
+						</div>
 					</>
 				) }
 			</DropdownMenu>

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

@@ -1,9 +1,20 @@
 .edit-site-new-template-dropdown {
-	.edit-site-new-template-dropdown__popover {
+	.edit-site-new-template-dropdown__menu-groups {
 		@include break-small() {
 			min-width: 300px;
 		}
 	}
+
+	// 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;
+	}
 }
 
 .edit-site-custom-template-modal {

package/src/components/block-editor/editor-canvas.js

@@ -43,7 +43,8 @@ function EditorCanvas( { enableResizing, settings, children, ...props } ) {
 						// Forming a "block formatting context" to prevent margin collapsing.
 						// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
 						`.is-root-container { display: flow-root; }
-							body { position: relative; }`
+							body { position: relative;
+							${ canvasMode === 'view' ? 'cursor: pointer;' : '' }}}`
 					}</style>
 					{ enableResizing && (
 						<style>

package/src/components/layout/index.js

@@ -277,6 +277,20 @@ export default function Layout() {
 							{ canvasResizer }
 							{ !! canvasSize.width && (
 								<motion.div
+									whileHover={
+										isEditorPage && canvasMode === 'view'
+											? {
+													scale: 1.01,
+													transition: {
+														duration:
+															disableMotion ||
+															isResizing
+																? 0
+																: 0.2,
+													},
+											  }
+											: {}
+									}
 									initial={ false }
 									layout="position"
 									className="edit-site-layout__canvas"

package/src/components/layout/style.scss

@@ -49,11 +49,9 @@
 }
 
 .edit-site-layout__content {
+	height: 100%;
 	flex-grow: 1;
 	display: flex;
-
-	// Hide scrollbars during the edit/view animation.
-	overflow: hidden;
 }
 
 .edit-site-layout__sidebar {

package/src/components/list/index.js

@@ -19,8 +19,10 @@ import useTitle from '../routes/use-title';
 
 export default function List() {
 	const {
-		params: { postType: templateType },
+		params: { path },
 	} = useLocation();
+	const templateType =
+		path === '/wp_template/all' ? 'wp_template' : 'wp_template_part';
 
 	useRegisterShortcuts();
 

package/src/components/routes/link.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { addQueryArgs } from '@wordpress/url';
+import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -21,8 +21,15 @@ export function useLink( params = {}, state, shouldReplace = false ) {
 		}
 	}
 
+	const currentArgs = getQueryArgs( window.location.href );
+	const currentUrlWithoutArgs = removeQueryArgs(
+		window.location.href,
+		...Object.keys( currentArgs )
+	);
+	const newUrl = addQueryArgs( currentUrlWithoutArgs, params );
+
 	return {
-		href: addQueryArgs( window.location.href, params ),
+		href: newUrl,
 		onClick,
 	};
 }

package/src/components/save-button/index.js

@@ -12,7 +12,7 @@ import { displayShortcut } from '@wordpress/keycodes';
  */
 import { store as editSiteStore } from '../../store';
 
-export default function SaveButton( { showTooltip = true } ) {
+export default function SaveButton() {
 	const { isDirty, isSaving, isSaveViewOpen } = useSelect( ( select ) => {
 		const { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =
 			select( coreStore );
@@ -52,7 +52,7 @@ export default function SaveButton( { showTooltip = true } ) {
 			 * of the button that we want to avoid. By setting `showTooltip`,
 			 & the tooltip is always rendered even when there's no keyboard shortcut.
 			 */
-			showTooltip={ showTooltip }
+			showTooltip
 		>
 			{ label }
 		</Button>

package/src/components/save-hub/index.js

@@ -0,0 +1,78 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { Button, __experimentalHStack as HStack } from '@wordpress/components';
+import { sprintf, __, _n } from '@wordpress/i18n';
+import { store as coreStore } from '@wordpress/core-data';
+import { displayShortcut } from '@wordpress/keycodes';
+import { check } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../store';
+
+export default function SaveButton() {
+	const { countUnsavedChanges, isDirty, isSaving, isSaveViewOpen } =
+		useSelect( ( select ) => {
+			const {
+				__experimentalGetDirtyEntityRecords,
+				isSavingEntityRecord,
+			} = select( coreStore );
+			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+			const { isSaveViewOpened } = select( editSiteStore );
+			return {
+				isDirty: dirtyEntityRecords.length > 0,
+				isSaving: dirtyEntityRecords.some( ( record ) =>
+					isSavingEntityRecord( record.kind, record.name, record.key )
+				),
+				isSaveViewOpen: isSaveViewOpened(),
+				countUnsavedChanges: dirtyEntityRecords.length,
+			};
+		}, [] );
+	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
+
+	const disabled = ! isDirty || isSaving;
+
+	const label = disabled ? __( 'Saved' ) : __( 'Save' );
+
+	return (
+		<HStack className="edit-site-save-hub" alignment="right" spacing={ 4 }>
+			{ isDirty && (
+				<span>
+					{ sprintf(
+						// translators: %d: number of unsaved changes (number).
+						_n(
+							'%d unsaved change',
+							'%d unsaved changes',
+							countUnsavedChanges
+						),
+						countUnsavedChanges
+					) }
+				</span>
+			) }
+			<Button
+				className="edit-site-save-hub__button"
+				variant={ disabled ? undefined : 'primary' }
+				aria-disabled={ disabled }
+				aria-expanded={ isSaveViewOpen }
+				isBusy={ isSaving }
+				onClick={
+					disabled ? undefined : () => setIsSaveViewOpened( true )
+				}
+				label={ label }
+				/*
+				 * We want the tooltip to show the keyboard shortcut only when the
+				 * button does something, i.e. when it's not disabled.
+				 */
+				shortcut={
+					disabled ? undefined : displayShortcut.primary( 's' )
+				}
+				icon={ disabled ? check : undefined }
+			>
+				{ label }
+			</Button>
+		</HStack>
+	);
+}

package/src/components/save-hub/style.scss

@@ -0,0 +1,15 @@
+.edit-site-save-hub {
+	color: $gray-600;
+}
+
+.edit-site-save-hub__button {
+	color: inherit;
+
+	&[aria-disabled="true"] {
+		opacity: 1;
+	}
+
+	&[aria-disabled="true"]:hover {
+		color: inherit;
+	}
+}

package/src/components/sidebar/index.js

@@ -18,7 +18,7 @@ import useSyncPathWithURL, {
 } from '../sync-state-with-url/use-sync-path-with-url';
 import SidebarNavigationScreenNavigationMenus from '../sidebar-navigation-screen-navigation-menus';
 import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
-import SaveButton from '../save-button';
+import SaveHub from '../save-hub';
 import SidebarNavigationScreenNavigationItem from '../sidebar-navigation-screen-navigation-item';
 import { useLocation } from '../routes';
 
@@ -61,9 +61,8 @@ function Sidebar() {
 			>
 				<SidebarScreens />
 			</NavigatorProvider>
-
 			<div className="edit-site-sidebar__footer">
-				<SaveButton showTooltip={ false } />
+				<SaveHub />
 			</div>
 		</>
 	);

package/src/components/sidebar/style.scss

@@ -1,7 +1,10 @@
 .edit-site-sidebar__content {
 	flex-grow: 1;
 	overflow-y: auto;
-	@include custom-scrollbars-on-hover;
+
+	.components-navigator-screen {
+		@include custom-scrollbars-on-hover;
+	}
 }
 
 .edit-site-sidebar__footer {
@@ -9,8 +12,6 @@
 	flex-shrink: 0;
 	margin: 0 $canvas-padding;
 	padding: $canvas-padding 0;
-	display: flex;
-	justify-content: flex-end;
 }
 
 .edit-site-sidebar__content.edit-site-sidebar__content {

package/src/components/sidebar-button/style.scss

@@ -17,7 +17,8 @@
 	&:hover,
 	&:focus-visible,
 	&:focus,
-	&:not([aria-disabled="true"]):active {
+	&:not([aria-disabled="true"]):active,
+	&[aria-expanded="true"] {
 		color: $white;
 	}
 }

package/src/components/sidebar-navigation-item/style.scss

@@ -15,26 +15,6 @@
 	}
 }
 
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button {
-	color: $gray-600;
-	&:hover,
-	&:focus,
-	&[aria-current] {
-		color: $white;
-	}
-}
-
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf {
-	&:hover,
-	&:focus,
-	&[aria-current] {
-		background: $gray-800;
-	}
-	.block-editor-list-view-block__menu {
-		margin-left: -$grid-unit-10;
-	}
-}
-
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
 	cursor: grab;
 	width: calc(100% - #{ $border-width-focus });

package/src/components/sidebar-navigation-screen/index.js

@@ -22,6 +22,7 @@ export default function SidebarNavigationScreen( {
 	title,
 	actions,
 	content,
+	description,
 } ) {
 	const { dashboardLink } = useSelect( ( select ) => {
 		const { getSettings } = unlock( select( editSiteStore ) );
@@ -58,6 +59,11 @@ export default function SidebarNavigationScreen( {
 			</HStack>
 
 			<nav className="edit-site-sidebar-navigation-screen__content">
+				{ description && (
+					<p className="edit-site-sidebar-navigation-screen__description">
+						{ description }
+					</p>
+				) }
 				{ content }
 			</nav>
 		</VStack>

package/src/components/sidebar-navigation-screen/style.scss

@@ -10,6 +10,21 @@
 	color: $gray-600;
 }
 
+.edit-site-sidebar-navigation-screen__page-link {
+	color: $gray-600;
+
+	&:hover,
+	&:focus {
+		color: $white;
+	}
+
+	.components-external-link__icon {
+		margin-left: $grid-unit-05;
+	}
+	margin-left: $grid-unit-20;
+	display: inline-block;
+}
+
 .edit-site-sidebar-navigation-screen__title-icon {
 	position: sticky;
 	top: 0;

package/src/components/sidebar-navigation-screen-main/index.js

@@ -31,6 +31,9 @@ export default function SidebarNavigationScreenMain() {
 		<SidebarNavigationScreen
 			isRoot
 			title={ __( 'Design' ) }
+			description={ __(
+				'Customize the appearance of your website using the block editor.'
+			) }
 			content={
 				<ItemGroup>
 					{ !! navigationMenus && navigationMenus.length > 0 && (

package/src/components/sidebar-navigation-screen-navigation-item/index.js

@@ -2,9 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
+import { useDispatch } from '@wordpress/data';
+import {
+	__experimentalUseNavigator as useNavigator,
+	ExternalLink,
+} from '@wordpress/components';
+import { useEntityRecord } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { pencil } from '@wordpress/icons';
 
@@ -21,26 +24,11 @@ export default function SidebarNavigationScreenNavigationItem() {
 	const {
 		params: { postType, postId },
 	} = useNavigator();
-
-	const { post } = useSelect(
-		( select ) => {
-			const { getEntityRecord } = select( coreStore );
-
-			// The currently selected entity to display.
-			// Typically template or template part in the site editor.
-			return {
-				post:
-					postId && postType
-						? getEntityRecord( 'postType', postType, postId )
-						: null,
-			};
-		},
-		[ postType, postId ]
-	);
+	const { record } = useEntityRecord( 'postType', postType, postId );
 
 	return (
 		<SidebarNavigationScreen
-			title={ post ? decodeEntities( post?.title?.rendered ) : null }
+			title={ record ? decodeEntities( record?.title?.rendered ) : null }
 			actions={
 				<SidebarButton
 					onClick={ () => setCanvasMode( 'edit' ) }
@@ -48,8 +36,29 @@ export default function SidebarNavigationScreenNavigationItem() {
 					icon={ pencil }
 				/>
 			}
+			description={
+				postType === 'page'
+					? __(
+							'Pages are static and are not listed by date. Pages do not use tags or categories.'
+					  )
+					: __(
+							'Posts are entries listed in reverse chronological order on the site homepage or on the posts page.'
+					  )
+			}
 			content={
-				post ? decodeEntities( post?.description?.rendered ) : null
+				<>
+					{ record?.link ? (
+						<ExternalLink
+							className="edit-site-sidebar-navigation-screen__page-link"
+							href={ record.link }
+						>
+							{ record.link }
+						</ExternalLink>
+					) : null }
+					{ record
+						? decodeEntities( record?.description?.rendered )
+						: null }
+				</>
 			}
 		/>
 	);