@ckeditor/ckeditor5-link 27.1.0 → 29.2.0

package/lang/translations/de-ch.po

@@ -0,0 +1,53 @@
+# Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+#
+#                                     !!! IMPORTANT !!!
+#
+#         Before you edit this file, please keep in mind that contributing to the project
+#                translations is possible ONLY via the Transifex online service.
+#
+#         To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
+#
+#                   To learn more, check out the official contributor's guide:
+#     https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
+#
+msgid ""
+msgstr ""
+"Language-Team: German (Switzerland) (https://www.transifex.com/ckeditor/teams/11143/de_CH/)\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Toolbar button tooltip for the Unlink feature."
+msgid "Unlink"
+msgstr "Link entfernen"
+
+msgctxt "Toolbar button tooltip for the Link feature."
+msgid "Link"
+msgstr "Link"
+
+msgctxt "Label for the URL input in the Link URL editing balloon."
+msgid "Link URL"
+msgstr "Link Adresse"
+
+msgctxt "Label for the image link button."
+msgid "Link image"
+msgstr "Bild verlinken"
+
+msgctxt "Button opening the Link URL editing balloon."
+msgid "Edit link"
+msgstr "Link bearbeiten"
+
+msgctxt "Button opening the link in new browser tab."
+msgid "Open link in new tab"
+msgstr "Link in neuem Tab öffnen"
+
+msgctxt "Label explaining that a link has no URL set (the URL is empty)."
+msgid "This link has no URL"
+msgstr "Dieser Link hat keine Adresse"
+
+msgctxt "The label of the switch button that controls whether the edited link will open in a new tab."
+msgid "Open in a new tab"
+msgstr "In neuem Tab öffnen"
+
+msgctxt "The label of the switch button that controls whether the edited link refers to downloadable resource."
+msgid "Downloadable"
+msgstr "Herunterladbar"

package/lang/translations/ro.po

@@ -30,7 +30,7 @@ msgstr "Link URL"
 
 msgctxt "Label for the image link button."
 msgid "Link image"
-msgstr ""
+msgstr "Link imagine"
 
 msgctxt "Button opening the Link URL editing balloon."
 msgid "Edit link"

package/package.json

