jodit 4.18.10 → 4.18.12

package/es5/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.10
+ * Version: v4.18.12
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1609,8 +1609,9 @@ var Async = /*#__PURE__*/ function() {
                 this.__controllers.forEach(function(controller) {
                     return controller.abort();
                 });
-                this.timers.forEach(function(key) {
-                    return (0,jodit_core_helpers_async__WEBPACK_IMPORTED_MODULE_7__.clearTimeout)(_this.timers.get(key));
+                // A labelled timer is kept under its label, so clear by the value
+                this.timers.forEach(function(timer) {
+                    return (0,jodit_core_helpers_async__WEBPACK_IMPORTED_MODULE_7__.clearTimeout)(timer);
                 });
                 this.timers.clear();
                 this.promisesRejections.forEach(function(reject) {
@@ -2152,7 +2153,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.18.10";
+var APP_VERSION = "4.18.12";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -8225,8 +8226,10 @@ function normalizeCssValue(key, value) {
  * ancestor's top-left corner. The returned offset should be subtracted from
  * the desired viewport coordinates before applying them.
  *
- * Returns `{ x: 0, y: 0 }` when no such ancestor exists (the common case), so
- * call sites keep their previous behaviour unchanged.
+ * Without such an ancestor the containing block is the layout viewport. Its
+ * offset is `{ x: 0, y: 0 }` in most browsers, but WebKit measures client
+ * rects from the visual viewport, so once the page is pinch-zoomed and panned
+ * the layout viewport starts above and to the left of the client origin.
  */ function getFixedPositionOffset(elm) {
     var _elm_ownerDocument;
     var win = (_elm_ownerDocument = elm.ownerDocument) === null || _elm_ownerDocument === void 0 ? void 0 : _elm_ownerDocument.defaultView;
@@ -8241,6 +8244,15 @@ function normalizeCssValue(key, value) {
         }
         node = node.parentElement;
     }
+    var vv = win === null || win === void 0 ? void 0 : win.visualViewport;
+    // WebKit's `scrollX`/`scrollY` follow the visual viewport too (truncated),
+    // where Blink's and Gecko's follow the layout viewport
+    if (win && vv && (vv.offsetLeft || vv.offsetTop) && Math.abs(vv.pageLeft - win.scrollX) < 1 && Math.abs(vv.pageTop - win.scrollY) < 1) {
+        return {
+            x: -Math.round(vv.offsetLeft),
+            y: -Math.round(vv.offsetTop)
+        };
+    }
     return {
         x: 0,
         y: 0
@@ -15197,6 +15209,7 @@ function elementsEqualAttributes(elm1, elm2) {
  * Replaces `ul->ol` or `ol->ul`, apply styles to the list, or remove a list item from it
  * @private
  */ function toggleOrderedList(commitStyle, li, jodit, mode) {
+    var collapsed = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
     if (!li) {
         return mode;
     }
@@ -15225,16 +15238,60 @@ function elementsEqualAttributes(elm1, elm2) {
         }
         // ul => ol, ol => ul or ul => ul.class1
         if (mode === jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE || isChangeMode || !isSameList) {
-            var wrapper = unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, list, li, jodit, commitStyle);
-            var newList = (0,_wrap_list__WEBPACK_IMPORTED_MODULE_7__.wrapList)(commitStyle, wrapper, jodit);
+            // With just a caret, Word converts the whole list
+            var items = collapsed && !isSameList ? Array.from(list.children).filter(function(item) {
+                return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(item);
+            }) : [
+                li
+            ];
+            var newList;
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                var _loop = function() {
+                    var item = _step.value;
+                    newList = keepNumbering(item, function(itemList) {
+                        return (0,_wrap_list__WEBPACK_IMPORTED_MODULE_7__.wrapList)(commitStyle, unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, itemList, item, jodit, commitStyle), jodit);
+                    });
+                };
+                for(var _iterator = items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
             hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, newList, commitStyle);
             return jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE;
         }
     }
-    var wrapper1 = unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, list, li, jodit, commitStyle);
-    hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, wrapper1, commitStyle);
+    var wrapper = keepNumbering(li, function(itemList) {
+        return unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, itemList, li, jodit, commitStyle);
+    });
+    hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, wrapper, commitStyle);
     return jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP;
 }
+/**
+ * Takes `item` out of its list with `takeOut`, and carries a numbered list's
+ * count on past it, as Word does: 1, a bullet, then 2
+ */ function keepNumbering(item, takeOut) {
+    var list = item.parentElement;
+    var rest = item.nextElementSibling;
+    var next = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(list, 'ol') ? (parseInt(list.getAttribute('start') || '1', 10) || 1) + Array.from(list.children).indexOf(item) : 0;
+    var result = takeOut(list);
+    var restList = rest === null || rest === void 0 ? void 0 : rest.parentElement;
+    if (next && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(restList, 'ol')) {
+        next > 1 ? restList.setAttribute('start', String(next)) : restList.removeAttribute('start');
+    }
+    return result;
+}
 /**
  * Other attributes, such as a class, still move the items into a new list,
  * where the `beforeWrapList` hook can add markup to each of them
@@ -16105,7 +16162,7 @@ var transactions = (_obj = {}, (0,_swc_helpers_define_property__WEBPACK_IMPORTED
 }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(_obj, states.TOGGLE_LIST, {
     exec: function exec(value) {
         return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_2__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_1__._)({}, value), {
-            mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_6__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode),
+            mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_6__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode, value.collapsed),
             next: states.END
         });
     }
@@ -33039,12 +33096,13 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_3__.Icon.set('about', (_about_svg__W
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34918);
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31635);
 /* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38574);
-/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(80991);
-/* harmony import */ var jodit_modules__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(60936);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(10685);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(80991);
+/* harmony import */ var jodit_modules__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(60936);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(10685);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -33067,6 +33125,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_3__.Icon.set('about', (_about_svg__W
 
 
 
+
 var ns = 'addnewline';
 /**
  * Create helper for adding new paragraph(Jodit.defaultOptions.enter tag) before iframe, table or image
@@ -33076,7 +33135,7 @@ var ns = 'addnewline';
     function addNewLine() {
         (0,_swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__._)(this, addNewLine);
         var _this;
-        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, addNewLine, arguments), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__line", _this.j.c.fromHTML('<div role="button" tabindex="-1" title="'.concat(_this.j.i18n('Break'), '" class="jodit-add-new-line"><span>').concat(jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Icon.get('enter'), "</span></div>"))), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__isMatchedTag", function(node) {
+        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, addNewLine, arguments), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__line", _this.j.c.fromHTML('<div role="button" tabindex="-1" title="'.concat(_this.j.i18n('Break'), '" class="jodit-add-new-line"><span>').concat(jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Icon.get('enter'), "</span></div>"))), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__isMatchedTag", function(node) {
             return Boolean(node && _this.j.o.addNewLineTagsTriggers.includes(node.nodeName.toLowerCase()));
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__timeout", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__isBeforeContent", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__current", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__lineInFocus", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__isShown", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__hideForce", function() {
             if (!_this.__isShown) {
@@ -33085,24 +33144,24 @@ var ns = 'addnewline';
             _this.__isShown = false;
             _this.j.async.clearTimeout(_this.__timeout);
             _this.__lineInFocus = false;
-            jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.safeRemove(_this.__line);
+            jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.safeRemove(_this.__line);
             _this.__line.style.setProperty('--jd-anl-handle-offset', '0');
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__canGetFocus", function(elm) {
-            return elm != null && jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.isBlock(elm) && !/^(img|table|iframe|hr)$/i.test(elm.nodeName);
+            return elm != null && jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.isBlock(elm) && !/^(img|table|iframe|hr)$/i.test(elm.nodeName);
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__onClickLine", function(e) {
             var editor = _this.j;
             var p = editor.createInside.element(editor.o.enter);
             if (_this.__isBeforeContent && _this.__current && _this.__current.parentNode) {
                 if (_this.__current === editor.editor) {
-                    jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.prepend(editor.editor, p);
+                    jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.prepend(editor.editor, p);
                 } else {
-                    jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.before(_this.__current, p);
+                    jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.before(_this.__current, p);
                 }
             } else {
-                jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.append(editor.editor, p);
+                jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.append(editor.editor, p);
             }
             editor.s.setCursorIn(p);
-            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.scrollIntoViewIfNeeded)(p, editor.editor, editor.ed);
+            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.scrollIntoViewIfNeeded)(p, editor.editor, editor.ed);
             editor.synchronizeValues();
             _this.__hideForce();
             e.preventDefault();
@@ -33121,8 +33180,8 @@ var ns = 'addnewline';
                     return;
                 }
                 this.__isShown = true;
-                jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.append(this.j.container, this.__line);
-                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_10__.css)(this.__line, 'width', this.j.container.clientWidth);
+                jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.append(this.j.container, this.__line);
+                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_11__.css)(this.__line, 'width', this.j.container.clientWidth);
             }
         },
         {
@@ -33174,18 +33233,48 @@ var ns = 'addnewline';
                 ], 'scroll' + '.' + ns, this.__hideForce).on('finishedCleanHTMLWorker' + '.' + ns, this.__hideForce).on(editor.editor, 'click' + '.' + ns, this.__hide).on(editor.container, 'mouseleave' + '.' + ns, this.__hide).on(editor.editor, 'mousemove' + '.' + ns, this.__onMouseMove);
             }
         },
+        {
+            key: "onArrowKey",
+            value: /**
+	 * A paragraph holding only an embed has no place for the caret, so the
+	 * arrow keys can't get past one that ends the content, or before one that
+	 * starts it. When an arrow key leaves the caret where it was and there is
+	 * content beyond it, a new line goes there, as when the line is clicked.
+	 */ function onArrowKey(e) {
+                var editor = this.j;
+                var forward = e.key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.KEY_DOWN || e.key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.KEY_RIGHT;
+                if (!editor.o.addNewLine || editor.o.readonly || editor.isLocked || e.shiftKey || !(forward || e.key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.KEY_UP || e.key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.KEY_LEFT) || !editor.s.isCollapsed()) {
+                    return;
+                }
+                var _editor_s_range = editor.s.range, startContainer = _editor_s_range.startContainer, startOffset = _editor_s_range.startOffset;
+                // Once the browser has moved the caret, if it could. With a 0 timeout
+                // Jodit would run this at once, before the browser moves it
+                editor.async.setTimeout(function() {
+                    var range = editor.s.range;
+                    var block = jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.closest(startContainer, jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.isBlock, editor.editor);
+                    if (e.defaultPrevented || !editor.s.isInsideArea || !range.collapsed || range.startContainer !== startContainer || range.startOffset !== startOffset || !block || !jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.findNotEmptyNeighbor(block, !forward, editor.editor)) {
+                        return;
+                    }
+                    var p = editor.createInside.element(editor.o.enter);
+                    forward ? jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.append(editor.editor, p) : jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.prepend(editor.editor, p);
+                    editor.s.setCursorIn(p);
+                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.scrollIntoViewIfNeeded)(p, editor.editor, editor.ed);
+                    editor.synchronizeValues();
+                }, 1);
+            }
+        },
         {
             key: "onDblClickEditor",
             value: function onDblClickEditor(e) {
                 var editor = this.j;
                 if (!editor.o.readonly && editor.o.addNewLineOnDBLClick && e.target === editor.editor && editor.s.isCollapsed()) {
-                    var editorBound = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.offset)(editor.editor, editor, editor.ed);
+                    var editorBound = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.offset)(editor.editor, editor, editor.ed);
                     var top = e.pageY - editor.ew.scrollX;
                     var p = editor.createInside.element(editor.o.enter);
                     if (Math.abs(top - editorBound.top) < Math.abs(top - (editorBound.height + editorBound.top)) && editor.editor.firstChild) {
-                        jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.prepend(editor.editor, p);
+                        jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.prepend(editor.editor, p);
                     } else {
-                        jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.append(editor.editor, p);
+                        jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.append(editor.editor, p);
                     }
                     editor.s.setCursorIn(p);
                     editor.synchronizeValues();
@@ -33202,27 +33291,27 @@ var ns = 'addnewline';
                 // Inside Shadow DOM `document.elementFromPoint` returns the shadow
                 // host, so the lookup must start from the shadow root
                 var currentElement = ((_editor_o_shadowRoot = editor.o.shadowRoot) !== null && _editor_o_shadowRoot !== void 0 ? _editor_o_shadowRoot : editor.ed).elementFromPoint(e.clientX, e.clientY);
-                if (!jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.isHTMLElement(currentElement) || !jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.isOrContains(editor.editor, currentElement)) {
+                if (!jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.isHTMLElement(currentElement) || !jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.isOrContains(editor.editor, currentElement)) {
                     return;
                 }
                 if (editor.editor !== currentElement && !this.__isMatchedTag(currentElement)) {
-                    currentElement = jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.closest(currentElement, this.__isMatchedTag, editor.editor);
+                    currentElement = jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.closest(currentElement, this.__isMatchedTag, editor.editor);
                 }
                 if (!currentElement) {
                     this.__hide();
                     return;
                 }
                 if (this.__isMatchedTag(currentElement)) {
-                    var parentBox = jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.up(currentElement, jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.isBlock, editor.editor);
+                    var parentBox = jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.up(currentElement, jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.isBlock, editor.editor);
                     if (parentBox && parentBox !== editor.editor) {
                         currentElement = parentBox;
                     }
                 }
-                var pos = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.position)(currentElement, this.j);
+                var pos = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.position)(currentElement, this.j);
                 var top = false;
                 var clientY = e.clientY, clientX = e.clientX;
                 if (this.j.iframe) {
-                    var _position = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.position)(this.j.iframe, this.j, true), top1 = _position.top, left = _position.left;
+                    var _position = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.position)(this.j.iframe, this.j, true), top1 = _position.top, left = _position.left;
                     clientY += top1;
                     clientX += left;
                 }
@@ -33235,8 +33324,8 @@ var ns = 'addnewline';
                     this.__isBeforeContent = false;
                 }
                 var isEditor = editor.editor === currentElement;
-                if (top !== false && (isEditor && !this.__isBeforeContent || !isEditor && !(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.call)(this.__isBeforeContent ? jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.prev : jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.next, currentElement, this.__canGetFocus, editor.editor))) {
-                    (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_10__.css)(this.__line, 'top', top);
+                if (top !== false && (isEditor && !this.__isBeforeContent || !isEditor && !(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.call)(this.__isBeforeContent ? jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.prev : jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.next, currentElement, this.__canGetFocus, editor.editor))) {
+                    (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_11__.css)(this.__line, 'top', top);
                     this.__current = currentElement;
                     this.__show();
                     this.__line.style.setProperty('--jd-anl-handle-offset', clientX - pos.left - 10 + 'px');
@@ -33251,7 +33340,7 @@ var ns = 'addnewline';
             value: /** @override */ function beforeDestruct() {
                 this.j.async.clearTimeout(this.__timeout);
                 this.j.e.off(this.__line).off('changePlace', this.__addEventListeners);
-                jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Dom.safeRemove(this.__line);
+                jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Dom.safeRemove(this.__line);
                 this.j.e.off([
                     this.j.ow,
                     this.j.ew,
@@ -33261,22 +33350,25 @@ var ns = 'addnewline';
         }
     ]);
     return addNewLine;
-}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__._)(jodit_modules__WEBPACK_IMPORTED_MODULE_11__.Plugin));
+}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__._)(jodit_modules__WEBPACK_IMPORTED_MODULE_12__.Plugin));
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.watch)(':lock')
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':lock')
 ], addNewLine.prototype, "onLock", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], addNewLine.prototype, "__hide", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.watch)(':dblclick')
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':keydown')
+], addNewLine.prototype, "onArrowKey", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':dblclick')
 ], addNewLine.prototype, "onDblClickEditor", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.throttle)(function(ctx) {
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.throttle)(function(ctx) {
         return ctx.defaultTimeout;
     })
 ], addNewLine.prototype, "__onMouseMove", null);
-jodit_core_global__WEBPACK_IMPORTED_MODULE_8__.pluginSystem.add('addNewLine', addNewLine);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('addNewLine', addNewLine);
 
 
 /***/ }),
@@ -33962,6 +34054,7 @@ UiAiAssistant = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decor
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(33831);
 /* harmony import */ var _cases_check_not_collapsed__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(89827);
 /* harmony import */ var _cases__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(17523);
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(15200);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -33986,6 +34079,7 @@ UiAiAssistant = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decor
 
 
 
+
 var backspace = /*#__PURE__*/ function(Plugin) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__._)(backspace, Plugin);
@@ -34093,17 +34187,56 @@ var backspace = /*#__PURE__*/ function(Plugin) {
                     throw e;
                 } finally{
                     jodit.e.fire('backSpaceAfterDelete', backspace, fakeNode);
+                    this.moveCaretToTextBefore(fakeNode);
                     this.safeRemoveEmptyNode(fakeNode);
                 }
                 return false;
             }
         },
+        {
+            key: "moveCaretToTextBefore",
+            value: /**
+	 * The browser types at the end of the text before the caret on its line,
+	 * in that text's formatting, but not inside a link. Moving the caret there
+	 * too makes a paste and the toolbar agree with what's typed:
+	 * `<p>one</p><p><b>|two</b></p>` joins to `<p>one|<b>two</b></p>`
+	 */ function moveCaretToTextBefore(fakeNode) {
+                var _ref;
+                var _text_nodeValue;
+                var jodit = this.jodit;
+                var range = jodit.s.range;
+                // A case may have merged the fake node away (#1722)
+                if (!fakeNode.parentNode) {
+                    return;
+                }
+                var around = jodit.ed.createRange();
+                around.selectNode(fakeNode);
+                if (!range.collapsed || !around.isPointInRange(range.startContainer, range.startOffset)) {
+                    return;
+                }
+                var text = (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.findMostNestedNeighbor)(fakeNode, false, jodit.editor, true);
+                var link = jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.closest(text, 'a', jodit.editor);
+                if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isText(text) || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isContentEditable(text, jodit.editor) || link && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isOrContains(link, fakeNode) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.closest(text, jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isBlock, jodit.editor) !== jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.closest(fakeNode, jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isBlock, jodit.editor)) {
+                    return;
+                }
+                range.setStart(text, (_ref = (_text_nodeValue = text.nodeValue) === null || _text_nodeValue === void 0 ? void 0 : _text_nodeValue.length) !== null && _ref !== void 0 ? _ref : 0);
+                range.collapse(true);
+                jodit.s.selectRange(range);
+            }
+        },
         {
             key: "safeRemoveEmptyNode",
             value: /**
 	 * Remove node and replace cursor position out of it
 	 */ function safeRemoveEmptyNode(fakeNode) {
+                var _fakeNode_nodeValue;
                 var range = this.j.s.range;
+                // wrap-nodes normalizes the line it wraps, which can merge the text
+                // after the fake node into it: remove only the fake node's own space
+                if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isText(fakeNode) && fakeNode.nodeValue !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.INVISIBLE_SPACE && ((_fakeNode_nodeValue = fakeNode.nodeValue) === null || _fakeNode_nodeValue === void 0 ? void 0 : _fakeNode_nodeValue.startsWith(jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.INVISIBLE_SPACE))) {
+                    fakeNode.deleteData(0, jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.INVISIBLE_SPACE.length);
+                    return;
+                }
                 if (range.startContainer === fakeNode) {
                     if (fakeNode.previousSibling) {
                         if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isText(fakeNode.previousSibling)) {
@@ -34180,6 +34313,9 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('backspace', bac
             return false;
         }
         var sibling = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.findNotEmptySibling(mainClosestBox, backspace);
+        if (moveInlinesInside(jodit, fakeNode, sibling)) {
+            return joinNeighbors(jodit, fakeNode, backspace, moved);
+        }
         // A line break before the cursor is a single unit: remove it instead of
         // merging the current element into the (void) `<br>`, which used to move
         // the whole element's content into the `<br>` and delete it (#1282).
@@ -34194,6 +34330,10 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('backspace', bac
             jodit.s.setCursorBefore(fakeNode);
             return true;
         }
+        // A non-editable sibling is removed by remove-not-editable, never joined
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(sibling) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isContentEditable(sibling, jodit.editor)) {
+            return false;
+        }
         var 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
@@ -34222,6 +34362,83 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('backspace', bac
     }
     return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isLeaf(block) && block.parentElement ? block.parentElement : block;
 }
+/**
+ * With an inline element round the caret's line or the one it joins moved
+ * inside its blocks, the cases join the lines as they join any two, and its
+ * styles stay with its text. One round both lines is left as it is.
+ */ function moveInlinesInside(jodit, fakeNode, sibling) {
+    if (!sibling) {
+        return false;
+    }
+    var around = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.furthest(fakeNode, function(node) {
+        return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, sibling);
+    }, jodit.editor);
+    return moveInlineInside(around, jodit.editor) || moveInlineInside(sibling, jodit.editor);
+}
+/**
+ * Old content can have an inline element round blocks. This moves it inside
+ * them, and gives the text, images and line breaks beside them a copy of
+ * their own: `<span style="…"><p>one</p><br><p>two</p></span>` becomes
+ * `<p><span style="…">one</span></p><span style="…"><br></span><p><span style="…">two</span></p>`
+ */ function moveInlineInside(node, root) {
+    if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(node)) {
+        return false;
+    }
+    // Embedded content, such as the `<iframe>` in a video's wrapper, counts
+    // as a block in `Dom.isBlock`, but stays with the text beside it
+    var isBlock = function isBlock(child) {
+        return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(child) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(child, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NO_EMPTY_TAGS);
+    };
+    // The inner one first: `<span><strong><p>one</p></strong></span>`
+    Array.from(node.childNodes).forEach(function(child) {
+        return moveInlineInside(child, root);
+    });
+    var children = Array.from(node.childNodes);
+    if (!children.some(isBlock)) {
+        return false;
+    }
+    var run = null;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var child = _step.value;
+            if (!isBlock(child)) {
+                // Blank text between blocks stays where it is
+                if (!run && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmptyTextNode(child)) {
+                    run = node.cloneNode(false);
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before(child, run);
+                }
+                run && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(run, child);
+                continue;
+            }
+            run = null;
+            // Nothing goes inside a rule or a non-editable block
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(child, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isContentEditable(child, root)) {
+                continue;
+            }
+            var inner = node.cloneNode(false);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.moveContent(child, inner);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(child, inner);
+            // A list or a table: on down to its items or cells
+            moveInlineInside(inner, root);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(node);
+    return true;
+}
 /**
  * The innermost block on the sibling's edge facing the caret, so the
  * content is joined to text: `<div><p>one</p></div><p>|two</p>` gives
@@ -34591,7 +34808,9 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
         while(jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isInlineBlock(sibling)){
             sibling = backspace ? sibling === null || sibling === void 0 ? void 0 : sibling.lastChild : sibling === null || sibling === void 0 ? void 0 : sibling.firstChild;
         }
-        if (!sibling) {
+        // A block inside an inline element, such as the `<p>` in
+        // `<span><p>…</p></span>`, isn't a char: the join cases handle it
+        if (!sibling || jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(sibling)) {
             break;
         }
         if ((_sibling_nodeValue = sibling.nodeValue) === null || _sibling_nodeValue === void 0 ? void 0 : _sibling_nodeValue.length) {
@@ -34740,6 +34959,7 @@ function isSpace(char) {
 /* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27795);
 /* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65946);
 /* harmony import */ var jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42259);
