From 55f97099ae07658062e5d74b75a05daae32fd384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20Erkkil=C3=A4?= Date: Tue, 21 May 2024 19:50:08 +0300 Subject: [PATCH 1/3] sidebar to panel --- packages/editor/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/editor/README.md b/packages/editor/README.md index 1fdb1d0918f5a..1f3b03419549e 100644 --- a/packages/editor/README.md +++ b/packages/editor/README.md @@ -829,11 +829,11 @@ function MyPluginSidebar() { return el( PluginSidebar, { - name: 'my-sidebar', - title: 'My sidebar title', + name: 'my-panel', + title: 'My panel title', icon: moreIcon, }, - el( PanelBody, {}, __( 'My sidebar content' ) ) + el( PanelBody, {}, __( 'My panel content' ) ) ); } ``` @@ -846,8 +846,8 @@ import { PluginSidebar } from '@wordpress/editor'; import { more } from '@wordpress/icons'; const MyPluginSidebar = () => ( - - { __( 'My sidebar content' ) } + + { __( 'My panel content' ) } ); ``` @@ -877,10 +877,10 @@ function MySidebarMoreMenuItem() { return React.createElement( PluginSidebarMoreMenuItem, { - target: 'my-sidebar', + target: 'my-panel', icon: moreIcon, }, - __( 'My sidebar title' ) + __( 'My panel title' ) ); } ``` @@ -892,8 +892,8 @@ import { PluginSidebarMoreMenuItem } from '@wordpress/editor'; import { more } from '@wordpress/icons'; const MySidebarMoreMenuItem = () => ( - - { __( 'My sidebar title' ) } + + { __( 'My panel title' ) } ); ``` From ab38cf2016b04a5922d57a4139581081f6e9e73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20Erkkil=C3=A4?= Date: Tue, 21 May 2024 19:51:48 +0300 Subject: [PATCH 2/3] Sidebar to panel term changes --- .../src/hooks/commands/use-common-commands.js | 2 +- .../src/hooks/commands/use-edit-mode-commands.js | 2 +- .../global-keyboard-shortcuts/register-shortcuts.js | 2 +- .../plugin-sidebar-more-menu-item/index.js | 8 ++++---- .../editor/src/components/plugin-sidebar/index.js | 12 ++++++------ post-content.php | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/edit-post/src/hooks/commands/use-common-commands.js b/packages/edit-post/src/hooks/commands/use-common-commands.js index bd2036eb85e74..4ba3fe1edd892 100644 --- a/packages/edit-post/src/hooks/commands/use-common-commands.js +++ b/packages/edit-post/src/hooks/commands/use-common-commands.js @@ -50,7 +50,7 @@ export default function useCommonCommands() { useCommand( { name: 'core/open-settings-sidebar', - label: __( 'Toggle settings sidebar' ), + label: __( 'Toggle settings panel' ), icon: isRTL() ? drawerLeft : drawerRight, callback: ( { close } ) => { close(); diff --git a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js index 6afe4dcaa7ea9..fe00188161881 100644 --- a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js +++ b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js @@ -195,7 +195,7 @@ function useEditUICommands() { commands.push( { name: 'core/open-settings-sidebar', - label: __( 'Toggle settings sidebar' ), + label: __( 'Toggle settings panel' ), icon: isRTL() ? drawerLeft : drawerRight, callback: ( { close } ) => { close(); diff --git a/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js b/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js index 26a07166c106c..8e6806013c64d 100644 --- a/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js +++ b/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js @@ -92,7 +92,7 @@ function EditorKeyboardShortcutsRegister() { registerShortcut( { name: 'core/editor/toggle-sidebar', category: 'global', - description: __( 'Show or hide the Settings sidebar.' ), + description: __( 'Show or hide the Settings panel.' ), keyCombination: { modifier: 'primaryShift', character: ',', diff --git a/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js b/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js index 0d7695c9abfe1..86762d1a5f31e 100644 --- a/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js +++ b/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js @@ -23,10 +23,10 @@ import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface'; * return React.createElement( * PluginSidebarMoreMenuItem, * { - * target: 'my-sidebar', + * target: 'my-panel', * icon: moreIcon, * }, - * __( 'My sidebar title' ) + * __( 'My panel title' ) * ) * } * ``` @@ -40,10 +40,10 @@ import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface'; * * const MySidebarMoreMenuItem = () => ( * - * { __( 'My sidebar title' ) } + * { __( 'My panel title' ) } * * ); * ``` diff --git a/packages/editor/src/components/plugin-sidebar/index.js b/packages/editor/src/components/plugin-sidebar/index.js index b9c0177e30fc4..c13e505fbbe97 100644 --- a/packages/editor/src/components/plugin-sidebar/index.js +++ b/packages/editor/src/components/plugin-sidebar/index.js @@ -42,14 +42,14 @@ import { store as editorStore } from '../../store'; * return el( * PluginSidebar, * { - * name: 'my-sidebar', - * title: 'My sidebar title', + * name: 'my-panel', + * title: 'My panel title', * icon: moreIcon, * }, * el( * PanelBody, * {}, - * __( 'My sidebar content' ) + * __( 'My panel content' ) * ) * ); * } @@ -65,12 +65,12 @@ import { store as editorStore } from '../../store'; * * const MyPluginSidebar = () => ( * * - * { __( 'My sidebar content' ) } + * { __( 'My panel content' ) } * * * ); diff --git a/post-content.php b/post-content.php index 3c9b18087b0e8..1adf56460860c 100644 --- a/post-content.php +++ b/post-content.php @@ -109,7 +109,7 @@ -

+

From 8a17e48f6b199161f4903d203c279cac761b9e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20Erkkil=C3=A4?= Date: Sat, 15 Jun 2024 11:07:13 +0300 Subject: [PATCH 3/3] Some merge conflict non-sense. This file does not exist in trunk and I don't want to add it --- .../src/hooks/commands/use-common-commands.js | 126 ------------------ 1 file changed, 126 deletions(-) delete mode 100644 packages/edit-post/src/hooks/commands/use-common-commands.js diff --git a/packages/edit-post/src/hooks/commands/use-common-commands.js b/packages/edit-post/src/hooks/commands/use-common-commands.js deleted file mode 100644 index 4ba3fe1edd892..0000000000000 --- a/packages/edit-post/src/hooks/commands/use-common-commands.js +++ /dev/null @@ -1,126 +0,0 @@ -/** - * WordPress dependencies - */ -import { useSelect, useDispatch } from '@wordpress/data'; -import { __, isRTL } from '@wordpress/i18n'; -import { - drawerLeft, - drawerRight, - blockDefault, - fullscreen, - formatListBullets, -} from '@wordpress/icons'; -import { useCommand } from '@wordpress/commands'; -import { store as preferencesStore } from '@wordpress/preferences'; -import { - store as editorStore, - privateApis as editorPrivateApis, -} from '@wordpress/editor'; -import { store as noticesStore } from '@wordpress/notices'; - -/** - * Internal dependencies - */ -import { store as editPostStore } from '../../store'; -import { unlock } from '../../lock-unlock'; - -const { interfaceStore } = unlock( editorPrivateApis ); - -export default function useCommonCommands() { - const { openGeneralSidebar, closeGeneralSidebar } = - useDispatch( editPostStore ); - const { activeSidebar, isFullscreen, isPublishSidebarEnabled } = useSelect( - ( select ) => { - const { get } = select( preferencesStore ); - - return { - activeSidebar: - select( interfaceStore ).getActiveComplementaryArea( - 'core' - ), - isPublishSidebarEnabled: - select( editorStore ).isPublishSidebarEnabled(), - isFullscreen: get( 'core/edit-post', 'fullscreenMode' ), - }; - }, - [] - ); - const { toggle } = useDispatch( preferencesStore ); - const { createInfoNotice } = useDispatch( noticesStore ); - - useCommand( { - name: 'core/open-settings-sidebar', - label: __( 'Toggle settings panel' ), - icon: isRTL() ? drawerLeft : drawerRight, - callback: ( { close } ) => { - close(); - if ( activeSidebar === 'edit-post/document' ) { - closeGeneralSidebar(); - } else { - openGeneralSidebar( 'edit-post/document' ); - } - }, - } ); - - useCommand( { - name: 'core/open-block-inspector', - label: __( 'Toggle block inspector' ), - icon: blockDefault, - callback: ( { close } ) => { - close(); - if ( activeSidebar === 'edit-post/block' ) { - closeGeneralSidebar(); - } else { - openGeneralSidebar( 'edit-post/block' ); - } - }, - } ); - - useCommand( { - name: 'core/toggle-fullscreen-mode', - label: isFullscreen - ? __( 'Exit fullscreen' ) - : __( 'Enter fullscreen' ), - icon: fullscreen, - callback: ( { close } ) => { - toggle( 'core/edit-post', 'fullscreenMode' ); - close(); - createInfoNotice( - isFullscreen ? __( 'Fullscreen off.' ) : __( 'Fullscreen on.' ), - { - id: 'core/edit-post/toggle-fullscreen-mode/notice', - type: 'snackbar', - actions: [ - { - label: __( 'Undo' ), - onClick: () => { - toggle( 'core/edit-post', 'fullscreenMode' ); - }, - }, - ], - } - ); - }, - } ); - - useCommand( { - name: 'core/toggle-publish-sidebar', - label: isPublishSidebarEnabled - ? __( 'Disable pre-publish checks' ) - : __( 'Enable pre-publish checks' ), - icon: formatListBullets, - callback: ( { close } ) => { - close(); - toggle( 'core', 'isPublishSidebarEnabled' ); - createInfoNotice( - isPublishSidebarEnabled - ? __( 'Pre-publish checks disabled.' ) - : __( 'Pre-publish checks enabled.' ), - { - id: 'core/editor/publish-sidebar/notice', - type: 'snackbar', - } - ); - }, - } ); -}