jodit 4.18.7 → 4.18.8

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.7
+ * Version: v4.18.8
  * 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.7";
+ */ const APP_VERSION = "4.18.8";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -20006,6 +20006,9 @@ ContextMenu = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__.__decorat
 
 
 
+/**
+ * A position from 0 up to `max`, or 0 when the panel is larger than the window
+ */ const clampToWindow = (value, max)=>Math.max(0, Math.min(value, max));
 jodit_config__WEBPACK_IMPORTED_MODULE_17__.Config.prototype.dialog = {
     namespace: '',
     extraButtons: [],
@@ -20096,6 +20099,11 @@ class Dialog extends jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_
         this.startY = e.clientY;
         this.startPoint.x = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_12__.css)(this.dialog, 'left');
         this.startPoint.y = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_12__.css)(this.dialog, 'top');
+        // Rounded up: at the right edge a fraction of a pixel less room would
+        // wrap the header of a panel that has no width of its own
+        const { width, height } = this.dialog.getBoundingClientRect();
+        this.startPoint.w = Math.ceil(width);
+        this.startPoint.h = Math.ceil(height);
         this.setMaxZIndex();
         if (e.cancelable) {
             e.preventDefault();
@@ -20111,7 +20119,11 @@ class Dialog extends jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_
     }
     __onMouseMove(e) {
         if (this.draggable && this.o.draggable) {
-            this.setPosition(this.startPoint.x + e.clientX - this.startX, this.startPoint.y + e.clientY - this.startY);
+            const { documentElement } = this.od;
+            // Keep the whole panel in the window at the size it had when the
+            // drag began. A panel with no width of its own would otherwise
+            // shrink as it neared the right edge, and then leave the window
+            this.setPosition(clampToWindow(this.startPoint.x + e.clientX - this.startX, (documentElement.clientWidth || this.ow.innerWidth) - this.startPoint.w), clampToWindow(this.startPoint.y + e.clientY - this.startY, (documentElement.clientHeight || this.ow.innerHeight) - this.startPoint.h));
             if (this.e) {
                 /**
 				 * Fired when dialog box is moved
@@ -20237,8 +20249,8 @@ class Dialog extends jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_
         }
         // strings on purpose: `css()` would truncate fractional pixels
         ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_12__.css)(this.dialog, {
-            left: (x || left) + 'px',
-            top: (y || top) + 'px'
+            left: (x !== null && x !== void 0 ? x : left) + 'px',
+            top: (y !== null && y !== void 0 ? y : top) + 'px'
         });
         return this;
     }
@@ -28491,6 +28503,9 @@ 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) {
+    if (checkJoinBareText(jodit, fakeNode, backspace)) {
+        return true;
+    }
     let nextBox = fakeNode, mainClosestBox = nextBox;
     // Find the main big closest element
     while(nextBox && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.findNotEmptySibling(nextBox, backspace) && nextBox.parentElement !== jodit.editor){
@@ -28518,7 +28533,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('backspace', bac
             return true;
         }
         const box = findCaretBox(fakeNode, mainClosestBox);
-        if (sibling && (checkPullNextLine(jodit, fakeNode, box, sibling, backspace) || checkMoveListContent(jodit, box, sibling, backspace) || moveContentAndRemoveEmpty(jodit, box, findEdgeBlock(resolveTableSibling(sibling, backspace), backspace, jodit.editor), backspace))) {
+        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;
         }
@@ -28603,6 +28618,70 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('backspace', bac
     }
     return true;
 }
+/**
+ * A block next to bare text in the same parent joins that text, as the
+ * browsers do: `<li>one<p>|two</p></li>` gives `<li>one|two</li>`, and
+ * `<li><p>one|</p>two</li>` gives `<li><p>one|two</p></li>`
+ * @private
+ */ function checkJoinInlineSibling(jodit, box, sibling, backspace) {
+    if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(sibling) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(box) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isList(box) || // The caret's block is nested deeper than the text: `text<div><p>|x</p></div>`
+    box.parentNode !== sibling.parentNode || Array.from(box.childNodes).some((node)=>jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node))) {
+        return false;
+    }
+    if (backspace) {
+        // Text after the block keeps its own line
+        const next = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.findNotEmptySibling(box, false);
+        if (next && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(next) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(next, 'br')) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.after(box, jodit.createInside.element('br'));
+        }
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(box);
+        return true;
+    }
+    const filter = (0,jodit_plugins_backspace_helpers__WEBPACK_IMPORTED_MODULE_2__.getMoveFilter)(jodit);
+    for(let node = sibling; node && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node);){
+        const next = node.nextSibling;
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(node, 'br')) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+            break;
+        }
+        filter(node) ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(box, node) : jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+        node = next;
+    }
+    return true;
+}
+/**
+ * Bare text next to a block in the same parent, as the browsers join them:
+ * Backspace in `<div><p>a</p>|b</div>` gives `<div><p>a|b</p></div>`, Delete
+ * in `<div>a|<p>b</p>c</div>` gives `<div>a|b<br>c</div>`
+ */ function checkJoinBareText(jodit, fakeNode, backspace) {
+    const block = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.findNotEmptySibling(fakeNode, backspace);
+    if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(block) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(block) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isList(block) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(block, 'table') || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isCell(block) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isContentEditable(block, jodit.editor) || Array.from(block.childNodes).some((node)=>jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node))) {
+        return false;
+    }
+    const filter = (0,jodit_plugins_backspace_helpers__WEBPACK_IMPORTED_MODULE_2__.getMoveFilter)(jodit);
+    if (backspace) {
+        // The caret's line goes to the end of the block before it
+        for(let node = fakeNode; node && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node);){
+            const next = node.nextSibling;
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(node, 'br')) {
+                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+                break;
+            }
+            filter(node) ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(block, node) : jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+            node = next;
+        }
+    } else {
+        // The block's content joins the caret's line, and text after the
+        // block keeps its own line
+        const next = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.findNotEmptySibling(block, false);
+        if (next && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(next) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(next, 'br')) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.after(block, jodit.createInside.element('br'));
+        }
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(block);
+    }
+    jodit.s.setCursorBefore(fakeNode);
+    return true;
+}
 function checkMoveListContent(jodit, mainClosestBox, sibling, backspace) {
     // Process UL/LI/OL cases
     const siblingIsList = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(sibling, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.LIST_TAGS);
@@ -28815,10 +28894,11 @@ function getNextInlineSibling(sibling, backspace, root) {
     let nextSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(sibling, backspace);
     if (!nextSibling && sibling.parentNode && sibling.parentNode !== root) {
         nextSibling = (0,jodit_plugins_backspace_helpers__WEBPACK_IMPORTED_MODULE_3__.findMostNestedNeighbor)(sibling, !backspace, root, true);
-        // Do not cross a list-item boundary. At the start of a list item the
-        // neighbor can be the text of the parent/previous item; deleting a char
-        // there is wrong — the list cases must handle the outdent/merge (#1277).
-        if (nextSibling && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(sibling, 'li', root) !== jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(nextSibling, 'li', root)) {
+        // Do not cross a block boundary. At the start of a list item the
+        // neighbor can be the text of the parent/previous item (#1277), and at
+        // the start of a paragraph the text before it in the same parent
+        // (#1693); deleting a char there is wrong — the join cases handle them.
+        if (nextSibling && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(sibling, jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, root) !== jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(nextSibling, jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, root)) {
             return null;
         }
     }
@@ -29198,6 +29278,69 @@ function isSpace(char) {
 }
 
 
+/***/ }),
+
+/***/ 88426:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   checkUnwrapListItem: function() { return /* binding */ checkUnwrapListItem; }
+/* harmony export */ });
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23211);
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
+ */ /**
+ * @module plugins/backspace
+ */ 
+/**
+ * Backspace at the start of a later list item takes the bullet off, as Word
+ * does: the item becomes a paragraph where it was, and the list is split
+ * around it. A split `<ol>` carries its numbering on with `start`.
+ *
+ * @example
+ * ```html
+ * <ol><li>first</li><li>|second</li><li>third</li></ol>
+ * ```
+ * Result
+ * ```html
+ * <ol><li>first</li></ol><p>|second</p><ol start="2"><li>third</li></ol>
+ * ```
+ *
+ * @private
+ */ function checkUnwrapListItem(jodit, fakeNode, backspace) {
+    if (!backspace) {
+        return false;
+    }
+    const li = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(fakeNode, 'li', jodit.editor);
+    const list = li ? li.parentElement : null;
+    if (!li || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isList(list) || !li.previousElementSibling || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(li) || Array.from(li.childNodes).some((node)=>jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(node)) || !jodit.s.cursorInTheEdge(true, li)) {
+        return false;
+    }
+    const p = jodit.createInside.element(jodit.o.enterBlock);
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.after(list, p);
+    if (li.nextElementSibling) {
+        const rest = list.cloneNode(false);
+        // Two lists cannot share one id
+        rest.removeAttribute('id');
+        while(li.nextSibling){
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.append(rest, li.nextSibling);
+        }
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(list, 'ol')) {
+            const start = parseInt(list.getAttribute('start') || '1', 10) || 1;
+            rest.setAttribute('start', String(start + list.children.length - 1));
+        }
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.after(p, rest);
+    }
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.moveContent(li, p);
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(li);
+    jodit.s.setCursorBefore(fakeNode);
+    return true;
+}
+
+
 /***/ }),
 
 /***/ 17523:
