jodit 3.15.2 → 3.16.2

package/src/plugins/index.ts

@@ -16,8 +16,7 @@ export { focus } from './focus/focus';
 export { classSpan } from './class-span/class-span';
 export { Backspace } from './keyboard/backspace/backspace';
 export { bold } from './bold/bold';
-export { cleanHtml } from './fix/clean-html';
-export { WrapTextNodes } from './fix/wrap-text-nodes';
+export { WrapNodes, cleanHtml } from './fix';
 export {
 	copyFormat,
 	clipboard,
@@ -57,6 +56,7 @@ export { size, resizeHandler } from './size';
 export { source } from './source';
 export { stat } from './stat/stat';
 export { sticky } from './sticky/sticky';
+export { spellcheck } from './spellcheck/spellcheck';
 export { symbols } from './symbols/symbols';
 export * from './table';
 export { tooltip } from './tooltip/tooltip';

package/src/plugins/inline-popup/config/items/a.ts

@@ -9,13 +9,13 @@
  */
 
 import type { IControlType, IJodit } from 'jodit/types';
-import { attr } from '../../../../core/helpers/utils';
+import { attr } from 'jodit/core/helpers/utils';
 
 export default [
 	{
 		name: 'eye',
 		tooltip: 'Open link',
-		exec: (editor: IJodit, current) => {
+		exec: (editor: IJodit, current): void => {
 			const href = attr(current as HTMLElement, 'href');
 
 			if (current && href) {

package/src/plugins/inline-popup/config/items/cells.ts

@@ -8,11 +8,11 @@
  * @module plugins/inline-popup
  */
 
-import type { Table } from '../../../../modules';
 import type { IControlType } from 'jodit/types';
-import { isJoditObject, isString } from '../../../../core/helpers/checker';
-import { css } from '../../../../core/helpers';
-import { ColorPickerWidget, TabsWidget } from '../../../../modules/widget';
+import type { Table } from 'jodit/modules/table/table';
+import { isJoditObject, isString } from 'jodit/core/helpers/checker';
+import { css } from 'jodit/core/helpers/utils/css';
+import { ColorPickerWidget, TabsWidget } from 'jodit/modules/widget';
 
 const cmd = (control: IControlType): string =>
 	control.args && isString(control.args[0])
@@ -34,7 +34,7 @@ export default [
 				return false;
 			}
 
-			const makeColorPicker = (key: string) =>
+			const makeColorPicker = (key: string): HTMLElement =>
 				ColorPickerWidget(
 					editor,
 					(value: string) => {
@@ -43,7 +43,7 @@ export default [
 						});
 
 						editor.lock();
-						editor.setEditorValue();
+						editor.synchronizeValues();
 						close();
 						editor.unlock();
 					},
@@ -64,8 +64,8 @@ export default [
 	{
 		name: 'valign',
 		list: ['Top', 'Middle', 'Bottom', 'Normal'],
-		childTemplate: (_, __, value: string) => value,
-		exec: (editor, table, { control }) => {
+		childTemplate: (_, __, value: string): string => value,
+		exec: (editor, table, { control }): void => {
 			const command = cmd(control);
 
 			editor
@@ -105,7 +105,7 @@ export default [
 			tableaddcolumnbefore: 'Insert column before',
 			tableaddcolumnafter: 'Insert column after'
 		},
-		exec: (editor, table, { control }) => {
+		exec: (editor, table, { control }): void => {
 			if (!isJoditObject(editor)) {
 				return;
 			}
@@ -122,7 +122,7 @@ export default [
 			tableaddrowbefore: 'Insert row above',
 			tableaddrowafter: 'Insert row below'
 		},
-		exec: (editor, table, { control }) => {
+		exec: (editor, table, { control }): void => {
 			if (!isJoditObject(editor)) {
 				return;
 			}
@@ -142,7 +142,7 @@ export default [
 			tablebincolumn: 'Delete column',
 			tableempty: 'Empty cell'
 		},
-		exec: (editor, table, { control }) => {
+		exec: (editor, table, { control }): void => {
 			if (!isJoditObject(editor)) {
 				return;
 			}

package/src/plugins/inline-popup/config/items/iframe.ts

@@ -15,7 +15,7 @@ export default [
 	{
 		name: 'bin',
 		tooltip: 'Delete',
-		exec: (editor: IJodit, image) => {
+		exec: (editor: IJodit, image): void => {
 			image && editor.s.removeNode(image);
 		}
 	},

package/src/plugins/inline-popup/config/items/img.ts

@@ -9,10 +9,10 @@
  */
 
 import type { IControlType, IJodit } from 'jodit/types';
-import { Dom } from '../../../../core/dom';
-import { isString } from '../../../../core/helpers/checker';
-import { css } from '../../../../core/helpers';
-import { hAlignElement } from '../../../image/helpers';
+import { Dom } from 'jodit/core/dom';
+import { isString } from 'jodit/core/helpers/checker/is-string';
+import { css } from 'jodit/core/helpers/utils/css';
+import { hAlignElement } from 'jodit/plugins/image/helpers';
 
 export const align: IControlType<IJodit> = {
 	name: 'left',
@@ -38,7 +38,7 @@ export const align: IControlType<IJodit> = {
 			hAlignElement(elm.firstElementChild as HTMLElement, command);
 		}
 
-		editor.setEditorValue();
+		editor.synchronizeValues();
 
 		editor.e.fire('recalcPositionPopup');
 	},
@@ -50,13 +50,13 @@ export default [
 		name: 'delete',
 		icon: 'bin',
 		tooltip: 'Delete',
-		exec: (editor: IJodit, image) => {
+		exec: (editor: IJodit, image): void => {
 			image && editor.s.removeNode(image);
 		}
 	},
 	{
 		name: 'pencil',
-		exec(editor: IJodit, current) {
+		exec(editor: IJodit, current): void {
 			const tagName = (current as HTMLElement).tagName.toLowerCase();
 
 			if (tagName === 'img') {

package/src/plugins/inline-popup/inline-popup.ts

@@ -219,12 +219,12 @@ export class inlinePopup extends Plugin {
 	private snapRange: Nullable<Range> = null;
 
 	@autobind
-	private onSelectionStart() {
+	private onSelectionStart(): void {
 		this.snapRange = this.j.s.range.cloneRange();
 	}
 
 	@autobind
-	private onSelectionEnd(e: MouseEvent) {
+	private onSelectionEnd(e: MouseEvent): void {
 		if (
 			e &&
 			e.target &&
@@ -327,11 +327,11 @@ export class inlinePopup extends Plugin {
 			.join(' ');
 	}
 
-	private addListenersForElements() {
+	private addListenersForElements(): void {
 		this.j.e.on(this._eventsList(), this.onClick);
 	}
 
-	private removeListenersForElements() {
+	private removeListenersForElements(): void {
 		this.j.e.off(this._eventsList(), this.onClick);
 	}
 
@@ -339,7 +339,7 @@ export class inlinePopup extends Plugin {
 	 * Show the inline WYSIWYG toolbar editor.
 	 */
 	@autobind
-	private showInlineToolbar(bound?: IBound) {
+	private showInlineToolbar(bound?: IBound): void {
 		this.showPopup(() => {
 			if (bound) {
 				return bound;

package/src/plugins/keyboard/backspace/backspace.ts

@@ -157,7 +157,7 @@ export class Backspace extends Plugin {
 	/**
 	 * Remove node and replace cursor position out of it
 	 */
-	private safeRemoveEmptyNode(fakeNode: Node) {
+	private safeRemoveEmptyNode(fakeNode: Node): void {
 		const { range } = this.j.s;
 
 		if (range.startContainer === fakeNode) {

package/src/plugins/keyboard/backspace/cases/check-join-neighbors.ts

@@ -65,7 +65,7 @@ function checkMoveListContent(
 	// Process UL/LI/OL cases
 	const siblingIsList = Dom.isTag(sibling, ['ol', 'ul']);
 	const boxIsList = Dom.isTag(mainClosestBox, ['ol', 'ul']);
-	const elementChild = (elm: Element, side: boolean) =>
+	const elementChild = (elm: Element, side: boolean): Nullable<Node> =>
 		side ? elm.firstElementChild : elm.lastElementChild;
 
 	if (boxIsList) {

package/src/plugins/keyboard/helpers.ts

@@ -56,7 +56,7 @@ export function findMostNestedNeighbor(
 	root: HTMLElement,
 	onlyInlide: boolean = false
 ): Nullable<Node> {
-	const nextChild = (node: Node) =>
+	const nextChild = (node: Node): Nullable<Node> =>
 		right ? node.firstChild : node.lastChild;
 
 	let next = findNotEmptyNeighbor(node, !right, root);

package/src/plugins/keyboard/hotkeys.ts

@@ -30,7 +30,7 @@ declare module 'jodit/config' {
  *
  * @example
  * ```js
- * var jodit = new Jodit('#editor', {
+ * var jodit = Jodit.make('#editor', {
  *  commandToHotkeys: {
  *      bold: 'ctrl+shift+b',
  *      italic: ['ctrl+i', 'ctrl+b'],

package/src/plugins/limit/limit.ts

@@ -56,7 +56,7 @@ export class limit extends Plugin {
 			jodit.e
 				.off('.limit')
 				.on('beforePaste.limit', () => {
-					snapshot = jodit.observer.snapshot.make();
+					snapshot = jodit.history.snapshot.make();
 				})
 				.on(
 					'keydown.limit keyup.limit beforeEnter.limit beforePaste.limit',
@@ -65,7 +65,7 @@ export class limit extends Plugin {
 				.on('change.limit', this.checkPreventChanging)
 				.on('afterPaste.limit', (): false | void => {
 					if (this.shouldPreventInsertHTML() && snapshot) {
-						jodit.observer.snapshot.restore(snapshot);
+						jodit.history.snapshot.restore(snapshot);
 						return false;
 					}
 				});
@@ -111,7 +111,7 @@ export class limit extends Plugin {
 	 * Check if some external changing should be prevented
 	 */
 	@autobind
-	private checkPreventChanging(newValue: string, oldValue: string) {
+	private checkPreventChanging(newValue: string, oldValue: string): void {
 		const { jodit } = this;
 		const { limitWords, limitChars } = jodit.o;
 

package/src/plugins/line-height/line-height.ts

@@ -35,7 +35,7 @@ export class lineHeight extends Plugin {
 	}
 
 	@autobind
-	private applyLineHeight(ignore: string, ignoreA: any, value: any) {
+	private applyLineHeight(ignore: string, ignoreA: any, value: any): void {
 		const { s, createInside: c, editor: root, o } = this.j;
 
 		if (!s.isFocused()) {

package/src/plugins/link/link.ts

@@ -116,7 +116,7 @@ Config.prototype.controls.unlink = {
 			Dom.unwrap(anchor);
 		}
 
-		editor.setEditorValue();
+		editor.synchronizeValues();
 		editor.e.fire('hidePopup');
 	},
 	tooltip: 'Unlink'
@@ -182,7 +182,7 @@ export class link extends Plugin {
 	}
 
 	@autobind
-	private onDblClickOnLink(e: MouseEvent) {
+	private onDblClickOnLink(e: MouseEvent): void {
 		if (!Dom.isTag(e.target, 'a')) {
 			return;
 		}
@@ -280,7 +280,7 @@ export class link extends Plugin {
 
 		let link: false | HTMLAnchorElement;
 
-		const getSelectionText = () =>
+		const getSelectionText = (): string =>
 			link
 				? link.innerText
 				: stripTags(jodit.s.range.cloneContents(), jodit.ed);
@@ -360,18 +360,18 @@ export class link extends Plugin {
 		}
 
 		jodit.editor.normalize();
-		const snapshot = jodit.observer.snapshot.make();
+		const snapshot = jodit.history.snapshot.make();
 
 		if (unlink) {
 			jodit.e.on(unlink, 'click', (e: MouseEvent) => {
 				jodit.s.restore();
-				jodit.observer.snapshot.restore(snapshot);
+				jodit.history.snapshot.restore(snapshot);
 
 				if (link) {
 					Dom.unwrap(link);
 				}
 
-				jodit.setEditorValue();
+				jodit.synchronizeValues();
 
 				close();
 				e.preventDefault();
@@ -390,7 +390,7 @@ export class link extends Plugin {
 			jodit.s.restore();
 			jodit.s.removeMarkers();
 			jodit.editor.normalize();
-			jodit.observer.snapshot.restore(snapshot);
+			jodit.history.snapshot.restore(snapshot);
 
 			const textWasChanged =
 				getSelectionText() !== content_input.value.trim();
@@ -487,7 +487,7 @@ export class link extends Plugin {
 				}
 			});
 
-			jodit.setEditorValue();
+			jodit.synchronizeValues();
 
 			close();
 

package/src/plugins/link/template.ts

@@ -8,7 +8,7 @@
  * @module plugins/link
  */
 
-import type { IJodit, IUIForm } from 'jodit/types';
+import type { IJodit, IUIElement, IUIForm, Nullable } from 'jodit/types';
 import {
 	UIBlock,
 	UICheckbox,
@@ -54,7 +54,7 @@ export const formTemplate = (editor: IJodit): IUIForm => {
 		),
 		modeClassName
 			? new UIBlock(editor, [
-					(() => {
+					((): Nullable<IUIElement> => {
 						if (modeClassName === 'input') {
 							return new UIInput(editor, {
 								name: 'className',

package/src/plugins/media/file.ts

@@ -24,7 +24,7 @@ Config.prototype.controls.file = {
 		self: IControlType,
 		close
 	) => {
-		const insert = (url: string, title: string = '') => {
+		const insert = (url: string, title: string = ''): void => {
 			editor.s.insertNode(
 				editor.createInside.fromHTML(
 					`<a href="${url}" title="${title}">${title || url}</a>`

package/src/plugins/media/media.ts

@@ -44,7 +44,7 @@ export function media(editor: IJodit): void {
 
 	const { mediaFakeTag, mediaBlocks, mediaInFakeBlock } = editor.options;
 
-	const wrap = (element: HTMLElement) => {
+	const wrap = (element: HTMLElement): void => {
 		if (
 			element.parentNode &&
 			attr(element.parentNode as HTMLElement, 'data-jodit_iframe_wrapper')

package/src/plugins/media/video/config.ts

@@ -48,7 +48,7 @@ Config.prototype.controls.video = {
 				])
 			]),
 			tabs: TabOption[] = [],
-			insertCode = (code: string) => {
+			insertCode = (code: string): void => {
 				editor.s.restore();
 				editor.s.insertHTML(code);
 				close();

package/src/plugins/mobile/config.ts

@@ -56,7 +56,7 @@ Config.prototype.controls.dots = {
 		if (store === undefined) {
 			store = {
 				toolbar: makeCollection(editor),
-				rebuild: () => {
+				rebuild: (): void => {
 					if (button) {
 						const buttons: CanUndef<Array<string | IControlType>> =
 							editor.e.fire(

package/src/plugins/mobile/mobile.ts

@@ -73,7 +73,7 @@ export function mobile(editor: IJodit): void {
 						editor.container.parentElement ?? editor.container
 					).offsetWidth;
 
-					const newStore = (() => {
+					const newStore = ((): ReturnType<typeof splitArray> => {
 						if (width >= editor.o.sizeLG) {
 							return splitArray(editor.o.buttons);
 						}

package/src/plugins/ordered-list/config.ts

@@ -0,0 +1,61 @@
+/*!
+ * 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 plugins/ordered-list
+ */
+
+import { Config } from 'jodit/config';
+import type { IControlType, IJodit } from 'jodit/types';
+import { dataBind } from 'jodit/core/helpers/utils/data-bind';
+
+const memoExec: IControlType<IJodit>['exec'] = (
+	jodit,
+	_,
+	{ control }
+): void => {
+	const key = `button${control.command}`;
+
+	const value = (control.args && control.args[0]) ?? dataBind(jodit, key);
+
+	dataBind(jodit, key, value);
+
+	jodit.execCommand(
+		control.command as string,
+		false,
+		value === 'default' ? null : value
+	);
+};
+
+Config.prototype.controls.ul = {
+	command: 'insertUnorderedList',
+	tags: ['ul'],
+	tooltip: 'Insert Unordered List',
+
+	list: {
+		default: 'Default',
+		circle: 'Circle',
+		disc: 'Dot',
+		square: 'Quadrate'
+	},
+	exec: memoExec
+} as IControlType;
+
+Config.prototype.controls.ol = {
+	command: 'insertOrderedList',
+	tags: ['ol'],
+	tooltip: 'Insert Ordered List',
+
+	list: {
+		default: 'Default',
+		'lower-alpha': 'Lower Alpha',
+		'lower-greek': 'Lower Greek',
+		'lower-roman': 'Lower Roman',
+		'upper-alpha': 'Upper Alpha',
+		'upper-roman': 'Upper Roman'
+	},
+	exec: memoExec
+} as IControlType;

package/src/plugins/ordered-list/ordered-list.ts

@@ -8,56 +8,11 @@
  * @module plugins/ordered-list
  */
 
-import type { IControlType, IJodit, Nullable } from 'jodit/types';
-import { Config } from 'jodit/config';
-import { Dom } from 'jodit/core/dom';
-import { dataBind, toArray } from 'jodit/core/helpers';
+import type { IJodit } from 'jodit/types';
 import { Plugin } from 'jodit/core/plugin';
 import { autobind } from 'jodit/core/decorators';
 
-const memoExec: IControlType<IJodit>['exec'] = (
-	jodit,
-	_,
-	{ control }
-): void => {
-	const key = `button${control.command}`;
-
-	const value = (control.args && control.args[0]) || dataBind(jodit, key);
-
-	dataBind(jodit, key, value);
-
-	jodit.execCommand(control.command as string, false, value);
-};
-
-Config.prototype.controls.ul = {
-	command: 'insertUnorderedList',
-	tags: ['ul'],
-	tooltip: 'Insert Unordered List',
-
-	list: {
-		default: 'Default',
-		circle: 'Circle',
-		disc: 'Dot',
-		square: 'Quadrate'
-	},
-	exec: memoExec
-} as IControlType;
-
-Config.prototype.controls.ol = {
-	command: 'insertOrderedList',
-	tags: ['ol'],
-	tooltip: 'Insert Ordered List',
-
-	list: {
-		default: 'Default',
-		'lower-alpha': 'Lower Alpha',
-		'lower-greek': 'Lower Greek',
-		'lower-roman': 'Lower Roman',
-		'upper-alpha': 'Upper Alpha',
-		'upper-roman': 'Upper Roman'
-	},
-	exec: memoExec
-} as IControlType;
+import './config';
 
 /**
  * Process commands insertOrderedList and insertUnOrderedList
@@ -91,115 +46,10 @@ export class orderedList extends Plugin {
 			}
 		);
 
-		this.jodit.setEditorValue();
+		this.jodit.synchronizeValues();
 
 		return false;
 	}
 
 	protected beforeDestruct(jodit: IJodit): void {}
 }
-
-export function orderedList1(editor: IJodit): void {
-	const isOurCommand = (command: string) =>
-			/insert(un)?orderedlist/i.test(command),
-		getListWrapper = () =>
-			Dom.up(
-				editor.s.current() as Node,
-				(tag: Node | null) => tag && /^UL|OL$/i.test(tag.nodeName),
-				editor.editor
-			),
-		listStyleTypeEqual = (el: HTMLElement, listStyleType: string) => {
-			const value = el.style.listStyleType;
-
-			return (
-				value === listStyleType ||
-				(!value && listStyleType === 'default')
-			);
-		},
-		setListStyleType = (el: HTMLElement, value: string) => {
-			if (value === 'default' || !value) {
-				el.style.removeProperty('list-style-type');
-			} else {
-				el.style.setProperty('list-style-type', value);
-			}
-		};
-
-	editor.e
-		.on(
-			'beforeCommand',
-			(command: string, _, listStyleType: string): false | void => {
-				if (isOurCommand(command) && listStyleType) {
-					const ul = getListWrapper();
-
-					if (ul && !listStyleTypeEqual(ul, listStyleType)) {
-						if (
-							(Dom.isTag(ul, 'ul') &&
-								/unordered/i.test(command)) ||
-							(Dom.isTag(ul, 'ol') && !/unordered/i.test(command))
-						) {
-							setListStyleType(ul, listStyleType);
-							return false;
-						}
-					}
-				}
-			}
-		)
-		.on(
-			'afterCommand',
-			(command: string, _, listStyleType: string): false | void => {
-				if (isOurCommand(command)) {
-					const ul = getListWrapper();
-
-					if (ul) {
-						setListStyleType(ul, listStyleType);
-						editor.createInside.applyCreateAttributes(ul);
-
-						ul.querySelectorAll('li').forEach(li => {
-							editor.createInside.applyCreateAttributes(li);
-						});
-					}
-
-					const unwrapList: Node[] = [],
-						shouldUnwrap = (elm: Nullable<Node>): void => {
-							if (
-								Dom.isTag(elm, [
-									'p',
-									'h1',
-									'h2',
-									'h3',
-									'h4',
-									'h5',
-									'h6'
-								])
-							) {
-								unwrapList.push(elm);
-							}
-						};
-
-					if (ul) {
-						shouldUnwrap(ul.parentNode);
-
-						ul.querySelectorAll('li').forEach(li =>
-							shouldUnwrap(li.firstChild)
-						);
-
-						if (unwrapList.length) {
-							editor.s.save();
-
-							toArray(ul.childNodes).forEach(li => {
-								if (Dom.isTag(li.lastChild, 'br')) {
-									Dom.safeRemove(li.lastChild);
-								}
-							});
-
-							unwrapList.forEach(elm => Dom.unwrap(elm));
-
-							editor.s.restore();
-						}
-					}
-
-					editor.setEditorValue();
-				}
-			}
-		);
-}

package/src/plugins/placeholder/placeholder.ts

@@ -94,7 +94,7 @@ export class placeholder extends Plugin {
 		this.addEvents();
 	}
 
-	private addNativeListeners = () => {
+	private addNativeListeners = (): void => {
 		this.j.e
 			.off(this.j.editor, 'input.placeholder keydown.placeholder')
 			.on(
@@ -104,7 +104,7 @@ export class placeholder extends Plugin {
 			);
 	};
 
-	private addEvents = () => {
+	private addEvents = (): void => {
 		const editor = this.j;
 
 		if (
@@ -191,7 +191,7 @@ export class placeholder extends Plugin {
 	}
 
 	@debounce(ctx => ctx.defaultTimeout / 10, true)
-	private toggle() {
+	private toggle(): void {
 		const editor = this.j;
 
 		if (!editor.editor || editor.isInDestruct) {