From ccbf75193052641d6ff225a3b74f769e1199f55e Mon Sep 17 00:00:00 2001 From: Tetsuaki Hamano Date: Sun, 3 Sep 2023 18:35:49 +0900 Subject: [PATCH] Command Palette: Fix dupulicate Patterns command --- .../src/admin-navigation-commands.js | 6 +++--- .../src/site-editor-navigation-commands.js | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/packages/core-commands/src/admin-navigation-commands.js b/packages/core-commands/src/admin-navigation-commands.js index 891361a6b33cca..0ba4df82920d9a 100644 --- a/packages/core-commands/src/admin-navigation-commands.js +++ b/packages/core-commands/src/admin-navigation-commands.js @@ -3,7 +3,7 @@ */ import { useCommand } from '@wordpress/commands'; import { __ } from '@wordpress/i18n'; -import { external, plus, symbol } from '@wordpress/icons'; +import { plus, symbol } from '@wordpress/icons'; import { addQueryArgs, getPath } from '@wordpress/url'; import { privateApis as routerPrivateApis } from '@wordpress/router'; @@ -42,7 +42,8 @@ export function useAdminNavigationCommands() { } ); useCommand( { name: 'core/manage-reusable-blocks', - label: __( 'Open patterns' ), + label: __( 'Patterns' ), + icon: symbol, callback: ( { close } ) => { if ( isTemplatesAccessible && isBlockBasedTheme ) { const args = { @@ -58,6 +59,5 @@ export function useAdminNavigationCommands() { document.location.href = 'edit.php?post_type=wp_block'; } }, - icon: isSiteEditor ? symbol : external, } ); } diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js index 9571d728c8ecab..f60a8af7d39a01 100644 --- a/packages/core-commands/src/site-editor-navigation-commands.js +++ b/packages/core-commands/src/site-editor-navigation-commands.js @@ -10,7 +10,6 @@ import { post, page, layout, - symbol, symbolFilled, styles, navigation, @@ -303,24 +302,6 @@ function useSiteEditorBasicNavigationCommands() { }, } ); - result.push( { - name: 'core/edit-site/open-patterns', - label: __( 'Patterns' ), - icon: symbol, - callback: ( { close } ) => { - const args = { - path: '/patterns', - }; - const targetUrl = addQueryArgs( 'site-editor.php', args ); - if ( isSiteEditor ) { - history.push( args ); - } else { - document.location = targetUrl; - } - close(); - }, - } ); - return result; }, [ history, isSiteEditor, isTemplatesAccessible, isBlockBasedTheme ] );