From 573269eccfdccfb85ddb8e2421bef7a82e6f1a22 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Wed, 2 May 2018 16:18:28 -0400
Subject: [PATCH] Utils: Improve range rect detection for br-separated content

---
 utils/dom.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/utils/dom.js b/utils/dom.js
index 9309b285030850..05bc0b80241559 100644
--- a/utils/dom.js
+++ b/utils/dom.js
@@ -136,21 +136,22 @@ export function getRectangleFromRange( range ) {
 		return range.getBoundingClientRect();
 	}
 
-	// If the collapsed range starts (and therefore ends) at an element node,
-	// `getClientRects` will return undefined. To fix this we can get the
-	// bounding rectangle of the element node to create a DOMRect based on that.
-	if ( range.startContainer.nodeType === ELEMENT_NODE ) {
-		const { x, y, height } = range.startContainer.getBoundingClientRect();
+	let rect = range.getClientRects()[ 0 ];
 
-		// Create a new DOMRect with zero width.
-		return new DOMRect( x, y, 0, height );
+	// If the collapsed range starts (and therefore ends) at an element node,
+	// `getClientRects` will be empty. To account for this, append a temporary
+	// node with zero-width character to use as source for dimensions.
+	if ( ! rect ) {
+		const span = document.createElement( 'span' );
+		span.appendChild( document.createTextNode( '\u200b' ) );
+		range.insertNode( span );
+		rect = span.getClientRects()[ 0 ];
+		const spanParent = span.parentNode;
+		spanParent.removeChild( span );
+		spanParent.normalize();
 	}
 
-	// For normal collapsed ranges (exception above), the bounding rectangle of
-	// the range may be inaccurate in some browsers. There will only be one
-	// rectangle since it is a collapsed range, so it is safe to pass this as
-	// the union of them. This works consistently in all browsers.
-	return first( range.getClientRects() );
+	return rect;
 }
 
 /**