@ckeditor/ckeditor5-image 39.0.2 → 40.0.0

package/src/image/imageinlineediting.d.ts

@@ -1,56 +1,59 @@
-/**
- * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-/**
- * @module image/image/imageinlineediting
- */
-import { Plugin } from 'ckeditor5/src/core';
-import { ClipboardPipeline } from 'ckeditor5/src/clipboard';
-import ImageEditing from './imageediting';
-import ImageUtils from '../imageutils';
-/**
- * The image inline plugin.
- *
- * It registers:
- *
- * * `<imageInline>` as an inline element in the document schema, and allows `alt`, `src` and `srcset` attributes.
- * * converters for editing and data pipelines.
- * * {@link module:image/image/imagetypecommand~ImageTypeCommand `'imageTypeInline'`} command that converts block images into
- * inline images.
- */
-export default class ImageInlineEditing extends Plugin {
-    /**
-     * @inheritDoc
-     */
-    static get requires(): readonly [typeof ImageEditing, typeof ImageUtils, typeof ClipboardPipeline];
-    /**
-     * @inheritDoc
-     */
-    static get pluginName(): "ImageInlineEditing";
-    /**
-     * @inheritDoc
-     */
-    init(): void;
-    /**
-     * Configures conversion pipelines to support upcasting and downcasting
-     * inline images (inline image widgets) and their attributes.
-     */
-    private _setupConversion;
-    /**
-     * Integrates the plugin with the clipboard pipeline.
-     *
-     * Idea is that the feature should recognize the user's intent when an **block** image is
-     * pasted or dropped. If such an image is pasted/dropped into a non-empty block
-     * (e.g. a paragraph with some text) it gets converted into an inline image on the fly.
-     *
-     * We assume this is the user's intent if they decided to put their image there.
-     *
-     * **Note**: If a block image has a caption, it will not be converted to an inline image
-     * to avoid the confusion. Captions are added on purpose and they should never be lost
-     * in the clipboard pipeline.
-     *
-     * See the `ImageBlockEditing` for the similar integration that works in the opposite direction.
-     */
-    private _setupClipboardIntegration;
-}
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+/**
+ * @module image/image/imageinlineediting
+ */
+import { Plugin } from 'ckeditor5/src/core';
+import { ClipboardPipeline } from 'ckeditor5/src/clipboard';
+import ImageEditing from './imageediting';
+import ImageSizeAttributes from '../imagesizeattributes';
+import ImageUtils from '../imageutils';
+/**
+ * The image inline plugin.
+ *
+ * It registers:
+ *
+ * * `<imageInline>` as an inline element in the document schema, and allows `alt`, `src` and `srcset` attributes.
+ * * converters for editing and data pipelines.
+ * * {@link module:image/image/imagetypecommand~ImageTypeCommand `'imageTypeInline'`} command that converts block images into
+ * inline images.
+ */
+export default class ImageInlineEditing extends Plugin {
+    /**
+     * @inheritDoc
+     */
+    static get requires(): readonly [typeof ImageEditing, typeof ImageSizeAttributes, typeof ImageUtils, typeof ClipboardPipeline];
+    /**
+     * @inheritDoc
+     */
+    static get pluginName(): "ImageInlineEditing";
+    /**
+     * @inheritDoc
+     */
+    init(): void;
+    /**
+     * Configures conversion pipelines to support upcasting and downcasting
+     * inline images (inline image widgets) and their attributes.
+     */
+    private _setupConversion;
+    /**
+     * Integrates the plugin with the clipboard pipeline.
+     *
+     * Idea is that the feature should recognize the user's intent when an **block** image is
+     * pasted or dropped. If such an image is pasted/dropped into a non-empty block
+     * (e.g. a paragraph with some text) it gets converted into an inline image on the fly.
+     *
+     * We assume this is the user's intent if they decided to put their image there.
+     *
+     * **Note**: If a block image has a caption, it will not be converted to an inline image
+     * to avoid the confusion. Captions are added on purpose and they should never be lost
+     * in the clipboard pipeline.
+     *
+     * See the `ImageBlockEditing` for the similar integration that works in the opposite direction.
+     *
+     * The feature also sets image `width` and `height` attributes when pasting.
+     */
+    private _setupClipboardIntegration;
+}

package/src/image/imageinlineediting.js

