jodit 4.2.25 → 4.2.27

package/es5/plugins/debug/debug.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.25
+ * Version: v4.2.27
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/debug/debug.min.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.25
+ * Version: v4.2.27
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.css

@@ -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.25
+ * Version: v4.2.27
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.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.25
+ * Version: v4.2.27
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.min.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.25
+ * Version: v4.2.27
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/esm/core/constants.js

@@ -3,7 +3,7 @@
  * 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
  */
-export const APP_VERSION = "4.2.25";
+export const APP_VERSION = "4.2.27";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;
@@ -165,8 +165,8 @@ export const KEY_ALIASES = {
     option: 'alt',
     return: 'enter',
     right: 'arrowright',
-    space: ' ',
-    spacebar: ' ',
+    space: 'space',
+    spacebar: 'space',
     up: 'arrowup',
     win: 'meta',
     windows: 'meta'

package/esm/core/dom/dom.d.ts

@@ -45,8 +45,9 @@ export declare class Dom {
      * // Replace the first <span> element to the < p >
      * ```
      */
+    static replace<T extends HTMLElement>(elm: Node, newTagName: HTMLTagNames): T;
     static replace<T extends HTMLElement>(elm: Node, newTagName: HTMLTagNames, create: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
-    static replace<T extends Node>(elm: Node, newTagName: T | string, create: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
+    static replace<T extends Node>(elm: Node, newTagName: T | string, create?: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
     /**
      * Checks whether the Node text and blank (in this case it may contain invisible auxiliary characters ,
      * it is also empty )

package/esm/core/dom/dom.js

@@ -8,7 +8,7 @@ import { INSEPARABLE_TAGS, LIST_TAGS, NO_EMPTY_TAGS, TEMP_ATTR } from "../consta
 import { toArray } from "../helpers/array/to-array.js";
 import { isArray, isFunction, isHTML, isMarker, isSet, isString, isVoid } from "../helpers/checker/index.js";
 import { trim } from "../helpers/string/trim.js";
-import { $$, attr, call, css, dataBind, error } from "../helpers/utils/index.js";
+import { $$, assert, attr, call, css, dataBind, error } from "../helpers/utils/index.js";
 /**
  * Module for working with DOM
  */
@@ -115,11 +115,17 @@ export class Dom {
     }
     static replace(elm, newTagName, create, withAttributes = false, notMoveContent = false) {
         if (isHTML(newTagName)) {
+            assert(create, 'Need create instance for new tag');
             newTagName = create.fromHTML(newTagName);
         }
-        const tag = isString(newTagName)
-            ? create.element(newTagName)
-            : newTagName;
+        let tag;
+        if (isString(newTagName)) {
+            assert(create, 'Need create instance for new tag');
+            tag = create.element(newTagName);
+        }
+        else {
+            tag = newTagName;
+        }
         if (!notMoveContent) {
             while (elm.firstChild) {
                 tag.appendChild(elm.firstChild);

package/esm/core/global.js

@@ -55,7 +55,8 @@ export function getContainer(jodit, classFunc, tag = 'div', createInsideEditor =
     const data = boxes.get(jodit) || {}, key = name + tag;
     const view = isViewObject(jodit) ? jodit : jodit.j;
     if (!data[key]) {
-        let c = view.c, body = isJoditObject(jodit) && jodit.o.shadowRoot
+        let c = view.c;
+        let body = isJoditObject(jodit) && jodit.o.shadowRoot
             ? jodit.o.shadowRoot
             : jodit.od.body;
         if (createInsideEditor &&
@@ -75,6 +76,7 @@ export function getContainer(jodit, classFunc, tag = 'div', createInsideEditor =
         body.appendChild(box);
         data[key] = box;
         jodit.hookStatus('beforeDestruct', () => {
+            view.events.off(box);
             Dom.safeRemove(box);
             delete data[key];
             if (Object.keys(data).length) {
@@ -82,6 +84,7 @@ export function getContainer(jodit, classFunc, tag = 'div', createInsideEditor =
             }
         });
         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'}`);

package/esm/core/helpers/normalize/normalize-key-aliases.js

@@ -15,7 +15,8 @@ export function normalizeKeyAliases(keys) {
         ctrl: 2,
         control: 2,
         alt: 3,
-        shift: 4
+        shift: 4,
+        space: 5
     };
     return keys
         .replace(/\+\+/g, '+add')

package/esm/core/ui/button/tooltip/tooltip.d.ts

@@ -16,6 +16,7 @@ export declare class UITooltip extends UIElement {
     className(): string;
     protected render(): string;
     constructor(view: IViewBased);
+    private __onAttach;
     private __listenClose;
     private __addListenersOnEnter;
     private __removeListenersOnLeave;

package/esm/core/ui/button/tooltip/tooltip.js

@@ -51,15 +51,21 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
         if (!view.o.textIcons &&
             view.o.showTooltip &&
             !view.o.useNativeTooltip) {
+            this.j.e.on('getContainer', (box) => {
+                this.__onAttach(box);
+            });
             view.hookStatus(STATUSES.ready, () => {
-                // TODO Move it inside __show method. Now it is here because testcase failed with capturing
-                getContainer(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
+        getContainer(this.j, UITooltip_1).appendChild(this.container);
+        this.j.e.on(container, 'mouseenter.tooltip', this.__onMouseEnter, {
+            capture: true
+        });
+    }
     __addListenersOnEnter() {
         if (this.__listenClose) {
             return;

package/esm/modules/table/table.d.ts

@@ -62,11 +62,10 @@ export declare class Table extends ViewComponent<IJodit> {
      * Remove row
      */
     removeRow(table: HTMLTableElement, rowIndex: number): void;
-    private static __appendColumn;
     /**
      * Insert column before / after all the columns containing the selected cells
      */
-    appendColumn(table: HTMLTableElement, j: number, after: boolean): void;
+    appendColumn(table: HTMLTableElement, selectedCell: HTMLTableCellElement, insertAfter?: boolean): void;
     private static __removeColumn;
     /**
      * Remove column by index
@@ -86,7 +85,7 @@ export declare class Table extends ViewComponent<IJodit> {
     normalizeTable(table: HTMLTableElement): void;
     private static __mergeSelected;
     /**
-     * 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: HTMLTableElement): void;
     private static __splitHorizontal;

package/esm/modules/table/table.js

@@ -254,46 +254,39 @@ export class Table extends ViewComponent {
     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;
+        if (!insertAfter && Dom.isCell(selectedCell.previousElementSibling)) {
+            return this.appendColumn(table, selectedCell.previousElementSibling, true);
         }
-        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) {
-                        Dom.before(td.nextSibling, cell);
-                    }
-                    else {
-                        td.parentNode && td.parentNode.appendChild(cell);
-                    }
-                    added = 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) {
+                    Dom.after(cells[columnIndex], cell);
                 }
-            }
-            else {
-                if (j - 1 < 0 ||
-                    (box[i][j] !== box[i][j - 1] && box[i][j].parentNode)) {
-                    Dom.before(box[i][j], cell);
-                    added = true;
+                else {
+                    Dom.before(cells[columnIndex], cell);
+                }
+                if (cells[columnIndex].rowSpan > 1) {
+                    cell.rowSpan = cells[columnIndex].rowSpan;
                 }
             }
-            if (!added) {
-                attr(box[i][j], 'colspan', parseInt(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;
@@ -511,7 +504,7 @@ export class Table extends ViewComponent {
                 alreadyMerged.delete(first);
                 Table.__unmark(__marked);
                 Table.__normalizeTable(table);
-                toArray(table.rows).forEach((tr, index) => {
+                toArray(table.rows).forEach(tr => {
                     if (!tr.cells.length) {
                         Dom.safeRemove(tr);
                     }
@@ -520,7 +513,7 @@ export class Table extends ViewComponent {
         }
     }
     /**
-     * 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);

package/esm/plugins/add-new-line/add-new-line.js

@@ -120,7 +120,9 @@ export class addNewLine extends 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);
@@ -208,7 +210,8 @@ export class addNewLine extends Plugin {
         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);
     }
 }
 __decorate([

package/esm/plugins/clean-html/helpers/visitor/filters/fill-empty-paragraph.js

@@ -5,13 +5,21 @@
  */
 import { INSEPARABLE_TAGS } from "../../../../../core/constants.js";
 import { Dom } from "../../../../../core/dom/dom.js";
+const TABLE_CONTAINER_TAGS = new Set([
+    'table',
+    'tbody',
+    'thead',
+    'tfoot',
+    'tr'
+]);
 /**
  * @private
  */
 export function fillEmptyParagraph(jodit, nodeElm, hadEffect) {
     if (jodit.o.cleanHTML.fillEmptyParagraph &&
         Dom.isBlock(nodeElm) &&
-        Dom.isEmpty(nodeElm, INSEPARABLE_TAGS)) {
+        Dom.isEmpty(nodeElm, INSEPARABLE_TAGS) &&
+        !Dom.isTag(nodeElm, TABLE_CONTAINER_TAGS)) {
         const br = jodit.createInside.element('br');
         nodeElm.appendChild(br);
         return true;

package/esm/plugins/hotkeys/hotkeys.js

@@ -15,7 +15,8 @@ export class hotkeys extends 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) {
@@ -109,7 +110,8 @@ export class hotkeys extends 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);

package/esm/plugins/select-cells/select-cells.js

@@ -283,7 +283,7 @@ export class selectCells extends Plugin {
                         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':

package/esm/plugins/table/config.js

@@ -25,6 +25,8 @@ Config.prototype.controls.table = {
         }
     },
     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 = () => {
@@ -117,10 +119,24 @@ Config.prototype.controls.table = {
                     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 = Dom.furthest(editor.s.current(), Dom.isBlock, editor.editor);
+            if (block && Dom.isEmpty(block)) {
+                Dom.replace(block, table, undefined, false, true);
+            }
+            else {
+                if (block) {
+                    const fake = crt.text('\n');
+                    Dom.after(block, fake);
+                    Dom.after(fake, table);
+                }
+                else {
+                    editor.s.insertNode(table, false);
+                }
             }
-            editor.s.insertNode(table, false);
             if (first_td) {
                 editor.s.setCursorIn(first_td);
                 scrollIntoViewIfNeeded(first_td, editor.editor, editor.ed);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.2.25",
+	"version": "4.2.27",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/core/dom/dom.d.ts

@@ -45,8 +45,9 @@ export declare class Dom {
      * // Replace the first <span> element to the < p >
      * ```
      */
+    static replace<T extends HTMLElement>(elm: Node, newTagName: HTMLTagNames): T;
     static replace<T extends HTMLElement>(elm: Node, newTagName: HTMLTagNames, create: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
-    static replace<T extends Node>(elm: Node, newTagName: T | string, create: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
+    static replace<T extends Node>(elm: Node, newTagName: T | string, create?: ICreate, withAttributes?: boolean, notMoveContent?: boolean): T;
     /**
      * Checks whether the Node text and blank (in this case it may contain invisible auxiliary characters ,
      * it is also empty )

package/types/core/ui/button/tooltip/tooltip.d.ts

@@ -16,6 +16,7 @@ export declare class UITooltip extends UIElement {
     className(): string;
     protected render(): string;
     constructor(view: IViewBased);
+    private __onAttach;
     private __listenClose;
     private __addListenersOnEnter;
     private __removeListenersOnLeave;

package/types/modules/table/table.d.ts

@@ -62,11 +62,10 @@ export declare class Table extends ViewComponent<IJodit> {
      * Remove row
      */
     removeRow(table: HTMLTableElement, rowIndex: number): void;
-    private static __appendColumn;
     /**
      * Insert column before / after all the columns containing the selected cells
      */
-    appendColumn(table: HTMLTableElement, j: number, after: boolean): void;
+    appendColumn(table: HTMLTableElement, selectedCell: HTMLTableCellElement, insertAfter?: boolean): void;
     private static __removeColumn;
     /**
      * Remove column by index
@@ -86,7 +85,7 @@ export declare class Table extends ViewComponent<IJodit> {
     normalizeTable(table: HTMLTableElement): void;
     private static __mergeSelected;
     /**
-     * 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: HTMLTableElement): void;
     private static __splitHorizontal;