Arrow navigation in navigation mode

WordPress · May 29, 2018 · 6283496 · 6283496
1 parent 8dfe428
commit 6283496
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/editor/components/writing-flow/index.js b/editor/components/writing-flow/index.js
@@ -219,16 +219,16 @@ class WritingFlow extends Component {
 
 		// In navigation mode, tab and arrows navigate from block to blocks
 		if ( keyboardMode === 'navigation' ) {
-			const navigateUp = keyCode === TAB && event.shiftKey;
-			const navigateDown = keyCode === TAB && ! event.shiftKey;
+			const navigateUp = ( keyCode === TAB && event.shiftKey ) || keyCode === UP;
+			const navigateDown = ( keyCode === TAB && ! event.shiftKey ) || keyCode === DOWN;
 
 			if ( ( navigateDown && nextBlockUid ) || ( navigateUp && previousBlockUid ) ) {
 				event.preventDefault();
 				this.moveSelection( navigateUp );
 			}
 
 			// Special case when reaching the end of the blocks (navigate to the next tabbable outside of the writing flow)
-			if ( navigateDown && selectedBlockUID && ! nextBlockUid ) {
+			if ( navigateDown && selectedBlockUID && ! nextBlockUid && [ UP, DOWN ].indexOf( keyCode ) === -1 ) {
 				this.props.clearSelectedBlock();
 				this.appender.focus();
 			}