jodit 4.2.14 → 4.2.15

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.2.14
+ * Version: v4.2.15
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1737,7 +1737,7 @@ __webpack_require__.r(__webpack_exports__);
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-const APP_VERSION = "4.2.14";
+const APP_VERSION = "4.2.15";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -9823,10 +9823,14 @@ class Response {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   W: function() { return /* reexport safe */ _move_node_inside_start__WEBPACK_IMPORTED_MODULE_0__.W; }
+/* harmony export */   Qe: function() { return /* binding */ cursorInTheEdgeOfString; },
+/* harmony export */   W8: function() { return /* reexport safe */ _move_node_inside_start__WEBPACK_IMPORTED_MODULE_2__.W; },
+/* harmony export */   dY: function() { return /* binding */ findCorrectCurrentNode; }
 /* harmony export */ });
-/* harmony import */ var _move_node_inside_start__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5298);
-/* harmony import */ var _move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(83541);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17352);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55186);
+/* harmony import */ var _move_node_inside_start__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5298);
+/* harmony import */ var _move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(83541);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -9839,6 +9843,54 @@ class Response {
 
 
 
+/**
+ * Check if the cursor is at the edge of the string
+ * @private
+ */
+function cursorInTheEdgeOfString(container, offset, start, end) {
+    const text = container.nodeValue?.length ? container.nodeValue : '';
+    if (end && text.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP_END)(), '').length > offset) {
+        return true;
+    }
+    const inv = (0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP_START)().exec(text);
+    return start && ((inv && inv[0].length < offset) || (!inv && offset > 0));
+}
+function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild, child) {
+    node = range.startContainer.childNodes[range.startOffset];
+    if (!node) {
+        node = range.startContainer.childNodes[range.startOffset - 1];
+        rightMode = true;
+    }
+    if (node && isCollapsed && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node)) {
+        // test Current method - Cursor in the left of some SPAN
+        if (!rightMode && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node.previousSibling)) {
+            node = node.previousSibling;
+        }
+        else if (checkChild) {
+            let current = child(node);
+            while (current) {
+                if (current && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(current)) {
+                    node = current;
+                    break;
+                }
+                current = child(current);
+            }
+        }
+    }
+    if (node && !isCollapsed && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node)) {
+        let leftChild = node, rightChild = node;
+        do {
+            leftChild = leftChild.firstChild;
+            rightChild = rightChild.lastChild;
+        } while (leftChild && rightChild && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(leftChild));
+        if (leftChild === rightChild && leftChild && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(leftChild)) {
+            node = leftChild;
+        }
+    }
+    return { node, rightMode };
+}
+
+
 /***/ }),
 
 /***/ 5298:
@@ -9959,7 +10011,7 @@ function moveTheNodeAlongTheEdgeOutward(node, start, root) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   L: function() { return /* binding */ Selection; }
 /* harmony export */ });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(31635);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17352);
 /* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(22664);
 /* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(55186);
@@ -9969,6 +10021,7 @@ function moveTheNodeAlongTheEdgeOutward(node, start, root) {
 /* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var jodit_core_selection_helpers_move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(83541);
 /* harmony import */ var _style_commit_style__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8757);
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(46602);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -9985,6 +10038,7 @@ function moveTheNodeAlongTheEdgeOutward(node, start, root) {
 
 
 
+
 class Selection {
     constructor(jodit) {
         this.jodit = jodit;
@@ -10367,63 +10421,35 @@ class Selection {
      * Returns the current element under the cursor inside editor
      */
     current(checkChild = true) {
-        if (this.j.getRealMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.MODE_WYSIWYG) {
-            const sel = this.sel;
-            if (!sel || sel.rangeCount === 0) {
-                return null;
-            }
-            const range = sel.getRangeAt(0);
-            let node = range.startContainer, rightMode = false;
-            const child = (nd) => rightMode ? nd.lastChild : nd.firstChild;
-            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(node, 'br') && sel.isCollapsed) {
-                return node;
-            }
-            if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node)) {
-                node = range.startContainer.childNodes[range.startOffset];
-                if (!node) {
-                    node =
-                        range.startContainer.childNodes[range.startOffset - 1];
-                    rightMode = true;
-                }
-                if (node && sel.isCollapsed && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node)) {
-                    // test Current method - Cursor in the left of some SPAN
-                    if (!rightMode && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node.previousSibling)) {
-                        node = node.previousSibling;
-                    }
-                    else if (checkChild) {
-                        let current = child(node);
-                        while (current) {
-                            if (current && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(current)) {
-                                node = current;
-                                break;
-                            }
-                            current = child(current);
-                        }
-                    }
-                }
-                if (node && !sel.isCollapsed && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node)) {
-                    let leftChild = node, rightChild = node;
-                    do {
-                        leftChild = leftChild.firstChild;
-                        rightChild = rightChild.lastChild;
-                    } while (leftChild && rightChild && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(leftChild));
-                    if (leftChild === rightChild &&
-                        leftChild &&
-                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(leftChild)) {
-                        node = leftChild;
-                    }
-                }
-            }
-            // check - cursor inside editor
-            if (node && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.area, node)) {
-                return node;
-            }
+        if (this.j.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.MODE_WYSIWYG) {
+            return null;
+        }
+        const sel = this.sel;
+        if (!sel || sel.rangeCount === 0) {
+            return null;
+        }
+        const range = sel.getRangeAt(0);
+        let node = range.startContainer;
+        let rightMode = false;
+        const child = (nd) => rightMode ? nd.lastChild : nd.firstChild;
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(node, 'br') && sel.isCollapsed) {
+            return node;
+        }
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node)) {
+            const ret = (0,_helpers__WEBPACK_IMPORTED_MODULE_8__/* .findCorrectCurrentNode */ .dY)(node, range, rightMode, sel.isCollapsed, checkChild, child);
+            node = ret.node;
+            rightMode = ret.rightMode;
+        }
+        // check - cursor inside editor
+        if (node && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.area, node)) {
+            return node;
         }
         return null;
     }
     /**
      * Insert element in editor
      *
+     * @param node - Node for insert
      * @param insertCursorAfter - After insert, cursor will move after element
      * @param fireChange - After insert, editor fire change event. You can prevent this behavior
      */
