Blocks: Reselect the current block if we click again on it

editor/modes/visual-editor/block.js

@@ -137,15 +137,13 @@ class VisualEditorBlock extends wp.element.Component {
 			wrapperProps = settings.getEditWrapperProps( block.attributes );
 		}
 
-		// Disable reason: Each block can receive focus but must be able to contain
-		// block children. Tab keyboard navigation enabled by tabIndex assignment.
+		// Disable reason: Each block can be selected by clicking on it
 
-		/* eslint-disable jsx-a11y/no-static-element-interactions */
+		/* eslint-disable jsx-a11y/no-static-element-interactions, jsx-a11y/onclick-has-role */
 		return (
 			<div
 				ref={ this.bindBlockNode }
-				tabIndex="0"
-				onFocus={ onSelect }
+				onClick={ onSelect }
 				onBlur={ this.maybeDeselect }
 				onKeyDown={ onStartTyping }
 				onMouseEnter={ onHover }

editor/state.js

@@ -112,9 +112,13 @@ export function selectedBlock( state = {}, action ) {
 			if ( ! action.selected ) {
 				return state.uid === action.uid ? {} : state;
 			}
-			return action.uid === state.uid
+			return action.uid === state.uid && ! state.typing
 				? state
-				: { uid: action.uid, typing: false, focus: {} };
+				: {
+					uid: action.uid,
+					typing: false,
+					focus: action.uid === state.uid ? state.focus : {}
+				};
 
 		case 'MOVE_BLOCK_UP':
 		case 'MOVE_BLOCK_DOWN':

editor/test/state.js

@@ -258,8 +258,8 @@ describe( 'state', () => {
 			expect( state ).to.eql( { uid: 'kumquat', typing: false, focus: {} } );
 		} );
 
-		it( 'should not update the state if already selected', () => {
-			const original = deepFreeze( { uid: 'kumquat', typing: true, focus: {} } );
+		it( 'should not update the state if already selected and not typing', () => {
+			const original = deepFreeze( { uid: 'kumquat', typing: false, focus: {} } );
 			const state = selectedBlock( original, {
 				type: 'TOGGLE_BLOCK_SELECTED',
 				uid: 'kumquat',
@@ -269,6 +269,21 @@ describe( 'state', () => {
 			expect( state ).to.equal( original );
 		} );
 
+		it( 'should update the state if already selected and typing', () => {
+			const original = deepFreeze( { uid: 'kumquat', typing: true, focus: { editable: 'content' } } );
+			const state = selectedBlock( original, {
+				type: 'TOGGLE_BLOCK_SELECTED',
+				uid: 'kumquat',
+				selected: true
+			} );
+
+			expect( state ).to.eql( {
+				uid: 'kumquat',
+				typing: false,
+				focus: { editable: 'content' }
+			} );
+		} );
+
 		it( 'should unselect the block if currently selected', () => {
 			const original = deepFreeze( { uid: 'kumquat', typing: true, focus: {} } );
 			const state = selectedBlock( original, {