@ckeditor/ckeditor5-link 31.0.0 → 33.0.0

package/src/link.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/linkcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/linkediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -11,12 +11,12 @@ import { Plugin } from 'ckeditor5/src/core';
 import { MouseObserver } from 'ckeditor5/src/engine';
 import { Input, TwoStepCaretMovement, inlineHighlight, findAttributeRange } from 'ckeditor5/src/typing';
 import { ClipboardPipeline } from 'ckeditor5/src/clipboard';
-import { keyCodes } from 'ckeditor5/src/utils';
+import { keyCodes, env } from 'ckeditor5/src/utils';
 
 import LinkCommand from './linkcommand';
 import UnlinkCommand from './unlinkcommand';
 import ManualDecorator from './utils/manualdecorator';
-import { createLinkElement, ensureSafeUrl, getLocalizedDecorators, normalizeDecorators } from './utils';
+import { createLinkElement, ensureSafeUrl, getLocalizedDecorators, normalizeDecorators, openLink } from './utils';
 
 import '../theme/link.css';
 
@@ -107,6 +107,9 @@ export default class LinkEditing extends Plugin {
 		// Setup highlight over selected link.
 		inlineHighlight( editor, 'linkHref', 'a', HIGHLIGHT_CLASS );
 
+		// Handle link following by CTRL+click or ALT+ENTER
+		this._enableLinkOpen();
+
 		// Change the attributes of the selection in certain situations after the link was inserted into the document.
 		this._enableInsertContentSelectionAttributesFixer();
 
@@ -220,6 +223,68 @@ export default class LinkEditing extends Plugin {
 		} );
 	}
 
+	/**
+	 * Attaches handlers for {@link module:engine/view/document~Document#event:enter} and
+	 * {@link module:engine/view/document~Document#event:click} to enable link following.
+	 *
+	 * @private
+	 */
+	_enableLinkOpen() {
+		const editor = this.editor;
+		const view = editor.editing.view;
+		const viewDocument = view.document;
+		const modelDocument = editor.model.document;
+
+		this.listenTo( viewDocument, 'click', ( evt, data ) => {
+			const shouldOpen = env.isMac ? data.domEvent.metaKey : data.domEvent.ctrlKey;
+
+			if ( !shouldOpen ) {
+				return;
+			}
+
+			let clickedElement = data.domTarget;
+
+			if ( clickedElement.tagName.toLowerCase() != 'a' ) {
+				clickedElement = clickedElement.closest( 'a' );
+			}
+
+			if ( !clickedElement ) {
+				return;
+			}
+
+			const url = clickedElement.getAttribute( 'href' );
+
+			if ( !url ) {
+				return;
+			}
+
+			evt.stop();
+			data.preventDefault();
+
+			openLink( url );
+		}, { context: '$capture' } );
+
+		this.listenTo( viewDocument, 'enter', ( evt, data ) => {
+			const selection = modelDocument.selection;
+
+			const selectedElement = selection.getSelectedElement();
+
+			const url = selectedElement ?
+				selectedElement.getAttribute( 'linkHref' ) :
+				selection.getAttribute( 'linkHref' );
+
+			const shouldOpen = url && data.domEvent.altKey;
+
+			if ( !shouldOpen ) {
+				return;
+			}
+
+			evt.stop();
+
+			openLink( url );
+		}, { context: 'a' } );
+	}
+
 	/**
 	 * Starts listening to {@link module:engine/model/model~Model#event:insertContent} and corrects the model
 	 * selection attributes if the selection is at the end of a link after inserting the content.
@@ -577,9 +642,9 @@ function shouldCopyAttributes( model ) {
 // @params {module:core/editor/editor~Editor} editor
 // @returns {Boolean}
 function isTyping( editor ) {
-	const input = editor.plugins.get( 'Input' );
+	const currentBatch = editor.model.change( writer => writer.batch );
 
-	return input.isInput( editor.model.change( writer => writer.batch ) );
+	return currentBatch.isTyping;
 }
 
 // Returns an array containing names of the attributes allowed on `$text` that describes the link item.

package/src/linkimage.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/linkimageediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -44,10 +44,6 @@ export default class LinkImageEditing extends Plugin {
 			schema.extend( 'imageBlock', { allowAttributes: [ 'linkHref' ] } );
 		}
 
-		if ( editor.plugins.has( 'ImageInlineEditing' ) ) {
-			schema.extend( 'imageInline', { allowAttributes: [ 'linkHref' ] } );
-		}
-
 		editor.conversion.for( 'upcast' ).add( upcastLink( editor ) );
 		editor.conversion.for( 'downcast' ).add( downcastImageLink( editor ) );
 
@@ -256,6 +252,7 @@ function downcastImageLinkManualDecorator( decorator ) {
 // @private
 // @returns {Function}
 function upcastImageLinkManualDecorator( editor, decorator ) {
+	const isImageInlinePluginLoaded = editor.plugins.has( 'ImageInlineEditing' );
 	const imageUtils = editor.plugins.get( 'ImageUtils' );
 
 	return dispatcher => {
@@ -269,6 +266,12 @@ function upcastImageLinkManualDecorator( editor, decorator ) {
 				return;
 			}
 
+			const blockImageView = imageInLink.findAncestor( element => imageUtils.isBlockImageView( element ) );
+
+			if ( isImageInlinePluginLoaded && !blockImageView ) {
+				return;
+			}
+
 			const matcher = new Matcher( decorator._createPattern() );
 			const result = matcher.match( viewLink );
 

package/src/linkimageui.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/linkui.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/ui/linkactionsview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -155,6 +155,16 @@ export default class LinkActionsView extends View {
 		this.keystrokes.listenTo( this.element );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	destroy() {
+		super.destroy();
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+	}
+
 	/**
 	 * Focuses the fist {@link #_focusables} in the actions.
 	 */

package/src/ui/linkformview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -200,6 +200,16 @@ export default class LinkFormView extends View {
 		this.keystrokes.listenTo( this.element );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	destroy() {
+		super.destroy();
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+	}
+
 	/**
 	 * Focuses the fist {@link #_focusables} in the form.
 	 */

package/src/unlinkcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/utils/automaticdecorators.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

package/src/utils/manualdecorator.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -7,6 +7,8 @@
  * @module link/utils
  */
 
+/* global window */
+
 import { upperFirst } from 'lodash-es';
 
 const ATTRIBUTE_WHITESPACES = /[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205f\u3000]/g; // eslint-disable-line no-control-regex
@@ -171,3 +173,12 @@ export function addLinkProtocolIfApplicable( link, defaultProtocol ) {
 
 	return link && isProtocolNeeded ? protocol + link : link;
 }
+
+/**
+ * Opens the link in a new browser tab.
+ *
+ * @param {String} link
+ */
+export function openLink( link ) {
+	window.open( link, '_blank', 'noopener' );
+}

package/theme/link.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/theme/linkactions.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/theme/linkform.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/theme/linkimage.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */