Cleanup

DevExpress · Dec 26, 2023 · 5d9b02c · 5d9b02c
1 parent 43becfc
commit 5d9b02c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/modules/clipboard.js b/modules/clipboard.js
@@ -398,23 +398,30 @@ function traverse(scroll, node, elementMatchers, textMatchers, nodeMatches) {
         textMatchers,
         nodeMatches,
       );
-      if (childNode.nodeType === node.ELEMENT_NODE) {
-        const isNextNodeList = idx < allNodes.length - 2
-          && allNodes[idx + 2].nodeType === node.ELEMENT_NODE
-          && ['ul', 'ol'].indexOf(allNodes[idx + 2].tagName.toLowerCase()) > -1;
-        const forceNewLine = childNode.tagName.toLowerCase() === 'br' && isNextNodeList;
+      const nextNode = idx < allNodes.length - 1 && allNodes[idx + 1];
+      const isNextNodeList = nextNode
+        && nextNode.nodeType === node.ELEMENT_NODE
+        && ['ul', 'ol'].indexOf(nextNode.tagName.toLowerCase()) > -1;
 
+      if (childNode.nodeType === node.ELEMENT_NODE) {
         childrenDelta = elementMatchers.reduce((reducedDelta, matcher) => {
           return matcher(childNode, reducedDelta, scroll);
         }, childrenDelta);
         childrenDelta = (nodeMatches.get(childNode) || []).reduce(
           (reducedDelta, matcher) => {
-            return matcher(childNode, reducedDelta, scroll, forceNewLine);
+            return matcher(childNode, reducedDelta, scroll);
           },
           childrenDelta,
         );
       }
-      return delta.concat(childrenDelta);
+
+      const newDelta = delta.concat(childrenDelta);
+
+      if (isNextNodeList) {
+        newDelta.insert('\n');
+      }
+
+      return newDelta;
     }, new Delta());
   }
   return new Delta();

diff --git a/modules/multiline.js b/modules/multiline.js
@@ -3,8 +3,8 @@ import Quill from '../core/quill';
 import MultilineBreak from '../blots/multiline_break';
 import Module from '../core/module';
 
-function breakMatcher(node, reducedDelta, scroll, forceNewLine) {
-  if (!(node.nextSibling || node.previousSibling) || forceNewLine) {
+function breakMatcher(node) {
+  if (!(node.nextSibling || node.previousSibling)) {
     return new Delta().insert('\n');
   }
   return new Delta().insert({ multilineBreak: '' });

diff --git a/test/functional/list.ts b/test/functional/list.ts
@@ -12,7 +12,7 @@ test('multiline break before list should not merge with the 1st list item (T1206
 
   await t.expect(tableContent.replace(/\s/g, ''))
     .eql(`
-      <p>Test Headline<br></p>
+      <p>Test Headline<br><br></p>
       <ol>
         <li><span class="ql-ui" contenteditable="false"></span>First</li>
         <li><span class="ql-ui" contenteditable="false"></span>Second</li>