diff --git a/edit-post/components/header/mode-switcher/index.js b/edit-post/components/header/mode-switcher/index.js index 9b1e9198821f64..849284d8e73a75 100644 --- a/edit-post/components/header/mode-switcher/index.js +++ b/edit-post/components/header/mode-switcher/index.js @@ -37,7 +37,6 @@ function ModeSwitcher( { onSwitch, mode } ) { return ( ( ( - - - { __( 'Manage All Reusable Blocks' ) } - - - - - + ) } /> diff --git a/edit-post/components/header/tools-more-menu-group/index.js b/edit-post/components/header/tools-more-menu-group/index.js new file mode 100644 index 00000000000000..01571604d4cb92 --- /dev/null +++ b/edit-post/components/header/tools-more-menu-group/index.js @@ -0,0 +1,24 @@ +/** + * External dependencies + */ +import { isEmpty } from 'lodash'; + +/** + * WordPress dependencies + */ +import { createSlotFill, MenuGroup } from '@wordpress/components'; +import { __ } from '@wordpress/i18n'; + +const { Fill: ToolsMoreMenuGroup, Slot } = createSlotFill( 'ToolsMoreMenuGroup' ); + +ToolsMoreMenuGroup.Slot = ( { fillProps } ) => ( + + { ( fills ) => ! isEmpty( fills ) && ( + + { fills } + + ) } + +); + +export default ToolsMoreMenuGroup; diff --git a/edit-post/components/header/writing-menu/index.js b/edit-post/components/header/writing-menu/index.js index 9dd11d3b0f602e..f39d5e17bb2dbf 100644 --- a/edit-post/components/header/writing-menu/index.js +++ b/edit-post/components/header/writing-menu/index.js @@ -14,7 +14,6 @@ function WritingMenu( { onClose } ) { return ( diff --git a/edit-post/hooks/index.js b/edit-post/hooks/index.js index ef9c274541dae3..dc90f62760a7d1 100644 --- a/edit-post/hooks/index.js +++ b/edit-post/hooks/index.js @@ -2,5 +2,4 @@ * Internal dependencies */ import './components'; -import './more-menu'; import './validate-multiple-use'; diff --git a/edit-post/hooks/more-menu/index.js b/edit-post/hooks/more-menu/index.js deleted file mode 100644 index 52989ffc575da8..00000000000000 --- a/edit-post/hooks/more-menu/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * WordPress dependencies - */ -import { addFilter } from '@wordpress/hooks'; - -/** - * Internal dependencies - */ -import CopyContentMenuItem from './copy-content-menu-item'; - -const withCopyContentMenuItem = ( menuItems ) => [ - ...menuItems, - , -]; - -addFilter( - 'editPost.MoreMenu.tools', - 'core/edit-post/more-menu/withCopyContentMenuItem', - withCopyContentMenuItem -); diff --git a/edit-post/index.js b/edit-post/index.js index eea6269c458cc5..bb48d148a04457 100644 --- a/edit-post/index.js +++ b/edit-post/index.js @@ -14,6 +14,7 @@ import { dispatch } from '@wordpress/data'; */ import './assets/stylesheets/main.scss'; import './hooks'; +import './plugins'; import store from './store'; import { initializeMetaBoxState } from './store/actions'; import Editor from './editor'; diff --git a/edit-post/hooks/more-menu/copy-content-menu-item/index.js b/edit-post/plugins/copy-content-menu-item/index.js similarity index 100% rename from edit-post/hooks/more-menu/copy-content-menu-item/index.js rename to edit-post/plugins/copy-content-menu-item/index.js diff --git a/edit-post/plugins/index.js b/edit-post/plugins/index.js new file mode 100644 index 00000000000000..5ed5d48f723157 --- /dev/null +++ b/edit-post/plugins/index.js @@ -0,0 +1,41 @@ +/** + * WordPress dependencies + */ +import { MenuItem } from '@wordpress/components'; +import { Fragment } from '@wordpress/element'; +import { __ } from '@wordpress/i18n'; +import { registerPlugin } from '@wordpress/plugins'; + +/** + * Internal dependencies + */ +import CopyContentMenuItem from './copy-content-menu-item'; +import KeyboardShortcutsHelpMenuItem from './keyboard-shortcuts-help-menu-item'; +import PublishSidebarToggleMenuItem from './publish-sidebar-toggle-menu-item'; +import TipsToggleMenuItem from './tips-toggle-menu-item'; +import ToolsMoreMenuGroup from '../components/header/tools-more-menu-group'; + +registerPlugin( 'edit-post', { + render() { + return ( + + + { ( { onClose } ) => ( + + + { __( 'Manage All Reusable Blocks' ) } + + + + + + + ) } + + + ); + }, +} ); diff --git a/edit-post/components/header/keyboard-shortcuts-help-menu-item/index.js b/edit-post/plugins/keyboard-shortcuts-help-menu-item/index.js similarity index 95% rename from edit-post/components/header/keyboard-shortcuts-help-menu-item/index.js rename to edit-post/plugins/keyboard-shortcuts-help-menu-item/index.js index 355c7a18b70be7..2581e4f05eaf99 100644 --- a/edit-post/components/header/keyboard-shortcuts-help-menu-item/index.js +++ b/edit-post/plugins/keyboard-shortcuts-help-menu-item/index.js @@ -1,14 +1,10 @@ /** * WordPress Dependencies */ +import { MenuItem } from '@wordpress/components'; import { withDispatch } from '@wordpress/data'; -import { displayShortcut } from '@wordpress/keycodes'; - -/** - * WordPress Dependencies - */ import { __ } from '@wordpress/i18n'; -import { MenuItem } from '@wordpress/components'; +import { displayShortcut } from '@wordpress/keycodes'; export function KeyboardShortcutsHelpMenuItem( { openModal, onSelect } ) { return ( diff --git a/edit-post/components/header/publish-sidebar-toggle/index.js b/edit-post/plugins/publish-sidebar-toggle-menu-item/index.js similarity index 88% rename from edit-post/components/header/publish-sidebar-toggle/index.js rename to edit-post/plugins/publish-sidebar-toggle-menu-item/index.js index b3949ec866b954..9b4e514279bb74 100644 --- a/edit-post/components/header/publish-sidebar-toggle/index.js +++ b/edit-post/plugins/publish-sidebar-toggle-menu-item/index.js @@ -6,7 +6,7 @@ import { MenuItem } from '@wordpress/components'; import { compose } from '@wordpress/compose'; import { withSelect, withDispatch } from '@wordpress/data'; -const PublishSidebarToggle = function( { onToggle, isEnabled } ) { +const PublishSidebarToggleMenuItem = function( { onToggle, isEnabled } ) { return ( { label } } - { menuItems } + { children } ); diff --git a/packages/components/src/menu-group/test/__snapshots__/index.js.snap b/packages/components/src/menu-group/test/__snapshots__/index.js.snap index 537a7b921b7738..b64233334e7f02 100644 --- a/packages/components/src/menu-group/test/__snapshots__/index.js.snap +++ b/packages/components/src/menu-group/test/__snapshots__/index.js.snap @@ -14,9 +14,7 @@ exports[`MenuGroup should match snapshot 1`] = ` aria-labelledby="components-menu-group-label-1" orientation="vertical" > -

+

My item