jodit 4.2.12 → 4.2.15

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.12
+ * Version: v4.2.15
  * 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.12
+ * Version: v4.2.15
  * 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.12
+ * Version: v4.2.15
  * 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.12
+ * Version: v4.2.15
  * 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.12
+ * Version: v4.2.15
  * 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.12";
+export const APP_VERSION = "4.2.15";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;

package/esm/core/decorators/autobind/autobind.d.ts

@@ -3,4 +3,9 @@
  * 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
  */
+/**
+ * [[include:core/decorators/autobind/README.md]]
+ * @packageDocumentation
+ * @module decorators/autobind
+ */
 export { default as autobind } from "autobind-decorator";

package/esm/core/decorators/autobind/autobind.js

@@ -3,4 +3,9 @@
  * 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
  */
+/**
+ * [[include:core/decorators/autobind/README.md]]
+ * @packageDocumentation
+ * @module decorators/autobind
+ */
 export { default as autobind } from "autobind-decorator";

package/esm/core/selection/helpers/index.d.ts

@@ -3,8 +3,14 @@
  * 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
  */
-/**
- * @module selection
- */
 export * from "./move-node-inside-start";
 export * from "./move-the-node-along-the-edge-outward";
+/**
+ * Check if the cursor is at the edge of the string
+ * @private
+ */
+export declare function cursorInTheEdgeOfString(container: Node, offset: number, start: boolean, end: boolean): boolean;
+export declare function findCorrectCurrentNode(node: Node, range: Range, rightMode: boolean, isCollapsed: boolean, checkChild: boolean, child: (nd: Node) => Node | null): {
+    node: Node;
+    rightMode: boolean;
+};

package/esm/core/selection/helpers/index.js

@@ -6,5 +6,53 @@
 /**
  * @module selection
  */
+import { INVISIBLE_SPACE_REG_EXP_END as INV_END, INVISIBLE_SPACE_REG_EXP_START as INV_START } from "../../constants.js";
+import { Dom } from "../../dom/dom.js";
 export * from "./move-node-inside-start.js";
 export * from "./move-the-node-along-the-edge-outward.js";
+/**
+ * Check if the cursor is at the edge of the string
+ * @private
+ */
+export function cursorInTheEdgeOfString(container, offset, start, end) {
+    const text = container.nodeValue?.length ? container.nodeValue : '';
+    if (end && text.replace(INV_END(), '').length > offset) {
+        return true;
+    }
+    const inv = INV_START().exec(text);
+    return start && ((inv && inv[0].length < offset) || (!inv && offset > 0));
+}
+export 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 && !Dom.isText(node)) {
+        // test Current method - Cursor in the left of some SPAN
+        if (!rightMode && Dom.isText(node.previousSibling)) {
+            node = node.previousSibling;
+        }
+        else if (checkChild) {
+            let current = child(node);
+            while (current) {
+                if (current && Dom.isText(current)) {
+                    node = current;
+                    break;
+                }
+                current = child(current);
+            }
+        }
+    }
+    if (node && !isCollapsed && !Dom.isText(node)) {
+        let leftChild = node, rightChild = node;
+        do {
+            leftChild = leftChild.firstChild;
+            rightChild = rightChild.lastChild;
+        } while (leftChild && rightChild && !Dom.isText(leftChild));
+        if (leftChild === rightChild && leftChild && Dom.isText(leftChild)) {
+            node = leftChild;
+        }
+    }
+    return { node, rightMode };
+}

package/esm/core/selection/selection.d.ts

