jodit-pro 4.13.45 → 4.13.47

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.13.45
+ * Version: v4.13.47
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1835,7 +1835,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.13.45";
+ */ const APP_VERSION = "4.13.47";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -11973,6 +11973,7 @@ if (_constants_js__WEBPACK_IMPORTED_MODULE_0__.globalDocument) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FiniteStateMachine: function() { return /* reexport safe */ _finite_state_machine_js__WEBPACK_IMPORTED_MODULE_1__.FiniteStateMachine; },
+/* harmony export */   WRAP_NODES: function() { return /* reexport safe */ _wrap_js__WEBPACK_IMPORTED_MODULE_13__.WRAP_NODES; },
 /* harmony export */   extractSelectedPart: function() { return /* reexport safe */ _extract_js__WEBPACK_IMPORTED_MODULE_0__.extractSelectedPart; },
 /* harmony export */   getSuitChild: function() { return /* reexport safe */ _get_suit_child_js__WEBPACK_IMPORTED_MODULE_2__.getSuitChild; },
 /* harmony export */   getSuitParent: function() { return /* reexport safe */ _get_suit_parent_js__WEBPACK_IMPORTED_MODULE_3__.getSuitParent; },
@@ -12623,6 +12624,7 @@ function toggleAttribute(jodit, value, elm, key, dry, mode) {
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* 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 _dom_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22732);
@@ -12677,7 +12679,7 @@ const WRAP_NODES = new Set([
  * otherwise it wraps free text in an element.
  */ function findOrCreateWrapper(commitStyle, font, jodit) {
     if (commitStyle.elementIsBlock) {
-        const box = _dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.up(font, (node)=>_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(node) && !_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, WRAP_NODES), jodit.editor);
+        const box = _dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.up(font, (node)=>_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(node) && !_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, WRAP_NODES) && !hasBlockChildren(node), jodit.editor);
         if (box) {
             return box;
         }
@@ -12686,6 +12688,13 @@ const WRAP_NODES = new Set([
     (0,_helpers_utils_attr_js__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)=>_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(child));
+}
 
 
 /***/ }),
@@ -13089,12 +13098,23 @@ const transactions = {
     },
     [states.UNWRAP]: {
         exec (value) {
-            if (value.element.attributes.length && _dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(value.element, value.style.element)) {
+            const { element, style, jodit } = value;
+            if (element.attributes.length && _dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(element, style.element)) {
+                return _object_spread_props(_object_spread({}, 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 && _dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock(parent) && !_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(parent, _api_index_js__WEBPACK_IMPORTED_MODULE_3__.WRAP_NODES)) {
                 return _object_spread_props(_object_spread({}, value), {
                     next: states.REPLACE_DEFAULT
                 });
             }
-            _dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(value.element);
+            _dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(element);
             return _object_spread_props(_object_spread({}, value), {
                 mode: _constants_js__WEBPACK_IMPORTED_MODULE_4__.UNWRAP,
                 next: states.END
@@ -35083,7 +35103,11 @@ __webpack_require__.r(__webpack_exports__);
  * @private
  */ function removeEmptyTextNode(jodit, node, hadEffect, arg, argi, currentNode) {
     if (_core_dom_dom_js__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);
         }
         _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(node);
@@ -35123,7 +35147,10 @@ __webpack_require__.r(__webpack_exports__);
         return hadEffect;
     }
     node.nodeValue = node.nodeValue.replace((0,_core_constants_js__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) {