From e2a6fa2144d1ef5fa3553ff965bb4503d9ea6194 Mon Sep 17 00:00:00 2001
From: iseulde <ella@iseulde.com>
Date: Fri, 13 Oct 2017 16:10:00 +0200
Subject: [PATCH] Multi-select on shift+click

---
 editor/modes/visual-editor/block-list.js | 23 +++++++++++++++++++++--
 editor/modes/visual-editor/block.js      | 11 +++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/editor/modes/visual-editor/block-list.js b/editor/modes/visual-editor/block-list.js
index 5b3e3f1b4f92e3..7dd3a73f73f817 100644
--- a/editor/modes/visual-editor/block-list.js
+++ b/editor/modes/visual-editor/block-list.js
@@ -24,8 +24,9 @@ import {
 	getMultiSelectedBlocksEndUid,
 	getMultiSelectedBlocks,
 	getMultiSelectedBlockUids,
+	getSelectedBlock,
 } from '../../selectors';
-import { insertBlock, startMultiSelect, stopMultiSelect, multiSelect } from '../../actions';
+import { insertBlock, startMultiSelect, stopMultiSelect, multiSelect, selectBlock } from '../../actions';
 
 const INSERTION_POINT_PLACEHOLDER = '[[insertion-point]]';
 
@@ -36,6 +37,7 @@ class VisualEditorBlockList extends Component {
 		this.onSelectionStart = this.onSelectionStart.bind( this );
 		this.onSelectionChange = this.onSelectionChange.bind( this );
 		this.onSelectionEnd = this.onSelectionEnd.bind( this );
+		this.onShiftSelection = this.onShiftSelection.bind( this );
 		this.onCopy = this.onCopy.bind( this );
 		this.onCut = this.onCut.bind( this );
 		this.setBlockRef = this.setBlockRef.bind( this );
@@ -175,6 +177,18 @@ class VisualEditorBlockList extends Component {
 		this.props.onStopMultiSelect();
 	}
 
+	onShiftSelection( uid ) {
+		const { selectedBlock, selectionStart, onMultiSelect, onSelect } = this.props;
+
+		if ( selectedBlock ) {
+			onMultiSelect( selectedBlock.uid, uid );
+		} else if ( selectionStart ) {
+			onMultiSelect( selectionStart, uid );
+		} else {
+			onSelect( uid );
+		}
+	}
+
 	appendDefaultBlock() {
 		const newBlock = createBlock( getDefaultBlockName() );
 		this.props.onInsertBlock( newBlock );
@@ -212,7 +226,8 @@ class VisualEditorBlockList extends Component {
 							key={ uid }
 							uid={ uid }
 							blockRef={ ( ref ) => this.setBlockRef( ref, uid ) }
-							onSelectionStart={ () => this.onSelectionStart( uid ) }
+							onSelectionStart={ this.onSelectionStart }
+							onShiftSelection={ this.onShiftSelection }
 						/>
 					);
 				} ) }
@@ -243,6 +258,7 @@ export default connect(
 		selectionEnd: getMultiSelectedBlocksEndUid( state ),
 		multiSelectedBlocks: getMultiSelectedBlocks( state ),
 		multiSelectedBlockUids: getMultiSelectedBlockUids( state ),
+		selectedBlock: getSelectedBlock( state ),
 	} ),
 	( dispatch ) => ( {
 		onInsertBlock( block ) {
@@ -257,6 +273,9 @@ export default connect(
 		onMultiSelect( start, end ) {
 			dispatch( multiSelect( start, end ) );
 		},
+		onSelect( uid ) {
+			dispatch( selectBlock( uid ) );
+		},
 		onRemove( uids ) {
 			dispatch( { type: 'REMOVE_BLOCKS', uids } );
 		},
diff --git a/editor/modes/visual-editor/block.js b/editor/modes/visual-editor/block.js
index e6f6d98e2da7b7..a009afe11af56b 100644
--- a/editor/modes/visual-editor/block.js
+++ b/editor/modes/visual-editor/block.js
@@ -262,8 +262,15 @@ class VisualEditorBlock extends Component {
 			return;
 		}
 
-		this.props.onSelectionStart();
-		this.props.onSelect();
+		if ( event.shiftKey ) {
+			if ( ! this.props.isSelected ) {
+				this.props.onShiftSelection( this.props.uid );
+				event.preventDefault();
+			}
+		} else {
+			this.props.onSelectionStart( this.props.uid );
+			this.props.onSelect();
+		}
 	}
 
 	onKeyDown( event ) {