Try a fixed toolbar in the navigation page #21340
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import classnames from 'classnames'; | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { useDispatch, useSelect } from '@wordpress/data'; | ||
| import { useEffect } from '@wordpress/element'; | ||
|
|
||
| import { | ||
| BlockList, | ||
| BlockToolbar, | ||
| NavigableToolbar, | ||
| ObserveTyping, | ||
| WritingFlow, | ||
| } from '@wordpress/block-editor'; | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { Button, Panel, PanelBody, Popover } from '@wordpress/components'; | ||
|
|
||
| export default function BlockEditorPanel( { menuId, saveBlocks } ) { | ||
| const { clearSelectedBlock } = useDispatch( 'core/block-editor' ); | ||
| const isNavigationModeActive = useSelect( | ||
| ( select ) => select( 'core/block-editor' ).isNavigationMode(), | ||
| [] | ||
| ); | ||
|
|
||
| // Clear the selected block when the menu is changed. | ||
| // Block selection isn't cleared implicity by the block-editor store. | ||
| // Dispatching this action fixes an issue where the toolbar | ||
| // for a block continues to be displayed after it no longer exists. | ||
| useEffect( () => { | ||
| clearSelectedBlock(); | ||
| }, [ menuId ] ); | ||
|
|
||
| return ( | ||
| <Panel | ||
| header={ | ||
| <Button isPrimary onClick={ saveBlocks }> | ||
| { __( 'Save navigation' ) } | ||
| </Button> | ||
| } | ||
| > | ||
| <PanelBody title={ __( 'Navigation menu' ) }> | ||
| <NavigableToolbar | ||
| className={ classnames( | ||
| 'edit-navigation-menu-editor__block-editor-toolbar', | ||
| { | ||
| 'is-hidden': isNavigationModeActive, | ||
| } | ||
| ) } | ||
| aria-label={ __( 'Block tools' ) } | ||
| > | ||
| <BlockToolbar hideDragHandle /> | ||
| </NavigableToolbar> | ||
| <Popover.Slot name="block-toolbar" /> | ||
| <WritingFlow> | ||
| <ObserveTyping> | ||
| <BlockList /> | ||
| </ObserveTyping> | ||
| </WritingFlow> | ||
| </PanelBody> | ||
| </Panel> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { __experimentalBlockNavigationList } from '@wordpress/block-editor'; | ||
| import { Panel, PanelBody } from '@wordpress/components'; | ||
| import { useViewportMatch } from '@wordpress/compose'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| export default function NavigationStructurePanel( { blocks } ) { | ||
| const isLargeViewport = useViewportMatch( 'medium' ); | ||
|
|
||
| return ( | ||
| <Panel> | ||
| <PanelBody | ||
| title={ __( 'Navigation structure' ) } | ||
| initialOpen={ isLargeViewport } | ||
|
There was a problem hiding this comment. Not sure what's wrong, but this is no longer applying? The panel is always closed, whatever the screen size. There was a problem hiding this comment. Hmm, yeah, unusual. Not sure why this happens. I moved the |
||
| > | ||
| { !! blocks.length && ( | ||
| <__experimentalBlockNavigationList | ||
| blocks={ blocks } | ||
| selectedBlockClientId={ blocks[ 0 ].clientId } | ||
| selectBlock={ () => {} } | ||
| showNestedBlocks | ||
| showAppender | ||
| /> | ||
| ) } | ||
| </PanelBody> | ||
| </Panel> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it be fine to just render the toolbar slot in a fixed position?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using the
BlockToolbarcomponent mirrors the way the fixed toolbar is implemented in the post editor. My thoughts were that this is preferable as the movers are implemented differently inBlockToolbarcomponent—they're inline buttons. Whereas with the Slot, the movers reveal and have a drag handle, which doesn't seem like the right behaviour for an inline toolbar.