Site Editor: Prevent access to the Design/Styles screen from classic themes without StyleBook support (#69377)

t-hamano · stokesman · Mamaduka · web-flow · commit 6683aff5d781 · 2025-03-10T18:23:59.000+09:00
* Router: Add context parameter to useMatch

* Change `context` prop to `matchResolverArgs`

* Site Editor: Prevent access to the Design/Styles screen from classic themes without StyleBook support

* Update warning message

Co-authored-by: Mitchell Austin &lt;mr.fye@oneandthesame.net&gt;

* Remove redundant logic

* Update comment

* Avoid redundant selectors

* SiteHubMobile: Fix back path

---------

Co-authored-by: t-hamano &lt;wildworks@git.wordpress.org&gt;
Co-authored-by: stokesman &lt;presstoke@git.wordpress.org&gt;
Co-authored-by: Mamaduka &lt;mamaduka@git.wordpress.org&gt;
Co-authored-by: carolinan &lt;poena@git.wordpress.org&gt;
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
@@ -120,6 +120,7 @@ export default function SidebarNavigationScreenPatterns( { backPath } ) {
 			description={ __(
 				'Manage what patterns are available when editing the site.'
 			) }
+			isRoot={ ! backPath }
 			backPath={ backPath }
 			content={
 				<>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-unsupported/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-unsupported/index.js
@@ -0,0 +1,17 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Notice, __experimentalSpacer as Spacer } from '@wordpress/components';
+
+export default function SidebarNavigationScreenUnsupported() {
+	return (
+		<Spacer padding={ 3 }>
+			<Notice status="warning" isDismissible={ false }>
+				{ __(
+					'The theme you are currently using does not support this screen.'
+				) }
+			</Notice>
+		</Spacer>
+	);
+}
diff --git a/packages/edit-site/src/components/site-editor-routes/home.js b/packages/edit-site/src/components/site-editor-routes/home.js
@@ -2,14 +2,38 @@
  * Internal dependencies
  */
 import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
+import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';
 import Editor from '../editor';
+import { isClassicThemeWithStyleBookSupport } from './utils';
 
 export const homeRoute = {
 	name: 'home',
 	path: '/',
 	areas: {
-		sidebar: <SidebarNavigationScreenMain />,
-		preview: <Editor isHomeRoute />,
-		mobile: <SidebarNavigationScreenMain />,
+		sidebar( { siteData } ) {
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			return isBlockTheme ||
+				isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<SidebarNavigationScreenMain />
+			) : (
+				<SidebarNavigationScreenUnsupported />
+			);
+		},
+		preview( { siteData } ) {
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			return isBlockTheme ||
+				isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<Editor isHomeRoute />
+			) : undefined;
+		},
+		mobile( { siteData } ) {
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			return isBlockTheme ||
+				isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<SidebarNavigationScreenMain />
+			) : (
+				<SidebarNavigationScreenUnsupported />
+			);
+		},
 	},
 };
diff --git a/packages/edit-site/src/components/site-editor-routes/pattern-item.js b/packages/edit-site/src/components/site-editor-routes/pattern-item.js
@@ -3,12 +3,20 @@
  */
 import Editor from '../editor';
 import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
+import { isClassicThemeWithStyleBookSupport } from './utils';
 
 export const patternItemRoute = {
 	name: 'pattern-item',
 	path: '/wp_block/:postId',
 	areas: {
-		sidebar: <SidebarNavigationScreenPatterns backPath="/" />,
+		sidebar( { siteData } ) {
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			const backPath =
+				isBlockTheme || isClassicThemeWithStyleBookSupport( siteData )
+					? '/'
+					: undefined;
+			return <SidebarNavigationScreenPatterns backPath={ backPath } />;
+		},
 		mobile: <Editor />,
 		preview: <Editor />,
 	},
diff --git a/packages/edit-site/src/components/site-editor-routes/patterns.js b/packages/edit-site/src/components/site-editor-routes/patterns.js
@@ -1,34 +1,35 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
 /**
  * Internal dependencies
  */
 import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
 import PagePatterns from '../page-patterns';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-function MobilePatternsView() {
-	const { query = {} } = useLocation();
-	const { categoryId } = query;
-
-	return !! categoryId ? (
-		<PagePatterns />
-	) : (
-		<SidebarNavigationScreenPatterns backPath="/" />
-	);
-}
+import { isClassicThemeWithStyleBookSupport } from './utils';
 
 export const patternsRoute = {
 	name: 'patterns',
 	path: '/pattern',
 	areas: {
-		sidebar: <SidebarNavigationScreenPatterns backPath="/" />,
+		sidebar( { siteData } ) {
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			const backPath =
+				isBlockTheme || isClassicThemeWithStyleBookSupport( siteData )
+					? '/'
+					: undefined;
+			return <SidebarNavigationScreenPatterns backPath={ backPath } />;
+		},
 		content: <PagePatterns />,
-		mobile: <MobilePatternsView />,
+		mobile( { siteData, query } ) {
+			const { categoryId } = query;
+			const isBlockTheme = siteData.currentTheme?.is_block_theme;
+			const backPath =
+				isBlockTheme || isClassicThemeWithStyleBookSupport( siteData )
+					? '/'
+					: undefined;
+			return !! categoryId ? (
+				<PagePatterns />
+			) : (
+				<SidebarNavigationScreenPatterns backPath={ backPath } />
+			);
+		},
 	},
 };
diff --git a/packages/edit-site/src/components/site-editor-routes/stylebook.js b/packages/edit-site/src/components/site-editor-routes/stylebook.js
@@ -7,22 +7,36 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';
 import { StyleBookPreview } from '../style-book';
+import { isClassicThemeWithStyleBookSupport } from './utils';
 
 export const stylebookRoute = {
 	name: 'stylebook',
 	path: '/stylebook',
 	areas: {
-		sidebar: (
-			<SidebarNavigationScreen
-				title={ __( 'Styles' ) }
-				backPath="/"
-				description={ __(
-					`Preview your website's visual identity: colors, typography, and blocks.`
-				) }
-			/>
-		),
-		preview: <StyleBookPreview isStatic />,
-		mobile: <StyleBookPreview isStatic />,
+		sidebar( { siteData } ) {
+			return isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<SidebarNavigationScreen
+					title={ __( 'Styles' ) }
+					backPath="/"
+					description={ __(
+						`Preview your website's visual identity: colors, typography, and blocks.`
+					) }
+				/>
+			) : (
+				<SidebarNavigationScreenUnsupported />
+			);
+		},
+		preview( { siteData } ) {
+			return isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<StyleBookPreview isStatic />
+			) : undefined;
+		},
+		mobile( { siteData } ) {
+			return isClassicThemeWithStyleBookSupport( siteData ) ? (
+				<StyleBookPreview isStatic />
+			) : undefined;
+		},
 	},
 };
