@wordpress/edit-site 5.12.0 → 5.12.2

package/src/components/sidebar-edit-mode/sidebar-fixed-bottom.js

@@ -6,7 +6,7 @@ import { privateApis as componentsPrivateApis } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../private-apis';
+import { unlock } from '../../lock-unlock';
 
 const { createPrivateSlotFill } = unlock( componentsPrivateApis );
 const SIDEBAR_FIXED_BOTTOM_SLOT_FILL_NAME = 'SidebarFixedBottom';

package/src/components/sidebar-edit-mode/template-panel/index.js

@@ -7,6 +7,7 @@ import { store as editorStore } from '@wordpress/editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { __ } from '@wordpress/i18n';
+import { navigation as navigationIcon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -20,7 +21,7 @@ import SidebarCard from '../sidebar-card';
 export default function TemplatePanel() {
 	const {
 		info: { title, description, icon },
-		template,
+		record,
 	} = useSelect( ( select ) => {
 		const { getEditedPostType, getEditedPostId } = select( editSiteStore );
 		const { getEditedEntityRecord } = select( coreStore );
@@ -29,11 +30,11 @@ export default function TemplatePanel() {
 
 		const postType = getEditedPostType();
 		const postId = getEditedPostId();
-		const record = getEditedEntityRecord( 'postType', postType, postId );
+		const _record = getEditedEntityRecord( 'postType', postType, postId );
 
-		const info = record ? getTemplateInfo( record ) : {};
+		const info = _record ? getTemplateInfo( _record ) : {};
 
-		return { info, template: record };
+		return { info, record: _record };
 	}, [] );
 
 	if ( ! title && ! description ) {
@@ -45,9 +46,11 @@ export default function TemplatePanel() {
 			<SidebarCard
 				className="edit-site-template-card"
 				title={ decodeEntities( title ) }
-				icon={ icon }
+				icon={
+					record?.type === 'wp_navigation' ? navigationIcon : icon
+				}
 				description={ decodeEntities( description ) }
-				actions={ <TemplateActions template={ template } /> }
+				actions={ <TemplateActions template={ record } /> }
 			>
 				<TemplateAreas />
 			</SidebarCard>

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

@@ -11,12 +11,14 @@ import {
 	__experimentalHStack as HStack,
 	FlexBlock,
 } from '@wordpress/components';
-import { chevronRightSmall, Icon } from '@wordpress/icons';
+import { isRTL } from '@wordpress/i18n';
+import { chevronRightSmall, chevronLeftSmall, Icon } from '@wordpress/icons';
 
 export default function SidebarNavigationItem( {
 	className,
 	icon,
 	withChevron = false,
+	suffix,
 	children,
 	...props
 } ) {
@@ -24,6 +26,7 @@ export default function SidebarNavigationItem( {
 		<Item
 			className={ classnames(
 				'edit-site-sidebar-navigation-item',
+				{ 'with-suffix': ! withChevron && suffix },
 				className
 			) }
 			{ ...props }
@@ -39,11 +42,12 @@ export default function SidebarNavigationItem( {
 				<FlexBlock>{ children }</FlexBlock>
 				{ withChevron && (
 					<Icon
-						icon={ chevronRightSmall }
+						icon={ isRTL() ? chevronLeftSmall : chevronRightSmall }
 						className="edit-site-sidebar-navigation-item__drilldown-indicator"
 						size={ 24 }
 					/>
 				) }
+				{ ! withChevron && suffix }
 			</HStack>
 		</Item>
 	);

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

@@ -4,11 +4,12 @@
 	padding: $grid-unit-10 6px $grid-unit-10 $grid-unit-20;
 	border: none;
 	min-height: $grid-unit-50;
+	border-radius: $radius-block-ui;
 
 	&:hover,
 	&:focus,
 	&[aria-current] {
-		color: $white;
+		color: $gray-200;
 		background: $gray-800;
 	}
 
@@ -22,12 +23,18 @@
 
 	&:is(a) {
 		text-decoration: none;
+		display: flex;
+		align-items: center;
 
 		&:focus {
 			box-shadow: none;
 			outline: none;
 		}
 	}
+
+	&.with-suffix {
+		padding-right: $grid-unit-20;
+	}
 }
 
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {

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

@@ -3,9 +3,10 @@
  */
 import {
 	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-	__experimentalNavigatorToParentButton as NavigatorToParentButton,
 	__experimentalHeading as Heading,
+	__experimentalNavigatorToParentButton as NavigatorToParentButton,
+	__experimentalUseNavigator as useNavigator,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { isRTL, __, sprintf } from '@wordpress/i18n';
 import { chevronRight, chevronLeft } from '@wordpress/icons';
@@ -16,7 +17,7 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../store';
-import { unlock } from '../../private-apis';
+import { unlock } from '../../lock-unlock';
 import SidebarButton from '../sidebar-button';
 import {
 	isPreviewingTheme,
@@ -31,6 +32,7 @@ export default function SidebarNavigationScreen( {
 	content,
 	footer,
 	description,
+	backPath,
 } ) {
 	const { dashboardLink } = useSelect( ( select ) => {
 		const { getSettings } = unlock( select( editSiteStore ) );
@@ -39,7 +41,9 @@ export default function SidebarNavigationScreen( {
 		};
 	}, [] );
 	const { getTheme } = useSelect( coreStore );
+	const { goTo } = useNavigator();
 	const theme = getTheme( currentlyPreviewingTheme() );
+	const icon = isRTL() ? chevronRight : chevronLeft;
 
 	return (
 		<>
@@ -53,15 +57,25 @@ export default function SidebarNavigationScreen( {
 					alignment="flex-start"
 					className="edit-site-sidebar-navigation-screen__title-icon"
 				>
-					{ ! isRoot ? (
+					{ ! isRoot && ! backPath && (
 						<NavigatorToParentButton
 							as={ SidebarButton }
 							icon={ isRTL() ? chevronRight : chevronLeft }
 							label={ __( 'Back' ) }
+							showTooltip={ false }
+						/>
+					) }
+					{ ! isRoot && backPath && (
+						<SidebarButton
+							onClick={ () => goTo( backPath, { isBack: true } ) }
+							icon={ icon }
+							label={ __( 'Back' ) }
+							showTooltip={ false }
 						/>
-					) : (
+					) }
+					{ isRoot && (
 						<SidebarButton
-							icon={ isRTL() ? chevronRight : chevronLeft }
+							icon={ icon }
 							label={
 								! isPreviewingTheme()
 									? __( 'Go back to the Dashboard' )
@@ -76,8 +90,8 @@ export default function SidebarNavigationScreen( {
 					) }
 					<Heading
 						className="edit-site-sidebar-navigation-screen__title"
-						color={ 'white' }
-						level={ 2 }
+						color={ '#e0e0e0' /* $gray-200 */ }
+						level={ 1 }
 						size={ 20 }
 					>
 						{ ! isPreviewingTheme()

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

@@ -12,15 +12,20 @@
 }
 
 .edit-site-sidebar-navigation-screen__content {
-	color: $gray-400;
 	padding: 0 $grid-unit-20;
+
 	.components-item-group {
 		margin-left: -$grid-unit-20;
 		margin-right: -$grid-unit-20;
 	}
+
 	.components-text {
 		color: $gray-400;
 	}
+
+	.components-heading {
+		margin-bottom: $grid-unit-10;
+	}
 }
 
 .edit-site-sidebar-navigation-screen__meta {
@@ -51,7 +56,6 @@
 	top: 0;
 	background: $gray-900;
 	padding-top: $grid-unit-60 + $header-height;
-	box-shadow: 0 $grid-unit-10 $grid-unit-20 $gray-900;
 	margin-bottom: $grid-unit-10;
 	padding-bottom: $grid-unit-10;
 	z-index: z-index(".edit-site-sidebar-navigation-screen__title-icon");
@@ -60,6 +64,8 @@
 .edit-site-sidebar-navigation-screen__title {
 	flex-grow: 1;
 	padding: $grid-unit-15 * 0.5 0 0 0;
+	overflow: hidden;
+	overflow-wrap: break-word;
 }
 
 .edit-site-sidebar-navigation-screen__actions {
@@ -82,7 +88,7 @@
 	}
 }
 
-.edit-site-sidebar-navigation-screen__sticky-section.edit-site-sidebar-navigation-screen__sticky-section {
+.edit-site-sidebar-navigation-screen__footer {
 	position: sticky;
 	bottom: 0;
 	background-color: $gray-900;
@@ -90,12 +96,27 @@
 	padding: $grid-unit-20 0;
 	margin: $grid-unit-20 0 0;
 	border-top: 1px solid $gray-800;
-	box-shadow: 0 #{-$grid-unit-10} $grid-unit-20 $gray-900;
 }
 
-.edit-site-sidebar-navigation-screen__footer {
-	position: sticky;
-	bottom: 0;
-	background-color: $gray-900;
-	padding: $grid-unit-20 0;
+/* In general style overrides are discouraged.
+ * This is a temporary solution to override the InputControl component's styles.
+ * The `Theme` component will potentially be the more appropriate approach
+ * once that component is stabilized.
+ * See: packages/components/src/theme
+ */
+.edit-site-sidebar-navigation-screen__input-control {
+	width: 100%;
+	.components-input-control__container {
+		background: transparent;
+	}
+	.components-input-control__input {
+		color: $gray-200 !important;
+		background: $gray-800 !important;
+	}
+	.components-input-control__backdrop {
+		border: 4px !important;
+	}
+	.components-base-control__help {
+		color: $gray-600;
+	}
 }

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

@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { humanTimeDiff } from '@wordpress/date';
+import { createInterpolateElement } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import {
+	SidebarNavigationScreenDetailsPanelRow,
+	SidebarNavigationScreenDetailsPanelLabel,
+	SidebarNavigationScreenDetailsPanelValue,
+} from '../sidebar-navigation-screen-details-panel';
+
+export default function SidebarNavigationScreenDetailsFooter( {
+	lastModifiedDateTime,
+} ) {
+	return (
+		<>
+			{ lastModifiedDateTime && (
+				<SidebarNavigationScreenDetailsPanelRow className="edit-site-sidebar-navigation-screen-details-footer">
+					<SidebarNavigationScreenDetailsPanelLabel>
+						{ __( 'Last modified' ) }
+					</SidebarNavigationScreenDetailsPanelLabel>
+					<SidebarNavigationScreenDetailsPanelValue>
+						{ createInterpolateElement(
+							sprintf(
+								/* translators: %s: is the relative time when the post was last modified. */
+								__( '<time>%s</time>' ),
+								humanTimeDiff( lastModifiedDateTime )
+							),
+							{
+								time: (
+									<time dateTime={ lastModifiedDateTime } />
+								),
+							}
+						) }
+					</SidebarNavigationScreenDetailsPanelValue>
+				</SidebarNavigationScreenDetailsPanelRow>
+			) }
+		</>
+	);
+}

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

@@ -0,0 +1,5 @@
+.edit-site-sidebar-navigation-screen-details-footer {
+	padding-top: $grid-unit-10;
+	padding-bottom: $grid-unit-10;
+	padding-left: $grid-unit-20;
+}

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

@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalVStack as VStack,
+	__experimentalHeading as Heading,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import SidebarNavigationScreenDetailsPanelLabel from './sidebar-navigation-screen-details-panel-label';
+import SidebarNavigationScreenDetailsPanelRow from './sidebar-navigation-screen-details-panel-row';
+import SidebarNavigationScreenDetailsPanelValue from './sidebar-navigation-screen-details-panel-value';
+
+function SidebarNavigationScreenDetailsPanel( { title, children, spacing } ) {
+	return (
+		<VStack
+			className="edit-site-sidebar-navigation-details-screen-panel"
+			spacing={ spacing }
+		>
+			{ title && (
+				<Heading
+					className="edit-site-sidebar-navigation-details-screen-panel__heading"
+					level={ 2 }
+				>
+					{ title }
+				</Heading>
+			) }
+			{ children }
+		</VStack>
+	);
+}
+
+export {
+	SidebarNavigationScreenDetailsPanel,
+	SidebarNavigationScreenDetailsPanelRow,
+	SidebarNavigationScreenDetailsPanelLabel,
+	SidebarNavigationScreenDetailsPanelValue,
+};

package/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-label.js

@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalText as Text } from '@wordpress/components';
+
+export default function SidebarNavigationScreenDetailsPanelLabel( {
+	children,
+} ) {
+	return (
+		<Text className="edit-site-sidebar-navigation-details-screen-panel__label">
+			{ children }
+		</Text>
+	);
+}

package/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js

@@ -0,0 +1,29 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+/**
+ * WordPress dependencies
+ */
+import { __experimentalHStack as HStack } from '@wordpress/components';
+
+export default function SidebarNavigationScreenDetailsPanelRow( {
+	label,
+	children,
+	className,
+} ) {
+	return (
+		<HStack
+			key={ label }
+			spacing={ 5 }
+			alignment="left"
+			className={ classnames(
+				'edit-site-sidebar-navigation-details-screen-panel__row',
+				className
+			) }
+		>
+			{ children }
+		</HStack>
+	);
+}

package/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-value.js

@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalText as Text } from '@wordpress/components';
+
+export default function SidebarNavigationScreenDetailsPanelValue( {
+	children,
+} ) {
+	return (
+		<Text className="edit-site-sidebar-navigation-details-screen-panel__value">
+			{ children }
+		</Text>
+	);
+}

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

@@ -0,0 +1,25 @@
+.edit-site-sidebar-navigation-details-screen-panel {
+	margin: $grid-unit-30 0;
+
+	&:last-of-type {
+		margin-bottom: 0;
+	}
+
+	.edit-site-sidebar-navigation-details-screen-panel__heading {
+		color: $gray-400;
+		text-transform: uppercase;
+		font-weight: 500;
+		font-size: 11px;
+		padding: 0;
+		margin-bottom: 0;
+	}
+}
+
+.edit-site-sidebar-navigation-details-screen-panel__label.edit-site-sidebar-navigation-details-screen-panel__label {
+	color: $gray-600;
+	width: 100px;
+}
+
+.edit-site-sidebar-navigation-details-screen-panel__value.edit-site-sidebar-navigation-details-screen-panel__value {
+	color: $gray-200;
+}

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

@@ -15,13 +15,14 @@ import { useViewportMatch } from '@wordpress/compose';
 import { BlockEditorProvider } from '@wordpress/block-editor';
 import { humanTimeDiff } from '@wordpress/date';
 import { useCallback } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import StyleVariationsContainer from '../global-styles/style-variations-container';
-import { unlock } from '../../private-apis';
+import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import SidebarButton from '../sidebar-button';
 import SidebarNavigationItem from '../sidebar-navigation-item';
@@ -31,8 +32,9 @@ import useGlobalStylesRevisions from '../global-styles/screen-revisions/use-glob
 const noop = () => {};
 
 export function SidebarNavigationItemGlobalStyles( props ) {
-	const { openGeneralSidebar } = useDispatch( editSiteStore );
+	const { openGeneralSidebar, toggleFeature } = useDispatch( editSiteStore );
 	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
+	const { createNotice } = useDispatch( noticesStore );
 	const hasGlobalStyleVariations = useSelect(
 		( select ) =>
 			!! select(
@@ -53,9 +55,19 @@ export function SidebarNavigationItemGlobalStyles( props ) {
 		<SidebarNavigationItem
 			{ ...props }
 			onClick={ () => {
-				// switch to edit mode.
+				// Disable distraction free mode.
+				toggleFeature( 'distractionFree', false );
+				createNotice(
+					'info',
+					__( 'Distraction free mode turned off' ),
+					{
+						isDismissible: true,
+						type: 'snackbar',
+					}
+				);
+				// Switch to edit mode.
 				setCanvasMode( 'edit' );
-				// open global styles sidebar.
+				// Open global styles sidebar.
 				openGeneralSidebar( 'edit-site/global-styles' );
 			} }
 		/>
@@ -141,7 +153,8 @@ function SidebarNavigationScreenGlobalStylesFooter( { onClickRevisions } ) {
 }
 
 export default function SidebarNavigationScreenGlobalStyles() {
-	const { openGeneralSidebar } = useDispatch( editSiteStore );
+	const { openGeneralSidebar, setIsListViewOpened } =
+		useDispatch( editSiteStore );
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const { setCanvasMode, setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
@@ -169,7 +182,12 @@ export default function SidebarNavigationScreenGlobalStyles() {
 		// and the global styles sidebar is open. This ensures that
 		// the Style Book is not prematurely closed.
 		setEditorCanvasContainerView( 'style-book' );
-	}, [ openGlobalStyles, setEditorCanvasContainerView ] );
+		setIsListViewOpened( false );
+	}, [
+		openGlobalStyles,
+		setEditorCanvasContainerView,
+		setIsListViewOpened,
+	] );
 
 	const openRevisions = useCallback( async () => {
 		await openGlobalStyles();

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

@@ -1,6 +1,3 @@
-.edit-site-sidebar-navigation-screen-global-styles__footer {
-	padding-left: $grid-unit-15;
-}
 
 .edit-site-sidebar-navigation-screen-global-styles__revisions {
 	border-radius: $radius-block-ui;

package/src/components/sidebar-navigation-screen-library/category-item.js

@@ -0,0 +1,43 @@
+/**
+ * Internal dependencies
+ */
+import SidebarNavigationItem from '../sidebar-navigation-item';
+import { useLink } from '../routes/link';
+
+export default function CategoryItem( {
+	count,
+	icon,
+	id,
+	isActive,
+	label,
+	type,
+} ) {
+	const linkInfo = useLink(
+		{
+			path: '/library',
+			categoryType: type,
+			categoryId: id,
+		},
+		{
+			// Keep a record of where we came from in state so we can
+			// use the browser's back button to go back to the library.
+			// See the implementation of the back button in patterns-list.
+			backPath: '/library',
+		}
+	);
+
+	if ( ! count ) {
+		return;
+	}
+
+	return (
+		<SidebarNavigationItem
+			{ ...linkInfo }
+			icon={ icon }
+			suffix={ <span>{ count }</span> }
+			aria-current={ isActive ? 'true' : undefined }
+		>
+			{ label }
+		</SidebarNavigationItem>
+	);
+}