jodit 4.18.9 → 4.18.10

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.18.9
+ * Version: v4.18.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1828,7 +1828,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.9";
+ */ const APP_VERSION = "4.18.10";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -28523,6 +28523,11 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('backspace', bac
  * Check if two separate elements can be connected
  * @private
  */ function checkJoinNeighbors(jodit, fakeNode, backspace) {
+    return joinNeighbors(jodit, fakeNode, backspace, false);
+}
+/**
+ * `moved` is set on the one re-entrant pass after `moveToNextLine`
+ */ function joinNeighbors(jodit, fakeNode, backspace, moved) {
     if (checkJoinBareText(jodit, fakeNode, backspace)) {
         return true;
     }
@@ -28553,6 +28558,14 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('backspace', bac
             return true;
         }
         const box = findCaretBox(fakeNode, mainClosestBox);
+        // One pass only: the line now sits beside the next one, so the
+        // cases below join them. The DOM has changed either way
+        if (!moved && sibling && moveToNextLine(jodit, fakeNode, box, sibling, backspace)) {
+            if (!joinNeighbors(jodit, fakeNode, backspace, true)) {
+                jodit.s.setCursorBefore(fakeNode);
+            }
+            return true;
+        }
         if (sibling && (checkPullNextLine(jodit, fakeNode, box, sibling, backspace) || checkMoveListContent(jodit, box, sibling, backspace) || checkJoinInlineSibling(jodit, box, sibling, backspace) || moveContentAndRemoveEmpty(jodit, box, findEdgeBlock(resolveTableSibling(sibling, backspace), backspace, jodit.editor), backspace))) {
             jodit.s.setCursorBefore(fakeNode);
             return true;
@@ -28604,6 +28617,68 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('backspace', bac
     });
     return cells.length ? cells[backspace ? cells.length - 1 : 0] : null;
 }
+/**
+ * On Delete, Word joins two lines where the next one is, inside or outside
+ * its box or quote, and the joined line keeps the caret line's kind, list item
+ * or paragraph. Two paragraphs already join that way. When either line is a
+ * list item, this moves the caret's line beside the next one, and the usual
+ * cases then join them: `<p>one|</p><div><ul><li>two</li></ul></div>` becomes
+ * `<div><p>one|</p><ul><li>two</li></ul></div>`
+ * @private
+ */ function moveToNextLine(jodit, fakeNode, box, sibling, backspace) {
+    if (backspace || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(sibling, 'table') || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(sibling, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isContentEditable(sibling, jodit.editor)) {
+        return false;
+    }
+    const line = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.up(fakeNode, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, box, true);
+    const next = findEdgeBlock(sibling, false, jodit.editor);
+    if (!line || !next || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isContentEditable(next, jodit.editor) || !(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(line) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(next)) || // A paragraph inside a list item is left as it is
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(line.parentElement) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(next.parentElement) || boxOf(line) === boxOf(next)) {
+        return false;
+    }
+    const from = line.parentElement;
+    if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(line) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(next)) {
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before(next, line);
+    } else if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(line)) {
+        // A list item keeps its bullet, in a list of its own
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before(next, ownList(line));
+    } else {
+        // A paragraph can't go inside a list, so it goes in front of it
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before(next.parentElement, line);
+    }
+    let remove = from;
+    while(remove && remove !== jodit.editor && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmpty(remove)){
+        const parent = remove.parentElement;
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(remove);
+        remove = parent;
+    }
+    return true;
+}
+/**
+ * The box or quote a line is in, past its lists
+ */ function boxOf(line) {
+    let box = line.parentElement;
+    while(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isList(box) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(box)){
+        box = box.parentElement;
+    }
+    return box;
+}
+/**
+ * Moves a list item into a list of its own, which carries on its numbering
+ */ function ownList(item) {
+    const list = item.parentElement;
+    const own = list.cloneNode(false);
+    const index = Array.from(list.children).indexOf(item);
+    if (index) {
+        // Two lists cannot share one id
+        own.removeAttribute('id');
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(list, 'ol')) {
+            const start = parseInt(list.getAttribute('start') || '1', 10) || 1;
+            own.setAttribute('start', String(start + index));
+        }
+    }
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(own, item);
+    return own;
+}
 /**
  * Delete at the edge of a list pulls the next line up to the caret, as the
  * browsers do, instead of moving the caret's line into the next block: