jodit 4.18.0 → 4.18.1

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.0
+ * Version: v4.18.1
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1830,7 +1830,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.0";
+ */ const APP_VERSION = "4.18.1";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -31933,7 +31933,12 @@ const brBoxes = new Set([
         if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findNotEmptySibling(br, false)) {
             return;
         }
-        jodit.s.setCursorBefore(br);
+        // After a block is inserted the caret is already at the end of its
+        // text; moving it before the `<br>` would put it on a line of its own
+        // below the block (#1315)
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isOrContains(node, jodit.s.range.startContainer)) {
+            jodit.s.setCursorBefore(br);
+        }
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(br);
     }
 }
@@ -31972,13 +31977,22 @@ const brBoxes = new Set([
         let current = (_ref = (_jodit_s_current = jodit.s.current()) === null || _jodit_s_current === void 0 ? void 0 : _jodit_s_current.parentElement) !== null && _ref !== void 0 ? _ref : null;
         while(current && current !== jodit.editor){
             if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(current)) {
-                if (jodit.o.dtd.blockLimits[current.nodeName.toLowerCase()]) {
+                // In DIV mode the caret's own empty block is a line, like
+                // `<p><br></p>`, not a container to insert into (#1315)
+                const isEmptyLine = !parent && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(current, jodit.o.enter) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(current);
+                if (jodit.o.dtd.blockLimits[current.nodeName.toLowerCase()] && !isEmptyLine) {
                     break;
                 }
                 parent = current;
             }
             current = current.parentElement;
         }
+        // A list that is all of the inserted content adds its items to the
+        // list of the item it goes into, as the browsers' own paste does
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(current) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isList(node) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isFragment(node.parentNode) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findNotEmptySibling(node, false)) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.unwrap(node);
+            parent = current;
+        }
         if (parent) {
             jodit.s.setCursorAfter(parent);
             if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(parent)) {
@@ -32033,10 +32047,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.dtd = {
         audio: 1,
         body: 1,
         caption: 1,
+        dd: 1,
         details: 1,
         dir: 1,
         div: 1,
         dl: 1,
+        dt: 1,
         fieldset: 1,
         figcaption: 1,
         figure: 1,
@@ -32044,6 +32060,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.dtd = {
         form: 1,
         header: 1,
         hgroup: 1,
+        li: 1,
         main: 1,
         menu: 1,
         nav: 1,