Moving blocks should not affect the selection reducer

WordPress · Oct 10, 2017 · 7c82b00 · 7c82b00
1 parent 5514202
commit 7c82b00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 29 deletions.
diff --git a/editor/block-mover/index.js b/editor/block-mover/index.js
@@ -17,6 +17,7 @@ import { getBlockType } from '@wordpress/blocks';
 import './style.scss';
 import { isFirstBlock, isLastBlock, getBlockIndex, getBlock } from '../selectors';
 import { getBlockMoverLabel } from './mover-label';
+import { selectBlock } from '../actions';
 
 function BlockMover( { onMoveUp, onMoveDown, isFirst, isLast, uids, blockType, firstIndex } ) {
 	// We emulate a disabled state because forcefully applying the `disabled`
@@ -68,12 +69,20 @@ export default connect(
 	} ),
 	( dispatch, ownProps ) => ( {
 		onMoveDown() {
+			if ( ownProps.uids.length === 1 ) {
+				dispatch( selectBlock( first( ownProps.uids ) ) );
+			}
+
 			dispatch( {
 				type: 'MOVE_BLOCKS_DOWN',
 				uids: ownProps.uids,
 			} );
 		},
 		onMoveUp() {
+			if ( ownProps.uids.length === 1 ) {
+				dispatch( selectBlock( first( ownProps.uids ) ) );
+			}
+
 			dispatch( {
 				type: 'MOVE_BLOCKS_UP',
 				uids: ownProps.uids,

diff --git a/editor/reducer.js b/editor/reducer.js
@@ -350,17 +350,6 @@ export function blockSelection( state = { start: null, end: null, focus: null },
 				end: action.blocks[ 0 ].uid,
 				focus: {},
 			};
-		case 'MOVE_BLOCKS_UP':
-		case 'MOVE_BLOCKS_DOWN': {
-			const firstUid = first( action.uids );
-			return firstUid === state.start
-				? state
-				: {
-					start: firstUid,
-					end: firstUid,
-					focus: {},
-				};
-		}
 	}
 
 	return state;

diff --git a/editor/test/reducer.js b/editor/test/reducer.js
@@ -734,24 +734,6 @@ describe( 'state', () => {
 			expect( state3 ).toEqual( { start: 'ribs', end: 'ribs', focus: {} } );
 		} );
 
-		it( 'should return with block moved up', () => {
-			const state = blockSelection( undefined, {
-				type: 'MOVE_BLOCKS_UP',
-				uids: [ 'ribs' ],
-			} );
-
-			expect( state ).toEqual( { start: 'ribs', end: 'ribs', focus: {} } );
-		} );
-
-		it( 'should return with block moved down', () => {
-			const state = blockSelection( undefined, {
-				type: 'MOVE_BLOCKS_DOWN',
-				uids: [ 'chicken' ],
-			} );
-
-			expect( state ).toEqual( { start: 'chicken', end: 'chicken', focus: {} } );
-		} );
-
 		it( 'should not update the state if the block moved is already selected', () => {
 			const original = deepFreeze( { start: 'ribs', end: 'ribs', focus: {} } );
 			const state = blockSelection( original, {