jodit-pro 4.2.23 → 4.2.24

package/es2018/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.2.23
+ * Version: v4.2.24
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2450,7 +2450,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.23";
+const APP_VERSION = "4.2.24";
 // prettier-ignore
 const ES = "es2018";
 const IS_ES_MODERN = true;
@@ -2612,8 +2612,8 @@ const KEY_ALIASES = {
     option: 'alt',
     return: 'enter',
     right: 'arrowright',
-    space: ' ',
-    spacebar: ' ',
+    space: 'space',
+    spacebar: 'space',
     up: 'arrowup',
     win: 'meta',
     windows: 'meta'
@@ -3575,11 +3575,17 @@ class Dom {
     }
     static replace(elm, newTagName, create, withAttributes = false, notMoveContent = false) {
         if ((0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__/* .isHTML */ .AH)(newTagName)) {
+            void 0;
             newTagName = create.fromHTML(newTagName);
         }
-        const tag = (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__/* .isString */ .Kg)(newTagName)
-            ? create.element(newTagName)
-            : newTagName;
+        let tag;
+        if ((0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__/* .isString */ .Kg)(newTagName)) {
+            void 0;
+            tag = create.element(newTagName);
+        }
+        else {
+            tag = newTagName;
+        }
         if (!notMoveContent) {
             while (elm.firstChild) {
                 tag.appendChild(elm.firstChild);
@@ -5232,7 +5238,8 @@ function getContainer(jodit, classFunc, tag = 'div', createInsideEditor = false)
     const data = boxes.get(jodit) || {}, key = name + tag;
     const view = (0,jodit_core_helpers_checker_is_view_object__WEBPACK_IMPORTED_MODULE_6__/* .isViewObject */ .h)(jodit) ? jodit : jodit.j;
     if (!data[key]) {
-        let c = view.c, body = (0,jodit_core_helpers_checker_is_jodit_object__WEBPACK_IMPORTED_MODULE_7__/* .isJoditObject */ .y)(jodit) && jodit.o.shadowRoot
+        let c = view.c;
+        let body = (0,jodit_core_helpers_checker_is_jodit_object__WEBPACK_IMPORTED_MODULE_7__/* .isJoditObject */ .y)(jodit) && jodit.o.shadowRoot
             ? jodit.o.shadowRoot
             : jodit.od.body;
         if (createInsideEditor &&
@@ -5252,6 +5259,7 @@ function getContainer(jodit, classFunc, tag = 'div', createInsideEditor = false)
         body.appendChild(box);
         data[key] = box;
         jodit.hookStatus('beforeDestruct', () => {
+            view.events.off(box);
             _dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.safeRemove(box);
             delete data[key];
             if (Object.keys(data).length) {
@@ -5259,6 +5267,7 @@ function getContainer(jodit, classFunc, tag = 'div', createInsideEditor = false)
             }
         });
         boxes.set(jodit, data);
+        view.events.fire('getContainer', box);
     }
     data[key].classList.remove('jodit_theme_default', 'jodit_theme_dark');
     data[key].classList.add(`jodit_theme_${view.o.theme || 'default'}`);
@@ -7059,7 +7068,8 @@ function normalizeKeyAliases(keys) {
         ctrl: 2,
         control: 2,
         alt: 3,
-        shift: 4
+        shift: 4,
+        space: 5
     };
     return keys
         .replace(/\+\+/g, '+add')
@@ -14137,15 +14147,21 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
         if (!view.o.textIcons &&
             view.o.showTooltip &&
             !view.o.useNativeTooltip) {
+            this.j.e.on('getContainer', (box) => {
+                this.__onAttach(box);
+            });
             view.hookStatus(jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .STATUSES */ .f.ready, () => {
-                // TODO Move it inside __show method. Now it is here because testcase failed with capturing
-                (0,jodit_core_global__WEBPACK_IMPORTED_MODULE_3__/* .getContainer */ .My)(this.j, UITooltip_1).appendChild(this.container);
-                view.e.on(view.container, 'mouseenter.tooltip', this.__onMouseEnter, {
-                    capture: true
-                });
+                this.__onAttach(this.j.container);
             });
         }
     }
+    __onAttach(container) {
+        // TODO Move it inside __show method. Now it is here because testcase failed with capturing
+        (0,jodit_core_global__WEBPACK_IMPORTED_MODULE_3__/* .getContainer */ .My)(this.j, UITooltip_1).appendChild(this.container);
+        this.j.e.on(container, 'mouseenter.tooltip', this.__onMouseEnter, {
+            capture: true
+        });
+    }
     __addListenersOnEnter() {
         if (this.__listenClose) {
             return;
@@ -23333,46 +23349,39 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
     removeRow(table, rowIndex) {
         return Table.__removeRow(table, rowIndex);
     }
-    static __appendColumn(table, j, after, create) {
+    /**
+     * Insert column before / after all the columns containing the selected cells
+     */
+    appendColumn(table, selectedCell, insertAfter = true) {
         const box = Table.__formalMatrix(table);
-        let i;
-        if (j === undefined || j < 0) {
-            j = Table.__getColumnsCount(table) - 1;
-        }
-        for (i = 0; i < box.length; i += 1) {
-            const cell = create.element('td');
-            const td = box[i][j];
-            let added = false;
-            if (after) {
-                if ((box[i] && td && j + 1 >= box[i].length) ||
-                    td !== box[i][j + 1]) {
-                    if (td.nextSibling) {
-                        jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.before(td.nextSibling, cell);
-                    }
-                    else {
-                        td.parentNode && td.parentNode.appendChild(cell);
-                    }
-                    added = true;
+        if (!insertAfter && jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.isCell(selectedCell.previousElementSibling)) {
+            return this.appendColumn(table, selectedCell.previousElementSibling, true);
+        }
+        const columnIndex = insertAfter
+            ? selectedCell.cellIndex + ((selectedCell.colSpan || 1) - 1)
+            : selectedCell.cellIndex;
+        const newColumnIndex = insertAfter ? columnIndex + 1 : columnIndex;
+        for (let i = 0; i < box.length;) {
+            const cells = box[i];
+            if (cells[columnIndex] !== cells[newColumnIndex] ||
+                columnIndex === newColumnIndex) {
+                const cell = this.j.createInside.element('td');
+                if (insertAfter) {
+                    jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.after(cells[columnIndex], cell);
                 }
-            }
-            else {
-                if (j - 1 < 0 ||
-                    (box[i][j] !== box[i][j - 1] && box[i][j].parentNode)) {
-                    jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.before(box[i][j], cell);
-                    added = true;
+                else {
+                    jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.before(cells[columnIndex], cell);
+                }
+                if (cells[columnIndex].rowSpan > 1) {
+                    cell.rowSpan = cells[columnIndex].rowSpan;
                 }
             }
-            if (!added) {
-                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'colspan', parseInt((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.attr)(box[i][j], 'colspan') || '1', 10) + 1);
+            else {
+                cells[columnIndex].colSpan += 1;
             }
+            i += cells[columnIndex].rowSpan || 1;
         }
     }
-    /**
-     * Insert column before / after all the columns containing the selected cells
-     */
-    appendColumn(table, j, after) {
-        return Table.__appendColumn(table, j, after, this.j.createInside);
-    }
     static __removeColumn(table, j) {
         const box = Table.__formalMatrix(table);
         let dec;
@@ -23590,7 +23599,7 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
                 alreadyMerged.delete(first);
                 Table.__unmark(__marked);
                 Table.__normalizeTable(table);
-                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.toArray)(table.rows).forEach((tr, index) => {
+                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_5__.toArray)(table.rows).forEach(tr => {
                     if (!tr.cells.length) {
                         jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__/* .Dom */ .J.safeRemove(tr);
                     }
@@ -23599,7 +23608,7 @@ class Table extends jodit_core_component__WEBPACK_IMPORTED_MODULE_0__/* .ViewCom
         }
     }
     /**
-     * It combines all of the selected cells into one. The contents of the cells will also be combined
+     * It combines all the selected cells into one. The contents of the cells will also be combined
      */
     mergeSelected(table) {
         return Table.__mergeSelected(table, this.j);
@@ -25955,7 +25964,9 @@ class addNewLine extends jodit_modules__WEBPACK_IMPORTED_MODULE_3__.Plugin {
         editor.e
             .off(editor.editor, '.' + ns)
             .off(editor.container, '.' + ns)
+            .off('.' + ns)
             .on([editor.ow, editor.ew, editor.editor], 'scroll' + '.' + ns, this.__hideForce)
+            .on('finishedCleanHTMLWorker' + '.' + ns, this.__hideForce)
             .on(editor.editor, 'click' + '.' + ns, this.__hide)
             .on(editor.container, 'mouseleave' + '.' + ns, this.__hide)
             .on(editor.editor, 'mousemove' + '.' + ns, this.__onMouseMove);
@@ -26043,7 +26054,8 @@ class addNewLine extends jodit_modules__WEBPACK_IMPORTED_MODULE_3__.Plugin {
         jodit_modules__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(this.__line);
         this.j.e
             .off([this.j.ow, this.j.ew, this.j.editor], '.' + ns)
-            .off(this.j.container, '.' + ns);
+            .off(this.j.container, '.' + ns)
+            .off('.' + ns);
     }
 }
 (0,tslib__WEBPACK_IMPORTED_MODULE_5__/* .__decorate */ .Cg)([
@@ -28230,13 +28242,21 @@ function allowAttributes(jodit, nodeElm, hadEffect, allow) {
  */
 
 
+const TABLE_CONTAINER_TAGS = new Set([
+    'table',
+    'tbody',
+    'thead',
+    'tfoot',
+    'tr'
+]);
 /**
  * @private
  */
 function fillEmptyParagraph(jodit, nodeElm, hadEffect) {
     if (jodit.o.cleanHTML.fillEmptyParagraph &&
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isBlock(nodeElm) &&
-        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isEmpty(nodeElm, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS)) {
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isEmpty(nodeElm, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS) &&
+        !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTag(nodeElm, TABLE_CONTAINER_TAGS)) {
         const br = jodit.createInside.element('br');
         nodeElm.appendChild(br);
         return true;
@@ -31467,7 +31487,8 @@ class hotkeys extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_3__/* .Plugin *
     constructor() {
         super(...arguments);
         this.onKeyPress = (event) => {
-            const special = this.specialKeys[event.which], character = (event.key || String.fromCharCode(event.which)).toLowerCase();
+            const special = this.specialKeys[event.which];
+            const character = (event.key || String.fromCharCode(event.which)).toLowerCase();
             const modif = [special || character];
             ['alt', 'ctrl', 'shift', 'meta'].forEach(specialKey => {
                 if (event[specialKey + 'Key'] && special !== specialKey) {
@@ -31561,7 +31582,8 @@ class hotkeys extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_3__/* .Plugin *
             }
         })
             .on('keydown.hotkeys', (event) => {
-            const shortcut = this.onKeyPress(event), stop = {
+            const shortcut = this.onKeyPress(event);
+            const stop = {
                 shouldStop: true
             };
             const resultOfFire = this.j.e.fire(shortcut + '.hotkey', event.type, stop);
@@ -39914,7 +39936,7 @@ class selectCells extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__/* .Plug
                         break;
                     case 'addcolumnafter':
                     case 'addcolumnbefore':
-                        this.__tableModule.appendColumn(table, cell.cellIndex, command === 'addcolumnafter');
+                        this.__tableModule.appendColumn(table, cell, command === 'addcolumnafter');
                         break;
                     case 'addrowafter':
                     case 'addrowbefore':
@@ -43273,6 +43295,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.controls.tab
         }
     },
     popup: (editor, current, close, button) => {
+        editor.editor.normalize();
+        const snapshot = editor.history.snapshot.make();
         const control = button.control;
         const default_rows_count = control.data && control.data.rows ? control.data.rows : 10, default_cols_count = control.data && control.data.cols ? control.data.cols : 10;
         const generateExtraClasses = () => {
@@ -43365,10 +43389,24 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.controls.tab
                     table.classList.add(className);
                 });
             });
-            if (editor.editor.firstChild) {
-                editor.s.insertNode(crt.text('\n'), false, false);
+            editor.s.restore();
+            editor.s.removeMarkers();
+            editor.editor.normalize();
+            editor.history.snapshot.restore(snapshot);
+            const block = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.furthest(editor.s.current(), jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.isBlock, editor.editor);
+            if (block && jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.isEmpty(block)) {
+                jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.replace(block, table, undefined, false, true);
+            }
+            else {
+                if (block) {
+                    const fake = crt.text('\n');
+                    jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.after(block, fake);
+                    jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.after(fake, table);
+                }
+                else {
+                    editor.s.insertNode(table, false);
+                }
             }
-            editor.s.insertNode(table, false);
             if (first_td) {
                 editor.s.setCursorIn(first_td);
                 (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.scrollIntoViewIfNeeded)(first_td, editor.editor, editor.ed);