diff --git a/packages/edit-site/src/components/site-editor-routes/utils.js b/packages/edit-site/src/components/site-editor-routes/utils.js
@@ -0,0 +1,14 @@
+/**
+ * Check if the classic theme supports the stylebook.
+ *
+ * @param {Object} siteData - The site data provided by the site editor route area resolvers.
+ * @return {boolean} True if the stylebook is supported, false otherwise.
+ */
+export function isClassicThemeWithStyleBookSupport( siteData ) {
+	const isBlockTheme = siteData.currentTheme?.is_block_theme;
+	const supportsEditorStyles =
+		siteData.currentTheme?.theme_supports[ 'editor-styles' ];
+	// This is a temp solution until the has_theme_json value is available for the current theme.
+	const hasThemeJson = siteData.editorSettings?.supportsLayout;
+	return ! isBlockTheme && ( supportsEditorStyles || hasThemeJson );
+}
diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
@@ -121,21 +121,65 @@ export const SiteHubMobile = memo(
 		const history = useHistory();
 		const { navigate } = useContext( SidebarNavigationContext );
 
-		const { dashboardLink, homeUrl, siteTitle } = useSelect( ( select ) => {
+		const {
+			dashboardLink,
+			homeUrl,
+			siteTitle,
+			isBlockTheme,
+			isClassicThemeWithStyleBookSupport,
+		} = useSelect( ( select ) => {
 			const { getSettings } = unlock( select( editSiteStore ) );
-			const { getEntityRecord } = select( coreStore );
+			const { getEntityRecord, getCurrentTheme } = select( coreStore );
 			const _site = getEntityRecord( 'root', 'site' );
+			const currentTheme = getCurrentTheme();
+			const settings = getSettings();
+			const supportsEditorStyles =
+				currentTheme.theme_supports[ 'editor-styles' ];
+			// This is a temp solution until the has_theme_json value is available for the current theme.
+			const hasThemeJson = settings.supportsLayout;
+
 			return {
-				dashboardLink: getSettings().__experimentalDashboardLink,
+				dashboardLink: settings.__experimentalDashboardLink,
 				homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
 				siteTitle:
 					! _site?.title && !! _site?.url
 						? filterURLForDisplay( _site?.url )
 						: _site?.title,
+				isBlockTheme: currentTheme?.is_block_theme,
+				isClassicThemeWithStyleBookSupport:
+					! currentTheme?.is_block_theme &&
+					( supportsEditorStyles || hasThemeJson ),
 			};
 		}, [] );
 		const { open: openCommandCenter } = useDispatch( commandsStore );
-		const isRoot = path === '/';
+
+		let backPath;
+
+		// If the current path is not the root page, find a page to back to.
+		if ( path !== '/' ) {
+			if ( isBlockTheme || isClassicThemeWithStyleBookSupport ) {
+				// If the current theme is a block theme or a classic theme that supports StyleBook,
+				// back to the Design screen.
+				backPath = '/';
+			} else if ( path !== '/pattern' ) {
+				// If the current theme is a classic theme that does not support StyleBook,
+				// back to the Patterns page.
+				backPath = '/pattern';
+			}
+		}
+
+		const backButtonProps = {
+			href: !! backPath ? undefined : dashboardLink,
+			label: !! backPath
+				? __( 'Go to Site Editor' )
+				: __( 'Go to the Dashboard' ),
+			onClick: !! backPath
+				? () => {
+						history.navigate( backPath );
+						navigate( 'back' );
+				  }
+				: undefined,
+		};
 
 		return (
 			<div className="edit-site-site-hub">
@@ -156,18 +200,7 @@ export const SiteHubMobile = memo(
 								transform: 'scale(0.5)',
 								borderRadius: 4,
 							} }
-							{ ...( isRoot
-								? {
-										href: dashboardLink,
-										label: __( 'Go to the Dashboard' ),
-								  }
-								: {
-										onClick: () => {
-											history.navigate( '/' );
-											navigate( 'back' );
-										},
-										label: __( 'Go to Site Editor' ),
-								  } ) }
+							{ ...backButtonProps }
 						>
 							<SiteIcon className="edit-site-layout__view-mode-toggle-icon" />
 						</Button>