@@ -29214,6 +29357,7 @@ function isSpace(char) {
 /* harmony import */ var _check_remove_unbreakable_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(93890);
 /* harmony import */ var _check_table_cell__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(12443);
 /* harmony import */ var _check_unwrap_first_list_item__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(10157);
+/* harmony import */ var _check_unwrap_list_item__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(88426);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -29229,6 +29373,7 @@ function isSpace(char) {
 
 
 
+
 /**
  * Ordered delete/backspace cases with stable keys. The first one returning
  * `true` wins. The keys are stable across minified builds (function names are
@@ -29263,6 +29408,10 @@ function isSpace(char) {
         'join-two-lists',
         _check_join_two_lists__WEBPACK_IMPORTED_MODULE_1__.checkJoinTwoLists
     ],
+    [
+        'unwrap-list-item',
+        _check_unwrap_list_item__WEBPACK_IMPORTED_MODULE_9__.checkUnwrapListItem
+    ],
     [
         'join-neighbors',
         _check_join_neighbors__WEBPACK_IMPORTED_MODULE_0__.checkJoinNeighbors
@@ -32935,7 +33084,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('dtd', dtd);
             ]);
             let block = (0,_helpers__WEBPACK_IMPORTED_MODULE_7__.getBlockWrapper)(fake, jodit);
             const isLi = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isLeaf(block);
-            // if use <br> defaultTag for break line or when was entered SHIFt key or in <td> or <th> or <blockquote>
+            // if use <br> defaultTag for break line or when was entered SHIFt key or in <td>, <th> or <blockquote> without an inner block
             if ((!isLi || (event === null || event === void 0 ? void 0 : event.shiftKey)) && (0,_helpers__WEBPACK_IMPORTED_MODULE_7__.checkBR)(fake, jodit, event === null || event === void 0 ? void 0 : event.shiftKey, block)) {
                 return false;
             }
@@ -32999,10 +33148,9 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('enter', enter);
  * Checks the possibility and necessity of inserting a BR instead of a block
  * @private
  */ function checkBR(fake, jodit, shiftKeyPressed, block) {
-    const isMultiLineBlock = Boolean(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(fake, [
-        'pre',
-        'blockquote'
-    ], jodit.editor));
+    // Text in a <pre>, or bare text in a quote, gets a BR. A real block inside
+    // a quote (<p>, <h3>, ...) is split like anywhere else, as in a cell below.
+    const isMultiLineBlock = Boolean(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(fake, 'pre', jodit.editor)) || (block ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(block, 'blockquote') : Boolean(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(fake, 'blockquote', jodit.editor)));
     // A cell itself can't be split into two cells, so bare cell content gets
     // a BR. But when the cell already holds a real block (<p>, <h3>, ...) that
     // block is split like anywhere else, otherwise every line of the cell
@@ -33012,7 +33160,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('enter', enter);
         'th'
     ], jodit.editor)));
     const isBRMode = jodit.o.enter.toLowerCase() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.BR.toLowerCase();
-    // if you use <br> defaultTag for break line or when was entered SHIFt key or in <td> or <th> or <blockquote>
+    // if you use <br> defaultTag for break line or when was entered SHIFt key or in <td>, <th> or <blockquote> without an inner block
     if (isBRMode || isCell || shiftKeyPressed && !isMultiLineBlock || !shiftKeyPressed && isMultiLineBlock) {
         // 2 BR before
         if (isMultiLineBlock && checkSeveralBR(fake)) {