Native Multi Block Selection

WordPress · Oct 4, 2019 · 3fb633a · 3fb633a
1 parent f68a107
commit 3fb633a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 30 deletions.
diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
@@ -68,6 +68,37 @@ class BlockList extends Component {
 		window.removeEventListener( 'mousemove', this.setLastClientY );
 	}
 
+	componentDidUpdate() {
+		const {
+			hasMultiSelection,
+			selectionStart,
+			selectionEnd,
+			blockClientIds,
+		} = this.props;
+
+		if ( ! hasMultiSelection ) {
+			return;
+		}
+
+		const startIndex = blockClientIds.indexOf( selectionStart );
+
+		// The selected block is not in this block list.
+		if ( startIndex === -1 ) {
+			return;
+		}
+
+		const startNode = document.querySelector( `[data-block="${ selectionStart }"]` );
+		const endNode = document.querySelector( `[data-block="${ selectionEnd }"]` );
+		const selection = window.getSelection();
+		const range = document.createRange();
+
+		range.setStartBefore( startNode );
+		range.setEndAfter( endNode );
+
+		selection.removeAllRanges();
+		selection.addRange( range );
+	}
+
 	setLastClientY( { clientY } ) {
 		this.lastClientY = clientY;
 	}

diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
@@ -247,36 +247,6 @@
  * Cross-block selection
  */
 
-.block-editor-block-list__layout .block-editor-block-list__block {
-	::-moz-selection {
-		background-color: $blue-medium-highlight;
-	}
-
-	::selection {
-		background-color: $blue-medium-highlight;
-	}
-
-	// Selection style for multiple blocks.
-	&.is-multi-selected *::selection {
-		background-color: transparent;
-	}
-
-	&.is-multi-selected .block-editor-block-list__block-edit::before {
-		background: $blue-medium-highlight;
-
-		// Use opacity to work in various editor styles.
-		mix-blend-mode: multiply;
-
-		// Collapse extra vertical padding on selection.
-		top: -$block-padding;
-		bottom: -$block-padding;
-
-		.is-dark-theme & {
-			mix-blend-mode: soft-light;
-		}
-	}
-}
-
 
 /**
  * Block styles and alignments

diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -352,6 +352,7 @@ class RichTextWrapper extends Component {
 			undo,
 			placeholder,
 			keepPlaceholderOnFocus,
+			hasMultiSelection,
 			// eslint-disable-next-line no-unused-vars
 			allowedFormats,
 			withoutInteractiveFormatting,
@@ -420,6 +421,7 @@ class RichTextWrapper extends Component {
 				__unstableMarkAutomaticChange={ markAutomaticChange }
 				__unstableDidAutomaticChange={ didAutomaticChange }
 				__unstableUndo={ undo }
+				__unstableContentEditable={ ! hasMultiSelection }
 			>
 				{ ( { isSelected, value, onChange, Editable } ) =>
 					<>
@@ -491,6 +493,7 @@ const RichTextContainer = compose( [
 			getSelectionEnd,
 			getSettings,
 			didAutomaticChange,
+			hasMultiSelection,
 		} = select( 'core/block-editor' );
 
 		const selectionStart = getSelectionStart();
@@ -512,6 +515,7 @@ const RichTextContainer = compose( [
 			selectionEnd: isSelected ? selectionEnd.offset : undefined,
 			isSelected,
 			didAutomaticChange: didAutomaticChange(),
+			hasMultiSelection: hasMultiSelection(),
 		};
 	} ),
 	withDispatch( ( dispatch, {

diff --git a/packages/rich-text/src/component/editable.js b/packages/rich-text/src/component/editable.js
@@ -46,6 +46,10 @@ class Editable extends Component {
 			element.reversed = nextProps.reversed;
 		}
 
+		if ( this.props.contentEditable !== nextProps.contentEditable ) {
+			this.editorNode.contentEditable = nextProps.contentEditable;
+		}
+
 		const { removedKeys, updatedKeys } = diffAriaProps( this.props, nextProps );
 		removedKeys.forEach( ( key ) =>
 			element.removeAttribute( key ) );

diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
@@ -951,7 +951,11 @@ class RichText extends Component {
 			style,
 			className,
 			placeholder,
+<<<<<<< HEAD
 			forwardedRef,
+=======
+			__unstableContentEditable,
+>>>>>>> Native Multi Block Selection
 		} = this.props;
 		// Generating a key that includes `tagName` ensures that if the tag
 		// changes, we replace the relevant element. This is needed because we
@@ -988,6 +992,7 @@ class RichText extends Component {
 				onKeyUp={ this.onSelectionChange }
 				onMouseUp={ this.onSelectionChange }
 				onTouchEnd={ this.onSelectionChange }
+				contentEditable={ __unstableContentEditable }
 			/>
 		);
 	}