From d4dce9982ef740101924a3dea8eee003688625f8 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 18 Jun 2026 11:49:55 +0400
Subject: [PATCH 1/2] Site Editor: Introduce `isHidden` prop for
 `SidebarNavigationItem`

---
 .../sidebar-navigation-item/index.js          |  11 ++
 .../sidebar-navigation-screen-main/index.js   | 110 +++++++++---------
 2 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-item/index.js b/packages/edit-site/src/components/sidebar-navigation-item/index.js
index 687f7f81b1a3ee..d504cb6f364211 100644
--- a/packages/edit-site/src/components/sidebar-navigation-item/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-item/index.js
@@ -22,6 +22,17 @@ import { SidebarNavigationContext } from '../sidebar';
 const { useHistory, useLink, useLocation } = unlock( routerPrivateApis );
 
 export default function SidebarNavigationItem( {
+	isHidden = false,
+	...props
+} ) {
+	if ( isHidden ) {
+		return null;
+	}
+
+	return <SidebarNavigationItemContent { ...props } />;
+}
+
+function SidebarNavigationItemContent( {
 	className,
 	icon,
 	withChevron = false,
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
index 666947b69cc73b..8dbf3bfe631e05 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
@@ -23,52 +23,51 @@ import SidebarNavigationItem from '../sidebar-navigation-item';
 export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 	return (
 		<ItemGroup className="edit-site-sidebar-navigation-screen-main">
-			{ isBlockBasedTheme && (
-				<>
-					<SidebarNavigationItem
-						to="/identity"
-						uid="identity-navigation-item"
-						icon={ siteLogo }
-						activeOnRouteName="identity"
-					>
-						{ _x( 'Identity', 'site identity' ) }
-					</SidebarNavigationItem>
-					<SidebarNavigationItem
-						to="/styles"
-						uid="global-styles-navigation-item"
-						icon={ styles }
-						activeOnRouteName="styles"
-					>
-						{ __( 'Styles' ) }
-					</SidebarNavigationItem>
-					<SidebarNavigationItem
-						uid="page-navigation-item"
-						to="/page"
-						withChevron
-						icon={ page }
-					>
-						{ __( 'Pages' ) }
-					</SidebarNavigationItem>
-					<SidebarNavigationItem
-						uid="navigation-navigation-item"
-						to="/navigation"
-						withChevron
-						icon={ navigation }
-					>
-						{ __( 'Navigation' ) }
-					</SidebarNavigationItem>
-				</>
-			) }
-			{ ! isBlockBasedTheme && (
-				<SidebarNavigationItem
-					uid="stylebook-navigation-item"
-					to="/stylebook"
-					withChevron
-					icon={ styles }
-				>
-					{ __( 'Styles' ) }
-				</SidebarNavigationItem>
-			) }
+			<SidebarNavigationItem
+				to="/identity"
+				uid="identity-navigation-item"
+				icon={ siteLogo }
+				activeOnRouteName="identity"
+				isHidden={ ! isBlockBasedTheme }
+			>
+				{ _x( 'Identity', 'site identity' ) }
+			</SidebarNavigationItem>
+			<SidebarNavigationItem
+				to="/styles"
+				uid="global-styles-navigation-item"
+				icon={ styles }
+				activeOnRouteName="styles"
+				isHidden={ ! isBlockBasedTheme }
+			>
+				{ __( 'Styles' ) }
+			</SidebarNavigationItem>
+			<SidebarNavigationItem
+				uid="page-navigation-item"
+				to="/page"
+				withChevron
+				icon={ page }
+				isHidden={ ! isBlockBasedTheme }
+			>
+				{ __( 'Pages' ) }
+			</SidebarNavigationItem>
+			<SidebarNavigationItem
+				uid="navigation-navigation-item"
+				to="/navigation"
+				withChevron
+				icon={ navigation }
+				isHidden={ ! isBlockBasedTheme }
+			>
+				{ __( 'Navigation' ) }
+			</SidebarNavigationItem>
+			<SidebarNavigationItem
+				uid="stylebook-navigation-item"
+				to="/stylebook"
+				withChevron
+				icon={ styles }
+				isHidden={ isBlockBasedTheme }
+			>
+				{ __( 'Styles' ) }
+			</SidebarNavigationItem>
 			<SidebarNavigationItem
 				uid="patterns-navigation-item"
 				to="/pattern"
@@ -77,16 +76,15 @@ export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 			>
 				{ __( 'Patterns' ) }
 			</SidebarNavigationItem>
-			{ isBlockBasedTheme && (
-				<SidebarNavigationItem
-					uid="template-navigation-item"
-					to="/template"
-					withChevron
-					icon={ layout }
-				>
-					{ __( 'Templates' ) }
-				</SidebarNavigationItem>
-			) }
+			<SidebarNavigationItem
+				uid="template-navigation-item"
+				to="/template"
+				withChevron
+				icon={ layout }
+				isHidden={ ! isBlockBasedTheme }
+			>
+				{ __( 'Templates' ) }
+			</SidebarNavigationItem>
 		</ItemGroup>
 	);
 }

From ed41e5ae4e5377fb25ebbe87904d02e7cfdcf0b6 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 19 Jun 2026 17:01:05 +0400
Subject: [PATCH 2/2] Avoid Styles item duplication

---
 .../sidebar-navigation-screen-main/index.js   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
index 8dbf3bfe631e05..950adb8795c8f1 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
@@ -33,11 +33,15 @@ export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 				{ _x( 'Identity', 'site identity' ) }
 			</SidebarNavigationItem>
 			<SidebarNavigationItem
-				to="/styles"
-				uid="global-styles-navigation-item"
+				to={ isBlockBasedTheme ? '/styles' : '/stylebook' }
+				uid={
+					isBlockBasedTheme
+						? 'global-styles-navigation-item'
+						: 'stylebook-navigation-item'
+				}
 				icon={ styles }
-				activeOnRouteName="styles"
-				isHidden={ ! isBlockBasedTheme }
+				activeOnRouteName={ isBlockBasedTheme ? 'styles' : undefined }
+				withChevron={ ! isBlockBasedTheme }
 			>
 				{ __( 'Styles' ) }
 			</SidebarNavigationItem>
@@ -59,15 +63,6 @@ export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 			>
 				{ __( 'Navigation' ) }
 			</SidebarNavigationItem>
-			<SidebarNavigationItem
-				uid="stylebook-navigation-item"
-				to="/stylebook"
-				withChevron
-				icon={ styles }
-				isHidden={ isBlockBasedTheme }
-			>
-				{ __( 'Styles' ) }
-			</SidebarNavigationItem>
 			<SidebarNavigationItem
 				uid="patterns-navigation-item"
 				to="/pattern"