@@ -1,160 +1,176 @@
-/**
- * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-/**
- * @module image/image/imageinlineediting
- */
-import { Plugin } from 'ckeditor5/src/core';
-import { ClipboardPipeline } from 'ckeditor5/src/clipboard';
-import { UpcastWriter } from 'ckeditor5/src/engine';
-import { downcastImageAttribute, downcastSrcsetAttribute } from './converters';
-import ImageEditing from './imageediting';
-import ImageTypeCommand from './imagetypecommand';
-import ImageUtils from '../imageutils';
-import { getImgViewElementMatcher, createInlineImageViewElement, determineImageTypeForInsertionAtSelection } from '../image/utils';
-/**
- * The image inline plugin.
- *
- * It registers:
- *
- * * `<imageInline>` as an inline element in the document schema, and allows `alt`, `src` and `srcset` attributes.
- * * converters for editing and data pipelines.
- * * {@link module:image/image/imagetypecommand~ImageTypeCommand `'imageTypeInline'`} command that converts block images into
- * inline images.
- */
-export default class ImageInlineEditing extends Plugin {
-    /**
-     * @inheritDoc
-     */
-    static get requires() {
-        return [ImageEditing, ImageUtils, ClipboardPipeline];
-    }
-    /**
-     * @inheritDoc
-     */
-    static get pluginName() {
-        return 'ImageInlineEditing';
-    }
-    /**
-     * @inheritDoc
-     */
-    init() {
-        const editor = this.editor;
-        const schema = editor.model.schema;
-        // Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
-        schema.register('imageInline', {
-            inheritAllFrom: '$inlineObject',
-            allowAttributes: ['alt', 'src', 'srcset']
-        });
-        // Disallow inline images in captions (for now). This is the best spot to do that because
-        // independent packages can introduce captions (ImageCaption, TableCaption, etc.) so better this
-        // be future-proof.
-        schema.addChildCheck((context, childDefinition) => {
-            if (context.endsWith('caption') && childDefinition.name === 'imageInline') {
-                return false;
-            }
-        });
-        this._setupConversion();
-        if (editor.plugins.has('ImageBlockEditing')) {
-            editor.commands.add('imageTypeInline', new ImageTypeCommand(this.editor, 'imageInline'));
-            this._setupClipboardIntegration();
-        }
-    }
-    /**
-     * Configures conversion pipelines to support upcasting and downcasting
-     * inline images (inline image widgets) and their attributes.
-     */
-    _setupConversion() {
-        const editor = this.editor;
-        const t = editor.t;
-        const conversion = editor.conversion;
-        const imageUtils = editor.plugins.get('ImageUtils');
-        conversion.for('dataDowncast')
-            .elementToElement({
-            model: 'imageInline',
-            view: (modelElement, { writer }) => writer.createEmptyElement('img')
-        });
-        conversion.for('editingDowncast')
-            .elementToStructure({
-            model: 'imageInline',
-            view: (modelElement, { writer }) => imageUtils.toImageWidget(createInlineImageViewElement(writer), writer, t('image widget'))
-        });
-        conversion.for('downcast')
-            .add(downcastImageAttribute(imageUtils, 'imageInline', 'src'))
-            .add(downcastImageAttribute(imageUtils, 'imageInline', 'alt'))
-            .add(downcastSrcsetAttribute(imageUtils, 'imageInline'));
-        // More image related upcasts are in 'ImageEditing' plugin.
-        conversion.for('upcast')
-            .elementToElement({
-            view: getImgViewElementMatcher(editor, 'imageInline'),
-            model: (viewImage, { writer }) => writer.createElement('imageInline', viewImage.hasAttribute('src') ? { src: viewImage.getAttribute('src') } : undefined)
-        });
-    }
-    /**
-     * Integrates the plugin with the clipboard pipeline.
-     *
-     * Idea is that the feature should recognize the user's intent when an **block** image is
-     * pasted or dropped. If such an image is pasted/dropped into a non-empty block
-     * (e.g. a paragraph with some text) it gets converted into an inline image on the fly.
-     *
-     * We assume this is the user's intent if they decided to put their image there.
-     *
-     * **Note**: If a block image has a caption, it will not be converted to an inline image
-     * to avoid the confusion. Captions are added on purpose and they should never be lost
-     * in the clipboard pipeline.
-     *
-     * See the `ImageBlockEditing` for the similar integration that works in the opposite direction.
-     */
-    _setupClipboardIntegration() {
-        const editor = this.editor;
-        const model = editor.model;
-        const editingView = editor.editing.view;
-        const imageUtils = editor.plugins.get('ImageUtils');
-        const clipboardPipeline = editor.plugins.get('ClipboardPipeline');
-        this.listenTo(clipboardPipeline, 'inputTransformation', (evt, data) => {
-            const docFragmentChildren = Array.from(data.content.getChildren());
-            let modelRange;
-            // Make sure only <figure class="image"></figure> elements are dropped or pasted. Otherwise, if there some other HTML
-            // mixed up, this should be handled as a regular paste.
-            if (!docFragmentChildren.every(imageUtils.isBlockImageView)) {
-                return;
-            }
-            // When drag and dropping, data.targetRanges specifies where to drop because
-            // this is usually a different place than the current model selection (the user
-            // uses a drop marker to specify the drop location).
-            if (data.targetRanges) {
-                modelRange = editor.editing.mapper.toModelRange(data.targetRanges[0]);
-            }
-            // Pasting, however, always occurs at the current model selection.
-            else {
-                modelRange = model.document.selection.getFirstRange();
-            }
-            const selection = model.createSelection(modelRange);
-            // Convert block images into inline images only when pasting or dropping into non-empty blocks
-            // and when the block is not an object (e.g. pasting to replace another widget).
-            if (determineImageTypeForInsertionAtSelection(model.schema, selection) === 'imageInline') {
-                const writer = new UpcastWriter(editingView.document);
-                // Unwrap <figure class="image"><img .../></figure> -> <img ... />
-                // but <figure class="image"><img .../><figcaption>...</figcaption></figure> -> stays the same
-                const inlineViewImages = docFragmentChildren.map(blockViewImage => {
-                    // If there's just one child, it can be either <img /> or <a><img></a>.
-                    // If there are other children than <img>, this means that the block image
-                    // has a caption or some other features and this kind of image should be
-                    // pasted/dropped without modifications.
-                    if (blockViewImage.childCount === 1) {
-                        // Pass the attributes which are present only in the <figure> to the <img>
-                        // (e.g. the style="width:10%" attribute applied by the ImageResize plugin).
-                        Array.from(blockViewImage.getAttributes())
-                            .forEach(attribute => writer.setAttribute(...attribute, imageUtils.findViewImgElement(blockViewImage)));
-                        return blockViewImage.getChild(0);
-                    }
-                    else {
-                        return blockViewImage;
-                    }
-                });
-                data.content = writer.createDocumentFragment(inlineViewImages);
-            }
-        });
-    }
-}
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+/**
+ * @module image/image/imageinlineediting
+ */
+import { Plugin } from 'ckeditor5/src/core';
+import { ClipboardPipeline } from 'ckeditor5/src/clipboard';
+import { UpcastWriter } from 'ckeditor5/src/engine';
+import { downcastImageAttribute, downcastSrcsetAttribute } from './converters';
+import ImageEditing from './imageediting';
+import ImageSizeAttributes from '../imagesizeattributes';
+import ImageTypeCommand from './imagetypecommand';
+import ImageUtils from '../imageutils';
+import { getImgViewElementMatcher, createInlineImageViewElement, determineImageTypeForInsertionAtSelection } from '../image/utils';
+/**
+ * The image inline plugin.
+ *
+ * It registers:
+ *
+ * * `<imageInline>` as an inline element in the document schema, and allows `alt`, `src` and `srcset` attributes.
+ * * converters for editing and data pipelines.
+ * * {@link module:image/image/imagetypecommand~ImageTypeCommand `'imageTypeInline'`} command that converts block images into
+ * inline images.
+ */
+export default class ImageInlineEditing extends Plugin {
+    /**
+     * @inheritDoc
+     */
+    static get requires() {
+        return [ImageEditing, ImageSizeAttributes, ImageUtils, ClipboardPipeline];
+    }
+    /**
+     * @inheritDoc
+     */
+    static get pluginName() {
+        return 'ImageInlineEditing';
+    }
+    /**
+     * @inheritDoc
+     */
+    init() {
+        const editor = this.editor;
+        const schema = editor.model.schema;
+        // Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
+        schema.register('imageInline', {
+            inheritAllFrom: '$inlineObject',
+            allowAttributes: ['alt', 'src', 'srcset']
+        });
+        // Disallow inline images in captions (for now). This is the best spot to do that because
+        // independent packages can introduce captions (ImageCaption, TableCaption, etc.) so better this
+        // be future-proof.
+        schema.addChildCheck((context, childDefinition) => {
+            if (context.endsWith('caption') && childDefinition.name === 'imageInline') {
+                return false;
+            }
+        });
+        this._setupConversion();
+        if (editor.plugins.has('ImageBlockEditing')) {
+            editor.commands.add('imageTypeInline', new ImageTypeCommand(this.editor, 'imageInline'));
+            this._setupClipboardIntegration();
+        }
+    }
+    /**
+     * Configures conversion pipelines to support upcasting and downcasting
+     * inline images (inline image widgets) and their attributes.
+     */
+    _setupConversion() {
+        const editor = this.editor;
+        const t = editor.t;
+        const conversion = editor.conversion;
+        const imageUtils = editor.plugins.get('ImageUtils');
+        conversion.for('dataDowncast')
+            .elementToElement({
+            model: 'imageInline',
+            view: (modelElement, { writer }) => writer.createEmptyElement('img')
+        });
+        conversion.for('editingDowncast')
+            .elementToStructure({
+            model: 'imageInline',
+            view: (modelElement, { writer }) => imageUtils.toImageWidget(createInlineImageViewElement(writer), writer, t('image widget'))
+        });
+        conversion.for('downcast')
+            .add(downcastImageAttribute(imageUtils, 'imageInline', 'src'))
+            .add(downcastImageAttribute(imageUtils, 'imageInline', 'alt'))
+            .add(downcastSrcsetAttribute(imageUtils, 'imageInline'));
+        // More image related upcasts are in 'ImageEditing' plugin.
+        conversion.for('upcast')
+            .elementToElement({
+            view: getImgViewElementMatcher(editor, 'imageInline'),
+            model: (viewImage, { writer }) => writer.createElement('imageInline', viewImage.hasAttribute('src') ? { src: viewImage.getAttribute('src') } : undefined)
+        });
+    }
+    /**
+     * Integrates the plugin with the clipboard pipeline.
+     *
+     * Idea is that the feature should recognize the user's intent when an **block** image is
+     * pasted or dropped. If such an image is pasted/dropped into a non-empty block
+     * (e.g. a paragraph with some text) it gets converted into an inline image on the fly.
+     *
+     * We assume this is the user's intent if they decided to put their image there.
+     *
+     * **Note**: If a block image has a caption, it will not be converted to an inline image
+     * to avoid the confusion. Captions are added on purpose and they should never be lost
+     * in the clipboard pipeline.
+     *
+     * See the `ImageBlockEditing` for the similar integration that works in the opposite direction.
+     *
+     * The feature also sets image `width` and `height` attributes when pasting.
+     */
+    _setupClipboardIntegration() {
+        const editor = this.editor;
+        const model = editor.model;
+        const editingView = editor.editing.view;
+        const imageUtils = editor.plugins.get('ImageUtils');
+        const clipboardPipeline = editor.plugins.get('ClipboardPipeline');
+        this.listenTo(clipboardPipeline, 'inputTransformation', (evt, data) => {
+            const docFragmentChildren = Array.from(data.content.getChildren());
+            let modelRange;
+            // Make sure only <figure class="image"></figure> elements are dropped or pasted. Otherwise, if there some other HTML
+            // mixed up, this should be handled as a regular paste.
+            if (!docFragmentChildren.every(imageUtils.isBlockImageView)) {
+                return;
+            }
+            // When drag and dropping, data.targetRanges specifies where to drop because
+            // this is usually a different place than the current model selection (the user
+            // uses a drop marker to specify the drop location).
+            if (data.targetRanges) {
+                modelRange = editor.editing.mapper.toModelRange(data.targetRanges[0]);
+            }
+            // Pasting, however, always occurs at the current model selection.
+            else {
+                modelRange = model.document.selection.getFirstRange();
+            }
+            const selection = model.createSelection(modelRange);
+            // Convert block images into inline images only when pasting or dropping into non-empty blocks
+            // and when the block is not an object (e.g. pasting to replace another widget).
+            if (determineImageTypeForInsertionAtSelection(model.schema, selection) === 'imageInline') {
+                const writer = new UpcastWriter(editingView.document);
+                // Unwrap <figure class="image"><img .../></figure> -> <img ... />
+                // but <figure class="image"><img .../><figcaption>...</figcaption></figure> -> stays the same
+                const inlineViewImages = docFragmentChildren.map(blockViewImage => {
+                    // If there's just one child, it can be either <img /> or <a><img></a>.
+                    // If there are other children than <img>, this means that the block image
+                    // has a caption or some other features and this kind of image should be
+                    // pasted/dropped without modifications.
+                    if (blockViewImage.childCount === 1) {
+                        // Pass the attributes which are present only in the <figure> to the <img>
+                        // (e.g. the style="width:10%" attribute applied by the ImageResize plugin).
+                        Array.from(blockViewImage.getAttributes())
+                            .forEach(attribute => writer.setAttribute(...attribute, imageUtils.findViewImgElement(blockViewImage)));
+                        return blockViewImage.getChild(0);
+                    }
+                    else {
+                        return blockViewImage;
+                    }
+                });
+                data.content = writer.createDocumentFragment(inlineViewImages);
+            }
+        });
+        this.listenTo(clipboardPipeline, 'contentInsertion', (evt, data) => {
+            if (data.method !== 'paste') {
+                return;
+            }
+            model.change(writer => {
+                const range = writer.createRangeIn(data.content);
+                for (const item of range.getItems()) {
+                    if (item.is('element', 'imageInline')) {
+                        imageUtils.setImageNaturalSizeAttributes(item);
+                    }
+                }
+            });
+        });
+    }
+}