@@ -10485,6 +10511,7 @@ class Selection {
      * Inserts in the current cursor position some HTML snippet
      *
      * @param html - HTML The text to be inserted into the document
+     * @param insertCursorAfter - After insert, cursor will move after element
      * @example
      * ```javascript
      * parent.s.insertHTML('<img src="image.png"/>');
@@ -10528,6 +10555,7 @@ class Selection {
      *
      * @param url - URL for image, or HTMLImageElement
      * @param styles - If specified, it will be applied <code>$(image).css(styles)</code>
+     * @param defaultWidth - If specified, it will be applied <code>css('width', defaultWidth)</code>
      */
     insertImage(url, styles = null, defaultWidth = null) {
         const image = (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_4__/* .isString */ .Kg)(url) ? this.j.createInside.element('img') : url;
@@ -10582,74 +10610,81 @@ class Selection {
      */
     eachSelection(callback) {
         const sel = this.sel;
-        if (sel && sel.rangeCount) {
-            const range = sel.getRangeAt(0);
-            let root = range.commonAncestorContainer;
-            if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isHTMLElement(root)) {
-                root = root.parentElement;
-            }
-            const nodes = [], startOffset = range.startOffset, length = root.childNodes.length, elementOffset = startOffset < length ? startOffset : length - 1;
-            let start = range.startContainer === this.area
-                ? root.childNodes[elementOffset]
-                : range.startContainer, end = range.endContainer === this.area
-                ? root.childNodes[range.endOffset - 1]
-                : range.endContainer;
-            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(start) &&
-                start === range.startContainer &&
-                range.startOffset === start.nodeValue?.length &&
-                start.nextSibling) {
-                start = start.nextSibling;
-            }
-            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(end) &&
-                end === range.endContainer &&
-                range.endOffset === 0 &&
-                end.previousSibling) {
-                end = end.previousSibling;
-            }
-            const checkElm = (node) => {
-                if (node &&
-                    node !== root &&
-                    !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isEmptyTextNode(node) &&
-                    !(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_4__/* .isMarker */ .rg)(node)) {
-                    nodes.push(node);
-                }
-            };
-            checkElm(start);
-            if (start !== end && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(root, start, true)) {
-                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.find(start, node => {
-                    checkElm(node);
-                    // checks parentElement as well because partial selections are not equal to entire element
-                    return (node === end ||
-                        (node && node.contains && node.contains(end)));
-                }, root, true, false);
-            }
-            const forEvery = (current) => {
-                if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.j.editor, current, true)) {
-                    return;
-                }
-                if (current.nodeName.match(/^(UL|OL)$/)) {
-                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.toArray)(current.childNodes).forEach(forEvery);
+        if (!sel || !sel.rangeCount) {
+            return;
+        }
+        const range = sel.getRangeAt(0);
+        let root = range.commonAncestorContainer;
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isHTMLElement(root)) {
+            root = root.parentElement;
+        }
+        const nodes = [];
+        const startOffset = range.startOffset;
+        const length = root.childNodes.length;
+        const elementOffset = startOffset < length ? startOffset : length - 1;
+        let start = range.startContainer === this.area
+            ? root.childNodes[elementOffset]
+            : range.startContainer;
+        let end = range.endContainer === this.area
+            ? root.childNodes[range.endOffset - 1]
+            : range.endContainer;
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(start) &&
+            start === range.startContainer &&
+            range.startOffset === start.nodeValue?.length &&
+            start.nextSibling) {
+            start = start.nextSibling;
+        }
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(end) &&
+            end === range.endContainer &&
+            range.endOffset === 0 &&
+            end.previousSibling) {
+            end = end.previousSibling;
+        }
+        const checkElm = (node) => {
+            if (node &&
+                node !== root &&
+                !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isEmptyTextNode(node) &&
+                !(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_4__/* .isMarker */ .rg)(node)) {
+                nodes.push(node);
+            }
+        };
+        checkElm(start);
+        if (start !== end && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(root, start, true)) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.find(start, node => {
+                checkElm(node);
+                // checks parentElement as well because partial selections are not equal to entire element
+                return (node === end ||
+                    (node && node.contains && node.contains(end)));
+            }, root, true, false);
+        }
+        const forEvery = (current) => {
+            if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.j.editor, current, true)) {
+                return;
+            }
+            if (current.nodeName.match(/^(UL|OL)$/)) {
+                return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.toArray)(current.childNodes).forEach(forEvery);
+            }
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(current, 'li')) {
+                if (current.firstChild) {
+                    current = current.firstChild;
                 }
-                if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(current, 'li')) {
-                    if (current.firstChild) {
-                        current = current.firstChild;
-                    }
-                    else {
-                        const currentB = this.j.createInside.text(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE);
-                        current.appendChild(currentB);
-                        current = currentB;
-                    }
+                else {
+                    const currentB = this.j.createInside.text(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE);
+                    current.appendChild(currentB);
+                    current = currentB;
                 }
-                callback(current);
-            };
-            if (nodes.length === 0 && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isEmptyTextNode(start)) {
+            }
+            callback(current);
+        };
+        if (nodes.length === 0) {
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isEmptyTextNode(start)) {
                 nodes.push(start);
             }
-            if (nodes.length === 0 && start.firstChild) {
+            if (start.firstChild) {
                 nodes.push(start.firstChild);
             }
-            nodes.forEach(forEvery);
         }
+        nodes.forEach(forEvery);
     }
     /**
      * Checks if the cursor is at the end(start) block
@@ -10676,13 +10711,7 @@ class Selection {
                 this.j.e.fire('isInvisibleForCursor', elm) === true));
         // check right offset
         if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(container)) {
-            const text = container.nodeValue?.length ? container.nodeValue : '';
-            if (end && text.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP_END)(), '').length > offset) {
-                return false;
-            }
-            const inv = (0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP_START)().exec(text);
-            if (start &&
-                ((inv && inv[0].length < offset) || (!inv && offset > 0))) {
+            if ((0,_helpers__WEBPACK_IMPORTED_MODULE_8__/* .cursorInTheEdgeOfString */ .Qe)(container, offset, start, end)) {
                 return false;
             }
         }
@@ -10770,6 +10799,7 @@ class Selection {
     }
     /**
      * Set cursor in the node
+     * @param node - Node element
      * @param inStart - set cursor in start of element
      */
     setCursorIn(node, inStart = false) {
@@ -10830,6 +10860,7 @@ class Selection {
     }
     /**
      * Select node
+     * @param node - Node element
      * @param inward - select all inside
      */
     select(node, inward = false) {
@@ -11103,19 +11134,19 @@ class Selection {
         return this;
     }
 }
-(0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Selection.prototype, "createRange", null);
-(0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Selection.prototype, "focus", null);
-(0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Selection.prototype, "setCursorAfter", null);
-(0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Selection.prototype, "setCursorBefore", null);
-(0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Selection.prototype, "setCursorIn", null);
 
@@ -22294,6 +22325,7 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
     }
     /**
      * Generate formal table martix columns*rows
+     * @param table - Working table
      * @param callback - if return false cycle break
      */
     formalMatrix(table, callback) {
@@ -22362,7 +22394,6 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
      * @param line - Insert a new line after/before this
      * line contains the selected cell
      * @param after - Insert a new line after line contains the selected cell
-     * @param create - Instance of Create class
      */
     appendRow(table, line, after) {
         return Table.__appendRow(table, line, after, this.j.createInside);
@@ -22531,13 +22562,36 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
         return Table.__getSelectedBound(table, selectedCells);
     }
     static __normalizeTable(table) {
-        let i, j, min, not;
         const __marked = [], box = Table.__formalMatrix(table);
-        // remove extra colspans
-        for (j = 0; j < box[0].length; j += 1) {
-            min = 1000000;
-            not = false;
-            for (i = 0; i < box.length; i += 1) {
+        Table.__removeExtraColspans(box, __marked);
+        Table.__removeExtraRowspans(box, __marked);
+        // remove rowspans and colspans equal 1 and empty class
+        for (let i = 0; i < box.length; i += 1) {
+            for (let j = 0; j < box[i].length; j += 1) {
+                if (box[i][j] === undefined) {
+                    continue; // broken table
+                }
+                if (box[i][j].hasAttribute('rowspan') &&
+                    box[i][j].rowSpan === 1) {
+                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'rowspan', null);
+                }
+                if (box[i][j].hasAttribute('colspan') &&
+                    box[i][j].colSpan === 1) {
+                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'colspan', null);
+                }
+                if (box[i][j].hasAttribute('class') &&
+                    !(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'class')) {
+                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'class', null);
+                }
+            }
+        }
+        Table.__unmark(__marked);
+    }
+    static __removeExtraColspans(box, __marked) {
+        for (let j = 0; j < box[0].length; j += 1) {
+            let min = 1000000;
+            let not = false;
+            for (let i = 0; i < box.length; i += 1) {
                 if (box[i][j] === undefined) {
                     continue; // broken table
                 }
@@ -22548,7 +22602,7 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
                 min = Math.min(min, box[i][j].colSpan);
             }
             if (!not) {
-                for (i = 0; i < box.length; i += 1) {
+                for (let i = 0; i < box.length; i += 1) {
                     if (box[i][j] === undefined) {
                         continue; // broken table
                     }
@@ -22556,10 +22610,13 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
                 }
             }
         }
-        // remove extra rowspans
+    }
+    static __removeExtraRowspans(box, marked) {
+        let i = 0;
+        let j = 0;
         for (i = 0; i < box.length; i += 1) {
-            min = 1000000;
-            not = false;
+            let min = 1000000;
+            let not = false;
             for (j = 0; j < box[i].length; j += 1) {
                 if (box[i][j] === undefined) {
                     continue; // broken table
@@ -22575,31 +22632,10 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
                     if (box[i][j] === undefined) {
                         continue; // broken table
                     }
-                    Table.__mark(box[i][j], 'rowspan', box[i][j].rowSpan - min + 1, __marked);
+                    Table.__mark(box[i][j], 'rowspan', box[i][j].rowSpan - min + 1, marked);
                 }
             }
         }
-        // remove rowspans and colspans equal 1 and empty class
-        for (i = 0; i < box.length; i += 1) {
-            for (j = 0; j < box[i].length; j += 1) {
-                if (box[i][j] === undefined) {
-                    continue; // broken table
-                }
-                if (box[i][j].hasAttribute('rowspan') &&
-                    box[i][j].rowSpan === 1) {
-                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'rowspan', null);
-                }
-                if (box[i][j].hasAttribute('colspan') &&
-                    box[i][j].colSpan === 1) {
-                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'colspan', null);
-                }
-                if (box[i][j].hasAttribute('class') &&
-                    !(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'class')) {
-                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'class', null);
-                }
-            }
-        }
-        Table.__unmark(__marked);
     }
     /**
      * Try recalculate all coluns and rows after change
@@ -24017,34 +24053,7 @@ function sendFiles(uploader, files, handlerSuccess, handlerError, process) {
     }
     const promises = [];
     if (o.insertImageAsBase64URI) {
-        let file, i;
-        for (i = 0; i < fileList.length; i += 1) {
-            file = fileList[i];
-            if (file && file.type) {
-                const mime = file.type.match(/\/([a-z0-9]+)/i);
-                const extension = mime[1] ? mime[1].toLowerCase() : '';
-                if (o.imagesExtensions.includes(extension)) {
-                    const reader = new FileReader();
-                    promises.push(uploader.j.async.promise((resolve, reject) => {
-                        reader.onerror = reject;
-                        reader.onloadend = () => {
-                            const resp = {
-                                baseurl: '',
-                                files: [reader.result],
-                                isImages: [true]
-                            };
-                            const handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.isFunction)(handlerSuccess)
-                                ? handlerSuccess
-                                : o.defaultHandlerSuccess;
-                            handler.call(uploader, resp);
-                            resolve(resp);
-                        };
-                        reader.readAsDataURL(file);
-                    }));
-                    fileList[i] = null;
-                }
-            }
-        }
+        readImagesWithReader(fileList, o.imagesExtensions, promises, uploader, handlerSuccess, o.defaultHandlerSuccess);
     }
     fileList = fileList.filter(a => a);
     if (fileList.length) {
@@ -24055,7 +24064,7 @@ function sendFiles(uploader, files, handlerSuccess, handlerError, process) {
         for (let i = 0; i < fileList.length; i += 1) {
             file = fileList[i];
             if (file) {
-                const hasRealExtension = /\.[\d\w]+$/.test(file.name);
+                const hasRealExtension = /\.\w+$/.test(file.name);
                 const mime = file.type.match(/\/([a-z0-9]+)/i);
                 const extension = mime && mime[1] ? mime[1].toLowerCase() : '';
                 let newName = fileList[i].name ||
@@ -24104,6 +24113,37 @@ function sendFiles(uploader, files, handlerSuccess, handlerError, process) {
     }
     return Promise.all(promises);
 }
+function readImagesWithReader(fileList, imagesExtensions, promises, uploader, handlerSuccess, defaultHandlerSuccess) {
+    let file, i;
+    for (i = 0; i < fileList.length; i += 1) {
+        file = fileList[i];
+        if (file && file.type) {
+            const mime = file.type.match(/\/([a-z0-9]+)/i);
+            const extension = mime[1] ? mime[1].toLowerCase() : '';
+            if (!imagesExtensions.includes(extension)) {
+                continue;
+            }
+            const reader = new FileReader();
+            promises.push(uploader.j.async.promise((resolve, reject) => {
+                reader.onerror = reject;
+                reader.onloadend = () => {
+                    const resp = {
+                        baseurl: '',
+                        files: [reader.result],
+                        isImages: [true]
+                    };
+                    const handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.isFunction)(handlerSuccess)
+                        ? handlerSuccess
+                        : defaultHandlerSuccess;
+                    handler.call(uploader, resp);
+                    resolve(resp);
+                };
+                reader.readAsDataURL(file);
+            }));
+            fileList[i] = null;
+        }
+    }
+}
 
 
 /***/ }),
@@ -25722,7 +25762,7 @@ class backspace extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_3__/* .Plugin
             if (jodit.e.fire('backSpaceBeforeCases', backspace, fakeNode)) {
                 return false;
             }
-            (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_4__/* .moveNodeInsideStart */ .W)(jodit, fakeNode, backspace);
+            (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_4__/* .moveNodeInsideStart */ .W8)(jodit, fakeNode, backspace);
             if (_cases__WEBPACK_IMPORTED_MODULE_6__/* .cases */ .C.some((func) => {
                 if ((0,jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_8__/* .isFunction */ .T)(func) &&
                     func(jodit, fakeNode, backspace, mode)) {
@@ -25982,19 +26022,12 @@ function checkNotCollapsed(jodit) {
 function checkRemoveChar(jodit, fakeNode, backspace, mode) {
     const step = backspace ? -1 : 1;
     const anotherSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.sibling(fakeNode, !backspace);
-    let sibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.sibling(fakeNode, backspace), removeNeighbor = null;
-    let charRemoved = false, removed;
-    const getNextInlineSibling = (sibling) => {
-        let nextSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.sibling(sibling, backspace);
-        if (!nextSibling &&
-            sibling.parentNode &&
-            sibling.parentNode !== jodit.editor) {
-            nextSibling = (0,jodit_plugins_backspace_helpers__WEBPACK_IMPORTED_MODULE_3__/* .findMostNestedNeighbor */ .s)(sibling, !backspace, jodit.editor, true);
-        }
-        return nextSibling;
-    };
+    let sibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.sibling(fakeNode, backspace);
+    let removeNeighbor = null;
+    let charRemoved = false;
+    let removed;
     if (!sibling) {
-        sibling = getNextInlineSibling(fakeNode);
+        sibling = getNextInlineSibling(fakeNode, backspace, jodit.editor);
     }
     while (sibling && (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(sibling) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isInlineBlock(sibling))) {
         while (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isInlineBlock(sibling)) {
@@ -26004,57 +26037,17 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
             break;
         }
         if (sibling.nodeValue?.length) {
-            // For Unicode escapes
-            let value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.toArray)(sibling.nodeValue);
-            const length = value.length;
-            let index = backspace ? length - 1 : 0;
-            if (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
-                while (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
-                    index += step;
-                }
-            }
-            removed = value[index];
-            if (value[index + step] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
-                index += step;
-                while (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
-                    index += step;
-                }
-                index += backspace ? 1 : -1;
-            }
-            if (backspace && index < 0) {
-                value = [];
-            }
-            else {
-                value = value.slice(backspace ? 0 : index + 1, backspace ? index : length);
-            }
-            if (!anotherSibling ||
-                !jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(anotherSibling) ||
-                (!backspace ? / $/ : /^ /).test(anotherSibling.nodeValue ?? '') ||
-                !(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.trimInv)(anotherSibling.nodeValue || '').length) {
-                for (let i = backspace ? value.length - 1 : 0; backspace ? i >= 0 : i < value.length; i += backspace ? -1 : 1) {
-                    if (value[i] === ' ') {
-                        value[i] = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE;
-                    }
-                    else {
-                        break;
-                    }
-                }
-            }
-            sibling.nodeValue = value.join('');
+            removed = tryRemoveChar(sibling, backspace, step, anotherSibling);
         }
         if (!sibling.nodeValue?.length) {
             removeNeighbor = sibling;
         }
         if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.isVoid)(removed) && removed !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
+            checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit);
             charRemoved = true;
-            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.after : jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.before, sibling, fakeNode);
-            if (mode === 'sentence' ||
-                (mode === 'word' && removed !== ' ' && removed !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE)) {
-                checkRemoveChar(jodit, fakeNode, backspace, mode);
-            }
             break;
         }
-        const nextSibling = getNextInlineSibling(sibling);
+        const nextSibling = getNextInlineSibling(sibling, backspace, jodit.editor);
         if (removeNeighbor) {
             jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.safeRemove(removeNeighbor);
             removeNeighbor = null;
@@ -26076,6 +26069,13 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
     }
     return charRemoved;
 }
+function getNextInlineSibling(sibling, backspace, root) {
+    let nextSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.sibling(sibling, backspace);
+    if (!nextSibling && sibling.parentNode && sibling.parentNode !== root) {
+        nextSibling = (0,jodit_plugins_backspace_helpers__WEBPACK_IMPORTED_MODULE_3__/* .findMostNestedNeighbor */ .s)(sibling, !backspace, root, true);
+    }
+    return nextSibling;
+}
 /**
  * Helper removes all empty inline parents
  */
@@ -26100,6 +26100,56 @@ function addBRInsideEmptyBlock(jodit, node) {
         jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.after(node, jodit.createInside.element('br'));
     }
 }
+function tryRemoveChar(sibling, backspace, step, anotherSibling) {
+    // For Unicode escapes
+    let value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.toArray)(sibling.nodeValue);
+    const length = value.length;
+    let index = backspace ? length - 1 : 0;
+    if (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
+        while (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
+            index += step;
+        }
+    }
+    const removed = value[index];
+    if (value[index + step] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
+        index += step;
+        while (value[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE) {
+            index += step;
+        }
+        index += backspace ? 1 : -1;
+    }
+    if (backspace && index < 0) {
+        value = [];
+    }
+    else {
+        value = value.slice(backspace ? 0 : index + 1, backspace ? index : length);
+    }
+    replaceSpaceOnNBSP(anotherSibling, backspace, value);
+    sibling.nodeValue = value.join('');
+    return removed;
+}
+function replaceSpaceOnNBSP(anotherSibling, backspace, value) {
+    if (!anotherSibling ||
+        !jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(anotherSibling) ||
+        (!backspace ? / $/ : /^ /).test(anotherSibling.nodeValue ?? '') ||
+        !(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.trimInv)(anotherSibling.nodeValue || '').length) {
+        for (let i = backspace ? value.length - 1 : 0; backspace ? i >= 0 : i < value.length; i += backspace ? -1 : 1) {
+            if (value[i] === ' ') {
+                value[i] = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE;
+            }
+            else {
+                break;
+            }
+        }
+    }
+}
+function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit) {
+    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.after : jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.before, sibling, fakeNode);
+    if (mode === 'sentence' ||
+        (mode === 'word' && removed !== ' ' && removed !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE)) {
+        checkRemoveChar(jodit, fakeNode, backspace, mode);
+    }
+}
 
 
 /***/ }),
@@ -26137,7 +26187,7 @@ function checkRemoveContentNotEditable(jodit, fakeNode, backspace) {
         !jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.isContentEditable(neighbor, jodit.editor)) {
         (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.before : jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.after, neighbor, fakeNode);
         jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.safeRemove(neighbor);
-        (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_2__/* .moveNodeInsideStart */ .W)(jodit, fakeNode, backspace);
+        (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_2__/* .moveNodeInsideStart */ .W8)(jodit, fakeNode, backspace);
         (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.call)(backspace ? jodit.s.setCursorBefore : jodit.s.setCursorAfter, fakeNode);
         return true;
     }
@@ -28993,45 +29043,11 @@ class dragAndDrop extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__/* .Plug
             const sel = this.j.s.sel;
             const range = this.bufferRange ||
                 (sel && sel.rangeCount ? sel.getRangeAt(0) : null);
-            let fragment = null;
-            if (!this.draggable && range) {
-                fragment = this.isCopyMode
-                    ? range.cloneContents()
-                    : range.extractContents();
-            }
-            else if (this.draggable) {
-                if (this.isCopyMode) {
-                    const [tagName, field] = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, '-is-file') === '1'
-                        ? ['a', 'href']
-                        : ['img', 'src'];
-                    fragment = this.j.createInside.element(tagName);
-                    fragment.setAttribute(field, (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, 'data-src') ||
-                        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, 'src') ||
-                        '');
-                    if (tagName === 'a') {
-                        fragment.textContent = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(fragment, field) || '';
-                    }
-                }
-                else {
-                    fragment = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.dataBind)(this.draggable, 'target');
-                }
-            }
-            else if (this.getText(event)) {
-                fragment = this.j.createInside.fromHTML(this.getText(event));
-            }
+            const fragment = this.__getWorkFragment(range, event);
             sel && sel.removeAllRanges();
             this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
             if (fragment) {
-                this.j.s.insertNode(fragment, false, false);
-                if (range && fragment.firstChild && fragment.lastChild) {
-                    range.setStartBefore(fragment.firstChild);
-                    range.setEndAfter(fragment.lastChild);
-                    this.j.s.selectRange(range);
-                    this.j.e.fire('synchro');
-                }
-                if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(fragment, 'img') && this.j.events) {
-                    this.j.e.fire('afterInsertImage', fragment);
-                }
+                this.__insertFragment.call(this, fragment, range);
             }
             event.preventDefault();
             event.stopPropagation();
@@ -29039,6 +29055,47 @@ class dragAndDrop extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__/* .Plug
         this.isFragmentFromEditor = false;
         this.removeDragListeners();
     }
+    __getWorkFragment(range, event) {
+        let fragment = null;
+        if (!this.draggable && range) {
+            fragment = this.isCopyMode
+                ? range.cloneContents()
+                : range.extractContents();
+        }
+        else if (this.draggable) {
+            if (this.isCopyMode) {
+                const [tagName, field] = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, '-is-file') === '1'
+                    ? ['a', 'href']
+                    : ['img', 'src'];
+                fragment = this.j.createInside.element(tagName);
+                fragment.setAttribute(field, (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, 'data-src') ||
+                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(this.draggable, 'src') ||
+                    '');
+                if (tagName === 'a') {
+                    fragment.textContent = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.attr)(fragment, field) || '';
+                }
+            }
+            else {
+                fragment = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.dataBind)(this.draggable, 'target');
+            }
+        }
+        else if (this.getText(event)) {
+            fragment = this.j.createInside.fromHTML(this.getText(event));
+        }
+        return fragment;
+    }
+    __insertFragment(fragment, range) {
+        this.j.s.insertNode(fragment, false, false);
+        if (range && fragment.firstChild && fragment.lastChild) {
+            range.setStartBefore(fragment.firstChild);
+            range.setEndAfter(fragment.lastChild);
+            this.j.s.selectRange(range);
+            this.j.e.fire('synchro');
+        }
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTag(fragment, 'img') && this.j.events) {
+            this.j.e.fire('afterInsertImage', fragment);
+        }
+    }
     /** @override */
     beforeDestruct() {
         this.onDragEnd();
@@ -34749,35 +34806,7 @@ class link extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plugin */ .
         if (link) {
             url_input.value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'href') || '';
             if (modeClassName) {
-                switch (modeClassName) {
-                    case 'input':
-                        if (className_input) {
-                            className_input.value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'class') || '';
-                        }
-                        break;
-                    case 'select':
-                        if (className_select) {
-                            for (let i = 0; i < className_select.selectedOptions.length; i++) {
-                                const option = className_select.options.item(i);
-                                if (option) {
-                                    option.selected = false;
-                                }
-                            }
-                            const classNames = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'class') || '';
-                            classNames.split(' ').forEach(className => {
-                                if (className) {
-                                    for (let i = 0; i < className_select.options.length; i++) {
-                                        const option = className_select.options.item(i);
-                                        if (option?.value &&
-                                            option.value === className) {
-                                            option.selected = true;
-                                        }
-                                    }
-                                }
-                            });
-                        }
-                        break;
-                }
+                readClassnames(modeClassName, className_input, link, className_select);
             }
             if (openInNewTabCheckbox && target_checkbox) {
                 target_checkbox.checked = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'target') === '_blank';
@@ -34839,42 +34868,9 @@ class link extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plugin */ .
             }
             links.forEach(a => {
                 (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'href', url_input.value);
-                if (modeClassName && (className_input ?? className_select)) {
-                    if (modeClassName === 'input') {
-                        if (className_input.value === '' &&
-                            a.hasAttribute('class')) {
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', null);
-                        }
-                        if (className_input.value !== '') {
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', className_input.value);
-                        }
-                    }
-                    else if (modeClassName === 'select') {
-                        if (a.hasAttribute('class')) {
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', null);
-                        }
-                        for (let i = 0; i < className_select.selectedOptions.length; i++) {
-                            const className = className_select.selectedOptions.item(i)?.value;
-                            if (className) {
-                                a.classList.add(className);
-                            }
-                        }
-                    }
-                }
+                writeClasses(modeClassName, className_input, className_select, a);
                 if (!isImageContent) {
-                    let newContent = a.textContent;
-                    if (content_input.value.trim().length) {
-                        if (textWasChanged) {
-                            newContent = content_input.value;
-                        }
-                    }
-                    else {
-                        newContent = url_input.value;
-                    }
-                    const content = a.textContent;
-                    if (newContent !== content) {
-                        a.textContent = newContent;
-                    }
+                    writeImage(a, content_input, textWasChanged, url_input);
                 }
                 if (openInNewTabCheckbox && target_checkbox) {
                     (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'target', target_checkbox.checked ? '_blank' : null);
@@ -34919,6 +34915,74 @@ class link extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plugin */ .
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], link.prototype, "__generateForm", null);
 jodit_core_global__WEBPACK_IMPORTED_MODULE_2__/* .pluginSystem */ .fg.add('link', link);
+function writeClasses(modeClassName, className_input, className_select, a) {
+    if (modeClassName && (className_input ?? className_select)) {
+        if (modeClassName === 'input') {
+            if (className_input.value === '' && a.hasAttribute('class')) {
+                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', null);
+            }
+            if (className_input.value !== '') {
+                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', className_input.value);
+            }
+        }
+        else if (modeClassName === 'select') {
+            if (a.hasAttribute('class')) {
+                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(a, 'class', null);
+            }
+            for (let i = 0; i < className_select.selectedOptions.length; i++) {
+                const className = className_select.selectedOptions.item(i)?.value;
+                if (className) {
+                    a.classList.add(className);
+                }
+            }
+        }
+    }
+}
+function readClassnames(modeClassName, className_input, link, className_select) {
+    switch (modeClassName) {
+        case 'input':
+            if (className_input) {
+                className_input.value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'class') || '';
+            }
+            break;
+        case 'select':
+            if (className_select) {
+                for (let i = 0; i < className_select.selectedOptions.length; i++) {
+                    const option = className_select.options.item(i);
+                    if (option) {
+                        option.selected = false;
+                    }
+                }
+                const classNames = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.attr)(link, 'class') || '';
+                classNames.split(' ').forEach(className => {
+                    if (className) {
+                        for (let i = 0; i < className_select.options.length; i++) {
+                            const option = className_select.options.item(i);
+                            if (option?.value && option.value === className) {
+                                option.selected = true;
+                            }
+                        }
+                    }
+                });
+            }
+            break;
+    }
+}
+function writeImage(a, content_input, textWasChanged, url_input) {
+    let newContent = a.textContent;
+    if (content_input.value.trim().length) {
+        if (textWasChanged) {
+            newContent = content_input.value;
+        }
+    }
+    else {
+        newContent = url_input.value;
+    }
+    const content = a.textContent;
+    if (newContent !== content) {
+        a.textContent = newContent;
+    }
+}
 
 
 /***/ }),
@@ -37756,7 +37820,6 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__/* .Config */ .T.prototype.controls.fin
 /* harmony export */   _B: function() { return /* binding */ highlightTextRanges; },
 /* harmony export */   zy: function() { return /* binding */ getSelectionWrappers; }
 /* harmony export */ });
-/* unused harmony export isSelectionWrapper */
 /* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55186);
 /* harmony import */ var jodit_core_helpers_utils_selector__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58720);
 /*!
@@ -37778,60 +37841,14 @@ function highlightTextRanges(jodit, rng, restRanges, ci, root) {
         rng.endContainer.nodeValue == null) {
         return;
     }
-    if (jodit.o.search.useCustomHighlightAPI &&
-        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-        typeof window.Highlight !== 'undefined') {
-        const ranges = [rng, ...restRanges].map(rng => {
-            const range = jodit.selection.createRange();
-            range.setStart(rng.startContainer, rng.startOffset);
-            range.setEnd(rng.endContainer, rng.endOffset);
-            return range;
-        });
-        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-        const searchHighlight = new Highlight(...ranges);
-        // @ts-ignore
-        CSS.highlights.clear();
-        // @ts-ignore
-        CSS.highlights.set('jodit-search-result', searchHighlight);
-        restRanges.length = 0;
+    if (checkNativeSelectionMethod(jodit, rng, restRanges)) {
         return;
     }
     const span = ci.element('span', {
         [TMP_ATTR]: true
     });
     jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.markTemporary(span);
-    const startText = rng.startContainer.nodeValue;
-    let diff = 0;
-    if (rng.startOffset !== 0) {
-        const text = ci.text(startText.substring(0, rng.startOffset));
-        rng.startContainer.nodeValue = startText.substring(rng.startOffset);
-        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.before(rng.startContainer, text);
-        if (rng.startContainer === rng.endContainer) {
-            diff = rng.startOffset;
-            rng.endOffset -= diff;
-        }
-        rng.startOffset = 0;
-    }
-    const endText = rng.endContainer.nodeValue;
-    if (rng.endOffset !== endText.length) {
-        const text = ci.text(endText.substring(rng.endOffset));
-        rng.endContainer.nodeValue = endText.substring(0, rng.endOffset);
-        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.after(rng.endContainer, text);
-        for (const range of restRanges) {
-            if (range.startContainer === rng.endContainer) {
-                range.startContainer = text;
-                range.startOffset = range.startOffset - rng.endOffset - diff;
-                if (range.endContainer === rng.endContainer) {
-                    range.endContainer = text;
-                    range.endOffset = range.endOffset - rng.endOffset - diff;
-                }
-            }
-            else {
-                break;
-            }
-        }
-        rng.endOffset = rng.endContainer.nodeValue.length;
-    }
+    normalizeRanges(rng, restRanges, ci);
     let next = rng.startContainer;
     do {
         if (!next) {
@@ -37877,6 +37894,61 @@ function clearSelectionWrappersFromHTML(root) {
 function isSelectionWrapper(node) {
     return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.isElement(node) && node.hasAttribute(TMP_ATTR);
 }
+function checkNativeSelectionMethod(jodit, rng, restRanges) {
+    if (jodit.o.search.useCustomHighlightAPI &&
+        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
+        typeof window.Highlight !== 'undefined') {
+        const ranges = [rng, ...restRanges].map(rng => {
+            const range = jodit.selection.createRange();
+            range.setStart(rng.startContainer, rng.startOffset);
+            range.setEnd(rng.endContainer, rng.endOffset);
+            return range;
+        });
+        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
+        const searchHighlight = new Highlight(...ranges);
+        // @ts-ignore
+        CSS.highlights.clear();
+        // @ts-ignore
+        CSS.highlights.set('jodit-search-result', searchHighlight);
+        restRanges.length = 0;
+        return true;
+    }
+    return false;
+}
+function normalizeRanges(rng, restRanges, ci) {
+    const startText = rng.startContainer.nodeValue;
+    let diff = 0;
+    if (rng.startOffset !== 0) {
+        const text = ci.text(startText.substring(0, rng.startOffset));
+        rng.startContainer.nodeValue = startText.substring(rng.startOffset);
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.before(rng.startContainer, text);
+        if (rng.startContainer === rng.endContainer) {
+            diff = rng.startOffset;
+            rng.endOffset -= diff;
+        }
+        rng.startOffset = 0;
+    }
+    const endText = rng.endContainer.nodeValue;
+    if (rng.endOffset !== endText.length) {
+        const text = ci.text(endText.substring(rng.endOffset));
+        rng.endContainer.nodeValue = endText.substring(0, rng.endOffset);
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.after(rng.endContainer, text);
+        for (const range of restRanges) {
+            if (range.startContainer === rng.endContainer) {
+                range.startContainer = text;
+                range.startOffset = range.startOffset - rng.endOffset - diff;
+                if (range.endContainer === rng.endContainer) {
+                    range.endContainer = text;
+                    range.endOffset = range.endOffset - rng.endOffset - diff;
+                }
+            }
+            else {
+                break;
+            }
+        }
+        rng.endOffset = rng.endContainer.nodeValue.length;
+    }
+}
 
 
 /***/ }),
@@ -42052,38 +42124,10 @@ function tableKeyboardNavigation(editor) {
         .off('.tableKeyboardNavigation')
         .on('keydown.tableKeyboardNavigation', (event) => {
         const { key } = event;
-        if (!WORK_KEYS.has(key)) {
-            return;
-        }
-        const current = editor.s.current();
-        if (!current) {
-            return;
-        }
-        const cell = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.up(current, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isCell, editor.editor);
+        const cell = findCell(editor, key);
         if (!cell) {
             return;
         }
-        const { range } = editor.s;
-        if (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_TAB && current !== cell) {
-            const isNextDirection = key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_RIGHT || key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN;
-            const hasNext = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.call)(!isNextDirection ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.prev : jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.next, current, elm => key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_UP || key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN
-                ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTag(elm, 'br')
-                : Boolean(elm), cell);
-            if ((!isNextDirection &&
-                (hasNext ||
-                    (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_UP &&
-                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(current) &&
-                        range.startOffset !== 0))) ||
-                (isNextDirection &&
-                    (hasNext ||
-                        (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN &&
-                            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(current) &&
-                            current.nodeValue &&
-                            range.startOffset !==
-                                current.nodeValue.length)))) {
-                return;
-            }
-        }
         const tableModule = editor.getInstance(jodit_modules_table_table__WEBPACK_IMPORTED_MODULE_4__/* .Table */ .X, editor.o);
         const table = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.closest(cell, 'table', editor.editor);
         let next = null;
@@ -42141,6 +42185,40 @@ function tableKeyboardNavigation(editor) {
     });
 }
 jodit_core_global__WEBPACK_IMPORTED_MODULE_2__/* .pluginSystem */ .fg.add('tableKeyboardNavigation', tableKeyboardNavigation);
+function findCell(editor, key) {
+    if (!WORK_KEYS.has(key)) {
+        return;
+    }
+    const current = editor.s.current();
+    if (!current) {
+        return;
+    }
+    const cell = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.up(current, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isCell, editor.editor);
+    if (!cell) {
+        return;
+    }
+    const { range } = editor.s;
+    if (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_TAB && current !== cell) {
+        const isNextDirection = key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_RIGHT || key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN;
+        const hasNext = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.call)(!isNextDirection ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.prev : jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.next, current, elm => key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_UP || key === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN
+            ? jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTag(elm, 'br')
+            : Boolean(elm), cell);
+        if ((!isNextDirection &&
+            (hasNext ||
+                (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_UP &&
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(current) &&
+                    range.startOffset !== 0))) ||
+            (isNextDirection &&
+                (hasNext ||
+                    (key !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.KEY_DOWN &&
+                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(current) &&
+                        current.nodeValue &&
+                        range.startOffset !== current.nodeValue.length)))) {
+            return;
+        }
+    }
+    return cell;
+}
 
 
 /***/ }),
@@ -44188,16 +44266,16 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   CommitMode: function() { return /* binding */ CommitMode; },
-/* harmony export */   Jodit: function() { return /* reexport safe */ _jodit__WEBPACK_IMPORTED_MODULE_6__.x; }
+/* harmony export */   Jodit: function() { return /* reexport safe */ _jodit__WEBPACK_IMPORTED_MODULE_0__.x; }
 /* harmony export */ });
-/* harmony import */ var jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9823);
-/* harmony import */ var jodit_plugins_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(88222);
+/* harmony import */ var _jodit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(46173);
+/* harmony import */ var jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9823);
 /* harmony import */ var _core_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17352);
 /* harmony import */ var _core_decorators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(22664);
 /* harmony import */ var _modules___WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(37435);
 /* harmony import */ var _styles_icons___WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79721);
-/* harmony import */ var _jodit__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(46173);
-/* harmony import */ var _languages__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(74470);
+/* harmony import */ var _languages__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(74470);
+/* harmony import */ var jodit_plugins_index__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88222);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -44208,6 +44286,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module jodit
  */
+// eslint-disable-next-line simple-import-sort/imports
 
 
 
@@ -44220,7 +44299,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // copy constants in Jodit
 Object.keys(_core_constants__WEBPACK_IMPORTED_MODULE_2__).forEach((key) => {
-    _jodit__WEBPACK_IMPORTED_MODULE_6__/* .Jodit */ .x[key] = _core_constants__WEBPACK_IMPORTED_MODULE_2__[key];
+    _jodit__WEBPACK_IMPORTED_MODULE_0__/* .Jodit */ .x[key] = _core_constants__WEBPACK_IMPORTED_MODULE_2__[key];
 });
 const esFilter = (key) => key !== '__esModule';
 // Icons
@@ -44235,32 +44314,32 @@ Object.keys(_modules___WEBPACK_IMPORTED_MODULE_4__)
     .forEach((key) => {
     // @ts-ignore
     const module = _modules___WEBPACK_IMPORTED_MODULE_4__[key];
-    const name = (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__/* .isFunction */ .Tn)(module.prototype?.className)
+    const name = (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_1__/* .isFunction */ .Tn)(module.prototype?.className)
         ? module.prototype.className()
         : key;
-    if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__/* .isString */ .Kg)(name)) {
+    if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_1__/* .isString */ .Kg)(name)) {
         console.warn('Module name must be a string', key);
         return;
     }
     // @ts-ignore
-    _jodit__WEBPACK_IMPORTED_MODULE_6__/* .Jodit */ .x.modules[name] = module;
+    _jodit__WEBPACK_IMPORTED_MODULE_0__/* .Jodit */ .x.modules[name] = module;
 });
 // Decorators
 Object.keys(_core_decorators__WEBPACK_IMPORTED_MODULE_3__)
     .filter(esFilter)
     .forEach((key) => {
     // @ts-ignore
-    _jodit__WEBPACK_IMPORTED_MODULE_6__/* .Jodit */ .x.decorators[key] = _core_decorators__WEBPACK_IMPORTED_MODULE_3__[key];
+    _jodit__WEBPACK_IMPORTED_MODULE_0__/* .Jodit */ .x.decorators[key] = _core_decorators__WEBPACK_IMPORTED_MODULE_3__[key];
 });
 ['Confirm', 'Alert', 'Prompt'].forEach((key) => {
     // @ts-ignore
-    _jodit__WEBPACK_IMPORTED_MODULE_6__/* .Jodit */ .x[key] = _modules___WEBPACK_IMPORTED_MODULE_4__[key];
+    _jodit__WEBPACK_IMPORTED_MODULE_0__/* .Jodit */ .x[key] = _modules___WEBPACK_IMPORTED_MODULE_4__[key];
 });
 // Languages
-Object.keys(_languages__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)
+Object.keys(_languages__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .A)
     .filter(esFilter)
     .forEach((key) => {
-    _jodit__WEBPACK_IMPORTED_MODULE_6__/* .Jodit */ .x.lang[key] = _languages__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A[key];
+    _jodit__WEBPACK_IMPORTED_MODULE_0__/* .Jodit */ .x.lang[key] = _languages__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .A[key];
 });
 
 class CommitMode {