@@ -125,10 +125,11 @@ export declare class Selection implements ISelect {
     /**
      * Returns the current element under the cursor inside editor
      */
-    current(checkChild?: boolean): null | Node;
+    current(checkChild?: boolean): Nullable<Node>;
     /**
      * 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
      */
@@ -137,6 +138,7 @@ export declare class Selection implements ISelect {
      * 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"/>');
@@ -148,6 +150,7 @@ export declare class Selection implements ISelect {
      *
      * @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: string | HTMLImageElement, styles?: Nullable<IDictionary<string>>, defaultWidth?: Nullable<number | string>): void;
     /**
@@ -188,6 +191,7 @@ export declare class Selection implements ISelect {
     private setCursorNearWith;
     /**
      * Set cursor in the node
+     * @param node - Node element
      * @param inStart - set cursor in start of element
      */
     setCursorIn(node: Node, inStart?: boolean): Node;
@@ -197,6 +201,7 @@ export declare class Selection implements ISelect {
     selectRange(range: Range, focus?: boolean): this;
     /**
      * Select node
+     * @param node - Node element
      * @param inward - select all inside
      */
     select(node: Node | HTMLElement | HTMLTableElement | HTMLTableCellElement, inward?: boolean): this;

package/esm/core/selection/selection.js

@@ -14,7 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import * as consts from "../constants.js";
-import { INSEPARABLE_TAGS, INVISIBLE_SPACE, INVISIBLE_SPACE_REG_EXP_END as INV_END, INVISIBLE_SPACE_REG_EXP_START as INV_START, IS_PROD } from "../constants.js";
+import { INSEPARABLE_TAGS, INVISIBLE_SPACE, IS_PROD } from "../constants.js";
 import { autobind } from "../decorators/index.js";
 import { Dom } from "../dom/dom.js";
 import { $$, attr, call, css, error, getScrollParent, scrollIntoViewIfNeeded, size, toArray } from "../helpers/index.js";
@@ -23,6 +23,7 @@ import { assert } from "../helpers/utils/assert.js";
 import { moveTheNodeAlongTheEdgeOutward } from "./helpers/move-the-node-along-the-edge-outward.js";
 import "./interface.js";
 import { CommitStyle } from "./style/commit-style.js";
+import { cursorInTheEdgeOfString, findCorrectCurrentNode } from "./helpers/index.js";
 export class Selection {
     constructor(jodit) {
         this.jodit = jodit;
@@ -405,63 +406,35 @@ export class Selection {
      * Returns the current element under the cursor inside editor
      */
     current(checkChild = true) {
-        if (this.j.getRealMode() === consts.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 (Dom.isTag(node, 'br') && sel.isCollapsed) {
-                return node;
-            }
-            if (!Dom.isText(node)) {
-                node = range.startContainer.childNodes[range.startOffset];
-                if (!node) {
-                    node =
-                        range.startContainer.childNodes[range.startOffset - 1];
-                    rightMode = true;
-                }
-                if (node && sel.isCollapsed && !Dom.isText(node)) {
-                    // test Current method - Cursor in the left of some SPAN
-                    if (!rightMode && Dom.isText(node.previousSibling)) {
-                        node = node.previousSibling;
-                    }
-                    else if (checkChild) {
-                        let current = child(node);
-                        while (current) {
-                            if (current && Dom.isText(current)) {
-                                node = current;
-                                break;
-                            }
-                            current = child(current);
-                        }
-                    }
-                }
-                if (node && !sel.isCollapsed && !Dom.isText(node)) {
-                    let leftChild = node, rightChild = node;
-                    do {
-                        leftChild = leftChild.firstChild;
-                        rightChild = rightChild.lastChild;
-                    } while (leftChild && rightChild && !Dom.isText(leftChild));
-                    if (leftChild === rightChild &&
-                        leftChild &&
-                        Dom.isText(leftChild)) {
-                        node = leftChild;
-                    }
-                }
-            }
-            // check - cursor inside editor
-            if (node && Dom.isOrContains(this.area, node)) {
-                return node;
-            }
+        if (this.j.getRealMode() !== consts.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 (Dom.isTag(node, 'br') && sel.isCollapsed) {
+            return node;
+        }
+        if (!Dom.isText(node)) {
+            const ret = findCorrectCurrentNode(node, range, rightMode, sel.isCollapsed, checkChild, child);
+            node = ret.node;
+            rightMode = ret.rightMode;
+        }
+        // check - cursor inside editor
+        if (node && Dom.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
      */
@@ -523,6 +496,7 @@ export 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"/>');
@@ -566,6 +540,7 @@ export 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 = isString(url) ? this.j.createInside.element('img') : url;
@@ -620,74 +595,81 @@ export class Selection {
      */
     eachSelection(callback) {
         const sel = this.sel;
-        if (sel && sel.rangeCount) {
-            const range = sel.getRangeAt(0);
-            let root = range.commonAncestorContainer;
-            if (!Dom.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 (Dom.isText(start) &&
-                start === range.startContainer &&
-                range.startOffset === start.nodeValue?.length &&
-                start.nextSibling) {
-                start = start.nextSibling;
+        if (!sel || !sel.rangeCount) {
+            return;
+        }
+        const range = sel.getRangeAt(0);
+        let root = range.commonAncestorContainer;
+        if (!Dom.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 (Dom.isText(start) &&
+            start === range.startContainer &&
+            range.startOffset === start.nodeValue?.length &&
+            start.nextSibling) {
+            start = start.nextSibling;
+        }
+        if (Dom.isText(end) &&
+            end === range.endContainer &&
+            range.endOffset === 0 &&
+            end.previousSibling) {
+            end = end.previousSibling;
+        }
+        const checkElm = (node) => {
+            if (node &&
+                node !== root &&
+                !Dom.isEmptyTextNode(node) &&
+                !isMarker(node)) {
+                nodes.push(node);
             }
-            if (Dom.isText(end) &&
-                end === range.endContainer &&
-                range.endOffset === 0 &&
-                end.previousSibling) {
-                end = end.previousSibling;
+        };
+        checkElm(start);
+        if (start !== end && Dom.isOrContains(root, start, true)) {
+            Dom.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 (!Dom.isOrContains(this.j.editor, current, true)) {
+                return;
             }
-            const checkElm = (node) => {
-                if (node &&
-                    node !== root &&
-                    !Dom.isEmptyTextNode(node) &&
-                    !isMarker(node)) {
-                    nodes.push(node);
-                }
-            };
-            checkElm(start);
-            if (start !== end && Dom.isOrContains(root, start, true)) {
-                Dom.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);
+            if (current.nodeName.match(/^(UL|OL)$/)) {
+                return toArray(current.childNodes).forEach(forEvery);
             }
-            const forEvery = (current) => {
-                if (!Dom.isOrContains(this.j.editor, current, true)) {
-                    return;
-                }
-                if (current.nodeName.match(/^(UL|OL)$/)) {
-                    return toArray(current.childNodes).forEach(forEvery);
+            if (Dom.isTag(current, 'li')) {
+                if (current.firstChild) {
+                    current = current.firstChild;
                 }
-                if (Dom.isTag(current, 'li')) {
-                    if (current.firstChild) {
-                        current = current.firstChild;
-                    }
-                    else {
-                        const currentB = this.j.createInside.text(INVISIBLE_SPACE);
-                        current.appendChild(currentB);
-                        current = currentB;
-                    }
+                else {
+                    const currentB = this.j.createInside.text(INVISIBLE_SPACE);
+                    current.appendChild(currentB);
+                    current = currentB;
                 }
-                callback(current);
-            };
-            if (nodes.length === 0 && Dom.isEmptyTextNode(start)) {
+            }
+            callback(current);
+        };
+        if (nodes.length === 0) {
+            if (Dom.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
@@ -714,13 +696,7 @@ export class Selection {
                 this.j.e.fire('isInvisibleForCursor', elm) === true));
         // check right offset
         if (Dom.isText(container)) {
-            const text = container.nodeValue?.length ? container.nodeValue : '';
-            if (end && text.replace(INV_END(), '').length > offset) {
-                return false;
-            }
-            const inv = INV_START().exec(text);
-            if (start &&
-                ((inv && inv[0].length < offset) || (!inv && offset > 0))) {
+            if (cursorInTheEdgeOfString(container, offset, start, end)) {
                 return false;
             }
         }
@@ -808,6 +784,7 @@ export class Selection {
     }
     /**
      * Set cursor in the node
+     * @param node - Node element
      * @param inStart - set cursor in start of element
      */
     setCursorIn(node, inStart = false) {
@@ -868,6 +845,7 @@ export class Selection {
     }
     /**
      * Select node
+     * @param node - Node element
      * @param inward - select all inside
      */
     select(node, inward = false) {

package/esm/index.d.ts

@@ -3,8 +3,13 @@
  * 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
  */
-import "./plugins/index";
+/**
+ * [[include:README.md]]
+ * @packageDocumentation
+ * @module jodit
+ */
 import { Jodit as DefaultJodit } from "./jodit";
+import "./plugins/index";
 
 
 export { DefaultJodit as Jodit };

package/esm/index.js

@@ -8,14 +8,15 @@
  * @packageDocumentation
  * @module jodit
  */
+// eslint-disable-next-line simple-import-sort/imports
+import { Jodit as DefaultJodit } from "./jodit.js";
 import { isFunction, isString } from "./core/helpers/checker/index.js";
-import "./plugins/index.js";
 import * as constants from "./core/constants.js";
 import * as decorators from "./core/decorators/index.js";
 import * as Modules from "./modules/index.js";
 import * as Icons from "./styles/icons/index.js";
-import { Jodit as DefaultJodit } from "./jodit.js";
 import Languages from "./languages.js";
+import "./plugins/index.js";
 // copy constants in Jodit
 Object.keys(constants).forEach((key) => {
     DefaultJodit[key] = constants[key];

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

@@ -38,6 +38,7 @@ export declare class Table extends ViewComponent<IJodit> {
     private static __formalMatrix;
     /**
      * Generate formal table martix columns*rows
+     * @param table - Working table
      * @param callback - if return false cycle break
      */
     formalMatrix(table: HTMLTableElement, callback?: (cell: HTMLTableCellElement, row: number, col: number, colSpan: number, rowSpan: number) => false | void): HTMLTableCellElement[][];
@@ -54,7 +55,6 @@ export declare class Table extends ViewComponent<IJodit> {
      * @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: HTMLTableElement, line: false | HTMLTableRowElement, after: boolean): void;
     private static __removeRow;
@@ -78,6 +78,8 @@ export declare class Table extends ViewComponent<IJodit> {
      */
     getSelectedBound(table: HTMLTableElement, selectedCells: HTMLTableCellElement[]): number[][];
     private static __normalizeTable;
+    private static __removeExtraColspans;
+    private static __removeExtraRowspans;
     /**
      * Try recalculate all coluns and rows after change
      */