@ckeditor/ckeditor5-image 32.0.0 → 34.1.0

package/src/image/converters.js

@@ -82,7 +82,7 @@ export function upcastImageFigure( imageUtils ) {
  * @returns {Function}
  */
 export function upcastPicture( imageUtils ) {
-	const sourceAttributeNames = [ 'srcset', 'media', 'type' ];
+	const sourceAttributeNames = [ 'srcset', 'media', 'type', 'sizes' ];
 
 	return dispatcher => {
 		dispatcher.on( 'element:picture', converter );
@@ -235,13 +235,11 @@ export function downcastSourcesAttribute( imageUtils ) {
 
 		if ( data.attributeNewValue && data.attributeNewValue.length ) {
 			// Make sure <picture> does not break attribute elements, for instance <a> in linked images.
-			const pictureElement = viewWriter.createContainerElement( 'picture', {}, { isAllowedInsideAttributeElement: true } );
-
-			for ( const sourceAttributes of data.attributeNewValue ) {
-				const sourceElement = viewWriter.createEmptyElement( 'source', sourceAttributes );
-
-				viewWriter.insert( viewWriter.createPositionAt( pictureElement, 'end' ), sourceElement );
-			}
+			const pictureElement = viewWriter.createContainerElement( 'picture', null,
+				data.attributeNewValue.map( sourceAttributes => {
+					return viewWriter.createEmptyElement( 'source', sourceAttributes );
+				} )
+			);
 
 			// Collect all wrapping attribute elements.
 			const attributeElements = [];

package/src/image/imageblockediting.js

@@ -22,7 +22,7 @@ import ImageTypeCommand from './imagetypecommand';
 import ImageUtils from '../imageutils';
 import {
 	getImgViewElementMatcher,
-	createImageViewElement,
+	createBlockImageViewElement,
 	determineImageTypeForInsertionAtSelection
 } from '../image/utils';
 
@@ -62,9 +62,7 @@ export default class ImageBlockEditing extends Plugin {
 
 		// Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
 		schema.register( 'imageBlock', {
-			isObject: true,
-			isBlock: true,
-			allowWhere: '$block',
+			inheritAllFrom: '$blockObject',
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 
@@ -90,16 +88,16 @@ export default class ImageBlockEditing extends Plugin {
 		const imageUtils = editor.plugins.get( 'ImageUtils' );
 
 		conversion.for( 'dataDowncast' )
-			.elementToElement( {
+			.elementToStructure( {
 				model: 'imageBlock',
-				view: ( modelElement, { writer } ) => createImageViewElement( writer, 'imageBlock' )
+				view: ( modelElement, { writer } ) => createBlockImageViewElement( writer )
 			} );
 
 		conversion.for( 'editingDowncast' )
-			.elementToElement( {
+			.elementToStructure( {
 				model: 'imageBlock',
 				view: ( modelElement, { writer } ) => imageUtils.toImageWidget(
-					createImageViewElement( writer, 'imageBlock' ), writer, t( 'image widget' )
+					createBlockImageViewElement( writer ), writer, t( 'image widget' )
 				)
 			} );
 

package/src/image/imageinlineediting.js

@@ -21,7 +21,7 @@ import ImageTypeCommand from './imagetypecommand';
 import ImageUtils from '../imageutils';
 import {
 	getImgViewElementMatcher,
-	createImageViewElement,
+	createInlineImageViewElement,
 	determineImageTypeForInsertionAtSelection
 } from '../image/utils';
 
@@ -61,10 +61,7 @@ export default class ImageInlineEditing extends Plugin {
 
 		// Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
 		schema.register( 'imageInline', {
-			isObject: true,
-			isInline: true,
-			allowWhere: '$text',
-			allowAttributesOf: '$text',
+			inheritAllFrom: '$inlineObject',
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 
@@ -105,10 +102,10 @@ export default class ImageInlineEditing extends Plugin {
 			} );
 
 		conversion.for( 'editingDowncast' )
-			.elementToElement( {
+			.elementToStructure( {
 				model: 'imageInline',
 				view: ( modelElement, { writer } ) => imageUtils.toImageWidget(
-					createImageViewElement( writer, 'imageInline' ), writer, t( 'image widget' )
+					createInlineImageViewElement( writer ), writer, t( 'image widget' )
 				)
 			} );
 

package/src/image/utils.js

@@ -10,33 +10,38 @@
 import { first } from 'ckeditor5/src/utils';
 
 /**
- * Creates a view element representing the image of provided image type.
+ * Creates a view element representing the inline image.
  *
- * An 'imageBlock' type (block image):
+ *		<span class="image-inline"><img></img></span>
  *
- *		<figure class="image"><img></img></figure>
+ * Note that `alt` and `src` attributes are converted separately, so they are not included.
  *
- * An 'imageInline' type (inline image):
+ * @protected
+ * @param {module:engine/view/downcastwriter~DowncastWriter} writer
+ * @returns {module:engine/view/containerelement~ContainerElement}
+ */
+export function createInlineImageViewElement( writer ) {
+	return writer.createContainerElement( 'span', { class: 'image-inline' },
+		writer.createEmptyElement( 'img' )
+	);
+}
+
+/**
+ * Creates a view element representing the block image.
  *
- *		<span class="image-inline"><img></img></span>
+ *		<figure class="image"><img></img></figure>
  *
  * Note that `alt` and `src` attributes are converted separately, so they are not included.
  *
  * @protected
  * @param {module:engine/view/downcastwriter~DowncastWriter} writer
- * @param {'imageBlock'|'imageInline'} imageType The type of created image.
  * @returns {module:engine/view/containerelement~ContainerElement}
  */
-export function createImageViewElement( writer, imageType ) {
-	const emptyElement = writer.createEmptyElement( 'img' );
-
-	const container = imageType === 'imageBlock' ?
-		writer.createContainerElement( 'figure', { class: 'image' } ) :
-		writer.createContainerElement( 'span', { class: 'image-inline' }, { isAllowedInsideAttributeElement: true } );
-
-	writer.insert( writer.createPositionAt( container, 0 ), emptyElement );
-
-	return container;
+export function createBlockImageViewElement( writer ) {
+	return writer.createContainerElement( 'figure', { class: 'image' }, [
+		writer.createEmptyElement( 'img' ),
+		writer.createSlot()
+	] );
 }
 
 /**
@@ -48,18 +53,20 @@ export function createImageViewElement( writer, imageType ) {
  * @returns {module:engine/view/matcher~MatcherPattern}
  */
 export function getImgViewElementMatcher( editor, matchImageType ) {
-	if ( editor.plugins.has( 'ImageInlineEditing' ) !== editor.plugins.has( 'ImageBlockEditing' ) ) {
-		return { name: 'img' };
-	}
-
 	const imageUtils = editor.plugins.get( 'ImageUtils' );
+	const areBothImagePluginsLoaded = editor.plugins.has( 'ImageInlineEditing' ) && editor.plugins.has( 'ImageBlockEditing' );
 
 	return element => {
-		// Check if view element is an `img`.
+		// Check if the matched view element is an <img>.
 		if ( !imageUtils.isInlineImageView( element ) ) {
 			return null;
 		}
 
+		// If just one of the plugins is loaded (block or inline), it will match all kinds of images.
+		if ( !areBothImagePluginsLoaded ) {
+			return getPositiveMatchPattern( element );
+		}
+
 		// The <img> can be standalone, wrapped in <figure>...</figure> (ImageBlock plugin) or
 		// wrapped in <figure><a>...</a></figure> (LinkImage plugin).
 		const imageType = element.findAncestor( imageUtils.isBlockImageView ) ? 'imageBlock' : 'imageInline';
@@ -68,8 +75,21 @@ export function getImgViewElementMatcher( editor, matchImageType ) {
 			return null;
 		}
 
-		return { name: true };
+		return getPositiveMatchPattern( element );
 	};
+
+	function getPositiveMatchPattern( element ) {
+		const pattern = {
+			name: true
+		};
+
+		// This will trigger src consumption (See https://github.com/ckeditor/ckeditor5/issues/11530).
+		if ( element.hasAttribute( 'src' ) ) {
+			pattern.attributes = [ 'src' ];
+		}
+
+		return pattern;
+	}
 }
 
 /**

package/src/imagecaption/imagecaptionediting.js

@@ -14,7 +14,7 @@ import { toWidgetEditable } from 'ckeditor5/src/widget';
 import ToggleImageCaptionCommand from './toggleimagecaptioncommand';
 
 import ImageUtils from '../imageutils';
-import { getCaptionFromImageModelElement, matchImageCaptionViewElement } from './utils';
+import ImageCaptionUtils from './imagecaptionutils';
 
 /**
  * The image caption engine plugin. It is responsible for:
@@ -30,7 +30,7 @@ export default class ImageCaptionEditing extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ ImageUtils ];
+		return [ ImageUtils, ImageCaptionUtils ];
 	}
 
 	/**
@@ -93,11 +93,12 @@ export default class ImageCaptionEditing extends Plugin {
 		const editor = this.editor;
 		const view = editor.editing.view;
 		const imageUtils = editor.plugins.get( 'ImageUtils' );
+		const imageCaptionUtils = editor.plugins.get( 'ImageCaptionUtils' );
 		const t = editor.t;
 
 		// View -> model converter for the data pipeline.
 		editor.conversion.for( 'upcast' ).elementToElement( {
-			view: element => matchImageCaptionViewElement( imageUtils, element ),
+			view: element => imageCaptionUtils.matchImageCaptionViewElement( element ),
 			model: 'caption'
 		} );
 
@@ -134,9 +135,6 @@ export default class ImageCaptionEditing extends Plugin {
 				return toWidgetEditable( figcaptionElement, writer );
 			}
 		} );
-
-		editor.editing.mapper.on( 'modelToViewPosition', mapModelPositionToView( view ) );
-		editor.data.mapper.on( 'modelToViewPosition', mapModelPositionToView( view ) );
 	}
 
 	/**
@@ -149,6 +147,7 @@ export default class ImageCaptionEditing extends Plugin {
 	_setupImageTypeCommandsIntegration() {
 		const editor = this.editor;
 		const imageUtils = editor.plugins.get( 'ImageUtils' );
+		const imageCaptionUtils = editor.plugins.get( 'ImageCaptionUtils' );
 		const imageTypeInlineCommand = editor.commands.get( 'imageTypeInline' );
 		const imageTypeBlockCommand = editor.commands.get( 'imageTypeBlock' );
 
@@ -166,7 +165,7 @@ export default class ImageCaptionEditing extends Plugin {
 			}
 
 			if ( imageUtils.isBlockImage( oldElement ) ) {
-				const oldCaptionElement = getCaptionFromImageModelElement( oldElement );
+				const oldCaptionElement = imageCaptionUtils.getCaptionFromImageModelElement( oldElement );
 
 				// If the old element was a captioned block image (the caption was visible),
 				// simply save it so it can be restored.
@@ -244,28 +243,3 @@ export default class ImageCaptionEditing extends Plugin {
 		this._savedCaptionsMap.set( imageModelElement, caption.toJSON() );
 	}
 }
-
-// Creates a mapper callback that reverses the order of `<img>` and `<figcaption>` in the image.
-// Without it, `<figcaption>` would precede the `<img>` in the conversion.
-//
-// <imageBlock>^</imageBlock> -> <figure><img>^<caption></caption></figure>
-//
-// @private
-// @param {module:engine/view/view~View} editingView
-// @returns {Function}
-function mapModelPositionToView( editingView ) {
-	return ( evt, data ) => {
-		const modelPosition = data.modelPosition;
-		const parent = modelPosition.parent;
-
-		if ( !parent.is( 'element', 'imageBlock' ) ) {
-			return;
-		}
-
-		const viewElement = data.mapper.toViewElement( parent );
-
-		// The "img" element is inserted by ImageBlockEditing during the downcast conversion via
-		// an explicit view position so the "0" position does not need any mapping.
-		data.viewPosition = editingView.createPositionAt( viewElement, modelPosition.offset + 1 );
-	};
-}

package/src/imagecaption/imagecaptionui.js

@@ -9,9 +9,7 @@
 
 import { Plugin, icons } from 'ckeditor5/src/core';
 import { ButtonView } from 'ckeditor5/src/ui';
-import ImageUtils from '../imageutils';
-
-import { getCaptionFromModelSelection } from './utils';
+import ImageCaptionUtils from './imagecaptionutils';
 
 /**
  * The image caption UI plugin. It introduces the `'toggleImageCaption'` UI button.
@@ -23,7 +21,7 @@ export default class ImageCaptionUI extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ ImageUtils ];
+		return [ ImageCaptionUtils ];
 	}
 
 	/**
@@ -39,7 +37,7 @@ export default class ImageCaptionUI extends Plugin {
 	init() {
 		const editor = this.editor;
 		const editingView = editor.editing.view;
-		const imageUtils = editor.plugins.get( 'ImageUtils' );
+		const imageCaptionUtils = editor.plugins.get( 'ImageCaptionUtils' );
 		const t = editor.t;
 
 		editor.ui.componentFactory.add( 'toggleImageCaption', locale => {
@@ -59,7 +57,7 @@ export default class ImageCaptionUI extends Plugin {
 				editor.execute( 'toggleImageCaption', { focusCaptionOnShow: true } );
 
 				// Scroll to the selection and highlight the caption if the caption showed up.
-				const modelCaptionElement = getCaptionFromModelSelection( imageUtils, editor.model.document.selection );
+				const modelCaptionElement = imageCaptionUtils.getCaptionFromModelSelection( editor.model.document.selection );
 
 				if ( modelCaptionElement ) {
 					const figcaptionElement = editor.editing.mapper.toViewElement( modelCaptionElement );

package/src/imagecaption/imagecaptionutils.js

@@ -0,0 +1,89 @@
+/**
+ * @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
+ */
+
+/**
+ * @module image/imagecaptionutils/utils
+ */
+
+import { Plugin } from 'ckeditor5/src/core';
+
+import ImageUtils from '../imageutils';
+
+/**
+ * The image caption utilities plugin.
+ *
+ * @extends module:core/plugin~Plugin
+ */
+export default class ImageCaptionUtils extends Plugin {
+	/**
+	 * @inheritDoc
+	 */
+	static get pluginName() {
+		return 'ImageCaptionUtils';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	static get requires() {
+		return [ ImageUtils ];
+	}
+
+	/**
+	 * 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}
+	 */
+	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:engine/model/selection~Selection} selection
+	 * @returns {module:engine/model/element~Element|null}
+	 */
+	getCaptionFromModelSelection( selection ) {
+		const imageUtils = this.editor.plugins.get( 'ImageUtils' );
+		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: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.
+	 */
+	matchImageCaptionViewElement( element ) {
+		const imageUtils = this.editor.plugins.get( 'ImageUtils' );
+
+		// Convert only captions for images.
+		if ( element.name == 'figcaption' && imageUtils.isBlockImageView( element.parent ) ) {
+			return { name: true };
+		}
+
+		return null;
+	}
+}

package/src/imagecaption/toggleimagecaptioncommand.js

@@ -10,7 +10,6 @@
 import { Command } from 'ckeditor5/src/core';
 
 import ImageBlockEditing from '../image/imageblockediting';
-import { getCaptionFromImageModelElement, getCaptionFromModelSelection } from './utils';
 
 /**
  * The toggle image caption command.
@@ -41,7 +40,7 @@ export default class ToggleImageCaptionCommand extends Command {
 	 */
 	refresh() {
 		const editor = this.editor;
-		const imageUtils = editor.plugins.get( 'ImageUtils' );
+		const imageCaptionUtils = editor.plugins.get( 'ImageCaptionUtils' );
 
 		// Only block images can get captions.
 		if ( !editor.plugins.has( ImageBlockEditing ) ) {
@@ -55,7 +54,7 @@ export default class ToggleImageCaptionCommand extends Command {
 		const selectedElement = selection.getSelectedElement();
 
 		if ( !selectedElement ) {
-			const ancestorCaptionElement = getCaptionFromModelSelection( imageUtils, selection );
+			const ancestorCaptionElement = imageCaptionUtils.getCaptionFromModelSelection( selection );
 
 			this.isEnabled = !!ancestorCaptionElement;
 			this.value = !!ancestorCaptionElement;
@@ -70,7 +69,7 @@ export default class ToggleImageCaptionCommand extends Command {
 		if ( !this.isEnabled ) {
 			this.value = false;
 		} else {
-			this.value = !!getCaptionFromImageModelElement( selectedElement );
+			this.value = !!imageCaptionUtils.getCaptionFromImageModelElement( selectedElement );
 		}
 	}
 
@@ -145,14 +144,14 @@ export default class ToggleImageCaptionCommand extends Command {
 		const editor = this.editor;
 		const selection = editor.model.document.selection;
 		const imageCaptionEditing = editor.plugins.get( 'ImageCaptionEditing' );
-		const imageUtils = editor.plugins.get( 'ImageUtils' );
+		const imageCaptionUtils = editor.plugins.get( 'ImageCaptionUtils' );
 		let selectedImage = selection.getSelectedElement();
 		let captionElement;
 
 		if ( selectedImage ) {
-			captionElement = getCaptionFromImageModelElement( selectedImage );
+			captionElement = imageCaptionUtils.getCaptionFromImageModelElement( selectedImage );
 		} else {
-			captionElement = getCaptionFromModelSelection( imageUtils, selection );
+			captionElement = imageCaptionUtils.getCaptionFromModelSelection( selection );
 			selectedImage = captionElement.parent;
 		}
 

package/src/imagestyle/utils.js

@@ -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/imageutils.js

@@ -103,18 +103,15 @@ export default class ImageUtils extends Plugin {
 		return model.change( writer => {
 			const imageElement = writer.createElement( imageType, attributes );
 
-			// If we want to insert a block image (for whatever reason) then we don't want to split text blocks.
-			// This applies only when we don't have the selectable specified (i.e., we insert multiple block images at once).
-			if ( !selectable && imageType != 'imageInline' ) {
-				selectable = findOptimalInsertionRange( selection, model );
-			}
-
-			model.insertContent( imageElement, selectable );
+			model.insertObject( imageElement, selectable, null, {
+				setSelection: 'on',
+				// If we want to insert a block image (for whatever reason) then we don't want to split text blocks.
+				// This applies only when we don't have the selectable specified (i.e., we insert multiple block images at once).
+				findOptimalPosition: !selectable && imageType != 'imageInline'
+			} );
 
 			// Inserting an image might've failed due to schema regulations.
 			if ( imageElement.parent ) {
-				writer.setSelection( imageElement, 'on' );
-
 				return imageElement;
 			}
 

package/src/index.js

@@ -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';
@@ -29,3 +30,4 @@ export { default as ImageUpload } from './imageupload';
 export { default as ImageUploadEditing } from './imageupload/imageuploadediting';
 export { default as ImageUploadProgress } from './imageupload/imageuploadprogress';
 export { default as ImageUploadUI } from './imageupload/imageuploadui';
+export { default as PictureEditing } from './pictureediting';