@@ -1,36 +1,40 @@
 {
   "name": "@ckeditor/ckeditor5-link",
-  "version": "27.1.0",
+  "version": "29.2.0",
   "description": "Link feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
     "ckeditor5",
     "ckeditor 5",
     "ckeditor5-feature",
-    "ckeditor5-plugin"
+    "ckeditor5-plugin",
+    "ckeditor5-dll"
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^27.1.0",
-    "ckeditor5": "^27.1.0",
+    "@ckeditor/ckeditor5-ui": "^29.2.0",
+    "ckeditor5": "^29.2.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^27.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^27.1.0",
-    "@ckeditor/ckeditor5-clipboard": "^27.1.0",
-    "@ckeditor/ckeditor5-code-block": "^27.1.0",
-    "@ckeditor/ckeditor5-core": "^27.1.0",
-    "@ckeditor/ckeditor5-dev-utils": "^24.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^27.1.0",
-    "@ckeditor/ckeditor5-engine": "^27.1.0",
-    "@ckeditor/ckeditor5-enter": "^27.1.0",
-    "@ckeditor/ckeditor5-image": "^27.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^27.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^27.1.0",
-    "@ckeditor/ckeditor5-typing": "^27.1.0",
-    "@ckeditor/ckeditor5-undo": "^27.1.0",
-    "@ckeditor/ckeditor5-utils": "^27.1.0",
+    "@ckeditor/ckeditor5-basic-styles": "^29.2.0",
+    "@ckeditor/ckeditor5-block-quote": "^29.2.0",
+    "@ckeditor/ckeditor5-clipboard": "^29.2.0",
+    "@ckeditor/ckeditor5-cloud-services": "^29.2.0",
+    "@ckeditor/ckeditor5-code-block": "^29.2.0",
+    "@ckeditor/ckeditor5-core": "^29.2.0",
+    "@ckeditor/ckeditor5-dev-utils": "^25.4.0",
+    "@ckeditor/ckeditor5-easy-image": "^29.2.0",
+    "@ckeditor/ckeditor5-editor-classic": "^29.2.0",
+    "@ckeditor/ckeditor5-engine": "^29.2.0",
+    "@ckeditor/ckeditor5-enter": "^29.2.0",
+    "@ckeditor/ckeditor5-image": "^29.2.0",
+    "@ckeditor/ckeditor5-paragraph": "^29.2.0",
+    "@ckeditor/ckeditor5-theme-lark": "^29.2.0",
+    "@ckeditor/ckeditor5-typing": "^29.2.0",
+    "@ckeditor/ckeditor5-undo": "^29.2.0",
+    "@ckeditor/ckeditor5-utils": "^29.2.0",
+    "@ckeditor/ckeditor5-widget": "^29.2.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },
@@ -51,7 +55,8 @@
     "lang",
     "src",
     "theme",
-    "build"
+    "build",
+    "ckeditor5-metadata.json"
   ],
   "scripts": {
     "dll:build": "webpack"

package/src/index.js

@@ -7,20 +7,10 @@
  * @module link
  */
 
-import Link from './link';
-import LinkEditing from './linkediting';
-import LinkUI from './linkui';
-import LinkImage from './linkimage';
-import LinkImageEditing from './linkimageediting';
-import LinkImageUI from './linkimageui';
-import AutoLink from './autolink';
-
-export default {
-	Link,
-	LinkEditing,
-	LinkUI,
-	LinkImage,
-	LinkImageEditing,
-	LinkImageUI,
-	AutoLink
-};
+export { default as Link } from './link';
+export { default as LinkEditing } from './linkediting';
+export { default as LinkUI } from './linkui';
+export { default as LinkImage } from './linkimage';
+export { default as LinkImageEditing } from './linkimageediting';
+export { default as LinkImageUI } from './linkimageui';
+export { default as AutoLink } from './autolink';

package/src/link.js

@@ -215,9 +215,15 @@ export default class Link extends Plugin {
  * @typedef {Object} module:link/link~LinkDecoratorAutomaticDefinition
  * @property {'automatic'} mode Link decorator type. It is `'automatic'` for all automatic decorators.
  * @property {Function} callback Takes a `url` as a parameter and returns `true` if the `attributes` should be applied to the link.
- * @property {Object} attributes Key-value pairs used as link attributes added to the output during the
+ * @property {Object} [attributes] Key-value pairs used as link attributes added to the output during the
  * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
  * Attributes should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
+ * @property {Object} [styles] Key-value pairs used as link styles added to the output during the
+ * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
+ * Styles should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
+ * @property {String|Array.<String>} [classes] Class names used as link classes added to the output during the
+ * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
+ * Classes should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
  */
 
 /**
@@ -241,8 +247,14 @@ export default class Link extends Plugin {
  * @typedef {Object} module:link/link~LinkDecoratorManualDefinition
  * @property {'manual'} mode Link decorator type. It is `'manual'` for all manual decorators.
  * @property {String} label The label of the UI button that the user can use to control the presence of link attributes.
- * @property {Object} attributes Key-value pairs used as link attributes added to the output during the
+ * @property {Object} [attributes] Key-value pairs used as link attributes added to the output during the
  * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
  * Attributes should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
+ * @property {Object} [styles] Key-value pairs used as link styles added to the output during the
+ * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
+ * Styles should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
+ * @property {String|Array.<String>} [classes] Class names used as link classes added to the output during the
+ * {@glink framework/guides/architecture/editing-engine#conversion downcasting}.
+ * Classes should follow the {@link module:engine/view/elementdefinition~ElementDefinition} syntax.
  * @property {Boolean} [defaultValue] Controls whether the decorator is "on" by default.
  */

package/src/linkcommand.js

@@ -9,10 +9,10 @@
 
 import { Command } from 'ckeditor5/src/core';
 import { findAttributeRange } from 'ckeditor5/src/typing';
-import { Collection, toMap, first } from 'ckeditor5/src/utils';
+import { Collection, first, toMap } from 'ckeditor5/src/utils';
 
 import AutomaticDecorators from './utils/automaticdecorators';
-import { isImageAllowed } from './utils';
+import { isLinkableElement } from './utils';
 
 /**
  * The link command. It is used by the {@link module:link/link~Link link feature}.
@@ -44,7 +44,7 @@ export default class LinkCommand extends Command {
 
 		/**
 		 * An instance of the helper that ties together all {@link module:link/link~LinkDecoratorAutomaticDefinition}
-		 * that are used by the {@glink features/link link} and the {@glink features/image#linking-images linking images} features.
+		 * that are used by the {@glink features/link link} and the {@glink features/images/images-linking linking images} features.
 		 *
 		 * @readonly
 		 * @type {module:link/utils~AutomaticDecorators}
@@ -66,18 +66,17 @@ export default class LinkCommand extends Command {
 	 */
 	refresh() {
 		const model = this.editor.model;
-		const doc = model.document;
-
-		const selectedElement = first( doc.selection.getSelectedBlocks() );
+		const selection = model.document.selection;
+		const selectedElement = selection.getSelectedElement() || first( selection.getSelectedBlocks() );
 
-		// A check for the `LinkImage` plugin. If the selection contains an element, get values from the element.
+		// A check for any integration that allows linking elements (e.g. `LinkImage`).
 		// Currently the selection reads attributes from text nodes only. See #7429 and #7465.
-		if ( isImageAllowed( selectedElement, model.schema ) ) {
+		if ( isLinkableElement( selectedElement, model.schema ) ) {
 			this.value = selectedElement.getAttribute( 'linkHref' );
 			this.isEnabled = model.schema.checkAttribute( selectedElement, 'linkHref' );
 		} else {
-			this.value = doc.selection.getAttribute( 'linkHref' );
-			this.isEnabled = model.schema.checkAttributeInSelection( doc.selection, 'linkHref' );
+			this.value = selection.getAttribute( 'linkHref' );
+			this.isEnabled = model.schema.checkAttributeInSelection( selection, 'linkHref' );
 		}
 
 		for ( const manualDecorator of this.manualDecorators ) {
@@ -258,17 +257,16 @@ export default class LinkCommand extends Command {
 	 */
 	_getDecoratorStateFromModel( decoratorName ) {
 		const model = this.editor.model;
-		const doc = model.document;
-
-		const selectedElement = first( doc.selection.getSelectedBlocks() );
+		const selection = model.document.selection;
+		const selectedElement = selection.getSelectedElement();
 
 		// A check for the `LinkImage` plugin. If the selection contains an element, get values from the element.
 		// Currently the selection reads attributes from text nodes only. See #7429 and #7465.
-		if ( isImageAllowed( selectedElement, model.schema ) ) {
+		if ( isLinkableElement( selectedElement, model.schema ) ) {
 			return selectedElement.getAttribute( decoratorName );
 		}
 
-		return doc.selection.getAttribute( decoratorName );
+		return selection.getAttribute( decoratorName );
 	}
 
 	/**

package/src/linkediting.js

@@ -184,14 +184,24 @@ export default class LinkEditing extends Plugin {
 			editor.model.schema.extend( '$text', { allowAttributes: decorator.id } );
 
 			// Keeps reference to manual decorator to decode its name to attributes during downcast.
-			manualDecorators.add( new ManualDecorator( decorator ) );
+			decorator = new ManualDecorator( decorator );
+
+			manualDecorators.add( decorator );
 
 			editor.conversion.for( 'downcast' ).attributeToElement( {
 				model: decorator.id,
 				view: ( manualDecoratorName, { writer } ) => {
 					if ( manualDecoratorName ) {
-						const attributes = manualDecorators.get( decorator.id ).attributes;
-						const element = writer.createAttributeElement( 'a', attributes, { priority: 5 } );
+						const element = writer.createAttributeElement( 'a', decorator.attributes, { priority: 5 } );
+
+						if ( decorator.classes ) {
+							writer.addClass( decorator.classes, element );
+						}
+
+						for ( const key in decorator.styles ) {
+							writer.setStyle( key, decorator.styles[ key ], element );
+						}
+
 						writer.setCustomProperty( 'link', true, element );
 
 						return element;
@@ -201,7 +211,7 @@ export default class LinkEditing extends Plugin {
 			editor.conversion.for( 'upcast' ).elementToAttribute( {
 				view: {
 					name: 'a',
-					attributes: manualDecorators.get( decorator.id ).attributes
+					...decorator._createPattern()
 				},
 				model: {
 					key: decorator.id
@@ -225,7 +235,6 @@ export default class LinkEditing extends Plugin {
 		const editor = this.editor;
 		const model = editor.model;
 		const selection = model.document.selection;
-		const linkCommand = editor.commands.get( 'link' );
 
 		this.listenTo( model, 'insertContent', () => {
 			const nodeBefore = selection.anchor.nodeBefore;
@@ -295,7 +304,7 @@ export default class LinkEditing extends Plugin {
 			}
 
 			model.change( writer => {
-				removeLinkAttributesFromSelection( writer, linkCommand.manualDecorators );
+				removeLinkAttributesFromSelection( writer, getLinkAttributesAllowedOnText( model.schema ) );
 			} );
 		}, { priority: 'low' } );
 	}
@@ -313,7 +322,7 @@ export default class LinkEditing extends Plugin {
 	 */
 	_enableClickingAfterLink() {
 		const editor = this.editor;
-		const linkCommand = editor.commands.get( 'link' );
+		const model = editor.model;
 
 		editor.editing.view.addObserver( MouseObserver );
 
@@ -333,7 +342,7 @@ export default class LinkEditing extends Plugin {
 			// ...and it was caused by the click...
 			clicked = false;
 
-			const selection = editor.model.document.selection;
+			const selection = model.document.selection;
 
 			// ...and no text is selected...
 			if ( !selection.isCollapsed ) {
@@ -346,13 +355,13 @@ export default class LinkEditing extends Plugin {
 			}
 
 			const position = selection.getFirstPosition();
-			const linkRange = findAttributeRange( position, 'linkHref', selection.getAttribute( 'linkHref' ), editor.model );
+			const linkRange = findAttributeRange( position, 'linkHref', selection.getAttribute( 'linkHref' ), model );
 
 			// ...check whether clicked start/end boundary of the link.
 			// If so, remove the `linkHref` attribute.
 			if ( position.isTouching( linkRange.start ) || position.isTouching( linkRange.end ) ) {
-				editor.model.change( writer => {
-					removeLinkAttributesFromSelection( writer, linkCommand.manualDecorators );
+				model.change( writer => {
+					removeLinkAttributesFromSelection( writer, getLinkAttributesAllowedOnText( model.schema ) );
 				} );
 			}
 		} );
@@ -453,7 +462,6 @@ export default class LinkEditing extends Plugin {
 		const model = editor.model;
 		const selection = model.document.selection;
 		const view = editor.editing.view;
-		const linkCommand = editor.commands.get( 'link' );
 
 		// A flag whether attributes `linkHref` attribute should be preserved.
 		let shouldPreserveAttributes = false;
@@ -502,7 +510,7 @@ export default class LinkEditing extends Plugin {
 
 			// Use `model.enqueueChange()` in order to execute the callback at the end of the changes process.
 			editor.model.enqueueChange( writer => {
-				removeLinkAttributesFromSelection( writer, linkCommand.manualDecorators );
+				removeLinkAttributesFromSelection( writer, getLinkAttributesAllowedOnText( model.schema ) );
 			} );
 		}, { priority: 'low' } );
 	}
@@ -510,15 +518,15 @@ export default class LinkEditing extends Plugin {
 
 // Make the selection free of link-related model attributes.
 // All link-related model attributes start with "link". That includes not only "linkHref"
-// but also all decorator attributes (they have dynamic names).
+// but also all decorator attributes (they have dynamic names), or even custom plugins.
 //
 // @param {module:engine/model/writer~Writer} writer
-// @param {module:utils/collection~Collection} manualDecorators
-function removeLinkAttributesFromSelection( writer, manualDecorators ) {
+// @param {Array.<String>} linkAttributes
+function removeLinkAttributesFromSelection( writer, linkAttributes ) {
 	writer.removeSelectionAttribute( 'linkHref' );
 
-	for ( const decorator of manualDecorators ) {
-		writer.removeSelectionAttribute( decorator.id );
+	for ( const attribute of linkAttributes ) {
+		writer.removeSelectionAttribute( attribute );
 	}
 }
 
@@ -573,3 +581,13 @@ function isTyping( editor ) {
 
 	return input.isInput( editor.model.change( writer => writer.batch ) );
 }
+
+// Returns an array containing names of the attributes allowed on `$text` that describes the link item.
+//
+// @param {module:engine/model/schema~Schema} schema
+// @returns {Array.<String>}
+function getLinkAttributesAllowedOnText( schema ) {
+	const textAttributes = schema.getDefinition( '$text' ).allowAttributes;
+
+	return textAttributes.filter( attribute => attribute.startsWith( 'link' ) );
+}