jodit 4.18.0 → 4.18.2

package/es2021.en/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.2
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1824,7 +1824,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.0";
+ */ const APP_VERSION = "4.18.2";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -28913,7 +28913,11 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
  * Clean HTML after removeFormat and insertHorizontalRule command
  */ const TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
 class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
-    /** @override */ afterInit(jodit) {}
+    /** @override */ afterInit() {
+        // The walker's own `:afterInit` watcher is bound on that very event,
+        // so without this the first pass waited for the first key or click
+        this.onChangeCleanHTML();
+    }
     get isEditMode() {
         return !(this.j.isInDestruct || !this.j.isEditorMode() || this.j.getReadOnly());
     }
@@ -29051,10 +29055,11 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
         ;(0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_6__.safeHTML)(sandBox, this.j.o.cleanHTML);
     }
     /** @override */ beforeDestruct() {
+        this.j.e.off('safeHTML', this.onSafeHTML).off('beforeSetNativeEditorValue', this.onBeforeSetNativeEditorValue).off('afterSetNativeEditorValue', this.onAfterSetNativeEditorValue);
         this.walker.destruct();
     }
-    constructor(...args){
-        super(...args), /** @override */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "buttons", [
+    constructor(jodit){
+        super(jodit), /** @override */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "buttons", [
             {
                 name: 'eraser',
                 group: 'font-style'
@@ -29062,6 +29067,12 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
         ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "currentSelectionNode", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "walker", new jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_4__.LazyWalker(this.j.async, {
             timeout: this.j.o.cleanHTML.timeout
         }));
+        // `@watch` binds once the plugin is ready, which is after the initial
+        // value has already gone into the editor. The handlers that keep
+        // markup out of the live tree have to be there from the start, or
+        // event handlers in a textarea's content run before anything
+        // sanitises them.
+        jodit.e.on('safeHTML', this.onSafeHTML).on('beforeSetNativeEditorValue', this.onBeforeSetNativeEditorValue).on('afterSetNativeEditorValue', this.onAfterSetNativeEditorValue);
     }
 }
 ;(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
@@ -29080,16 +29091,16 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':beforeCommand')
 ], cleanHtml.prototype, "beforeCommand", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':afterSetNativeEditorValue')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
 ], cleanHtml.prototype, "onAfterSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':beforeSetNativeEditorValue')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':afterGetValueFromEditor')
 ], cleanHtml.prototype, "onAfterGetValueFromEditor", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':safeHTML')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
 ], cleanHtml.prototype, "onSafeHTML", null);
 jodit_core_global__WEBPACK_IMPORTED_MODULE_5__.pluginSystem.add('cleanHtml', cleanHtml);
 
@@ -31312,7 +31323,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);
     }
 }
@@ -31349,13 +31365,22 @@ const brBoxes = new Set([
         let current = jodit.s.current()?.parentElement ?? 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)) {
@@ -31410,10 +31435,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,
@@ -31421,6 +31448,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.dtd = {
         form: 1,
         header: 1,
         hgroup: 1,
+        li: 1,
         main: 1,
         menu: 1,
         nav: 1,