+/* harmony import */ var _check_join_neighbors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26106);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -34749,23 +34969,48 @@ function isSpace(char) {
  */ 
 
 
+
 /**
- * Checks if a non-editable element can be deleted
+ * Checks if a non-editable element can be deleted. A non-editable block goes
+ * whole, and the lines either side of it then join, as the spec's tests do:
+ * `<ul><li>one|</li></ul><div contenteditable="false">x</div><p>two</p>`
+ * gives `<ul><li>one|two</li></ul>`
  * @private
  */ function checkRemoveContentNotEditable(jodit, fakeNode, backspace) {
-    var neighbor = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findSibling(fakeNode, backspace);
-    if (!neighbor && fakeNode.parentElement && fakeNode.parentElement !== jodit.editor) {
-        neighbor = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findSibling(fakeNode.parentElement, backspace);
-    }
-    if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(neighbor) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isContentEditable(neighbor, jodit.editor)) {
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.before : jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.after, neighbor, fakeNode);
-        jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(neighbor);
-        (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_2__.moveNodeInsideStart)(jodit, fakeNode, backspace);
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit.s.setCursorBefore : jodit.s.setCursorAfter, fakeNode);
+    var node = fakeNode;
+    var neighbor = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findSibling(node, backspace);
+    // Past the edges of the blocks the caret is at, but not into a table cell
+    while(!neighbor && node.parentElement && node.parentElement !== jodit.editor && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isCell(node.parentElement)){
+        node = node.parentElement;
+        neighbor = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findSibling(node, backspace);
+        // At the start of a list item, Backspace takes the bullet off first,
+        // unless the item before it is a non-editable one to remove
+        if (backspace && jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(node) && !(jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(neighbor) && isNotEditable(jodit, neighbor))) {
+            return false;
+        }
+    }
+    if (isNotEditable(jodit, neighbor)) {
+        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(neighbor)) {
+            // Backspace after a removed list item leaves the items apart: the
+            // next press takes the bullet off, as for any later item
+            var joinLines = !(backspace && jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(neighbor));
+            jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(neighbor);
+            if (joinLines) {
+                (0,_check_join_neighbors__WEBPACK_IMPORTED_MODULE_3__.checkJoinNeighbors)(jodit, fakeNode, backspace);
+            }
+        } else {
+            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.before : jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.after, neighbor, fakeNode);
+            jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(neighbor);
+            (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_2__.moveNodeInsideStart)(jodit, fakeNode, backspace);
+        }
+        ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit.s.setCursorBefore : jodit.s.setCursorAfter, fakeNode);
         return true;
     }
     return false;
 }
