Add a header menu to switch between edit and select tool

docs/designers-developers/developers/data/data-core-block-editor.md

@@ -1141,16 +1141,12 @@ _Parameters_
 
 <a name="setNavigationMode" href="#setNavigationMode">#</a> **setNavigationMode**
 
-Returns an action object used to enable or disable the navigation mode.
+Generators that triggers an action used to enable or disable the navigation mode.
 
 _Parameters_
 
 -   _isNavigationMode_ `string`: Enable/Disable navigation mode.
 
-_Returns_
-
--   `Object`: Action object
-
 <a name="setTemplateValidity" href="#setTemplateValidity">#</a> **setTemplateValidity**
 
 Returns an action object resetting the template validity.

packages/block-editor/README.md

@@ -427,6 +427,10 @@ _Type_
 
 -   `Object` 
 
+<a name="ToolSelector" href="#ToolSelector">#</a> **ToolSelector**
+
+Undocumented declaration.
+
 <a name="transformStyles" href="#transformStyles">#</a> **transformStyles**
 
 Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.

packages/block-editor/src/components/block-list/block.js

@@ -101,7 +101,7 @@ function BlockListBlock( {
 	animateOnChange,
 	enableAnimation,
 	isNavigationMode,
-	enableNavigationMode,
+	setNavigationMode,
 } ) {
 	// Random state used to rerender the component if needed, ideally we don't need this
 	const [ , updateRerenderState ] = useState( {} );
@@ -326,7 +326,7 @@ function BlockListBlock( {
 					isSelected &&
 					isEditMode
 				) {
-					enableNavigationMode();
+					setNavigationMode( true );
 					wrapper.current.focus();
 				}
 				break;
@@ -345,6 +345,14 @@ function BlockListBlock( {
 			return;
 		}
 
+		if (
+			isNavigationMode &&
+			isSelected &&
+			isInsideRootBlock( blockNodeRef.current, event.target )
+		) {
+			setNavigationMode( false );
+		}
+
 		if ( event.shiftKey ) {
 			if ( ! isSelected ) {
 				onShiftSelection();
@@ -778,9 +786,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 		toggleSelection( selectionEnabled ) {
 			toggleSelection( selectionEnabled );
 		},
-		enableNavigationMode() {
-			setNavigationMode( true );
-		},
+		setNavigationMode,
 	};
 } );
 

packages/block-editor/src/components/index.js

@@ -39,6 +39,7 @@ export {
 	RichTextToolbarButton,
 	__unstableRichTextInputEvent,
 } from './rich-text';
+export { default as ToolSelector } from './tool-selector';
 export { default as URLInput } from './url-input';
 export { default as URLInputButton } from './url-input/button';
 export { default as URLPopover } from './url-popover';

packages/block-editor/src/components/inner-blocks/index.js

@@ -7,7 +7,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { withViewportMatch } from '@wordpress/viewport'; // Temporary click-through disable on desktop.
+import { withViewportMatch } from '@wordpress/viewport';
 import { Component } from '@wordpress/element';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { synchronizeBlocksWithTemplate, withBlockContentContext } from '@wordpress/blocks';
@@ -102,7 +102,7 @@ class InnerBlocks extends Component {
 
 	render() {
 		const {
-			isSmallScreen, // Temporary click-through disable on desktop.
+			enableClickThrough,
 			clientId,
 			hasOverlay,
 			renderAppender,
@@ -117,7 +117,7 @@ class InnerBlocks extends Component {
 		const isPlaceholder = template === null && !! templateOptions;
 
 		const classes = classnames( 'editor-inner-blocks block-editor-inner-blocks', {
-			'has-overlay': isSmallScreen && ( hasOverlay && ! isPlaceholder ), // Temporary click-through disable on desktop.
+			'has-overlay': enableClickThrough && ( hasOverlay && ! isPlaceholder ),
 		} );
 
 		return (
@@ -141,7 +141,7 @@ class InnerBlocks extends Component {
 }
 
 InnerBlocks = compose( [
-	withViewportMatch( { isSmallScreen: '< medium' } ), // Temporary click-through disable on desktop.
+	withViewportMatch( { isSmallScreen: '< medium' } ),
 	withBlockEditContext( ( context ) => pick( context, [ 'clientId' ] ) ),
 	withSelect( ( select, ownProps ) => {
 		const {
@@ -151,8 +151,9 @@ InnerBlocks = compose( [
 			getBlockListSettings,
 			getBlockRootClientId,
 			getTemplateLock,
+			isNavigationMode,
 		} = select( 'core/block-editor' );
-		const { clientId } = ownProps;
+		const { clientId, isSmallScreen } = ownProps;
 		const block = getBlock( clientId );
 		const rootClientId = getBlockRootClientId( clientId );
 
@@ -161,6 +162,7 @@ InnerBlocks = compose( [
 			blockListSettings: getBlockListSettings( clientId ),
 			hasOverlay: block.name !== 'core/template' && ! isBlockSelected( clientId ) && ! hasSelectedInnerBlock( clientId, true ),
 			parentLock: getTemplateLock( rootClientId ),
+			enableClickThrough: isNavigationMode() || isSmallScreen,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps ) => {

packages/block-editor/src/components/tool-selector/index.js

@@ -0,0 +1,76 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Dropdown,
+	IconButton,
+	MenuItemsChoice,
+	SVG,
+	Path,
+	NavigableMenu,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { ifViewportMatches } from '@wordpress/viewport';
+
+const editIcon = <SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><Path fill="none" d="M0 0h24v24H0V0z" /><Path d="M14.06 9.02l.92.92L5.92 19H5v-.92l9.06-9.06M17.66 3c-.25 0-.51.1-.7.29l-1.83 1.83 3.75 3.75 1.83-1.83c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.2-.2-.45-.29-.71-.29zm-3.6 3.19L3 17.25V21h3.75L17.81 9.94l-3.75-3.75z" /></SVG>;
+const selectIcon = <SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><Path d="M6.5 1v21.5l6-6.5H21L6.5 1zm5.1 13l-3.1 3.4V5.9l7.8 8.1h-4.7z" /></SVG>;
+
+function ToolSelector() {
+	const isNavigationTool = useSelect( ( select ) => select( 'core/block-editor' ).isNavigationMode() );
+	const { setNavigationMode } = useDispatch( 'core/block-editor' );
+	const onSwitchMode = ( mode ) => {
+		setNavigationMode( mode === 'edit' ? false : true );
+	};
+
+	return (
+		<Dropdown
+			renderToggle={ ( { isOpen, onToggle } ) => (
+				<IconButton
+					icon={ isNavigationTool ? selectIcon : editIcon }
+					aria-expanded={ isOpen }
+					onClick={ onToggle }
+					label={ __( 'Tools' ) }
+				/>
+			) }
+			renderContent={ () => (
+				<>
+					<NavigableMenu
+						role="menu"
+						aria-label={ __( 'Tools' ) }
+					>
+						<MenuItemsChoice
+							value={ isNavigationTool ? 'select' : 'edit' }
+							onSelect={ onSwitchMode }
+							choices={ [
+								{
+									value: 'edit',
+									label: (
+										<>
+											{ editIcon }
+											{ __( 'Edit' ) }
+										</>
+									),
+								},
+								{
+									value: 'select',
+									label: (
+										<>
+											{ selectIcon }
+											{ __( 'Select' ) }
+										</>
+									),
+								},
+							] }
+						/>
+					</NavigableMenu>
+					<div className="block-editor-tool-selector__help">
+						{ __( 'Tools offer different interactions for block selection & editing. To select, press Escape, to go back to editing, press Enter.' ) }
+					</div>
+				</>
+			) }
+		/>
+	);
+}
+
+export default ifViewportMatches( 'medium' )( ToolSelector );

packages/block-editor/src/components/tool-selector/style.scss

@@ -0,0 +1,5 @@
+.block-editor-tool-selector__help {
+	padding: $grid-size-large;
+	border-top: 1px solid $light-gray-500;
+	color: $dark-gray-300;
+}

packages/block-editor/src/components/writing-flow/index.js

@@ -104,13 +104,6 @@ class WritingFlow extends Component {
 
 	onMouseDown() {
 		this.verticalRect = null;
-		this.disableNavigationMode();
-	}
-
-	disableNavigationMode() {
-		if ( this.props.isNavigationMode ) {
-			this.props.disableNavigationMode();
-		}
 	}
 
 	/**
@@ -377,7 +370,6 @@ class WritingFlow extends Component {
 	 * Sets focus to the end of the last tabbable text field, if one exists.
 	 */
 	focusLastTextField() {
-		this.disableNavigationMode();
 		const focusableNodes = focus.focusable.find( this.container );
 		const target = findLast( focusableNodes, isTabbableTextField );
 		if ( target ) {
@@ -445,11 +437,10 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { multiSelect, selectBlock, setNavigationMode, clearSelectedBlock } = dispatch( 'core/block-editor' );
+		const { multiSelect, selectBlock, clearSelectedBlock } = dispatch( 'core/block-editor' );
 		return {
 			onMultiSelect: multiSelect,
 			onSelectBlock: selectBlock,
-			disableNavigationMode: () => setNavigationMode( false ),
 			clearSelectedBlock,
 		};
 	} ),

packages/block-editor/src/store/actions.js

@@ -7,6 +7,8 @@ import { castArray, first, get, includes } from 'lodash';
  * WordPress dependencies
  */
 import { getDefaultBlockName, createBlock } from '@wordpress/blocks';
+import { speak } from '@wordpress/a11y';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -793,15 +795,19 @@ export function __unstableMarkAutomaticChange() {
 }
 
 /**
- * Returns an action object used to enable or disable the navigation mode.
+ * Generators that triggers an action used to enable or disable the navigation mode.
  *
  * @param {string} isNavigationMode Enable/Disable navigation mode.
- *
- * @return {Object} Action object
  */
-export function setNavigationMode( isNavigationMode = true ) {
-	return {
+export function * setNavigationMode( isNavigationMode = true ) {
+	yield {
 		type: 'SET_NAVIGATION_MODE',
 		isNavigationMode,
 	};
+
+	if ( isNavigationMode ) {
+		speak( __( 'You are currently in navigation mode. Navigate blocks using arrow keys. To exit navigation mode and edit the selected block, press Enter.' ) );
+	} else {
+		speak( __( 'You are currently in edit mode. To return to the navigation mode, press Escape.' ) );
+	}
 }

packages/block-editor/src/store/reducer.js

@@ -1256,7 +1256,7 @@ export const blockListSettings = ( state = {}, action ) => {
  *
  * @return {string} Updated state.
  */
-export function isNavigationMode( state = true, action ) {
+export function isNavigationMode( state = false, action ) {
 	if ( action.type === 'SET_NAVIGATION_MODE' ) {
 		return action.isNavigationMode;
 	}

packages/block-editor/src/style.scss

@@ -32,6 +32,7 @@
 @import "./components/rich-text/format-toolbar/style.scss";
 @import "./components/rich-text/style.scss";
 @import "./components/skip-to-selected-block/style.scss";
+@import "./components/tool-selector/style.scss";
 @import "./components/url-input/style.scss";
 @import "./components/url-popover/style.scss";
 @import "./components/warning/style.scss";

packages/components/src/menu-items-choice/index.js

@@ -17,6 +17,7 @@ export default function MenuItemsChoice( {
 				icon={ isSelected && 'yes' }
 				isSelected={ isSelected }
 				shortcut={ item.shortcut }
+				className="components-menu-items-choice"
 				onClick={ () => {
 					if ( ! isSelected ) {
 						onSelect( item.value );

packages/components/src/menu-items-choice/style.scss

@@ -0,0 +1,12 @@
+.components-menu-items-choice,
+.components-menu-items-choice.components-icon-button {
+	padding-left: 2rem;
+
+	&.has-icon {
+		padding-left: 0.5rem;
+	}
+
+	.dashicon {
+		margin-right: 4px;
+	}
+}

packages/components/src/style.scss

@@ -25,6 +25,7 @@
 @import "./icon-button/style.scss";
 @import "./menu-group/style.scss";
 @import "./menu-item/style.scss";
+@import "./menu-items-choice/style.scss";
 @import "./modal/style.scss";
 @import "./notice/style.scss";
 @import "./panel/style.scss";

packages/e2e-test-utils/CHANGELOG.md

@@ -1,3 +1,9 @@
+## master
+
+### Breaking Changes
+
+- The disableNavigationMode utility was removed. By default, the editor is in edit mode now.
+
 ## 3.0.0 (2019-11-14)
 
 ### Breaking Changes

packages/e2e-test-utils/README.md

@@ -137,14 +137,6 @@ _Parameters_
 
 -   _slug_ `string`: Plugin slug.
 
-<a name="disableNavigationMode" href="#disableNavigationMode">#</a> **disableNavigationMode**
-
-Triggers edit mode if not already active.
-
-_Returns_
-
--   `Promise`: Promise resolving after enabling the keyboard edit mode.
-
 <a name="disablePrePublishChecks" href="#disablePrePublishChecks">#</a> **disablePrePublishChecks**
 
 Disables Pre-publish checks.

packages/e2e-test-utils/src/create-new-post.js

@@ -7,7 +7,6 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies
  */
 import { visitAdminPage } from './visit-admin-page';
-import { disableNavigationMode } from './keyboard-mode';
 
 /**
  * Creates new post.
@@ -37,6 +36,4 @@ export async function createNewPost( {
 	if ( enableTips ) {
 		await page.reload();
 	}
-
-	await disableNavigationMode();
 }

packages/e2e-test-utils/src/index.js

@@ -42,7 +42,6 @@ export { selectBlockByClientId } from './select-block-by-client-id';
 export { setBrowserViewport } from './set-browser-viewport';
 export { setPostContent } from './set-post-content';
 export { switchEditorModeTo } from './switch-editor-mode-to';
-export { disableNavigationMode } from './keyboard-mode';
 export { switchUserToAdmin } from './switch-user-to-admin';
 export { switchUserToTest } from './switch-user-to-test';
 export { toggleMoreMenu } from './toggle-more-menu';

packages/e2e-test-utils/src/keyboard-mode.js

@@ -1,12 +1 @@
-/**
- * Triggers edit mode if not already active.
- *
- * @return {Promise} Promise resolving after enabling the keyboard edit mode.
- */
-export async function disableNavigationMode() {
-	const focusedElement = await page.$( ':focus' );
-	await page.click( '.editor-post-title' );
-	if ( focusedElement ) {
-		await focusedElement.focus();
-	}
-}
+