@wordpress/edit-site 6.30.1-next.a730c9c8c.0 → 6.31.1-next.233ccab9b.0

package/src/components/sidebar-global-styles-wrapper/index.js

@@ -2,12 +2,20 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 import { useMemo, useState } from '@wordpress/element';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useViewportMatch } from '@wordpress/compose';
-import { Button } from '@wordpress/components';
+import {
+	Button,
+	__experimentalHStack as HStack,
+	DropdownMenu,
+	MenuGroup,
+	MenuItem,
+} from '@wordpress/components';
 import { addQueryArgs, removeQueryArgs } from '@wordpress/url';
-import { seen } from '@wordpress/icons';
+import { seen, moreVertical } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -24,21 +32,59 @@ const GlobalStylesPageActions = ( {
 	path,
 } ) => {
 	const history = useHistory();
+	const canEditCSS = useSelect( ( select ) => {
+		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
+			select( coreStore );
+		const globalStylesId = __experimentalGetCurrentGlobalStylesId();
+		const globalStyles = globalStylesId
+			? getEntityRecord( 'root', 'globalStyles', globalStylesId )
+			: undefined;
+		return !! globalStyles?._links?.[ 'wp:action-edit-css' ];
+	}, [] );
+
 	return (
-		<Button
-			isPressed={ isStyleBookOpened }
-			icon={ seen }
-			label={ __( 'Style Book' ) }
-			onClick={ () => {
-				setIsStyleBookOpened( ! isStyleBookOpened );
-				const updatedPath = ! isStyleBookOpened
-					? addQueryArgs( path, { preview: 'stylebook' } )
-					: removeQueryArgs( path, 'preview' );
-				// Navigate to the updated path.
-				history.navigate( updatedPath );
-			} }
-			size="compact"
-		/>
+		<HStack>
+			<Button
+				isPressed={ isStyleBookOpened }
+				icon={ seen }
+				label={ __( 'Style Book' ) }
+				onClick={ () => {
+					setIsStyleBookOpened( ! isStyleBookOpened );
+					const updatedPath = ! isStyleBookOpened
+						? addQueryArgs( path, { preview: 'stylebook' } )
+						: removeQueryArgs( path, 'preview' );
+					// Navigate to the updated path.
+					history.navigate( updatedPath );
+				} }
+				size="compact"
+			/>
+			{ canEditCSS && (
+				<DropdownMenu
+					icon={ moreVertical }
+					label={ __( 'More' ) }
+					toggleProps={ { size: 'compact' } }
+				>
+					{ ( { onClose } ) => (
+						<MenuGroup>
+							{ canEditCSS && (
+								<MenuItem
+									onClick={ () => {
+										onClose();
+										history.navigate(
+											addQueryArgs( path, {
+												section: '/css',
+											} )
+										);
+									} }
+								>
+									{ __( 'Additional CSS' ) }
+								</MenuItem>
+							) }
+						</MenuGroup>
+					) }
+				</DropdownMenu>
+			) }
+		</HStack>
 	);
 };
 

package/src/components/sidebar-navigation-screen-templates-browse/content.js

@@ -14,7 +14,6 @@ import { addQueryArgs } from '@wordpress/url';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import { useAddedBy } from '../page-templates/hooks';
 import { layout } from '@wordpress/icons';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
 
 const { useLocation } = unlock( routerPrivateApis );
@@ -37,11 +36,15 @@ function TemplateDataviewItem( { template, isActive } ) {
 
 export default function DataviewsTemplatesSidebarContent() {
 	const {
-		query: { activeView = 'all' },
+		query: { activeView = 'active' },
 	} = useLocation();
-	const { records } = useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
-		per_page: -1,
-	} );
+	const { records } = useEntityRecords(
+		'postType',
+		'wp_registered_template',
+		{
+			per_page: -1,
+		}
+	);
 	const firstItemPerAuthorText = useMemo( () => {
 		const firstItemPerAuthor = records?.reduce( ( acc, template ) => {
 			const author = template.author_text;
@@ -61,9 +64,16 @@ export default function DataviewsTemplatesSidebarContent() {
 			<SidebarNavigationItem
 				to="/template"
 				icon={ layout }
-				aria-current={ activeView === 'all' }
+				aria-current={ activeView === 'active' }
+			>
+				{ __( 'Active templates' ) }
+			</SidebarNavigationItem>
+			<SidebarNavigationItem
+				to={ addQueryArgs( '/template', { activeView: 'user' } ) }
+				icon={ layout }
+				aria-current={ activeView === 'user' }
 			>
-				{ __( 'All templates' ) }
+				{ __( 'Custom templates' ) }
 			</SidebarNavigationItem>
 			{ firstItemPerAuthorText.map( ( template ) => {
 				return (

package/src/components/site-editor-routes/index.js

@@ -17,7 +17,7 @@ import { patternsRoute } from './patterns';
 import { patternItemRoute } from './pattern-item';
 import { templatePartItemRoute } from './template-part-item';
 import { templatesRoute } from './templates';
-import { templateItemRoute } from './template-item';
+import { templateItemRoute, staticTemplateItemRoute } from './template-item';
 import { pagesRoute } from './pages';
 import { pageItemRoute } from './page-item';
 import { stylebookRoute } from './stylebook';
@@ -27,6 +27,7 @@ const routes = [
 	pageItemRoute,
 	pagesRoute,
 	templateItemRoute,
+	staticTemplateItemRoute,
 	templatesRoute,
 	templatePartItemRoute,
 	patternItemRoute,

package/src/components/site-editor-routes/template-item.js

@@ -5,33 +5,41 @@ import Editor from '../editor';
 import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
 import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';
 
+const areas = {
+	sidebar( { siteData } ) {
+		const isBlockTheme = siteData.currentTheme?.is_block_theme;
+		return isBlockTheme ? (
+			<SidebarNavigationScreenTemplatesBrowse backPath="/" />
+		) : (
+			<SidebarNavigationScreenUnsupported />
+		);
+	},
+	mobile( { siteData } ) {
+		const isBlockTheme = siteData.currentTheme?.is_block_theme;
+		return isBlockTheme ? (
+			<Editor />
+		) : (
+			<SidebarNavigationScreenUnsupported />
+		);
+	},
+	preview( { siteData } ) {
+		const isBlockTheme = siteData.currentTheme?.is_block_theme;
+		return isBlockTheme ? (
+			<Editor />
+		) : (
+			<SidebarNavigationScreenUnsupported />
+		);
+	},
+};
+
 export const templateItemRoute = {
 	name: 'template-item',
 	path: '/wp_template/*postId',
-	areas: {
-		sidebar( { siteData } ) {
-			const isBlockTheme = siteData.currentTheme?.is_block_theme;
-			return isBlockTheme ? (
-				<SidebarNavigationScreenTemplatesBrowse backPath="/" />
-			) : (
-				<SidebarNavigationScreenUnsupported />
-			);
-		},
-		mobile( { siteData } ) {
-			const isBlockTheme = siteData.currentTheme?.is_block_theme;
-			return isBlockTheme ? (
-				<Editor />
-			) : (
-				<SidebarNavigationScreenUnsupported />
-			);
-		},
-		preview( { siteData } ) {
-			const isBlockTheme = siteData.currentTheme?.is_block_theme;
-			return isBlockTheme ? (
-				<Editor />
-			) : (
-				<SidebarNavigationScreenUnsupported />
-			);
-		},
-	},
+	areas,
+};
+
+export const staticTemplateItemRoute = {
+	name: 'static-template-item',
+	path: '/wp_registered_template/*postId',
+	areas,
 };