Merge pull request #17579 from ckeditor/ck/epic/17230-fix-focus-toolb…

…ar-button

Internal (link): Open link form on top of the link toolbar if user clicked toolbar button on selected link. Focus no longer stays in link toolbar.

packages/ckeditor5-link/src/linkui.ts

@@ -625,7 +625,15 @@ export default class LinkUI extends Plugin {
 		view.bind( 'isOn' ).to( command, 'value', value => !!value );
 
 		// Show the panel on button click.
-		this.listenTo<ButtonExecuteEvent>( view, 'execute', () => this._showUI( true ) );
+		this.listenTo<ButtonExecuteEvent>( view, 'execute', () => {
+			this._showUI( true );
+
+			// Open the form view on-top of the toolbar view if it's already visible.
+			// It should be visible every time the link is selected.
+			if ( this._getSelectedLinkElement() ) {
+				this._addFormView();
+			}
+		} );
 
 		return view;
 	}

packages/ckeditor5-link/tests/linkui.js

@@ -172,6 +172,14 @@ describe( 'LinkUI', () => {
 
 				expect( linkUIFeature.formView.backButtonView.isVisible ).to.be.false;
 			} );
+
+			it( 'should open on-top of the toolbar if the link is selected', () => {
+				setModelData( editor.model, '<paragraph><$text linkHref="url">f[]oo</$text></paragraph>' );
+
+				linkButton.fire( 'execute' );
+
+				expect( balloon.visibleView ).to.equal( linkUIFeature.formView );
+			} );
 		}
 
 		describe( 'the "linkPreview" toolbar button', () => {