jodit 4.13.22 → 4.13.24

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.13.22
+ * Version: v4.13.24
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1849,7 +1849,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.13.22";
+ */ const APP_VERSION = "4.13.24";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -12060,6 +12060,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; },
@@ -12726,6 +12727,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);
@@ -12780,7 +12782,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;
         }
@@ -12789,6 +12791,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));
+}
 
 
 /***/ }),
@@ -13162,12 +13171,23 @@ const transactions = {
     },
     [states.UNWRAP]: {
         exec (value) {
-            if (value.element.attributes.length && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(value.element, value.style.element)) {
+            const { element, style, jodit } = value;
+            if (element.attributes.length && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(element, style.element)) {
+                return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, 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_3__.Dom.isBlock(parent) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(parent, jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_5__.WRAP_NODES)) {
                 return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, value), {
                     next: states.REPLACE_DEFAULT
                 });
             }
-            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.unwrap(value.element);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.unwrap(element);
             return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, value), {
                 mode: jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP,
                 next: states.END
@@ -28683,7 +28703,11 @@ __webpack_require__.r(__webpack_exports__);
  * @private
  */ function removeEmptyTextNode(jodit, node, hadEffect, arg, argi, currentNode) {
     if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isText(node) && !node.nodeValue) {
-        if (node === currentNode && jodit.s.isCollapsed()) {
+        // Restore the caret only while the editor owns focus. The walker runs
+        // asynchronously, so the user may have already tabbed away — moving the
+        // selection here would call `focus()` and steal focus back from the
+        // element the user navigated to (e.g. Shift+Tab accessibility flow).
+        if (node === currentNode && jodit.s.isFocused() && jodit.s.isCollapsed()) {
             jodit.s.setCursorAfter(node);
         }
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(node);
@@ -28726,7 +28750,10 @@ __webpack_require__.r(__webpack_exports__);
         return hadEffect;
     }
     node.nodeValue = node.nodeValue.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP)(), '');
-    if (node === currentNode && jodit.s.isCollapsed()) {
+    // Same guard as in `removeEmptyTextNode`: the walker is asynchronous, so
+    // never move the selection (it re-focuses the editor) once the user has
+    // moved focus elsewhere.
+    if (node === currentNode && jodit.s.isFocused() && jodit.s.isCollapsed()) {
         jodit.s.setCursorAfter(node);
     }
     if (!node.nodeValue) {