@ckeditor/ckeditor5-clipboard 0.0.0-nightly-20240716.0 → 0.0.0-nightly-20240718.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-clipboard",
-  "version": "0.0.0-nightly-20240716.0",
+  "version": "0.0.0-nightly-20240718.0",
   "description": "Clipboard integration feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,11 +13,11 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "0.0.0-nightly-20240716.0",
-    "@ckeditor/ckeditor5-engine": "0.0.0-nightly-20240716.0",
-    "@ckeditor/ckeditor5-ui": "0.0.0-nightly-20240716.0",
-    "@ckeditor/ckeditor5-utils": "0.0.0-nightly-20240716.0",
-    "@ckeditor/ckeditor5-widget": "0.0.0-nightly-20240716.0",
+    "@ckeditor/ckeditor5-core": "0.0.0-nightly-20240718.0",
+    "@ckeditor/ckeditor5-engine": "0.0.0-nightly-20240718.0",
+    "@ckeditor/ckeditor5-ui": "0.0.0-nightly-20240718.0",
+    "@ckeditor/ckeditor5-utils": "0.0.0-nightly-20240718.0",
+    "@ckeditor/ckeditor5-widget": "0.0.0-nightly-20240718.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/pasteplaintext.js

@@ -33,17 +33,10 @@ export default class PastePlainText extends Plugin {
         const editor = this.editor;
         const model = editor.model;
         const view = editor.editing.view;
-        const viewDocument = view.document;
         const selection = model.document.selection;
-        let shiftPressed = false;
         view.addObserver(ClipboardObserver);
-        this.listenTo(viewDocument, 'keydown', (evt, data) => {
-            shiftPressed = data.shiftKey;
-        });
         editor.plugins.get(ClipboardPipeline).on('contentInsertion', (evt, data) => {
-            // Plain text can be determined based on the event flag (#7799) or auto-detection (#1006). If detected,
-            // preserve selection attributes on pasted items.
-            if (!shiftPressed && !isPlainTextFragment(data.content, model.schema)) {
+            if (!isUnformattedInlineContent(data.content, model)) {
                 return;
             }
             model.change(writer => {
@@ -59,8 +52,10 @@ export default class PastePlainText extends Plugin {
                 textAttributes.push(...selection.getAttributes());
                 const range = writer.createRangeIn(data.content);
                 for (const item of range.getItems()) {
-                    if (item.is('$textProxy')) {
-                        writer.setAttributes(textAttributes, item);
+                    for (const attribute of textAttributes) {
+                        if (model.schema.checkAttribute(item, attribute[0])) {
+                            writer.setAttribute(attribute[0], attribute[1], item);
+                        }
                     }
                 }
             });
@@ -68,15 +63,34 @@ export default class PastePlainText extends Plugin {
     }
 }
 /**
- * Returns true if specified `documentFragment` represents a plain text.
+ * Returns true if specified `documentFragment` represents the unformatted inline content.
  */
-function isPlainTextFragment(documentFragment, schema) {
-    if (documentFragment.childCount > 1) {
-        return false;
+function isUnformattedInlineContent(documentFragment, model) {
+    let range = model.createRangeIn(documentFragment);
+    // We consider three scenarios here. The document fragment may include:
+    //
+    // 1. Only text and inline objects. Then it could be unformatted inline content.
+    // 2. Exactly one block element on top-level, eg. <p>Foobar</p> or <h2>Title</h2>.
+    //    In this case, check this element content, it could be treated as unformatted inline content.
+    // 3. More block elements or block objects, then it is not unformatted inline content.
+    //
+    // We will check for scenario 2. specifically, and if it happens, we will unwrap it and follow with the regular algorithm.
+    //
+    if (documentFragment.childCount == 1) {
+        const child = documentFragment.getChild(0);
+        if (child.is('element') && model.schema.isBlock(child) && !model.schema.isObject(child) && !model.schema.isLimit(child)) {
+            // Scenario 2. as described above.
+            range = model.createRangeIn(child);
+        }
     }
-    const child = documentFragment.getChild(0);
-    if (schema.isObject(child)) {
-        return false;
+    for (const child of range.getItems()) {
+        if (!model.schema.isInline(child)) {
+            return false;
+        }
+        const attributeKeys = Array.from(child.getAttributeKeys());
+        if (attributeKeys.find(key => model.schema.getAttributeProperties(key).isFormatting)) {
+            return false;
+        }
     }
-    return Array.from(child.getAttributeKeys()).length == 0;
+    return true;
 }

package/src/utils/viewtoplaintext.js

@@ -62,6 +62,11 @@ function newLinePadding(element, previous) {
         // Add small padding between selected container elements.
         return '\n';
     }
+    // Do not add padding around the elements that won't be rendered.
+    if (element.is('element') && element.getCustomProperty('dataPipeline:transparentRendering') ||
+        previous.is('element') && previous.getCustomProperty('dataPipeline:transparentRendering')) {
+        return '';
+    }
     // Add empty lines between container elements.
     return '\n\n';
 }