Blocks: Fix tab navigation

WordPress · May 2, 2017 · 691faec · 691faec
1 parent c507737
commit 691faec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
@@ -42,6 +42,7 @@ registerBlock( 'core/quote', {
 
 	edit( { attributes, setAttributes, focus, setFocus } ) {
 		const { value, citation, style = 1 } = attributes;
+		const focusedEditable = focus ? focus.editable || 'value' : null;
 
 		return (
 			<blockquote className={ `blocks-quote blocks-quote-style-${ style }` }>
@@ -52,7 +53,7 @@ registerBlock( 'core/quote', {
 							value: nextValue
 						} )
 					}
-					focus={ focus && focus.editable === 'value' ? focus : null }
+					focus={ focusedEditable === 'value' ? focus : null }
 					onFocus={ () => setFocus( { editable: 'value' } ) }
 					showAlignments
 				/>
@@ -65,7 +66,7 @@ registerBlock( 'core/quote', {
 									citation: nextCitation
 								} )
 							}
-							focus={ focus && focus.editable === 'citation' ? focus : null }
+							focus={ focusedEditable === 'citation' ? focus : null }
 							onFocus={ () => setFocus( { editable: 'citation' } ) }
 						/>
 					</footer>

diff --git a/editor/modes/visual-editor/block.js b/editor/modes/visual-editor/block.js
@@ -145,13 +145,15 @@ class VisualEditorBlock extends wp.element.Component {
 			<div
 				ref={ this.bindBlockNode }
 				onClick={ onSelect }
+				onFocus={ onSelect }
 				onBlur={ this.maybeDeselect }
 				onKeyDown={ onStartTyping }
 				onMouseEnter={ onHover }
 				onMouseMove={ this.maybeHover }
 				onMouseLeave={ onMouseLeave }
 				className={ className }
 				data-type={ block.blockType }
+				tabIndex="0"
 				{ ...wrapperProps }
 			>
 				{ ( ( isSelected && ! isTyping ) || isHovered ) && <BlockMover uid={ block.uid } /> }