jodit 4.4.7 → 4.5.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.4.7
+ * Version: v4.5.1
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1742,7 +1742,7 @@ __webpack_require__.r(__webpack_exports__);
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2025 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-const APP_VERSION = "4.4.7";
+const APP_VERSION = "4.5.1";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -2887,28 +2887,25 @@ class Dom {
         }
     }
     /**
-     * Wrap all inline siblings
+     * Wrap all inline next siblings
      */
-    static wrapInline(current, tag, editor) {
-        let tmp, first = current, last = current;
+    static wrapNextInline(current, tag, editor) {
+        let tmp;
+        const first = current;
+        let last = current;
         editor.s.save();
         let needFindNext = false;
-        do {
-            needFindNext = false;
-            tmp = first.previousSibling;
-            if (tmp && !Dom.isBlock(tmp)) {
-                needFindNext = true;
-                first = tmp;
-            }
-        } while (needFindNext);
         do {
             needFindNext = false;
             tmp = last.nextSibling;
-            if (tmp && !Dom.isBlock(tmp)) {
+            if (tmp && !Dom.isBlock(tmp) && !Dom.isTag(tmp, 'br')) {
                 needFindNext = true;
                 last = tmp;
             }
         } while (needFindNext);
+        return Dom.__wrapElements(tag, editor, first, last);
+    }
+    static __wrapElements(tag, editor, first, last) {
         const wrapper = (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__/* .isString */ .Kg)(tag) ? editor.createInside.element(tag) : tag;
         if (first.parentNode) {
             first.parentNode.insertBefore(wrapper, first);
@@ -2925,6 +2922,33 @@ class Dom {
         editor.s.restore();
         return wrapper;
     }
+    /**
+     * Wrap all inline siblings
+     */
+    static wrapInline(current, tag, editor) {
+        let tmp;
+        let first = current;
+        let last = current;
+        editor.s.save();
+        let needFindNext = false;
+        do {
+            needFindNext = false;
+            tmp = first.previousSibling;
+            if (tmp && !Dom.isBlock(tmp)) {
+                needFindNext = true;
+                first = tmp;
+            }
+        } while (needFindNext);
+        do {
+            needFindNext = false;
+            tmp = last.nextSibling;
+            if (tmp && !Dom.isBlock(tmp)) {
+                needFindNext = true;
+                last = tmp;
+            }
+        } while (needFindNext);
+        return Dom.__wrapElements(tag, editor, first, last);
+    }
     /**
      * Wrap node inside another node
      */
@@ -27871,12 +27895,18 @@ function tryRemoveNode(jodit, nodeElm, hadEffect, allowTags, denyTags, currentSe
  * @private
  */
 function isRemovableNode(jodit, node, current, allow, deny) {
-    if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node) &&
-        ((allow && !allow[node.nodeName]) || (deny && deny[node.nodeName]))) {
-        return true;
+    if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node)) {
+        if (allow && !allow[node.nodeName]) {
+            return true;
+        }
+        if (!allow && deny && deny[node.nodeName]) {
+            return true;
+        }
     }
-    return (jodit.o.cleanHTML.removeEmptyElements &&
-        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(node) &&
+    if (!jodit.o.cleanHTML.removeEmptyElements) {
+        return false;
+    }
+    return (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(node) &&
         node.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null &&
         !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTemporary(node) &&
         (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__/* .trim */ .Bq)(node.innerHTML).length === 0 &&
@@ -33179,7 +33209,7 @@ const getKey = (direction, box) => `${jodit_core_dom_dom__WEBPACK_IMPORTED_MODUL
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17352);
 /* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71842);
 /* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56298);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(65147);
+/* harmony import */ var jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(97369);
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(97767);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3392);
 /*!
@@ -33193,6 +33223,22 @@ const getKey = (direction, box) => `${jodit_core_dom_dom__WEBPACK_IMPORTED_MODUL
 
 
 
+const applyIndentToBox = (processedElements, currentBox, editor, command) => {
+    if (!currentBox) {
+        return;
+    }
+    if (processedElements.has(currentBox)) {
+        return;
+    }
+    const key = (0,_helpers__WEBPACK_IMPORTED_MODULE_5__/* .getKey */ .i)(editor.o.direction, currentBox);
+    processedElements.add(currentBox);
+    let value = currentBox.style[key] ? parseInt(currentBox.style[key], 10) : 0;
+    value += editor.o.indentMargin * (command === 'outdent' ? -1 : 1);
+    currentBox.style[key] = value > 0 ? value + 'px' : '';
+    if (!(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style')) {
+        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style', null);
+    }
+};
 /**
  * Indents the line containing the selection or insertion point.
  */
@@ -33206,46 +33252,42 @@ function indent(editor) {
         name: 'outdent',
         group: 'indent'
     });
-    const callback = (command) => {
-        const processedElements = [];
+    const indentCommand = (command) => {
+        const processedElements = new Set();
+        const { enter, enterBlock } = editor.o;
+        const isBrMode = enter.toLowerCase() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.BR;
+        const current = editor.s.current();
+        if (isBrMode && editor.s.isCollapsed()) {
+            if (current) {
+                const box = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapNextInline(current, enterBlock, editor);
+                applyIndentToBox(processedElements, box, editor, command);
+                return false;
+            }
+        }
         editor.s.eachSelection((current) => {
             editor.s.save();
             let currentBox = current
                 ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.up(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isBlock, editor.editor)
                 : false;
-            const { enter } = editor.o;
             if (!currentBox && current) {
-                currentBox = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapInline(current, enter !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.BR ? enter : jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.PARAGRAPH, editor);
+                currentBox = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_3__.call)(!isBrMode ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapInline : jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapNextInline, current, !isBrMode ? enter.toLowerCase() : enterBlock, editor);
             }
             if (!currentBox) {
                 editor.s.restore();
                 return false;
             }
-            const alreadyIndented = processedElements.includes(currentBox);
-            if (currentBox && !alreadyIndented) {
-                const key = (0,_helpers__WEBPACK_IMPORTED_MODULE_5__/* .getKey */ .i)(editor.o.direction, currentBox);
-                processedElements.push(currentBox);
-                let value = currentBox.style[key]
-                    ? parseInt(currentBox.style[key], 10)
-                    : 0;
-                value +=
-                    editor.o.indentMargin * (command === 'outdent' ? -1 : 1);
-                currentBox.style[key] = value > 0 ? value + 'px' : '';
-                if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style')) {
-                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style', null);
-                }
-            }
+            applyIndentToBox(processedElements, currentBox, editor, command);
             editor.s.restore();
         });
         editor.synchronizeValues();
         return false;
     };
     editor.registerCommand('indent', {
-        exec: callback,
+        exec: indentCommand,
         hotkeys: ['ctrl+]', 'cmd+]']
     });
     editor.registerCommand('outdent', {
-        exec: callback,
+        exec: indentCommand,
         hotkeys: ['ctrl+[', 'cmd+[']
     });
 }