diff --git a/packages/edit-post/src/plugins/index.js b/packages/edit-post/src/plugins/index.js index c0f3c5264596a0..94a5d4c98396cf 100644 --- a/packages/edit-post/src/plugins/index.js +++ b/packages/edit-post/src/plugins/index.js @@ -14,7 +14,6 @@ import CopyContentMenuItem from './copy-content-menu-item'; import KeyboardShortcutsHelpMenuItem from './keyboard-shortcuts-help-menu-item'; import ToolsMoreMenuGroup from '../components/header/tools-more-menu-group'; import WelcomeGuideMenuItem from './welcome-guide-menu-item'; -import NavigationListViewMenuItem from './navigation-list-view-menu-item'; registerPlugin( 'edit-post', { render() { @@ -56,7 +55,6 @@ registerPlugin( 'edit-post', { ) } - ); }, diff --git a/packages/edit-post/src/plugins/navigation-list-view-menu-item.js b/packages/edit-post/src/plugins/navigation-list-view-menu-item.js deleted file mode 100644 index 18bb1bed3760ac..00000000000000 --- a/packages/edit-post/src/plugins/navigation-list-view-menu-item.js +++ /dev/null @@ -1,56 +0,0 @@ -/** - * WordPress dependencies - */ -import { - BlockEditorProvider, - __unstableBlockToolbarLastItem, - __unstableBlockNameContext, -} from '@wordpress/block-editor'; -import { ToolbarButton, ToolbarGroup } from '@wordpress/components'; -import { useDispatch } from '@wordpress/data'; -import { Fragment } from '@wordpress/element'; -import { __ } from '@wordpress/i18n'; -import { listView } from '@wordpress/icons'; - -const NavMenuSidebarToggle = () => { - // eslint-disable-next-line @wordpress/data-no-store-string-literals - const { openGeneralSidebar } = useDispatch( 'core/edit-post' ); - - return ( - - openGeneralSidebar( 'edit-post/block' ) } - icon={ listView } - /> - - ); -}; - -let MaybeNavMenuSidebarToggle = Fragment; - -const isOffCanvasNavigationEditorEnabled = - window?.__experimentalEnableOffCanvasNavigationEditor === true; - -if ( isOffCanvasNavigationEditorEnabled ) { - MaybeNavMenuSidebarToggle = NavMenuSidebarToggle; -} - -const NavigationEditMenuItem = () => { - return ( - - <__unstableBlockToolbarLastItem> - <__unstableBlockNameContext.Consumer> - { ( blockName ) => - blockName === 'core/navigation' && ( - - ) - } - - - - ); -}; - -export default NavigationEditMenuItem; diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js index fc09b957a3cd28..a237ce8f329202 100644 --- a/packages/edit-site/src/components/block-editor/index.js +++ b/packages/edit-site/src/components/block-editor/index.js @@ -7,7 +7,7 @@ import classnames from 'classnames'; * WordPress dependencies */ import { useSelect, useDispatch } from '@wordpress/data'; -import { useCallback, useMemo, useRef, Fragment } from '@wordpress/element'; +import { useCallback, useMemo, useRef } from '@wordpress/element'; import { useEntityBlockEditor, __experimentalFetchMedia as fetchMedia, @@ -19,12 +19,10 @@ import { __experimentalLinkControl, BlockInspector, BlockTools, - __unstableBlockToolbarLastItem, __unstableUseClipboardHandler as useClipboardHandler, __unstableUseTypingObserver as useTypingObserver, BlockEditorKeyboardShortcuts, store as blockEditorStore, - __unstableBlockNameContext, } from '@wordpress/block-editor'; import { useMergeRefs, @@ -32,9 +30,6 @@ import { useResizeObserver, } from '@wordpress/compose'; import { ReusableBlocksMenuItems } from '@wordpress/reusable-blocks'; -import { listView } from '@wordpress/icons'; -import { ToolbarButton, ToolbarGroup } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; /** * Internal dependencies @@ -159,33 +154,6 @@ export default function BlockEditor( { setIsInserterOpen } ) { const showBlockAppender = ( isTemplatePart && hasBlocks ) || isViewMode ? false : undefined; - // eslint-disable-next-line @wordpress/data-no-store-string-literals - const { enableComplementaryArea } = useDispatch( 'core/interface' ); - - const NavMenuSidebarToggle = () => ( - - - enableComplementaryArea( - 'core/edit-site', - 'edit-site/block-inspector' - ) - } - icon={ listView } - /> - - ); - - let MaybeNavMenuSidebarToggle = Fragment; - const isOffCanvasNavigationEditorEnabled = - window?.__experimentalEnableOffCanvasNavigationEditor === true; - - if ( isOffCanvasNavigationEditorEnabled ) { - MaybeNavMenuSidebarToggle = NavMenuSidebarToggle; - } - return ( - <__unstableBlockToolbarLastItem> - <__unstableBlockNameContext.Consumer> - { ( blockName ) => - blockName === 'core/navigation' && ( - - ) - } - - ) }