Fix paste multiline text issue(T1130660) (#84)

Fix paste multiline text issue(T1130660)
DevExpress · Mar 14, 2023 · 18139a2 · 18139a2
1 parent 3c294c7
commit 18139a2
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/core/editor.js b/core/editor.js
@@ -153,7 +153,8 @@ class Editor {
 
   getHTML(index, length) {
     const [line, lineOffset] = this.scroll.line(index);
-    if (line.length() >= lineOffset + length) {
+
+    if (line.length() > lineOffset + length) {
       return convertHTML(line, lineOffset, length, true);
     }
     return convertHTML(this.scroll, index, length, true);

diff --git a/modules/clipboard.js b/modules/clipboard.js
@@ -88,15 +88,15 @@ class Clipboard extends Module {
     this.tableBlots.push(blotName);
   }
 
-  convert({ html, text }, formats = {}) {
+  convert({ html, text, keepLastNewLine }, formats = {}) {
     if (formats[CodeBlock.blotName]) {
       return new Delta().insert(text, {
         [CodeBlock.blotName]: formats[CodeBlock.blotName],
       });
     }
 
     return html
-      ? this.applyMatchers(html, formats)
+      ? this.applyMatchers(html, keepLastNewLine, formats)
       : this.applyTextMatchers(text);
   }
 
@@ -115,7 +115,7 @@ class Clipboard extends Module {
     }, new Delta());
   }
 
-  applyMatchers(html, formats = {}) {
+  applyMatchers(html, keepLastNewLine, formats = {}) {
     const doc = new DOMParser().parseFromString(html, 'text/html');
     const container = doc.body;
     const nodeMatches = new WeakMap();
@@ -132,7 +132,8 @@ class Clipboard extends Module {
     );
     // Remove trailing newline
     if (
-      deltaEndsWith(delta, '\n')
+      !keepLastNewLine
+      && deltaEndsWith(delta, '\n')
       && (delta.ops[delta.ops.length - 1].attributes == null
         || Object.values(formats).some((blotName) => this.tableBlots.includes(blotName)))
     ) {
@@ -212,7 +213,11 @@ class Clipboard extends Module {
     }
 
     const text = e.clipboardData.getData('text/plain');
-    this.onPaste(range, { html, text });
+    this.onPaste(range, {
+      html,
+      text,
+      keepLastNewLine: true,
+    });
   }
 
   raiseCallback(name, event) {
@@ -223,15 +228,15 @@ class Clipboard extends Module {
     }
   }
 
-  onCopy(range) {
-    const text = this.quill.getText(range);
-    const html = this.quill.getSemanticHTML(range);
+  onCopy({ index, length }) {
+    const text = this.quill.getText(index, length);
+    const html = this.quill.getSemanticHTML(index, length);
     return { html, text };
   }
 
-  onPaste(range, { text, html }) {
+  onPaste(range, { text, html, keepLastNewLine }) {
     const formats = this.quill.getFormat(range.index);
-    const pastedDelta = this.convert({ text, html }, formats);
+    const pastedDelta = this.convert({ text, html, keepLastNewLine }, formats);
     debug.log('onPaste', pastedDelta, { text, html });
     const delta = new Delta()
       .retain(range.index)

diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
@@ -897,6 +897,14 @@ describe('Editor', function () {
       expect(editor.getHTML(0, 11)).toEqual('&lt;b&gt;Test&lt;/b&gt;');
     });
 
+    it('text should be wrapped to P tag when get part of initial text with new line on end', function () {
+      const editor = this.initialize(Editor, '<p>1</p><br><p>2</p>');
+
+      const html = editor.getHTML(0, 2);
+
+      expect(html).toEqual('<p>1</p>');
+    });
+
     it('multiline code', function () {
       const editor = this.initialize(
         Editor,

diff --git a/test/unit/modules/clipboard.js b/test/unit/modules/clipboard.js
@@ -31,6 +31,26 @@ describe('Clipboard', function () {
         }, 2);
       });
 
+      it('last line break should not be cut on a multiline text paste', function (done) {
+        this.quill.setSelection(0, 8);
+
+        const captureData = {
+          ...this.clipboardEvent,
+          clipboardData: {
+            ...this.clipboardData,
+            getData: (type) => (type === 'text/html' ? '1<br>' : '1\n'),
+          },
+        };
+
+        this.quill.clipboard.onCapturePaste(captureData);
+        setTimeout(() => {
+          expect(this.quill.root).toEqualHTML(
+            '<p>1</p><p>8</p>',
+          );
+          done();
+        }, 2);
+      });
+
       // Copying from Word includes both html and files
       it('pastes html data if present with file', function (done) {
         const upload = spyOn(this.quill.uploader, 'upload');