Skip to content
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.

Sign up for GitHub

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

Disable navigation block for text mode. #12185

Merged
merged 8 commits into from
Feb 5, 2019
Merged

Disable navigation block for text mode. #12185

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b408a41
Disable navigation block for text mode.
nicolad Nov 21, 2018
1bce35f
Merge branch 'master' of https://github.com/WordPress/gutenberg into …
nicolad Nov 22, 2018
a0e33df
Add additional rule for disabling navigation blocks.
nicolad Nov 22, 2018
5887c0d
Disable click handler for required rules.
nicolad Nov 22, 2018
2414f78
Adjusted click handler for for text mode.
nicolad Nov 22, 2018
6804900
Merge conflict fixed.
nicolad Nov 27, 2018
93cb697
Disabled keyboard shortcut in text mode.
nicolad Nov 27, 2018
78deb0e
Deleted obsolete onClick check.
nicolad Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/editor/src/components/block-navigation/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,26 @@ const MenuIcon = (
</SVG>
);

function BlockNavigationDropdown( { hasBlocks } ) {
function BlockNavigationDropdown( { hasBlocks, isTextModeEnabled } ) {
return (
<Dropdown
renderToggle={ ( { isOpen, onToggle } ) => (
<Fragment>
<KeyboardShortcuts
{ hasBlocks && ! isTextModeEnabled && <KeyboardShortcuts
bindGlobal
shortcuts={ {
[ rawShortcut.access( 'o' ) ]: onToggle,
} }
/>
}
<IconButton
icon={ MenuIcon }
aria-expanded={ isOpen }
onClick={ hasBlocks ? onToggle : undefined }
label={ __( 'Block Navigation' ) }
className="editor-block-navigation"
shortcut={ displayShortcut.access( 'o' ) }
aria-disabled={ ! hasBlocks }
disabled={ ! hasBlocks || isTextModeEnabled }
/>
</Fragment>
) }
Expand All @@ -50,5 +51,6 @@ function BlockNavigationDropdown( { hasBlocks } ) {
export default withSelect( ( select ) => {
return {
hasBlocks: !! select( 'core/editor' ).getBlockCount(),
isTextModeEnabled: select( 'core/edit-post' ).getEditorMode() === 'text',
};
} )( BlockNavigationDropdown );