fix: implement pages override command in site editor to resolve Menu …

…API conflict
WordPress · t-hamano · Sep 9, 2025 · Aug 25, 2025 · Aug 26, 2025 · Aug 28, 2025
commit 44f7f046a1103026c8ce1afca587c66846ba72ec
diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js
@@ -338,25 +338,6 @@ const getSiteEditorBasicNavigationCommands = () =>
 					},
 				} );
 
-				result.push( {
-					name: 'core/edit-site/open-pages',
-					label: __( 'Go to: Pages' ),
-					icon: page,
-					callback: ( { close } ) => {
-						if ( isSiteEditor ) {
-							history.navigate( '/page' );
-						} else {
-							document.location = addQueryArgs(
-								'site-editor.php',
-								{
-									p: '/page',
-								}
-							);
-						}
-						close();
-					},
-				} );
-
 				result.push( {
 					name: 'core/edit-site/open-templates',
 					label: __( 'Go to: Templates' ),
@@ -376,6 +357,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 					},
 				} );
 			}
+
 			if ( canCreatePatterns ) {
 				result.push( {
 					name: 'core/edit-site/open-patterns',
@@ -418,6 +400,56 @@ const getSiteEditorBasicNavigationCommands = () =>
 		};
 	};
 
+// Override Pages command when in site editor to avoid conflict with Menu API.
+const getSiteEditorPagesOverrideCommand = () =>
+	function useSiteEditorPagesOverrideCommand() {
+		const history = useHistory();
+		const isSiteEditor = getPath( window.location.href )?.includes(
+			'site-editor.php'
+		);
+		const { isBlockBasedTheme, canCreateTemplate } = useSelect(
+			( select ) => {
+				return {
+					isBlockBasedTheme:
+						select( coreStore ).getCurrentTheme()?.is_block_theme,
+					canCreateTemplate: select( coreStore ).canUser( 'create', {
+						kind: 'postType',
+						name: 'wp_template',
+					} ),
+				};
+			},
+			[]
+		);
+
+		const commands = useMemo( () => {
+			// Only provide this command when in site editor and user can access it.
+			if (
+				! isSiteEditor ||
+				! canCreateTemplate ||
+				! isBlockBasedTheme
+			) {
+				return [];
+			}
+
+			return [
+				{
+					name: 'core/edit-site/open-pages',
+					label: __( 'Go to Pages' ),
+					icon: page,
+					callback: ( { close } ) => {
+						history.navigate( '/page' );
+						close();
+					},
+				},
+			];
+		}, [ history, isSiteEditor, canCreateTemplate, isBlockBasedTheme ] );
+
+		return {
+			commands,
+			isLoading: false,
+		};
+	};
+
 export function useSiteEditorNavigationCommands() {
 	useCommandLoader( {
 		name: 'core/edit-site/navigate-pages',
@@ -440,4 +472,11 @@ export function useSiteEditorNavigationCommands() {
 		hook: getSiteEditorBasicNavigationCommands(),
 		context: 'site-editor',
 	} );
+
+	// Register the Pages override command to handle Menu API conflict
+	useCommandLoader( {
+		name: 'core/edit-site/open-pages',
+		hook: getSiteEditorPagesOverrideCommand(),
+		context: 'site-editor',
+	} );
 }