package/src/image/imageloadobserver.d.ts

@@ -1,48 +1,48 @@
-/**
- * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-/**
- * @module image/image/imageloadobserver
- */
-import { Observer } from 'ckeditor5/src/engine';
-/**
- * Observes all new images added to the {@link module:engine/view/document~Document},
- * fires {@link module:engine/view/document~Document#event:imageLoaded} and
- * {@link module:engine/view/document~Document#event:layoutChanged} event every time when the new image
- * has been loaded.
- *
- * **Note:** This event is not fired for images that has been added to the document and rendered as `complete` (already loaded).
- */
-export default class ImageLoadObserver extends Observer {
-    /**
-     * @inheritDoc
-     */
-    observe(domRoot: HTMLElement): void;
-    /**
-     * @inheritDoc
-     */
-    stopObserving(domRoot: HTMLElement): void;
-    /**
-     * Fires {@link module:engine/view/document~Document#event:layoutChanged} and
-     * {@link module:engine/view/document~Document#event:imageLoaded}
-     * if observer {@link #isEnabled is enabled}.
-     *
-     * @param domEvent The DOM event.
-     */
-    private _fireEvents;
-}
-/**
- * Fired when an <img/> DOM element has been loaded in the DOM root.
- *
- * Introduced by {@link module:image/image/imageloadobserver~ImageLoadObserver}.
- *
- * @see module:image/image/imageloadobserver~ImageLoadObserver
- *
- * @eventName module:engine/view/document~Document#imageLoaded
- * @param data Event data.
- */
-export type ImageLoadedEvent = {
-    name: 'imageLoaded';
-    args: [Event];
-};
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+/**
+ * @module image/image/imageloadobserver
+ */
+import { Observer } from 'ckeditor5/src/engine';
+/**
+ * Observes all new images added to the {@link module:engine/view/document~Document},
+ * fires {@link module:engine/view/document~Document#event:imageLoaded} and
+ * {@link module:engine/view/document~Document#event:layoutChanged} event every time when the new image
+ * has been loaded.
+ *
+ * **Note:** This event is not fired for images that has been added to the document and rendered as `complete` (already loaded).
+ */
+export default class ImageLoadObserver extends Observer {
+    /**
+     * @inheritDoc
+     */
+    observe(domRoot: HTMLElement): void;
+    /**
+     * @inheritDoc
+     */
+    stopObserving(domRoot: HTMLElement): void;
+    /**
+     * Fires {@link module:engine/view/document~Document#event:layoutChanged} and
+     * {@link module:engine/view/document~Document#event:imageLoaded}
+     * if observer {@link #isEnabled is enabled}.
+     *
+     * @param domEvent The DOM event.
+     */
+    private _fireEvents;
+}
+/**
+ * Fired when an <img/> DOM element has been loaded in the DOM root.
+ *
+ * Introduced by {@link module:image/image/imageloadobserver~ImageLoadObserver}.
+ *
+ * @see module:image/image/imageloadobserver~ImageLoadObserver
+ *
+ * @eventName module:engine/view/document~Document#imageLoaded
+ * @param data Event data.
+ */
+export type ImageLoadedEvent = {
+    name: 'imageLoaded';
+    args: [Event];
+};