jodit 4.13.23 → 4.13.25

package/es2021/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.13.23
+ * Version: v4.13.25
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1843,7 +1843,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.13.23";
+ */ const APP_VERSION = "4.13.25";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -2441,20 +2441,41 @@ class Create {
         return value;
     };
 }
+function getOwnerDocument(component) {
+    const od = component.od;
+    return od ?? document;
+}
 function cacheHTML(target, _, descriptor) {
     const fn = descriptor.value;
     if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__.isFunction)(fn)) {
         throw (0,jodit_core_helpers_utils_error_error__WEBPACK_IMPORTED_MODULE_3__.error)('Handler must be a Function');
     }
     let useCache = true;
-    const cached = new WeakMap();
+    /**
+	 * The cache is keyed by the owner document first and only then by the
+	 * component class. A page can create editors inside different documents
+	 * (iframes) and destroy those documents later: a template cached from a
+	 * dead document would otherwise be cloned for every subsequent editor,
+	 * whose buttons then never react to clicks.
+	 */ const cached = new WeakMap();
     descriptor.value = function(...attrs) {
-        if (useCache && cached.has(this.constructor)) {
-            return cached.get(this.constructor)?.cloneNode(true);
+        const doc = getOwnerDocument(this);
+        const docCache = cached.get(doc);
+        if (useCache && docCache?.has(this.constructor)) {
+            return docCache.get(this.constructor)?.cloneNode(true);
         }
         const value = fn.apply(this, attrs);
         if (useCache && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(value)) {
-            cached.set(this.constructor, value);
+            if (docCache) {
+                docCache.set(this.constructor, value);
+            } else {
+                cached.set(doc, new WeakMap([
+                    [
+                        this.constructor,
+                        value
+                    ]
+                ]));
+            }
         }
         return useCache ? value.cloneNode(true) : value;
     };
@@ -11985,6 +12006,7 @@ if (jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.globalDocument) {
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FiniteStateMachine: function() { return /* reexport safe */ _finite_state_machine__WEBPACK_IMPORTED_MODULE_1__.FiniteStateMachine; },
+/* harmony export */   WRAP_NODES: function() { return /* reexport safe */ _wrap__WEBPACK_IMPORTED_MODULE_13__.WRAP_NODES; },
 /* harmony export */   extractSelectedPart: function() { return /* reexport safe */ _extract__WEBPACK_IMPORTED_MODULE_0__.extractSelectedPart; },
 /* harmony export */   getSuitChild: function() { return /* reexport safe */ _get_suit_child__WEBPACK_IMPORTED_MODULE_2__.getSuitChild; },
 /* harmony export */   getSuitParent: function() { return /* reexport safe */ _get_suit_parent__WEBPACK_IMPORTED_MODULE_3__.getSuitParent; },
@@ -12647,6 +12669,7 @@ function toggleAttribute(jodit, value, elm, key, dry, mode) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   WRAP_NODES: function() { return /* binding */ WRAP_NODES; },
 /* harmony export */   wrap: function() { return /* binding */ wrap; }
 /* harmony export */ });
 /* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27795);
@@ -12701,7 +12724,7 @@ const WRAP_NODES = new Set([
  * otherwise it wraps free text in an element.
  */ function findOrCreateWrapper(commitStyle, font, jodit) {
     if (commitStyle.elementIsBlock) {
-        const box = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.up(font, (node)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(node) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, WRAP_NODES), jodit.editor);
+        const box = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.up(font, (node)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(node) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, WRAP_NODES) && !hasBlockChildren(node), jodit.editor);
         if (box) {
             return box;
         }
@@ -12710,6 +12733,13 @@ const WRAP_NODES = new Set([
     (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_1__.attr)(font, 'size', null);
     return font;
 }
+/**
+ * A block that itself contains block-level children is a layout container:
+ * replacing it wholesale would merge all its blocks into the new element,
+ * so the selection must be wrapped in a new block inside it instead.
+ */ function hasBlockChildren(node) {
+    return Array.from(node.childNodes).some((child)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(child));
+}
 
 
 /***/ }),
@@ -13096,13 +13126,25 @@ const transactions = {
     },
     [states.UNWRAP]: {
         exec (value) {
-            if (value.element.attributes.length && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(value.element, value.style.element)) {
+            const { element, style, jodit } = value;
+            if (element.attributes.length && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(element, style.element)) {
+                return {
+                    ...value,
+                    next: states.REPLACE_DEFAULT
+                };
+            }
+            // Unwrapping a block inside a container (e.g. an h3 inside a div)
+            // leaves bare inline content there: the wrapNodes plugin restores
+            // paragraphs only at the editor root. Replace such a block with
+            // the default tag instead.
+            const parent = element.parentElement;
+            if (style.elementIsBlock && !style.elementIsDefault && parent && parent !== jodit.editor && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(parent) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(parent, jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_3__.WRAP_NODES)) {
                 return {
                     ...value,
                     next: states.REPLACE_DEFAULT
                 };
             }
-            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(value.element);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(element);
             return {
                 ...value,
                 mode: jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_4__.UNWRAP,