+function isNotEditable(jodit, node) {
+    return jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(node) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isContentEditable(node, jodit.editor);
+}
 
 
 /***/ }),
@@ -57627,12 +57872,13 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34918);
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31635);
 /* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38574);
-/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(27795);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(85932);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(91206);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(86038);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(27795);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(85932);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91206);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(86038);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -57654,6 +57900,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
 
 
 
+
 /**
  * Wrap single text nodes in block wrapper
  */ var wrapNodes = /*#__PURE__*/ function(Plugin) {
@@ -57666,15 +57913,15 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
 	 * Found Node which should be wrapped
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "isSuitableStart", function(n) {
             var _n_parentNode;
-            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isText(n) && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_10__.isString)(n.nodeValue) && (/[^\s]/.test(n.nodeValue) || ((_n_parentNode = n.parentNode) === null || _n_parentNode === void 0 ? void 0 : _n_parentNode.firstChild) === n && _this.isSuitable(n.nextSibling)) || _this.isNotWrapped(n) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isTemporary(n);
+            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isText(n) && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_11__.isString)(n.nodeValue) && (/[^\s]/.test(n.nodeValue) || ((_n_parentNode = n.parentNode) === null || _n_parentNode === void 0 ? void 0 : _n_parentNode.firstChild) === n && _this.isSuitable(n.nextSibling)) || _this.isNotWrapped(n) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTemporary(n);
         }), /**
 	 * Node should add in a block element
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "isSuitable", function(n) {
-            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isText(n) || _this.isNotWrapped(n);
+            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isText(n) || _this.isNotWrapped(n);
         }), /**
 	 * Some element which needs to append in block
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "isNotWrapped", function(n) {
-            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isElement(n) && !(jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isBlock(n) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isTag(n, _this.j.o.wrapNodes.exclude));
+            return jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isElement(n) && !(jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isBlock(n) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(n, _this.j.o.wrapNodes.exclude) || holdsBlock(n));
         });
         return _this;
     }
@@ -57715,10 +57962,11 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
                         }
                         isChanged = true;
                         var box = jodit.createInside.element(jodit.o.enter);
-                        jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.before(child, box);
-                        while(child && this.isSuitable(child)){
+                        jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.before(child, box);
+                        // `exclude` keeps a <br> from starting a box, but one between loose lines stays with them
+                        while(child && (this.isSuitable(child) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(child, 'br'))){
                             var next = child.nextSibling;
-                            jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(box, child);
+                            jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.append(box, child);
                             child = next;
                         }
                         box.normalize();
@@ -57745,8 +57993,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
                 }
                 var box = jodit.createInside.element(jodit.o.enter);
                 var br = jodit.createInside.element('br');
-                jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(box, br);
-                jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(jodit.editor, box);
+                jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.append(box, br);
+                jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.append(jodit.editor, box);
                 if (jodit.s.isFocused() || jodit.e.current === 'backSpaceAfterDelete') {
                     jodit.s.setCursorBefore(br);
                 }
@@ -57755,23 +58003,51 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
         }
     ]);
     return wrapNodes;
-}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_11__.Plugin));
+}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__.Plugin));
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], wrapNodes.prototype, "postProcessSetEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], wrapNodes.prototype, "preprocessInput", null);
+/**
+ * A block can't go in a paragraph, so neither can an element that holds one,
+ * such as a `<span>` round a `<p>`. Embedded content such as an `<iframe>` can.
+ */ function holdsBlock(elm) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.eachGen(elm)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var node = _step.value;
+            if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isBlock(node) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(node, jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.NO_EMPTY_TAGS)) {
+                return true;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return false;
+}
 function checkAloneListLeaf(child, jodit) {
     var result = child;
     var next = child;
     do {
-        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isElement(next) && jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isLeaf(next) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isList(next.parentElement)) {
-            var nextChild = jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.findNotEmptySibling(next, false);
-            if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isTag(result, 'ul')) {
-                jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(result, next);
+        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isElement(next) && jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isLeaf(next) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isList(next.parentElement)) {
+            var nextChild = jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.findNotEmptySibling(next, false);
+            if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(result, 'ul')) {
+                jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.append(result, next);
             } else {
-                result = jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.wrap(next, 'ul', jodit.createInside);
+                result = jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.wrap(next, 'ul', jodit.createInside);
             }
             next = nextChild;
         } else {
@@ -57780,7 +58056,7 @@ function checkAloneListLeaf(child, jodit) {
     }while (next);
     return result;
 }
-jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('wrapNodes', wrapNodes);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_10__.pluginSystem.add('wrapNodes', wrapNodes);
 
 
 /***/ }),