@ckeditor/ckeditor5-image 31.0.0 → 33.0.0

package/src/imagestyle/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
  */
 
@@ -40,75 +40,91 @@ const {
  */
 const DEFAULT_OPTIONS = {
 	// This style represents an image placed in the line of text.
-	inline: {
-		name: 'inline',
-		title: 'In line',
-		icon: objectInline,
-		modelElements: [ 'imageInline' ],
-		isDefault: true
+	get inline() {
+		return {
+			name: 'inline',
+			title: 'In line',
+			icon: objectInline,
+			modelElements: [ 'imageInline' ],
+			isDefault: true
+		};
 	},
 
 	// This style represents an image aligned to the left and wrapped with text.
-	alignLeft: {
-		name: 'alignLeft',
-		title: 'Left aligned image',
-		icon: objectLeft,
-		modelElements: [ 'imageBlock', 'imageInline' ],
-		className: 'image-style-align-left'
+	get alignLeft() {
+		return {
+			name: 'alignLeft',
+			title: 'Left aligned image',
+			icon: objectLeft,
+			modelElements: [ 'imageBlock', 'imageInline' ],
+			className: 'image-style-align-left'
+		};
 	},
 
 	// This style represents an image aligned to the left.
-	alignBlockLeft: {
-		name: 'alignBlockLeft',
-		title: 'Left aligned image',
-		icon: objectBlockLeft,
-		modelElements: [ 'imageBlock' ],
-		className: 'image-style-block-align-left'
+	get alignBlockLeft() {
+		return {
+			name: 'alignBlockLeft',
+			title: 'Left aligned image',
+			icon: objectBlockLeft,
+			modelElements: [ 'imageBlock' ],
+			className: 'image-style-block-align-left'
+		};
 	},
 
 	// This style represents a centered image.
-	alignCenter: {
-		name: 'alignCenter',
-		title: 'Centered image',
-		icon: objectCenter,
-		modelElements: [ 'imageBlock' ],
-		className: 'image-style-align-center'
+	get alignCenter() {
+		return {
+			name: 'alignCenter',
+			title: 'Centered image',
+			icon: objectCenter,
+			modelElements: [ 'imageBlock' ],
+			className: 'image-style-align-center'
+		};
 	},
 
 	// This style represents an image aligned to the right and wrapped with text.
-	alignRight: {
-		name: 'alignRight',
-		title: 'Right aligned image',
-		icon: objectRight,
-		modelElements: [ 'imageBlock', 'imageInline' ],
-		className: 'image-style-align-right'
+	get alignRight() {
+		return {
+			name: 'alignRight',
+			title: 'Right aligned image',
+			icon: objectRight,
+			modelElements: [ 'imageBlock', 'imageInline' ],
+			className: 'image-style-align-right'
+		};
 	},
 
 	// This style represents an image aligned to the right.
-	alignBlockRight: {
-		name: 'alignBlockRight',
-		title: 'Right aligned image',
-		icon: objectBlockRight,
-		modelElements: [ 'imageBlock' ],
-		className: 'image-style-block-align-right'
+	get alignBlockRight() {
+		return {
+			name: 'alignBlockRight',
+			title: 'Right aligned image',
+			icon: objectBlockRight,
+			modelElements: [ 'imageBlock' ],
+			className: 'image-style-block-align-right'
+		};
 	},
 
 	// This option is equal to the situation when no style is applied.
-	block: {
-		name: 'block',
-		title: 'Centered image',
-		icon: objectCenter,
-		modelElements: [ 'imageBlock' ],
-		isDefault: true
+	get block() {
+		return {
+			name: 'block',
+			title: 'Centered image',
+			icon: objectCenter,
+			modelElements: [ 'imageBlock' ],
+			isDefault: true
+		};
 	},
 
 	// This represents a side image.
-	side: {
-		name: 'side',
-		title: 'Side image',
-		icon: objectRight,
-		modelElements: [ 'imageBlock' ],
-		className: 'image-style-side'
+	get side() {
+		return {
+			name: 'side',
+			title: 'Side image',
+			icon: objectRight,
+			modelElements: [ 'imageBlock' ],
+			className: 'image-style-side'
+		};
 	}
 };
 

package/src/imagestyle.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/imagetextalternative/imagetextalternativecommand.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/imagetextalternative/imagetextalternativeediting.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/imagetextalternative/imagetextalternativeui.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/imagetextalternative/ui/textalternativeformview.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
  */
 
@@ -151,6 +151,16 @@ export default class TextAlternativeFormView extends View {
 			} );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	destroy() {
+		super.destroy();
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+	}
+
 	/**
 	 * Creates the button view.
 	 *

package/src/imagetextalternative.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/imagetoolbar.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/imageupload/imageuploadediting.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
  */
 
@@ -129,7 +129,7 @@ export default class ImageUploadEditing extends Plugin {
 				}
 
 				// Upload images after the selection has changed in order to ensure the command's state is refreshed.
-				editor.model.enqueueChange( 'default', () => {
+				editor.model.enqueueChange( () => {
 					editor.execute( 'uploadImage', { file: images } );
 				} );
 			} );
@@ -277,7 +277,7 @@ export default class ImageUploadEditing extends Plugin {
 		const imageUtils = editor.plugins.get( 'ImageUtils' );
 		const imageUploadElements = this._uploadImageElements;
 
-		model.enqueueChange( 'transparent', writer => {
+		model.enqueueChange( { isUndoable: false }, writer => {
 			writer.setAttribute( 'uploadStatus', 'reading', imageUploadElements.get( loader.id ) );
 		} );
 
@@ -317,14 +317,14 @@ export default class ImageUploadEditing extends Plugin {
 					} );
 				}
 
-				model.enqueueChange( 'transparent', writer => {
+				model.enqueueChange( { isUndoable: false }, writer => {
 					writer.setAttribute( 'uploadStatus', 'uploading', imageElement );
 				} );
 
 				return promise;
 			} )
 			.then( data => {
-				model.enqueueChange( 'transparent', writer => {
+				model.enqueueChange( { isUndoable: false }, writer => {
 					const imageElement = imageUploadElements.get( loader.id );
 
 					writer.setAttribute( 'uploadStatus', 'complete', imageElement );
@@ -378,7 +378,7 @@ export default class ImageUploadEditing extends Plugin {
 				}
 
 				// Permanently remove image from insertion batch.
-				model.enqueueChange( 'transparent', writer => {
+				model.enqueueChange( { isUndoable: false }, writer => {
 					writer.remove( imageUploadElements.get( loader.id ) );
 				} );
 
@@ -386,7 +386,7 @@ export default class ImageUploadEditing extends Plugin {
 			} );
 
 		function clean() {
-			model.enqueueChange( 'transparent', writer => {
+			model.enqueueChange( { isUndoable: false }, writer => {
 				const imageElement = imageUploadElements.get( loader.id );
 
 				writer.removeAttribute( 'uploadId', imageElement );

package/src/imageupload/imageuploadprogress.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
  */
 
@@ -12,8 +12,6 @@
 import { Plugin } from 'ckeditor5/src/core';
 import { FileRepository } from 'ckeditor5/src/upload';
 
-import uploadingPlaceholder from '../../theme/icons/image_placeholder.svg';
-
 import '../../theme/imageuploadprogress.css';
 import '../../theme/imageuploadicon.css';
 import '../../theme/imageuploadloader.css';
@@ -41,10 +39,12 @@ export default class ImageUploadProgress extends Plugin {
 		/**
 		 * The image placeholder that is displayed before real image data can be accessed.
 		 *
+		 * For the record, this image is a 1x1 px GIF with an aspect ratio set by CSS.
+		 *
 		 * @protected
 		 * @member {String} #placeholder
 		 */
-		this.placeholder = 'data:image/svg+xml;utf8,' + encodeURIComponent( uploadingPlaceholder );
+		this.placeholder = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
 	}
 
 	/**

package/src/imageupload/imageuploadui.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/imageupload/uploadimagecommand.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/imageupload/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
  */
 

package/src/imageupload.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/imageutils.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/index.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
  */
 
@@ -10,6 +10,7 @@
 export { default as AutoImage } from './autoimage';
 export { default as Image } from './image';
 export { default as ImageEditing } from './image/imageediting';
+export { default as ImageCaptionUtils } from './imagecaption/imagecaptionutils';
 export { default as ImageCaption } from './imagecaption';
 export { default as ImageCaptionEditing } from './imagecaption/imagecaptionediting';
 export { default as ImageInsert } from './imageinsert';

package/src/pictureediting.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/theme/image.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/imagecaption.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/imageinsert.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/imageinsertformrowview.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/imageresize.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/imagestyle.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/imageuploadicon.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/imageuploadloader.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/imageuploadprogress.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/textalternativeform.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/src/imagecaption/utils.js

@@ -1,63 +0,0 @@
-/**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @module image/imagecaption/utils
- */
-
-/**
- * Returns the caption model element from a given image element. Returns `null` if no caption is found.
- *
- * @param {module:engine/model/element~Element} imageModelElement
- * @returns {module:engine/model/element~Element|null}
- */
-export function getCaptionFromImageModelElement( imageModelElement ) {
-	for ( const node of imageModelElement.getChildren() ) {
-		if ( !!node && node.is( 'element', 'caption' ) ) {
-			return node;
-		}
-	}
-
-	return null;
-}
-
-/**
- * Returns the caption model element for a model selection. Returns `null` if the selection has no caption element ancestor.
- *
- * @param {module:image/imageutils~ImageUtils} imageUtils
- * @param {module:engine/model/selection~Selection} selection
- * @returns {module:engine/model/element~Element|null}
- */
-export function getCaptionFromModelSelection( imageUtils, selection ) {
-	const captionElement = selection.getFirstPosition().findAncestor( 'caption' );
-
-	if ( !captionElement ) {
-		return null;
-	}
-
-	if ( imageUtils.isBlockImage( captionElement.parent ) ) {
-		return captionElement;
-	}
-
-	return null;
-}
-
-/**
- * {@link module:engine/view/matcher~Matcher} pattern. Checks if a given element is a `<figcaption>` element that is placed
- * inside the image `<figure>` element.
- *
- * @param {module:image/imageutils~ImageUtils} imageUtils
- * @param {module:engine/view/element~Element} element
- * @returns {Object|null} Returns the object accepted by {@link module:engine/view/matcher~Matcher} or `null` if the element
- * cannot be matched.
- */
-export function matchImageCaptionViewElement( imageUtils, element ) {
-	// Convert only captions for images.
-	if ( element.name == 'figcaption' && imageUtils.isBlockImageView( element.parent ) ) {
-		return { name: true };
-	}
-
-	return null;
-}

package/theme/icons/image_placeholder.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 250"><rect rx="4"/></svg>