-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge the block navigation and the document outline in the same popover/panel #14956
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
79 changes: 6 additions & 73 deletions
79
packages/block-editor/src/components/block-navigation/dropdown.js
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 |
|---|---|---|
| @@ -1,80 +1,13 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Button, Dropdown, SVG, Path } from '@wordpress/components'; | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { useSelect } from '@wordpress/data'; | ||
| import { useShortcut } from '@wordpress/keyboard-shortcuts'; | ||
| import { useCallback } from '@wordpress/element'; | ||
| import deprecated from '@wordpress/deprecated'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import BlockNavigation from './'; | ||
|
|
||
| const MenuIcon = ( | ||
| <SVG | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| viewBox="0 0 24 24" | ||
| width="24" | ||
| height="24" | ||
| > | ||
| <Path d="M13.8 5.2H3v1.5h10.8V5.2zm-3.6 12v1.5H21v-1.5H10.2zm7.2-6H6.6v1.5h10.8v-1.5z" /> | ||
| </SVG> | ||
| ); | ||
|
|
||
| function BlockNavigationDropdownToggle( { isEnabled, onToggle, isOpen } ) { | ||
| useShortcut( | ||
| 'core/edit-post/toggle-block-navigation', | ||
| useCallback( onToggle, [ onToggle ] ), | ||
| { | ||
| bindGlobal: true, | ||
| isDisabled: ! isEnabled, | ||
| } | ||
| ); | ||
| const shortcut = useSelect( | ||
| ( select ) => | ||
| select( 'core/keyboard-shortcuts' ).getShortcutRepresentation( | ||
| 'core/edit-post/toggle-block-navigation' | ||
| ), | ||
| [] | ||
| ); | ||
|
|
||
| return ( | ||
| <Button | ||
| icon={ MenuIcon } | ||
| aria-expanded={ isOpen } | ||
| onClick={ isEnabled ? onToggle : undefined } | ||
| label={ __( 'Block navigation' ) } | ||
| className="block-editor-block-navigation" | ||
| shortcut={ shortcut } | ||
| aria-disabled={ ! isEnabled } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| function BlockNavigationDropdown( { isDisabled } ) { | ||
| const hasBlocks = useSelect( | ||
| ( select ) => !! select( 'core/block-editor' ).getBlockCount(), | ||
| [] | ||
| ); | ||
| const isEnabled = hasBlocks && ! isDisabled; | ||
|
|
||
| return ( | ||
| <Dropdown | ||
| contentClassName="block-editor-block-navigation__popover" | ||
| position="bottom right" | ||
| renderToggle={ ( toggleProps ) => ( | ||
| <BlockNavigationDropdownToggle | ||
| { ...toggleProps } | ||
| isEnabled={ isEnabled } | ||
| /> | ||
| ) } | ||
| renderContent={ ( { onClose } ) => ( | ||
| <BlockNavigation onSelect={ onClose } /> | ||
| ) } | ||
| /> | ||
| ); | ||
| function BlockNavigationDropdown() { | ||
| deprecated( 'BlockNavigationDropdown component', { | ||
| hint: 'This component is now include in the TableOfContents component.', | ||
| } ); | ||
| return null; | ||
| } | ||
|
|
||
| export default BlockNavigationDropdown; |
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
9 changes: 0 additions & 9 deletions
9
packages/block-editor/src/components/block-navigation/style.scss
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
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
Oops, something went wrong.
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.
This dropdown won't be used anywhere in Gutenberg. I feel like we can probably safely remove it as I don't think third party developers would need this but since it's part of the public API, I kept it for now.