From dfb85fd3ab79f98655f1fc7886ed866854ea826e Mon Sep 17 00:00:00 2001
From: iseulde <wp@iseulde.com>
Date: Thu, 11 Apr 2019 11:06:01 +0200
Subject: [PATCH] Use caret position when adding link

---
 packages/format-library/src/link/inline.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
index 03c466d1086997..40d1adefede53d 100644
--- a/packages/format-library/src/link/inline.js
+++ b/packages/format-library/src/link/inline.js
@@ -236,7 +236,9 @@ class InlineLinkUI extends Component {
 
 		return (
 			<PositionedAtSelection
-				selector="a"
+				// When adding a new link, set the container at the caret,
+				// otherwise set it at the link element.
+				selector={ addingLink ? null : 'a' }
 				// Since the key cannot be the format object, we have to keep it
 				// in the state and bump it when the object reference changes.
 				key={ this.state.key }