jodit 3.6.16 → 3.7.2

package/src/modules/toolbar/button/button.ts

@@ -43,11 +43,11 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	implements IToolbarButton
 {
 	/** @override */
-	className(): string {
+	override className(): string {
 		return 'ToolbarButton';
 	}
 
-	state = {
+	override state = {
 		...UIButtonState(),
 		theme: 'toolbar',
 		currentValue: '',
@@ -73,7 +73,7 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	}
 
 	/** @override **/
-	update(): void {
+	override update(): void {
 		const { control, state } = this,
 			tc = this.closest(ToolbarCollection) as ToolbarCollection;
 
@@ -90,13 +90,13 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	}
 
 	/** @override */
-	protected onChangeActivated(): void {
+	protected override onChangeActivated(): void {
 		attr(this.button, 'aria-pressed', this.state.activated);
 		super.onChangeActivated();
 	}
 
 	/** @override */
-	protected onChangeText(): void {
+	protected override onChangeText(): void {
 		if (isFunction(this.control.template)) {
 			this.text.innerHTML = this.control.template(
 				this.j,
@@ -111,12 +111,12 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	}
 
 	/** @override */
-	onChangeTabIndex(): void {
+	override onChangeTabIndex(): void {
 		attr(this.button, 'tabIndex', this.state.tabIndex);
 	}
 
 	/** @override */
-	protected createContainer(): HTMLElement {
+	protected override createContainer(): HTMLElement {
 		const cn = this.componentName;
 		const container = this.j.c.span(cn),
 			button = super.createContainer();
@@ -144,7 +144,7 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	}
 
 	/** @override */
-	focus(): void {
+	override focus(): void {
 		this.container.querySelector('button')?.focus();
 	}
 
@@ -160,7 +160,7 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 	}
 
 	/** @override */
-	protected onChangeDisabled(): void {
+	protected override onChangeDisabled(): void {
 		const dsb = this.state.disabled ? 'disabled' : null;
 
 		attr(this.trigger, 'disabled', dsb);
@@ -413,7 +413,8 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 				button: this
 			});
 
-			if (result !== false) {
+			// For memorise exec
+			if (result !== false && result !== true) {
 				this.j?.e?.fire('synchro');
 
 				if (this.parentElement) {
@@ -425,7 +426,9 @@ export class ToolbarButton<T extends IViewBased = IViewBased>
 				 * @event afterExec
 				 */
 				this.j?.e?.fire('closeAllPopups afterExec');
+			}
 
+			if (result !== false) {
 				return;
 			}
 		}

package/src/modules/toolbar/button/content.ts

@@ -23,12 +23,12 @@ export class ToolbarContent<T extends IViewBased = IViewBased>
 	implements IToolbarButton
 {
 	/** @override */
-	className(): string {
+	override className(): string {
 		return 'ToolbarContent';
 	}
 
 	/** @override */
-	update(): void {
+	override update(): void {
 		const content = this.control.getContent(this.j, this.control, this);
 
 		if (isString(content) || content.parentNode !== this.container) {
@@ -43,7 +43,7 @@ export class ToolbarContent<T extends IViewBased = IViewBased>
 	}
 
 	/** @override */
-	protected createContainer(): HTMLElement {
+	protected override createContainer(): HTMLElement {
 		return this.j.c.span(this.componentName);
 	}
 

package/src/modules/toolbar/collection/collection.ts

@@ -29,11 +29,11 @@ export class ToolbarCollection<T extends IViewBased = IViewBased>
 	implements IToolbarCollection
 {
 	/** @override */
-	className(): string {
+	override className(): string {
 		return 'ToolbarCollection';
 	}
 
-	jodit!: T;
+	override jodit!: T;
 
 	readonly listenEvents =
 		'updateToolbar changeStack mousedown mouseup keydown change afterInit readonly afterResize ' +
@@ -47,7 +47,7 @@ export class ToolbarCollection<T extends IViewBased = IViewBased>
 		return button || null;
 	}
 
-	protected makeButton(
+	protected override makeButton(
 		control: IControlTypeStrong,
 		target: Nullable<HTMLElement> = null
 	): IUIButton {
@@ -116,7 +116,7 @@ export class ToolbarCollection<T extends IViewBased = IViewBased>
 		this.j.e.fire('afterUpdateToolbar');
 	}
 
-	update = this.j.async.debounce(
+	override update = this.j.async.debounce(
 		this.immediateUpdate,
 		() => this.j.defaultTimeout
 	);
@@ -143,7 +143,10 @@ export class ToolbarCollection<T extends IViewBased = IViewBased>
 	}
 
 	/** @override **/
-	build(items: ButtonsGroups, target: Nullable<HTMLElement> = null): this {
+	override build(
+		items: ButtonsGroups,
+		target: Nullable<HTMLElement> = null
+	): this {
 		const itemsWithGroupps = this.j.e.fire(
 			'beforeToolbarBuild',
 			items
@@ -158,7 +161,7 @@ export class ToolbarCollection<T extends IViewBased = IViewBased>
 	}
 
 	/** @override **/
-	destruct(): void {
+	override destruct(): void {
 		if (this.isDestructed) {
 			return;
 		}

package/src/modules/toolbar/collection/editor-collection.ts

@@ -19,12 +19,12 @@ import { component } from '../../../core/decorators';
 @component
 export class ToolbarEditorCollection extends ToolbarCollection<IJodit> {
 	/** @override */
-	className(): string {
+	override className(): string {
 		return 'ToolbarEditorCollection';
 	}
 
 	/** @override */
-	shouldBeDisabled(button: IToolbarButton): boolean {
+	override shouldBeDisabled(button: IToolbarButton): boolean {
 		const disabled = super.shouldBeDisabled(button);
 
 		if (disabled !== undefined) {
@@ -40,7 +40,7 @@ export class ToolbarEditorCollection extends ToolbarCollection<IJodit> {
 	}
 
 	/** @override */
-	shouldBeActive(button: IToolbarButton): boolean {
+	override shouldBeActive(button: IToolbarButton): boolean {
 		const active = super.shouldBeActive(button);
 
 		if (active !== undefined) {
@@ -135,7 +135,29 @@ export class ToolbarEditorCollection extends ToolbarCollection<IJodit> {
 	};
 
 	/** @override */
-	getTarget(button: IToolbarButton): Node | null {
+	override getTarget(button: IToolbarButton): Node | null {
 		return button.target || this.j.s.current() || null;
 	}
+
+	/** @override */
+	constructor(jodit: IJodit) {
+		super(jodit);
+		this.prependInvisibleInput(this.container);
+	}
+
+	/**
+	 * Adds an invisible element to the container that can handle the
+	 * situation when the editor is inside the <label>
+	 *
+	 * @see https://github.com/jodit/jodit-react/issues/138
+	 * @param container
+	 */
+	private prependInvisibleInput(container: HTMLElement): void {
+		const input = this.j.create.element('input', {
+			tabIndex: -1,
+			style: 'width: 0; height:0; position: absolute; visibility: hidden;'
+		});
+
+		Dom.appendChildFirst(container, input);
+	}
 }

package/src/modules/uploader/uploader.ts

@@ -774,7 +774,7 @@ export class Uploader extends ViewComponent implements IUploader {
 		) as IUploaderOptions<Uploader>;
 	}
 
-	destruct(): any {
+	override destruct(): any {
 		this.setStatus(STATUSES.beforeDestruct);
 
 		this.ajaxInstances.forEach(ajax => {

package/src/modules/widget/file-selector/file-selector.ts

@@ -145,7 +145,7 @@ export const FileSelectorWidget = (
 					required: true,
 					label: 'URL',
 					name: 'url',
-					type: 'url',
+					type: 'text',
 					placeholder: 'https://'
 				}),
 				new UIInput(editor, {

package/src/plugins/about/about.ts

@@ -32,7 +32,7 @@ Config.prototype.controls.about = {
 							: normalizeLicense(editor.o.license)
 					)}</div>
 					<div>
-						<a href="https://xdsoft.net/jodit/" target="_blank">http://xdsoft.net/jodit/</a>
+						<a href="${process.env.HOMEPAGE}" target="_blank">${process.env.HOMEPAGE}</a>
 					</div>
 					<div>
 						<a href="https://xdsoft.net/jodit/doc/" target="_blank">${i18n(

package/src/plugins/class-span/class-span.ts

@@ -115,7 +115,7 @@ Config.prototype.controls.classSpan = {
  */
 export class classSpan extends Plugin {
 	/** @override */
-	buttons: Plugin['buttons'] = [
+	override buttons: Plugin['buttons'] = [
 		{
 			name: 'classSpan',
 			group: 'font'
@@ -123,7 +123,7 @@ export class classSpan extends Plugin {
 	];
 
 	/** @override */
-	protected afterInit(jodit: IJodit): void {
+	protected override afterInit(jodit: IJodit): void {
 		jodit.registerCommand(
 			'applyClassName',
 			(command: string, second: string, third: string): false => {
@@ -136,5 +136,5 @@ export class classSpan extends Plugin {
 		);
 	}
 
-	protected beforeDestruct(jodit: IJodit): void {}
+	protected override beforeDestruct(jodit: IJodit): void {}
 }

package/src/plugins/clipboard/clipboard.ts

@@ -43,36 +43,40 @@ export class clipboard implements IPlugin {
 
 		editor.e
 			.off(`copy.${pluginKey} cut.${pluginKey}`)
-			.on(`copy.${pluginKey} cut.${pluginKey}`, (event: ClipboardEvent):
-				| false
-				| void => {
-				const selectedText = editor.s.html;
+			.on(
+				`copy.${pluginKey} cut.${pluginKey}`,
+				(event: ClipboardEvent): false | void => {
+					const selectedText = editor.s.html;
 
-				const clipboardData =
-					getDataTransfer(event) ||
-					getDataTransfer(editor.ew as any) ||
-					getDataTransfer((event as any).originalEvent);
+					const clipboardData =
+						getDataTransfer(event) ||
+						getDataTransfer(editor.ew as any) ||
+						getDataTransfer((event as any).originalEvent);
 
-				if (clipboardData) {
-					clipboardData.setData(TEXT_PLAIN, stripTags(selectedText));
-					clipboardData.setData(TEXT_HTML, selectedText);
-				}
+					if (clipboardData) {
+						clipboardData.setData(
+							TEXT_PLAIN,
+							stripTags(selectedText)
+						);
+						clipboardData.setData(TEXT_HTML, selectedText);
+					}
 
-				editor.buffer.set(pluginKey, selectedText);
-				editor.e.fire('pasteStack', {
-					html: selectedText,
-					action: editor.o.defaultActionOnPaste
-				});
+					editor.buffer.set(pluginKey, selectedText);
+					editor.e.fire('pasteStack', {
+						html: selectedText,
+						action: editor.o.defaultActionOnPaste
+					});
 
-				if (event.type === 'cut') {
-					editor.s.remove();
-					editor.s.focus();
-				}
+					if (event.type === 'cut') {
+						editor.s.remove();
+						editor.s.focus();
+					}
 
-				event.preventDefault();
+					event.preventDefault();
 
-				editor?.events?.fire('afterCopy', selectedText);
-			});
+					editor?.events?.fire('afterCopy', selectedText);
+				}
+			);
 	}
 
 	/** @override */

package/src/plugins/clipboard/paste/helpers.ts

@@ -6,13 +6,7 @@
 
 import type { IJodit, Nullable } from '../../../types';
 import type { PasteEvent } from '../config';
-import {
-	isArray,
-	isNumber,
-	isString,
-	isVoid,
-	type
-} from '../../../core/helpers';
+import { isArray, isNumber, isString, isVoid } from '../../../core/helpers';
 import { Dom } from '../../../core/dom';
 import { TEXT_PLAIN } from '../../../core/constants';
 
@@ -104,7 +98,10 @@ export function getAllTypes(dt: DataTransfer): string {
 
 	let types_str: string = '';
 
-	if (isArray(types) || type(types) === 'domstringlist') {
+	if (
+		isArray(types) ||
+		{}.toString.call(types) === '[object DOMStringList]'
+	) {
 		for (let i = 0; i < types.length; i += 1) {
 			types_str += types[i] + ';';
 		}

package/src/plugins/clipboard/paste/paste.ts

@@ -50,7 +50,7 @@ export class paste extends Plugin {
 	pasteStack: LimitedStack<PastedValue> = new LimitedStack(20);
 
 	/** @override **/
-	protected afterInit(jodit: IJodit) {
+	protected afterInit(jodit: IJodit): void {
 		jodit.e
 			.on('paste.paste', this.onPaste)
 			.on('pasteStack.paste', (item: PastedValue) =>
@@ -395,7 +395,7 @@ export class paste extends Plugin {
 	 * TODO: need check all browser, now not used
 	 * @param event
 	 */
-	useFakeDivBox(event: PasteEvent) {
+	useFakeDivBox(event: PasteEvent): void {
 		const div = this.j.c.div('', {
 			tabindex: -1,
 			contenteditable: true,
@@ -446,7 +446,7 @@ export class paste extends Plugin {
 	}
 
 	/** @override **/
-	protected beforeDestruct(jodit: IJodit) {
+	protected beforeDestruct(jodit: IJodit): void {
 		jodit.e.off('paste.paste', this.onPaste);
 	}
 }

package/src/plugins/fix/clean-html.ts

@@ -107,7 +107,7 @@ Config.prototype.controls.eraser = {
  */
 export class cleanHtml extends Plugin<IJodit> {
 	/** @override */
-	buttons: Plugin['buttons'] = [
+	override buttons: Plugin['buttons'] = [
 		{
 			name: 'eraser',
 			group: 'font-style'
@@ -115,7 +115,7 @@ export class cleanHtml extends Plugin<IJodit> {
 	];
 
 	/** @override */
-	protected afterInit(jodit: IJodit): void {
+	protected override afterInit(jodit: IJodit): void {
 		jodit.e
 			.off('.cleanHtml')
 			.on(
@@ -536,7 +536,7 @@ export class cleanHtml extends Plugin<IJodit> {
 	}
 
 	/** @override */
-	protected beforeDestruct(): void {
+	protected override beforeDestruct(): void {
 		this.j.e.off('.cleanHtml');
 	}
 }

package/src/plugins/image/helpers.ts

@@ -15,7 +15,7 @@ import { clearCenterAlign, css } from '../../core/helpers';
 export const hAlignElement = (
 	image: HTMLElement,
 	align: 'normal' | 'left' | 'right' | 'center' | ''
-) => {
+): void => {
 	if (align && align !== 'normal') {
 		if (align !== 'center') {
 			css(image, 'float', align);

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

@@ -37,7 +37,7 @@ import { debounce, wait, autobind, watch } from '../../core/decorators';
  * Plugin for show inline popup dialog
  */
 export class inlinePopup extends Plugin {
-	requires = ['select'];
+	override requires = ['select'];
 
 	private type: Nullable<string> = null;
 

package/src/plugins/keyboard/delete.ts

@@ -47,7 +47,7 @@ Config.prototype.delete = {
 
 export class Delete extends Plugin {
 	/** @override */
-	requires = ['hotkeys'];
+	override requires = ['hotkeys'];
 
 	/**
 	 * Shortcut for jodit.editor

package/src/plugins/keyboard/enter.ts

@@ -74,33 +74,33 @@ export class enter extends Plugin {
 				: (this.defaultTag as 'p' | 'div');
 		}
 
-		editor.e.off('.enter').on('keydown.enter', (event: KeyboardEvent):
-			| false
-			| void => {
-			if (event.key === consts.KEY_ENTER) {
-				/**
-				 * Fired on processing `Enter` key. If return some value, plugin `enter` will do nothing.
-				 * if return false - prevent default Enter behavior
-				 *
-				 * @event beforeEnter
-				 */
-				const beforeEnter = editor.e.fire('beforeEnter', event);
-
-				if (beforeEnter !== undefined) {
-					return beforeEnter;
+		editor.e
+			.off('.enter')
+			.on('keydown.enter', (event: KeyboardEvent): false | void => {
+				if (event.key === consts.KEY_ENTER) {
+					/**
+					 * Fired on processing `Enter` key. If return some value, plugin `enter` will do nothing.
+					 * if return false - prevent default Enter behavior
+					 *
+					 * @event beforeEnter
+					 */
+					const beforeEnter = editor.e.fire('beforeEnter', event);
+
+					if (beforeEnter !== undefined) {
+						return beforeEnter;
+					}
+
+					if (!editor.s.isCollapsed()) {
+						editor.execCommand('Delete');
+					}
+
+					editor.s.focus();
+
+					this.onEnter(event);
+
+					return false;
 				}
-
-				if (!editor.s.isCollapsed()) {
-					editor.execCommand('Delete');
-				}
-
-				editor.s.focus();
-
-				this.onEnter(event);
-
-				return false;
-			}
-		});
+			});
 	}
 
 	private onEnter(event: KeyboardEvent): false | void {

package/src/plugins/limit.ts

@@ -43,7 +43,7 @@ Config.prototype.limitHTML = false;
  */
 export class limit extends Plugin {
 	/** @override **/
-	protected afterInit(jodit: IJodit) {
+	protected afterInit(jodit: IJodit): void {
 		const { limitWords, limitChars } = jodit.o;
 
 		if (jodit && (limitWords || limitChars)) {
@@ -142,7 +142,7 @@ export class limit extends Plugin {
 	}
 
 	/** @override **/
-	protected beforeDestruct(jodit: IJodit) {
+	protected beforeDestruct(jodit: IJodit): void {
 		jodit.e.off('.limit');
 	}
 }

package/src/plugins/link/link.ts

@@ -141,7 +141,7 @@ Config.prototype.controls.link = {
  */
 export class link extends Plugin {
 	/** @override */
-	buttons: Plugin['buttons'] = [
+	override buttons: Plugin['buttons'] = [
 		{
 			name: 'link',
 			group: 'insert'
@@ -149,7 +149,7 @@ export class link extends Plugin {
 	];
 
 	/** @override */
-	protected afterInit(jodit: IJodit): void {
+	protected override afterInit(jodit: IJodit): void {
 		if (jodit.o.link.followOnDblClick) {
 			jodit.e.on('dblclick.link', this.onDblClickOnLink);
 		}
@@ -496,7 +496,7 @@ export class link extends Plugin {
 	}
 
 	/** @override */
-	protected beforeDestruct(jodit: IJodit): void {
+	protected override beforeDestruct(jodit: IJodit): void {
 		jodit.e
 			.off('generateLinkForm.link', this.generateForm)
 			.off('dblclick.link', this.onDblClickOnLink)

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

@@ -7,7 +7,7 @@
 import type { IJodit } from '../../../types';
 import './config';
 
-export function video(editor: IJodit) {
+export function video(editor: IJodit): void {
 	editor.registerButton({
 		name: 'video',
 		group: 'media'