jodit 4.2.14 → 4.2.15

package/esm/plugins/table-keyboard-navigation/table-keyboard-navigation.js

@@ -23,38 +23,10 @@ export 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 = Dom.up(current, Dom.isCell, editor.editor);
+        const cell = findCell(editor, key);
         if (!cell) {
             return;
         }
-        const { range } = editor.s;
-        if (key !== consts.KEY_TAB && current !== cell) {
-            const isNextDirection = key === consts.KEY_RIGHT || key === consts.KEY_DOWN;
-            const hasNext = call(!isNextDirection ? Dom.prev : Dom.next, current, elm => key === consts.KEY_UP || key === consts.KEY_DOWN
-                ? Dom.isTag(elm, 'br')
-                : Boolean(elm), cell);
-            if ((!isNextDirection &&
-                (hasNext ||
-                    (key !== consts.KEY_UP &&
-                        Dom.isText(current) &&
-                        range.startOffset !== 0))) ||
-                (isNextDirection &&
-                    (hasNext ||
-                        (key !== consts.KEY_DOWN &&
-                            Dom.isText(current) &&
-                            current.nodeValue &&
-                            range.startOffset !==
-                                current.nodeValue.length)))) {
-                return;
-            }
-        }
         const tableModule = editor.getInstance(Table, editor.o);
         const table = Dom.closest(cell, 'table', editor.editor);
         let next = null;
@@ -112,3 +84,37 @@ export function tableKeyboardNavigation(editor) {
     });
 }
 pluginSystem.add('tableKeyboardNavigation', tableKeyboardNavigation);
+function findCell(editor, key) {
+    if (!WORK_KEYS.has(key)) {
+        return;
+    }
+    const current = editor.s.current();
+    if (!current) {
+        return;
+    }
+    const cell = Dom.up(current, Dom.isCell, editor.editor);
+    if (!cell) {
+        return;
+    }
+    const { range } = editor.s;
+    if (key !== consts.KEY_TAB && current !== cell) {
+        const isNextDirection = key === consts.KEY_RIGHT || key === consts.KEY_DOWN;
+        const hasNext = call(!isNextDirection ? Dom.prev : Dom.next, current, elm => key === consts.KEY_UP || key === consts.KEY_DOWN
+            ? Dom.isTag(elm, 'br')
+            : Boolean(elm), cell);
+        if ((!isNextDirection &&
+            (hasNext ||
+                (key !== consts.KEY_UP &&
+                    Dom.isText(current) &&
+                    range.startOffset !== 0))) ||
+            (isNextDirection &&
+                (hasNext ||
+                    (key !== consts.KEY_DOWN &&
+                        Dom.isText(current) &&
+                        current.nodeValue &&
+                        range.startOffset !== current.nodeValue.length)))) {
+            return;
+        }
+    }
+    return cell;
+}

package/package.json

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

package/types/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/types/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/types/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/types/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
      */

package/types/plugins/drag-and-drop/drag-and-drop.d.ts

@@ -21,6 +21,8 @@ export declare class dragAndDrop extends Plugin {
     private onDrag;
     private onDragEnd;
     private onDrop;
+    private __getWorkFragment;
+    private __insertFragment;
     private getText;
     /** @override */
     beforeDestruct(): void;

package/types/plugins/search/helpers/highlight-text-ranges.d.ts

@@ -23,7 +23,3 @@ export declare function clearSelectionWrappers(root: HTMLElement): void;
  * @private
  */
 export declare function clearSelectionWrappersFromHTML(root: string): string;
-/**
- * @private
- */
-export declare function isSelectionWrapper(node: unknown): boolean;