jodit 3.15.2 → 3.16.2

package/src/core/helpers/utils/selector.ts

@@ -24,7 +24,7 @@ import { UIElement } from 'jodit/core/ui';
 
 let temp = 1;
 
-const $$temp = () => {
+const $$temp = (): number => {
 	temp++;
 	return temp;
 };

package/src/core/helpers/utils/utils.ts

@@ -51,7 +51,7 @@ export function attr(elm: Element, key: string): null | string;
 /**
  * Remove attribute
  */
-export function attr(elm: Element, key: string, value: null): null | string;
+export function attr(elm: Element, key: string, value: null): void;
 
 /**
  * Set attribute
@@ -200,11 +200,11 @@ export const loadImage = (
 ): RejectablePromise<HTMLImageElement> =>
 	jodit.async.promise<HTMLImageElement>((res, rej) => {
 		const image = new Image(),
-			onError = () => {
+			onError = (): void => {
 				jodit.e.off(image);
 				rej?.();
 			},
-			onSuccess = () => {
+			onSuccess = (): void => {
 				jodit.e.off(image);
 				res(image);
 			};

package/src/core/plugin/plugin-system.ts

@@ -91,14 +91,20 @@ export class PluginSystem implements IPluginSystem {
 		const extrasList: IExtraPlugin[] = jodit.o.extraPlugins.map(s =>
 				isString(s) ? { name: s } : s
 			),
-			disableList = splitArray(jodit.o.disablePlugins).map(s =>
-				this.normalizeName(s)
-			),
+			disableList = splitArray(jodit.o.disablePlugins).map(s => {
+				const name = this.normalizeName(s);
+
+				if (!isProd && !this._items.has(name)) {
+					console.error(TypeError(`Unknown plugin disabled:${name}`));
+				}
+
+				return name;
+			}),
 			doneList: string[] = [],
 			promiseList: IDictionary<PluginInstance | undefined> = {},
 			plugins: PluginInstance[] = [],
 			pluginsMap: IDictionary<PluginInstance> = {},
-			makeAndInit = ([name, plugin]: [string, PluginType]) => {
+			makeAndInit = ([name, plugin]: [string, PluginType]): void => {
 				if (
 					disableList.includes(name) ||
 					doneList.includes(name) ||
@@ -197,7 +203,7 @@ export class PluginSystem implements IPluginSystem {
 		instance: PluginInstance,
 		doneList: string[],
 		promiseList: IDictionary<PluginInstance | undefined>
-	) {
+	): void {
 		const initPlugin = (name: string, plugin: PluginInstance): boolean => {
 			if (isInitable(plugin)) {
 				const req = (plugin as IPlugin).requires;
@@ -218,7 +224,7 @@ export class PluginSystem implements IPluginSystem {
 
 					doneList.push(name);
 				} else {
-					if (!isProd) {
+					if (!isProd && !promiseList[name]) {
 						console.log('Await plugin: ', name);
 					}
 
@@ -258,7 +264,7 @@ export class PluginSystem implements IPluginSystem {
 	private addListenerOnBeforeDestruct(
 		jodit: IJodit,
 		plugins: PluginInstance[]
-	) {
+	): void {
 		jodit.e.on('beforeDestruct', () => {
 			plugins.forEach(instance => {
 				if (isDestructable(instance)) {
@@ -276,7 +282,7 @@ export class PluginSystem implements IPluginSystem {
 	 * Download plugins
 	 */
 	private load(jodit: IJodit, pluginList: IExtraPlugin[]): Promise<any> {
-		const reflect = (p: Promise<any>) =>
+		const reflect = (p: Promise<any>): Promise<any> =>
 			p.then(
 				(v: any) => ({ v, status: 'fulfilled' }),
 				(e: any) => ({ e, status: 'rejected' })

package/src/core/request/ajax.ts

@@ -102,11 +102,11 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 		const request = this.prepareRequest();
 
 		return this.j.async.promise((resolve, reject) => {
-			const onReject = () => {
+			const onReject = (): void => {
 				reject(error('Connection error'));
 			};
 
-			const onResolve = () => {
+			const onResolve = (): void => {
 				this.resolved = true;
 
 				resolve(
@@ -138,7 +138,7 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 				this.options.onProgress?.(percentComplete);
 			};
 
-			xhr.onreadystatechange = () => {
+			xhr.onreadystatechange = (): void => {
 				this.options.onProgress?.(10);
 
 				if (xhr.readyState === XMLHttpRequest.DONE) {

package/src/core/selection/select.ts

@@ -179,7 +179,7 @@ export class Select implements ISelect {
 		try {
 			const rng = this.createRange();
 
-			(() => {
+			((): void => {
 				if (this.doc.caretPositionFromPoint) {
 					const caret = this.doc.caretPositionFromPoint(x, y);
 
@@ -286,7 +286,7 @@ export class Select implements ISelect {
 	restore(): void {
 		let range: Range | false = false;
 
-		const markAttr = (start: boolean) =>
+		const markAttr = (start: boolean): string =>
 			`span[data-${consts.MARKER_CLASS}=${start ? 'start' : 'end'}]`;
 
 		const start = this.area.querySelector(markAttr(true)),
@@ -725,7 +725,7 @@ export class Select implements ISelect {
 			css(image, styles);
 		}
 
-		const onload = () => {
+		const onload = (): void => {
 			if (
 				image.naturalHeight < image.offsetHeight ||
 				image.naturalWidth < image.offsetWidth
@@ -750,7 +750,7 @@ export class Select implements ISelect {
 		 * {@link FileBrowser|FileBrowser} or {@link Uploader|Uploader}
 		 * @example
 		 * ```javascript
-		 * var editor = new Jodit("#redactor");
+		 * var editor = Jodit.make("#redactor");
 		 * editor.e.on('afterInsertImage', function (image) {
 		 *     image.className = 'bloghead4';
 		 * });
@@ -806,7 +806,7 @@ export class Select implements ISelect {
 				end = end.previousSibling;
 			}
 
-			const checkElm = (node: Nullable<Node>) => {
+			const checkElm = (node: Nullable<Node>): void => {
 				if (
 					node &&
 					node !== root &&
@@ -900,8 +900,8 @@ export class Select implements ISelect {
 		const container = start ? range.startContainer : range.endContainer;
 		const offset = start ? range.startOffset : range.endOffset;
 
-		const check = (elm: Node | null) =>
-			elm && !Dom.isTag(elm, 'br') && !Dom.isEmptyTextNode(elm);
+		const check = (elm: Node | null): boolean =>
+			Boolean(elm && !Dom.isTag(elm, 'br') && !Dom.isEmptyTextNode(elm));
 
 		// check right offset
 		if (Dom.isText(container)) {
@@ -1117,7 +1117,7 @@ export class Select implements ISelect {
 	 * Return current selected HTML
 	 * @example
 	 * ```javascript
-	 * const editor = new jodit();
+	 * const editor = Jodit.make();
 	 * console.log(editor.s.html); // html
 	 * console.log(Jodit.modules.Helpers.stripTags(editor.s.html)); // plain text
 	 * ```
@@ -1318,7 +1318,7 @@ export class Select implements ISelect {
 				const clearBR = (
 					start: Node,
 					getNext: (node: Node) => Node | null
-				) => {
+				): void => {
 					let next = getNext(start);
 
 					while (next) {
@@ -1373,7 +1373,7 @@ export class Select implements ISelect {
 			}
 
 			// After splitting some part can be empty
-			const fillFakeParent = (fake: Node) => {
+			const fillFakeParent = (fake: Node): void => {
 				if (
 					fake?.parentNode?.firstChild === fake?.parentNode?.lastChild
 				) {

package/src/core/selection/style/api/toggle/toggle-css.ts

@@ -45,12 +45,15 @@ export function toggleCSS(
 			) {
 				!dry && css(elm, rule, null);
 				mode = UNSET;
-				mode = removeExtraCSS(commitStyle, elm, mode);
+				mode = removeExtraStyleAttribute(commitStyle, elm, mode);
 				return;
 			}
 
 			mode = CHANGE;
 			!dry && css(elm, rule, style[rule]);
+			if (!dry) {
+				mode = removeExtraStyleAttribute(commitStyle, elm, mode);
+			}
 		});
 	}
 
@@ -71,7 +74,7 @@ export function toggleCSS(
  * If the element has an empty style attribute, it removes the attribute,
  * and if it is default, it removes the element itself
  */
-function removeExtraCSS(
+function removeExtraStyleAttribute(
 	commitStyle: CommitStyle,
 	elm: HTMLElement,
 	mode: CommitMode

package/src/core/selection/style/api/wrap-unwrapped-text.ts

@@ -20,7 +20,7 @@ export function wrapUnwrappedText(
 ): HTMLElement {
 	const root = jodit.editor,
 		ci = jodit.createInside,
-		edge = (n: Node, key: keyof Node = 'previousSibling') => {
+		edge = (n: Node, key: keyof Node = 'previousSibling'): Node => {
 			let edgeNode: Node = n,
 				node: Nullable<Node> = n;
 

package/src/core/selection/style/apply-style.ts

@@ -34,7 +34,7 @@ export function ApplyStyle(jodit: IJodit, cs: CommitStyle): void {
 
 	const fsm = new FiniteStateMachine('start', {
 		start: {
-			start() {
+			start(): void {
 				sel.save();
 				normalizeNode(editor.firstChild); // FF fix for test "commandsTest - Exec command "bold"
 				this.setState('generator');
@@ -42,7 +42,7 @@ export function ApplyStyle(jodit: IJodit, cs: CommitStyle): void {
 		},
 
 		generator: {
-			initGenerator() {
+			initGenerator(): Generator {
 				return jodit.s.wrapInTagGen();
 			},
 
@@ -174,13 +174,13 @@ export function ApplyStyle(jodit: IJodit, cs: CommitStyle): void {
 		},
 
 		endProcess: {
-			toggleStyles() {
+			toggleStyles(): void {
 				this.setState('generator');
 			}
 		},
 
 		end: {
-			finalize() {
+			finalize(): void {
 				sel.restore();
 			}
 		}

package/src/core/storage/engines/local-storage-provider.ts

@@ -13,31 +13,32 @@ import type { BooleanFunction, IStorage, StorageValueType } from 'jodit/types';
 /**
  * Check if user disable local storages/cookie etc.
  */
-export const canUsePersistentStorage: BooleanFunction = (() => {
-	const canUse = () => {
-		const tmpKey = '___Jodit___' + Math.random().toString();
+export const canUsePersistentStorage: BooleanFunction =
+	((): BooleanFunction => {
+		const canUse = (): boolean => {
+			const tmpKey = '___Jodit___' + Math.random().toString();
 
-		try {
-			localStorage.setItem(tmpKey, '1');
-			const result = localStorage.getItem(tmpKey) === '1';
-			localStorage.removeItem(tmpKey);
+			try {
+				localStorage.setItem(tmpKey, '1');
+				const result = localStorage.getItem(tmpKey) === '1';
+				localStorage.removeItem(tmpKey);
 
-			return result;
-		} catch {}
+				return result;
+			} catch {}
 
-		return false;
-	};
+			return false;
+		};
 
-	let result: boolean | undefined;
+		let result: boolean | undefined;
 
-	return () => {
-		if (result === undefined) {
-			result = canUse();
-		}
+		return () => {
+			if (result === undefined) {
+				result = canUse();
+			}
 
-		return result;
-	};
-})();
+			return result;
+		};
+	})();
 
 /**
  * Persistent storage in localStorage

package/src/core/ui/button/button/button.ts

@@ -49,16 +49,16 @@ export const UIButtonState = (): IUIButtonState => ({
 @component
 export class UIButton extends UIElement implements IUIButton {
 	/** @override */
-	className(): string {
+	override className(): string {
 		return 'UIButton';
 	}
 
 	/**
 	 * Marker for buttons
 	 */
-	isButton: true = true;
+	readonly isButton: true = true;
 
-	state = UIButtonState();
+	readonly state = UIButtonState();
 
 	/**
 	 * Set state
@@ -148,7 +148,7 @@ export class UIButton extends UIElement implements IUIButton {
 	}
 
 	@watch('state.tabIndex')
-	onChangeTabIndex(): void {
+	protected onChangeTabIndex(): void {
 		attr(this.container, 'tabindex', this.state.tabIndex);
 	}
 
@@ -228,7 +228,7 @@ export class UIButton extends UIElement implements IUIButton {
 		return super.destruct();
 	}
 
-	private actionHandlers: Function[] = [];
+	private readonly actionHandlers: Function[] = [];
 
 	/**
 	 * Add action handler

package/src/core/ui/element.ts

@@ -71,8 +71,8 @@ export abstract class UIElement<T extends IViewBased = IViewBased>
 	closest<T extends IUIElement>(type: Function | T): Nullable<T> {
 		const c =
 			typeof type === 'object'
-				? (pe: IUIElement) => pe === type
-				: (pe: IUIElement) => pe instanceof type;
+				? (pe: IUIElement): boolean => pe === type
+				: (pe: IUIElement): boolean => pe instanceof type;
 
 		let pe = this.__parentElement;
 

package/src/core/ui/form/inputs/input/input.ts

@@ -279,7 +279,7 @@ export class UIInput extends UIElement implements IUIInput {
 	/**
 	 * Set `focused` mod on change focus
 	 */
-	private onChangeFocus() {
+	private onChangeFocus(): void {
 		this.setMod('focused', this.isFocused);
 	}
 }

package/src/core/ui/form/inputs/select/select.ts

@@ -49,7 +49,7 @@ export class UISelect extends UIInput implements IUISelect {
 		const { j } = this,
 			{ nativeInput } = this;
 
-		const opt = () => j.create.element('option');
+		const opt = (): HTMLOptionElement => j.create.element('option');
 
 		if (state.placeholder !== undefined) {
 			const option = opt();

package/src/core/ui/group/list.ts

@@ -99,7 +99,7 @@ export class UIList<T extends IViewBased = IViewBased>
 
 		let group: IUIGroup;
 
-		const addButton = (control: IControlTypeStrong) => {
+		const addButton = (control: IControlTypeStrong): void => {
 			let elm: Nullable<IUIElement> = null;
 
 			switch (control.name) {
@@ -146,7 +146,7 @@ export class UIList<T extends IViewBased = IViewBased>
 			}
 		};
 
-		const isNotRemoved = (b: IControlTypeStrong) =>
+		const isNotRemoved = (b: IControlTypeStrong): boolean =>
 			!this.removeButtons.includes(b.name);
 
 		items.forEach(item => {

package/src/core/vdom/render/index.ts

@@ -14,13 +14,17 @@ import { domToVDom } from '../helpers';
 import { Async } from 'jodit/core/async';
 import autobind from 'autobind-decorator';
 
-const isProperty = (key: string) => key !== 'children';
+const isProperty = (key: string): boolean => key !== 'children';
 
-const isNew = (prev: IDictionary, next: IDictionary) => (key: string) =>
-	prev[key] !== next[key];
+const isNew =
+	(prev: IDictionary, next: IDictionary) =>
+	(key: string): boolean =>
+		prev[key] !== next[key];
 
-const isGone = (prev: IDictionary, next: IDictionary) => (key: string) =>
-	!(key in next);
+const isGone =
+	(prev: IDictionary, next: IDictionary) =>
+	(key: string): boolean =>
+		!(key in next);
 
 const updateDom = (
 	dom: Node,
@@ -59,7 +63,7 @@ const createDom = (fiber: IFiber): Node => {
 export class VDomRender {
 	private async: Async = new Async();
 
-	private commitRoot() {
+	private commitRoot(): void {
 		this.deletions.forEach(this.commitWork);
 		this.deletions.length = 0;
 		this.commitWork(this.wipRoot?.child);
@@ -67,7 +71,7 @@ export class VDomRender {
 		this.wipRoot = undefined;
 	}
 
-	private commitWork(fiber: CanUndef<IFiber>) {
+	private commitWork(fiber: CanUndef<IFiber>): void {
 		if (!fiber) {
 			return;
 		}
@@ -92,7 +96,7 @@ export class VDomRender {
 		this.commitWork(fiber?.sibling);
 	}
 
-	private commitDeletion(fiber: CanUndef<IFiber>, domParent: Node) {
+	private commitDeletion(fiber: CanUndef<IFiber>, domParent: Node): void {
 		if (fiber?.dom) {
 			domParent.removeChild(fiber.dom);
 		} else {

package/src/core/vdom/v-dom-jodit.ts

@@ -36,7 +36,7 @@ export class VDomJodit {
 		return new VDomJodit(elm);
 	}
 
-	private preventAllInputEvents() {
+	private preventAllInputEvents(): void {
 		this.container.addEventListener('keydown', e => {
 			e.preventDefault();
 		});

package/src/core/view/view.ts

@@ -98,7 +98,7 @@ export abstract class View extends Component implements IViewBased, Mods, Elms {
 
 	/**
 	 * Return default timeout period in milliseconds for some debounce or throttle functions.
-	 * By default return `{observer.timeout}` options
+	 * By default, `{history.timeout}` options
 	 */
 	get defaultTimeout(): number {
 		return isVoid(this.o.defaultTimeout) ? 100 : this.o.defaultTimeout;

package/src/index.ts

@@ -23,14 +23,14 @@ import { Jodit as DefaultJodit } from './jodit';
 import Languages from './langs/';
 
 import * as decorators from './core/decorators';
-import * as consts from './core/constants';
+import * as constants from './core/constants';
 import * as Modules from './modules/';
 import * as Plugins from './plugins/';
 import * as Icons from './styles/icons/';
 
 // copy constants in Jodit
-Object.keys(consts).forEach((key: string) => {
-	(DefaultJodit as any)[key] = (consts as any)[key];
+Object.keys(constants).forEach((key: string) => {
+	(DefaultJodit as any)[key] = (constants as any)[key];
 });
 
 const esFilter = (key: string): boolean => key !== '__esModule';