Allow copying text in block (non input) (#4531)

ellatrix · web-flow · commit 0940478a49ea · 2018-01-17T15:24:32.000+01:00
diff --git a/editor/components/block-list/index.js b/editor/components/block-list/index.js
@@ -36,7 +36,7 @@ import {
 	isSelectionEnabled,
 } from '../../store/selectors';
 import { startMultiSelect, stopMultiSelect, multiSelect, selectBlock } from '../../store/actions';
-import { isInputField } from '../../utils/dom';
+import { documentHasSelection } from '../../utils/dom';
 
 class BlockList extends Component {
 	constructor( props ) {
@@ -116,7 +116,7 @@ class BlockList extends Component {
 		}
 
 		// Let native copy behaviour take over in input fields.
-		if ( selectedBlock && isInputField( document.activeElement ) ) {
+		if ( selectedBlock && documentHasSelection() ) {
 			return;
 		}
 
diff --git a/editor/utils/dom.js b/editor/utils/dom.js
@@ -324,3 +324,20 @@ export function isInputField( { nodeName, contentEditable } ) {
 		contentEditable === 'true'
 	);
 }
+
+/**
+ * Check wether the current document has a selection.
+ * This checks both for focus in an input field and general text selection.
+ *
+ * @returns {Boolean} True if there is selection, false if not.
+ */
+export function documentHasSelection() {
+	if ( isInputField( document.activeElement ) ) {
+		return true;
+	}
+
+	const selection = window.getSelection();
+	const range = selection.rangeCount ? selection.getRangeAt( 0 ) : null;
+
+	return range && ! range.collapsed;
+}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import {`
`36`	`36`	`isSelectionEnabled,`
`37`	`37`	`} from '../../store/selectors';`
`38`	`38`	`import { startMultiSelect, stopMultiSelect, multiSelect, selectBlock } from '../../store/actions';`
`39`		`-import { isInputField } from '../../utils/dom';`
	`39`	`+import { documentHasSelection } from '../../utils/dom';`
`40`	`40`
`41`	`41`	`class BlockList extends Component {`
`42`	`42`	`constructor( props ) {`
`@@ -116,7 +116,7 @@ class BlockList extends Component {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// Let native copy behaviour take over in input fields.`
`119`		`- if ( selectedBlock && isInputField( document.activeElement ) ) {`
	`119`	`+ if ( selectedBlock && documentHasSelection() ) {`
`120`	`120`	`return;`
`121`	`121`	`}`
`122`	`122`