jodit 3.19.4 → 3.20.2

package/src/plugins/wrap-nodes/wrap-nodes.ts

@@ -29,10 +29,18 @@ class wrapNodes extends Plugin {
 			return;
 		}
 
-		jodit.e.on(
-			'afterInit.wtn postProcessSetEditorValue.wtn',
-			this.postProcessSetEditorValue
-		);
+		jodit.e
+			.on(
+				'drop.wtn focus.wtn keydown.wtn mousedown.wtn',
+				this.preprocessInput,
+				{
+					top: true
+				}
+			)
+			.on(
+				'afterInit.wtn postProcessSetEditorValue.wtn',
+				this.postProcessSetEditorValue
+			);
 	}
 
 	/** @override **/
@@ -55,7 +63,7 @@ class wrapNodes extends Plugin {
 			isChanged: boolean = false;
 
 		while (child) {
-			this.checkAloneListLeaf(child, jodit);
+			child = this.checkAloneListLeaf(child, jodit);
 
 			if (this.isSuitableStart(child)) {
 				if (!isChanged) {
@@ -74,6 +82,7 @@ class wrapNodes extends Plugin {
 				}
 
 				box.normalize();
+				child = box;
 			}
 
 			child = child && child.nextSibling;
@@ -88,17 +97,33 @@ class wrapNodes extends Plugin {
 		}
 	}
 
-	private checkAloneListLeaf(
-		child: Node | Element | HTMLLIElement,
-		jodit: IJodit
-	): void {
-		if (
-			Dom.isElement(child) &&
-			Dom.isTag(child, 'li') &&
-			!Dom.isTag(child.parentElement, ['ul', 'ol'])
-		) {
-			Dom.wrap(child, 'ul', jodit.createInside);
-		}
+	private checkAloneListLeaf(child: Node, jodit: IJodit): Node {
+		// debugger
+		let result = child;
+		let next: Nullable<Node> = child;
+
+		do {
+			if (
+				Dom.isElement(next) &&
+				Dom.isTag(next, 'li') &&
+				!Dom.isTag(next.parentElement, ['ul', 'ol'])
+			) {
+				const nextChild: Nullable<Node> = Dom.findNotEmptySibling(
+					next,
+					false
+				);
+				if (Dom.isTag(result, 'ul')) {
+					result.appendChild(next);
+				} else {
+					result = Dom.wrap(next, 'ul', jodit.createInside);
+				}
+				next = nextChild;
+			} else {
+				break;
+			}
+		} while (next);
+
+		return result;
 	}
 
 	/**
@@ -120,6 +145,24 @@ class wrapNodes extends Plugin {
 	private isNotClosed = (n: Nullable<Node>): n is Element =>
 		Dom.isElement(n) &&
 		!(Dom.isBlock(n) || Dom.isTag(n, this.j.o.wrapNodes.exclude));
+
+	/**
+	 * Process input without parent box
+	 */
+	@autobind
+	private preprocessInput(): void {
+		const { jodit } = this;
+
+		if (!jodit.isEditorMode() || jodit.editor.firstChild) {
+			return;
+		}
+
+		const box = jodit.createInside.element(jodit.o.enter);
+		const br = jodit.createInside.element('br');
+		Dom.append(box, br);
+		Dom.append(jodit.editor, box);
+		jodit.s.setCursorBefore(br);
+	}
 }
 
 pluginSystem.add('wrapNodes', wrapNodes);

package/src/styles/variables.less

@@ -80,10 +80,10 @@
 	//z-index
 	--z-index-full-size: 100000;
 	--z-index-popup: 10000001;
-	--z-index-tooltip: 10000002;
 	--z-index-dialog-overlay: 20000003;
 	--z-index-dialog: 20000004;
 	--z-index-context-menu: 30000005;
+	--z-index-tooltip: 30000006;
 
 	--icon-loader-size: 48px;
 

package/src/types/ajax.d.ts

@@ -82,8 +82,8 @@ export interface AjaxOptions {
 
 	/**
 	 * An object (or a function which returns an object) of additional header key/value pairs to send along
-	 * with requests using the XMLHttpRequest transport. Uses in {@link FileBrowser|FileBrowser}
-	 * and {@link Uploader|Uploader}
+	 * with requests using the XMLHttpRequest transport. Uses in [[FileBrowser]]
+	 * and [[Uploader]]
 	 */
 	headers?:
 		| IDictionary<string>

package/src/types/file-browser.d.ts

@@ -17,10 +17,11 @@ import type {
 	Nullable
 } from './types';
 import type { IUploader, IUploaderOptions } from './uploader';
-import type { IPanel, IViewOptions } from './view';
+import type { IViewOptions, IViewWithToolbar } from './view';
 import type { IUIGroup } from './ui';
 import type { IObservable } from './events';
 import type { IAjax } from './ajax';
+import type { IDlgs } from './traits';
 
 /**
  * The module creates a web browser dialog box. In a Web browser ,you can select an image, remove, drag it. Upload new
@@ -252,7 +253,8 @@ export interface IFileBrowserDataProvider extends IDestructible {
 // TODO - Remove extending
 export interface IFileBrowser<
 	T extends IFileBrowserOptions = IFileBrowserOptions
-> extends IPanel<T> {
+> extends IViewWithToolbar<T>,
+		IDlgs {
 	readonly dataProvider: IFileBrowserDataProvider;
 	readonly state: IFileBrowserState & IObservable;
 

package/src/types/jodit.d.ts

@@ -8,12 +8,13 @@
  * @module types
  */
 
-import { IViewOptions, IPanel } from './view';
+import { IViewOptions, IViewWithToolbar } from './view';
 import type { Config } from 'jodit/config';
 import type {
 	CustomCommand,
 	ICreate,
 	IDestructible,
+	IDlgs,
 	IHistory,
 	IStatusBar,
 	Modes
@@ -34,7 +35,7 @@ interface IWorkPlace {
 	options: IViewOptions;
 }
 
-interface IJodit extends IPanel {
+interface IJodit extends IViewWithToolbar, IDlgs {
 	isJodit: true;
 
 	options: Config;

package/src/types/plugin.d.ts

@@ -54,6 +54,7 @@ export interface IExtraPlugin {
 
 export interface IPluginSystem {
 	add(name: string, plugin: any): void;
+	wait(name: string): Promise<void>;
 	get(name: string): PluginType | void;
 	remove(name: string): void;
 	init(jodit: IJodit): CanPromise<void>;

package/src/types/toolbar.d.ts

@@ -17,7 +17,8 @@ import type {
 	IViewBased,
 	IJodit,
 	IMods,
-	IBound
+	IBound,
+	IContainer
 } from './';
 import type { IFileBrowser } from './file-browser';
 
@@ -113,7 +114,7 @@ interface IControlType<
 
 	/**
 	 * Drop-down list. A hash or array. You must specify the command which will be submitted for the hash key
-	 * (or array value) (see .[[Jodit.execCommand]] or define 'exec' function. See example
+	 * (or array value) (see .[[IJodit.execCommand]] or define 'exec' function. See example
 	 * @example
 	 * ```javascript
 	 * Jodit.make('#editor2', {
@@ -146,8 +147,8 @@ interface IControlType<
 
 	/**
 	 * The command executes when the button is pressed. Allowed all
-	 * {@link https://developer.mozilla.org/ru/docs/Web/API/Document/execCommand#commands}
-	 * and several specific [[Jodit.execCommand]]
+	 * @see https://developer.mozilla.org/ru/docs/Web/API/Document/execCommand#commands
+	 * and several specific [[IJodit.execCommand]]
 	 */
 	command?: string;
 	tagRegExp?: RegExp;
@@ -209,7 +210,12 @@ interface IControlType<
 	 * The method which will be called for each element of button.list
 	 */
 	template?: (jodit: T, key: string, value: string) => string;
-	childTemplate?: (jodit: T, key: string, value: string, button: IToolbarButton) => string;
+	childTemplate?: (
+		jodit: T,
+		key: string,
+		value: string,
+		button: IToolbarButton
+	) => string;
 
 	/**
 	 * After click on the button it will show popup element which consist value that this function returned
@@ -311,7 +317,7 @@ interface IToolbarCollection extends IUIList {
 	showInline(bound?: IBound): void;
 }
 
-export interface IStatusBar extends IComponent, IMods {
+export interface IStatusBar extends IContainer, IComponent, IMods {
 	show(): void;
 	hide(): void;
 	isShown: boolean;

package/src/types/traits.d.ts

@@ -9,6 +9,7 @@
  */
 
 import type { IDictionary, Nullable } from 'jodit/types';
+import type { IComponent, IContainer, IDialog, IDialogOptions } from 'jodit/types';
 
 export type ModType = string | boolean | null;
 
@@ -16,7 +17,9 @@ export interface IMods {
 	/**
 	 * Set/remove modification (null - remove)
 	 */
-	setMod(name: string, value: ModType): this;
+	setMod<T extends IComponent & IContainer & IMods>(this: T, name: string, value: ModType): T;
+	afterSetMod(name: string, value: ModType): void;
+
 	getMod(name: string): ModType;
 	mods: IDictionary<ModType>;
 }
@@ -25,3 +28,29 @@ export interface IElms {
 	getElm(elementName: string): Nullable<HTMLElement>;
 	getElms(elementName: string): HTMLElement[];
 }
+
+
+export interface IDlgs {
+	dlg(options?: IDialogOptions): IDialog;
+
+	confirm(
+		msg: string,
+		title: string | ((yes: boolean) => void) | undefined,
+		callback?: (yes: boolean) => void | false
+	): IDialog;
+
+	prompt(
+		msg: string,
+		title: string | (() => false | void) | undefined,
+		callback: (value: string) => false | void,
+		placeholder?: string,
+		defaultValue?: string
+	): IDialog;
+
+	alert(
+		msg: string | HTMLElement,
+		title?: string | (() => void | false),
+		callback?: string | ((dialog: IDialog) => void | false),
+		className?: string
+	): IDialog;
+}

package/src/types/types.d.ts

@@ -273,6 +273,7 @@ declare global {
 		jodit: HTMLDivElement;
 		svg: HTMLElement;
 		path: HTMLElement;
+		font: HTMLElement;
 		'jodit-media': HTMLElement;
 	}
 }

package/src/types/view.d.ts

@@ -23,8 +23,7 @@ import type { IStorage } from './storage';
 import type { IUIButtonState } from './ui';
 import type { IEventEmitter } from './events';
 import type { IPluginButton } from './plugin';
-import type { Mods, Elms } from '../core/traits'; //TODO remove export
-import type { IDialog, IDialogOptions } from './dialog';
+import type { IElms, IMods } from './traits';
 
 interface ILanguageOptions {
 	language?: string;
@@ -90,16 +89,17 @@ interface IViewOptions extends ILanguageOptions, IToolbarOptions {
 interface IViewBased<T = IViewOptions>
 	extends IContainer,
 		IComponent,
-		Mods,
-		Elms {
+		IMods,
+		IElms {
 	readonly isView: true;
+	readonly parent: Nullable<IViewBased>;
 
 	/**
 	 * ID attribute for source element, id add \{id\}_editor it's editor's id
 	 */
 	readonly id: string;
 
-	basePath: string;
+	readonly basePath: string;
 
 	readonly isLocked: boolean;
 	isLockedNotBy(name: string): boolean;
@@ -112,7 +112,7 @@ interface IViewBased<T = IViewOptions>
 	readonly buffer: IStorage;
 	readonly storage: IStorage;
 
-	progressbar: IProgressBar;
+	readonly progressbar: IProgressBar;
 
 	readonly events: IEventEmitter;
 	readonly e: this['events'];
@@ -125,11 +125,11 @@ interface IViewBased<T = IViewOptions>
 	// alias
 	readonly o: this['options'];
 
-	i18n: (text: string, ...params: Array<string | number>) => string;
+	i18n(text: string, ...params: Array<string | number>): string;
 
-	defaultTimeout: number;
+	readonly defaultTimeout: number;
 
-	getVersion: () => string;
+	getVersion(): string;
 
 	readonly components: Set<IComponent>;
 	getInstance<T extends IComponent>(moduleName: string, options?: object): T;
@@ -146,28 +146,3 @@ interface IViewWithToolbar<T = IViewOptions> extends IViewBased<T> {
 
 	setPanel(element: HTMLElement | string): void;
 }
-
-interface IPanel<T = IViewOptions> extends IViewWithToolbar<T> {
-	dialog(options?: IDialogOptions): IDialog;
-
-	confirm(
-		msg: string,
-		title: string | ((yes: boolean) => void) | undefined,
-		callback?: (yes: boolean) => void | false
-	): IDialog;
-
-	prompt(
-		msg: string,
-		title: string | (() => false | void) | undefined,
-		callback: (value: string) => false | void,
-		placeholder?: string,
-		defaultValue?: string
-	): IDialog;
-
-	alert(
-		msg: string | HTMLElement,
-		title?: string | (() => void | false),
-		callback?: string | ((dialog: IDialog) => void | false),
-		className?: string
-	): IDialog;
-}

package/src/typings.d.ts

@@ -6,6 +6,7 @@
 
 /**
  * @module types
+ * @internal
  */
 
 declare module '*.svg' {

package/types/config.d.ts

@@ -117,6 +117,7 @@ export declare class Config implements IViewOptions {
      */
     disabled: boolean;
     activeButtonsInReadOnly: string[];
+    allowCommandsInReadOnly: string[];
     /**
      * Size of icons in the toolbar (can be "small", "middle", "large")
      *
@@ -153,8 +154,8 @@ export declare class Config implements IViewOptions {
     /**
      * Class name that can be appended to the editor
      *
-     * @see {@link Jodit.defaultOptions.iframeCSSLinks|iframeCSSLinks}
-     * @see {@link Jodit.defaultOptions.iframeStyle|iframeStyle}
+     * @see [[Config.iframeCSSLinks]]
+     * @see [[Config.iframeStyle]]
      *
      * @example
      * ```javascript

package/types/core/constants.d.ts

@@ -46,7 +46,7 @@ export declare const MODE_WYSIWYG = 1;
 export declare const MODE_SOURCE = 2;
 /**
  * Source code editor and HTML editor both like
- * {@link http://getuikit.com/docs/htmleditor.html|this}
+ * @see http://getuikit.com/docs/htmleditor.html|this
  */
 export declare const MODE_SPLIT = 3;
 /**
@@ -75,33 +75,33 @@ export declare const EMULATE_DBLCLICK_TIMEOUT = 300;
 export declare const INSERT_AS_HTML = "insert_as_html";
 /**
  * Same as [[INSERT_AS_HTML]], but content will be stripped of extra styles and empty tags
- * ```
+ * ```html
  * <h1 style="color:red">test</h1>
  * ```
  * Will be inserted into the document as
- * ```
+ * ```html
  * <h1>test</h1>
  * ```
  */
 export declare const INSERT_CLEAR_HTML = "insert_clear_html";
 /**
  * The contents of the clipboard will be pasted into the document as plain text, i.e. all tags will be displayed as text.
- * ```
+ * ```html
  * <h1>test</h1>
  * ```
  * Will be inserted into the document as
- * ```
+ * ```html
  * &gt;&lt;h1&gt;test&lt;/h1&gt;
  * ```
  */
 export declare const INSERT_AS_TEXT = "insert_as_text";
 /**
  * All tags will be stripped:
- * ```
+ * ```html
  * <h1>test</h1>
  * ```
  * Will be inserted into the document as
- * ```
+ * ```html
  * test
  * ```
  */

package/types/core/decorators/derive/derive.d.ts

@@ -0,0 +1,6 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+export declare function derive(...traits: Function[]): (target: Function) => void;

package/types/core/decorators/index.d.ts

@@ -17,4 +17,5 @@ export * from './nonenumerable/nonenumerable';
 export * from './persistent/persistent';
 export * from './wait/wait';
 export * from './watch/watch';
+export * from './derive/derive';
 export { default as autobind } from 'autobind-decorator';

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

@@ -44,7 +44,7 @@ export declare class Dom {
      * // Replace the first <span> element to the < p >
      * ```
      */
-    static replace(elm: HTMLElement, newTagName: HTMLTagNames | HTMLElement | string, create: ICreate, withAttributes?: boolean, notMoveContent?: boolean): HTMLElement;
+    static replace<T extends Node>(elm: Node, newTagName: HTMLTagNames | Node | 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 )
@@ -152,7 +152,7 @@ export declare class Dom {
     /**
      * Returns the nearest non-empty sibling
      */
-    static findNotEmptySibling(node: Node, backspace: boolean): Nullable<Node>;
+    static findNotEmptySibling(node: Node, left: boolean): Nullable<Node>;
     /**
      * Returns the nearest non-empty neighbor
      */
@@ -205,6 +205,7 @@ export declare class Dom {
      * Safe remove element from DOM
      */
     static safeRemove(...nodes: unknown[]): void;
+    static safeInsertNode(range: Range, node: Node): void;
     /**
      * Hide element
      */
@@ -216,8 +217,8 @@ export declare class Dom {
     /**
      * Check if element is some tag
      */
-    static isTag<K extends keyof HTMLElementTagNameMap>(node: Node | null | undefined | false | EventTarget, tagName: K): node is HTMLElementTagNameMap[K];
-    static isTag<K extends keyof HTMLElementTagNameMap>(node: Node | null | undefined | false | EventTarget, tagNames: K[]): node is HTMLElementTagNameMap[K];
+    static isTag<K extends HTMLTagNames>(node: Node | null | undefined | false | EventTarget, tagName: K): node is HTMLElementTagNameMap[K];
+    static isTag<K extends HTMLTagNames>(node: Node | null | undefined | false | EventTarget, tagNames: K[]): node is HTMLElementTagNameMap[K];
     /**
      * Marks an item as temporary
      */

package/types/core/plugin/plugin-system.d.ts

@@ -39,6 +39,10 @@ export declare class PluginSystem implements IPluginSystem {
      * Public method for async init all plugins
      */
     init(jodit: IJodit): CanPromise<void>;
+    /**
+     * Returns the promise to wait for the plugin to load.
+     */
+    wait(name: string): Promise<void>;
     /**
      * Plugin type has disabled requires
      */

package/types/core/traits/dlgs.d.ts

@@ -0,0 +1,15 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+/**
+ * @module traits
+ */
+import type { IDialog, IDialogOptions, IViewBased, IDlgs } from 'jodit/types';
+export declare abstract class Dlgs implements IDlgs {
+    dlg(this: IViewBased & IDlgs, options?: IDialogOptions): IDialog;
+    confirm(this: IViewBased & IDlgs, msg: string, title: string | ((yes: boolean) => void) | undefined, callback?: (yes: boolean) => void | false): IDialog;
+    prompt(this: IViewBased & IDlgs, msg: string, title: string | (() => false | void) | undefined, callback: (value: string) => false | void, placeholder?: string, defaultValue?: string): IDialog;
+    alert(this: IViewBased & IDlgs, msg: string | HTMLElement, title?: string | (() => void | false), callback?: string | ((dialog: IDialog) => void | false), className?: string): IDialog;
+}

package/types/core/traits/elms.d.ts

@@ -8,14 +8,12 @@
  */
 import type { IComponent, IContainer, IElms, Nullable } from 'jodit/types';
 export declare abstract class Elms implements IElms {
-    abstract getElm(elementName: string): Nullable<HTMLElement>;
-    abstract getElms(elementName: string): HTMLElement[];
     /**
      * Return element with BEM class name
      */
-    static getElm(this: IComponent & IContainer, elementName: string): Nullable<HTMLElement>;
+    getElm<T extends IComponent & IContainer & IElms>(this: T, elementName: string): Nullable<HTMLElement>;
     /**
      * Return elements with BEM class name
      */
-    static getElms(this: IComponent & IContainer, elementName: string): HTMLElement[];
+    getElms<T extends IComponent & IContainer & IElms>(this: T, elementName: string): HTMLElement[];
 }

package/types/core/traits/index.d.ts

@@ -8,3 +8,4 @@
  */
 export * from './elms';
 export * from './mods';
+export * from './dlgs';

package/types/core/traits/mods.d.ts

@@ -6,21 +6,18 @@
 /**
  * @module traits
  */
-import type { IComponent, IContainer, IMods, ModType } from 'jodit/types';
+import type { IContainer, IDictionary, IMods, IComponent, ModType } from 'jodit/types';
 export declare abstract class Mods implements IMods {
-    abstract mods: IMods['mods'];
-    abstract readonly componentName: string;
-    abstract container: HTMLElement;
-    abstract setMod(name: string, value: ModType): this;
-    abstract getMod(name: string): ModType;
+    abstract mods: IDictionary;
+    afterSetMod(name: string, value: ModType): void;
     /**
      * Set/remove BEM class modification
      *
      * @param value - if null, mod will be removed
      */
-    static setMod<T extends IComponent & IContainer & Mods>(this: T, name: string, value: ModType, container?: HTMLElement): void;
+    setMod<T extends IComponent & IContainer & IMods>(this: T, name: string, value: ModType, container?: HTMLElement): T;
     /**
      * Get BEM class modification value
      */
-    static getMod(this: IComponent & IContainer & Mods, name: string): ModType;
+    getMod(this: IMods, name: string): ModType;
 }

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

@@ -10,3 +10,4 @@
  */
 export * from './button/button';
 export * from './group/group';
+export * from './tooltip/tooltip';

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

@@ -0,0 +1,29 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+/**
+ * [[include:plugins/tooltip/README.md]]
+ * @packageDocumentation
+ * @module plugins/tooltip
+ */
+import './tooltip.less';
+import type { IViewBased } from 'jodit/types';
+import { UIElement } from '../../element';
+export declare class UITooltip extends UIElement {
+    private __isOpened;
+    className(): string;
+    protected constructor(view: IViewBased);
+    private __useCount;
+    /**
+     * Creates only one instance of the tooltip for the container
+     */
+    static make(view: IViewBased): UITooltip;
+    private __delayShowTimeout;
+    private __delayOpen;
+    private __open;
+    private __setPosition;
+    private __close;
+    destruct(): void;
+}

package/types/core/ui/element.d.ts

@@ -6,9 +6,11 @@
 /**
  * @module ui
  */
-import type { IDictionary, IUIElement, IViewBased, Nullable, ModType } from 'jodit/types';
+import type { IDictionary, IUIElement, IViewBased, Nullable } from 'jodit/types';
 import { ViewComponent } from 'jodit/core/component';
 import { Elms, Mods } from 'jodit/core/traits';
+export interface UIElement extends Mods, Elms {
+}
 export declare abstract class UIElement<T extends IViewBased = IViewBased> extends ViewComponent<T> implements IUIElement, Mods, Elms {
     container: HTMLElement;
     name: string;
@@ -28,14 +30,6 @@ export declare abstract class UIElement<T extends IViewBased = IViewBased> exten
      */
     static closestElement(node: Node, type: Function): Nullable<IUIElement>;
     readonly mods: IDictionary<string | boolean | null>;
-    /** @see [[Mods.setMod]] */
-    setMod(name: string, value: ModType, container?: HTMLElement): this;
-    /** @see [[Mods.getMod]] */
-    getMod(name: string): ModType;
-    /** @see [[Elms.getElm]]*/
-    getElm(elementName: string): Nullable<HTMLElement>;
-    /** @see [[Elms.getElms]]*/
-    getElms(elementName: string): HTMLElement[];
     /**
      * Update UI from state
      */