jodit 4.2.27 → 4.2.33

package/esm/core/helpers/size/get-scroll-parent.js

@@ -3,6 +3,7 @@
  * 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 { globalDocument } from "../../constants.js";
 import { Dom } from "../../dom/dom.js";
 import { css } from "../utils/index.js";
 export function getScrollParent(node) {
@@ -16,6 +17,6 @@ export function getScrollParent(node) {
         return node;
     }
     return (getScrollParent(node.parentNode) ||
-        document.scrollingElement ||
-        document.body);
+        globalDocument.scrollingElement ||
+        globalDocument.body);
 }

package/esm/core/helpers/utils/complete-url.js

@@ -3,11 +3,12 @@
  * 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 { globalWindow } from "../../constants.js";
 /**
  * @module helpers/utils
  */
 export const completeUrl = (url) => {
-    if (window.location.protocol === 'file:' && /^\/\//.test(url)) {
+    if (globalWindow.location.protocol === 'file:' && /^\/\//.test(url)) {
         url = 'https:' + url;
     }
     return url;

package/esm/core/helpers/utils/convert-media-url-to-video-embed.js

@@ -6,6 +6,7 @@
 /**
  * @module helpers/utils
  */
+import { globalDocument } from "../../constants.js";
 import { isURL } from "../checker/is-url.js";
 import { parseQuery } from "./parse-query.js";
 /**
@@ -15,7 +16,7 @@ export const convertMediaUrlToVideoEmbed = (url, width = 400, height = 345) => {
     if (!isURL(url)) {
         return url;
     }
-    const parser = document.createElement('a'), pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
+    const parser = globalDocument.createElement('a'), pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
     parser.href = url;
     if (!width) {
         width = 400;

package/esm/core/helpers/utils/default-language.js

@@ -6,6 +6,7 @@
 /**
  * @module helpers/utils
  */
+import { globalDocument } from "../../constants.js";
 import { isString } from "../checker/is-string.js";
 /**
  * Try define user language
@@ -14,8 +15,8 @@ export const defaultLanguage = (language, defaultLanguage = 'en') => {
     if (language !== 'auto' && isString(language)) {
         return language;
     }
-    if (document.documentElement && document.documentElement.lang) {
-        return document.documentElement.lang;
+    if (globalDocument.documentElement && globalDocument.documentElement.lang) {
+        return globalDocument.documentElement.lang;
     }
     if (navigator.language) {
         return navigator.language.substring(0, 2);

package/esm/core/helpers/utils/reset.js

@@ -3,7 +3,7 @@
  * 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 { IS_PROD } from "../../constants.js";
+import { globalDocument, IS_PROD } from "../../constants.js";
 import { isFunction } from "../checker/is-function.js";
 import { get } from "./get.js";
 const map = {};
@@ -17,10 +17,10 @@ const map = {};
  */
 export function reset(key) {
     if (!(key in map)) {
-        const iframe = document.createElement('iframe');
+        const iframe = globalDocument.createElement('iframe');
         try {
             iframe.src = 'about:blank';
-            document.body.appendChild(iframe);
+            globalDocument.body.appendChild(iframe);
             if (!iframe.contentWindow) {
                 return null;
             }

package/esm/core/request/ajax.js

@@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { Async } from "../async/index.js";
+import { globalWindow } from "../constants.js";
 import { autobind } from "../decorators/autobind/autobind.js";
 import { buildQuery, ConfigProto, isFunction, isPlainObject, isString, parseQuery } from "../helpers/index.js";
 import * as error from "../helpers/utils/error/index.js";
@@ -42,7 +43,7 @@ export class Ajax {
             return this.o.queryBuild.call(this, obj, prefix);
         }
         if (isString(obj) ||
-            obj instanceof window.FormData ||
+            obj instanceof globalWindow.FormData ||
             (typeof obj === 'object' && obj != null && isFunction(obj.append))) {
             return obj;
         }

package/esm/core/selection/selection.js

@@ -593,6 +593,7 @@ export class Selection {
     /**
      * Call callback for all selection node
      */
+    // eslint-disable-next-line complexity
     eachSelection(callback) {
         const sel = this.sel;
         if (!sel || !sel.rangeCount) {

package/esm/core/selection/style/api/has-same-style.js

@@ -3,6 +3,7 @@
  * 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 { globalDocument } from "../../../constants.js";
 import { Dom } from "../../../dom/dom.js";
 import { isVoid } from "../../../helpers/checker/is-void.js";
 import { normalizeCssValue } from "../../../helpers/normalize/normalize-css-value.js";
@@ -29,11 +30,13 @@ export function hasSameStyle(elm, rules) {
                     .toLowerCase() === value.toString().toLowerCase());
         }));
 }
-const elm = document.createElement('div');
-elm.style.color = 'red';
-assert(hasSameStyle(elm, { color: 'red' }), 'Style test');
-assert(hasSameStyle(elm, { fontSize: null }), 'Style test');
-assert(hasSameStyle(elm, { fontSize: '' }), 'Style test');
+if (globalDocument) {
+    const elm = globalDocument.createElement('div');
+    elm.style.color = 'red';
+    assert(hasSameStyle(elm, { color: 'red' }), 'Style test');
+    assert(hasSameStyle(elm, { fontSize: null }), 'Style test');
+    assert(hasSameStyle(elm, { fontSize: '' }), 'Style test');
+}
 /**
  * Element has the similar styles keys
  */
@@ -45,8 +48,10 @@ export function hasSameStyleKeys(elm, rules) {
             return value !== '';
         }));
 }
-const elm2 = document.createElement('div');
-elm2.style.color = 'red';
-assert(hasSameStyleKeys(elm2, { color: 'red' }), 'Style test');
-assert(!hasSameStyleKeys(elm2, { font: 'Arial', color: 'red' }), 'Style test');
-assert(!hasSameStyleKeys(elm2, { border: '1px solid #ccc' }), 'Style test');
+if (globalDocument) {
+    const elm2 = globalDocument.createElement('div');
+    elm2.style.color = 'red';
+    assert(hasSameStyleKeys(elm2, { color: 'red' }), 'Style test');
+    assert(!hasSameStyleKeys(elm2, { font: 'Arial', color: 'red' }), 'Style test');
+    assert(!hasSameStyleKeys(elm2, { border: '1px solid #ccc' }), 'Style test');
+}

package/esm/core/selection/style/api/toggle-attributes.js

@@ -3,6 +3,7 @@
  * 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 { globalDocument } from "../../../constants.js";
 import { Dom } from "../../../dom/dom.js";
 import { getContainer } from "../../../global.js";
 import { isBoolean, isNumber, isPlainObject, isString } from "../../../helpers/checker/index.js";
@@ -129,7 +130,7 @@ function getShadowRoot(jodit) {
         return dataBind(jodit, 'shadowRoot');
     }
     const container = getContainer(jodit);
-    const iframe = document.createElement('iframe');
+    const iframe = globalDocument.createElement('iframe');
     css(iframe, {
         width: 0,
         height: 0,

package/esm/core/selection/style/commit-style.d.ts

@@ -23,7 +23,7 @@ export declare class CommitStyle implements ICommitStyle {
      */
     get isElementCommit(): boolean;
     get defaultTag(): HTMLTagNames;
-    get elementIsDefault(): Boolean;
+    get elementIsDefault(): boolean;
     constructor(options: IStyleOptions);
     apply(jodit: IJodit): void;
 }

package/esm/core/ui/form/inputs/file/file.d.ts

@@ -13,6 +13,7 @@ export declare class UIFileInput extends UIInput {
     private button;
     state: UIInput['state'] & {
         onlyImages: boolean;
+        tooltip?: string;
     };
     /** @override */
     className(): string;

package/esm/core/ui/form/inputs/file/file.js

@@ -23,6 +23,7 @@ let UIFileInput = class UIFileInput extends UIInput {
     }
     createContainer(options) {
         this.button = new UIButton(this.j, {
+            tooltip: options.tooltip,
             icon: {
                 name: 'plus'
             }

package/esm/core/ui/form/validators/input.d.ts

@@ -6,12 +6,12 @@
 /**
  * @module ui/form
  */
-import type { IUIInput, IUIInputValidator } from "../../../../types";
+import type { IUIInputValidator } from "../../../../types";
 /**
  * Input is required
  */
-export declare const required: IUIInputValidator<IUIInput>;
+export declare const required: IUIInputValidator;
 /**
  * Input value should be valid URL
  */
-export declare const url: IUIInputValidator<IUIInput>;
+export declare const url: IUIInputValidator;

package/esm/core/ui/form/validators/select.d.ts

@@ -10,4 +10,4 @@ import type { IUIInputValidator } from "../../../../types";
 /**
  * Select is required
  */
-export declare const required: IUIInputValidator<import("../../../../types").IUIInput>;
+export declare const required: IUIInputValidator;

package/esm/jodit.js

@@ -844,6 +844,9 @@ let Jodit = Jodit_1 = class Jodit extends ViewWithToolbar {
             }
         }
         catch (e) {
+            if (!IS_PROD) {
+                throw e;
+            }
             this.destruct();
             throw e;
         }

package/esm/modules/file-browser/config.js

@@ -220,10 +220,12 @@ Config.prototype.filebrowser = {
 Config.prototype.controls.filebrowser = {
     upload: {
         icon: 'plus',
+        tooltip: 'Upload file',
         isInput: true,
         isDisabled: (browser) => !browser.dataProvider.canI('FileUpload'),
-        getContent: (filebrowser) => {
+        getContent: (filebrowser, btnInt) => {
             const btn = new UIFileInput(filebrowser, {
+                tooltip: btnInt.control.tooltip,
                 onlyImages: filebrowser.state.onlyImages
             });
             filebrowser.e.fire('bindUploader.filebrowser', btn.container);
@@ -232,6 +234,7 @@ Config.prototype.controls.filebrowser = {
     },
     remove: {
         icon: 'bin',
+        tooltip: 'Remove file',
         isDisabled: (browser) => {
             return (!browser.state.activeElements.length ||
                 !browser.dataProvider.canI('FileRemove'));
@@ -241,11 +244,13 @@ Config.prototype.controls.filebrowser = {
         }
     },
     update: {
+        tooltip: 'Update file list',
         exec: (editor) => {
             editor.e.fire('update.filebrowser');
         }
     },
     select: {
+        tooltip: 'Select file',
         icon: 'check',
         isDisabled: (browser) => !browser.state.activeElements.length,
         exec: (editor) => {
@@ -253,6 +258,7 @@ Config.prototype.controls.filebrowser = {
         }
     },
     edit: {
+        tooltip: 'Edit image',
         icon: 'pencil',
         isDisabled: (browser) => {
             const selected = browser.state.activeElements;
@@ -266,6 +272,7 @@ Config.prototype.controls.filebrowser = {
         }
     },
     tiles: {
+        tooltip: 'Tiles view',
         icon: 'th',
         isActive: (filebrowser) => filebrowser.state.view === 'tiles',
         exec: (filebrowser) => {
@@ -273,6 +280,7 @@ Config.prototype.controls.filebrowser = {
         }
     },
     list: {
+        tooltip: 'List view',
         icon: 'th-list',
         isActive: (filebrowser) => filebrowser.state.view === 'list',
         exec: (filebrowser) => {

package/esm/modules/file-browser/data-provider.js

@@ -354,7 +354,6 @@ let DataProvider = class DataProvider {
                 data: {}
             };
         }
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const query = this.o[type];
         if (query.data === undefined) {
             query.data = {

package/esm/modules/file-browser/file-browser.js

@@ -41,7 +41,6 @@ let FileBrowser = class FileBrowser extends ViewWithToolbar {
     get dataProvider() {
         return makeDataProvider(this, this.options);
     }
-    // eslint-disable-next-line no-unused-vars
     onSelect(callback) {
         return () => {
             if (this.state.activeElements.length) {

package/esm/modules/table/table.js

@@ -36,7 +36,6 @@ export class Table extends ViewComponent {
             const selector = cssPath(td);
             selector && selectors.push(selector);
         });
-        // eslint-disable-next-line no-prototype-builtins
         style.innerHTML = selectors.length
             ? selectors.join(',') +
                 `{${this.jodit.options.table.selectionCellStyle}}`

package/esm/modules/toolbar/button/button.d.ts

@@ -20,7 +20,7 @@ export declare class ToolbarButton<T extends IViewBased = IViewBased> extends UI
         theme: string;
         currentValue: string;
         hasTrigger: boolean;
-        size: "small" | "tiny" | "xsmall" | "middle" | "large";
+        size: "tiny" | "xsmall" | "small" | "middle" | "large";
         name: string;
         value: string | number | boolean;
         variant: import("../../../types").ButtonVariant;

package/esm/plugins/backspace/cases/check-remove-char.js

@@ -20,6 +20,7 @@ import { findMostNestedNeighbor } from "../helpers.js";
  * ```
  * @private
  */
+// eslint-disable-next-line complexity
 export function checkRemoveChar(jodit, fakeNode, backspace, mode) {
     const step = backspace ? -1 : 1;
     const anotherSibling = Dom.sibling(fakeNode, !backspace);

package/esm/plugins/clean-html/config.d.ts

@@ -19,9 +19,9 @@ declare module 'jodit/config' {
             removeEmptyElements: boolean;
             replaceOldTags: IDictionary<HTMLTagNames> | false;
             /**
-             * Use iframe[sandbox] to paste HTML code into the editor to check it for safety
-             * Allows you not to run scripts and handlers, but it works much slower
-             * @example
+             * You can use an iframe with the sandbox attribute to safely paste and test HTML code.
+             * It prevents scripts and handlers from running, but it does slow things down.
+             *
              * ```javascript
              * Jodit.make('#editor', {
              * 	 cleanHTML: {

package/esm/plugins/iframe/config.d.ts

@@ -22,7 +22,7 @@ declare module 'jodit/config' {
          *
          * @example
          * ```javascript
-         * new Jodit('#editor', {
+         * Jodit.make('#editor', {
          *    iframe: true,
          *    iframeBaseUrl: 'https://xdsoft.net/jodit/docs/',
          * });
@@ -41,7 +41,7 @@ declare module 'jodit/config' {
          * Custom style to be used inside the iframe to display content.
          * @example
          * ```javascript
-         * new Jodit('#editor', {
+         * Jodit.make('#editor', {
          *    iframe: true,
          *    iframeStyle: 'html{margin: 0px;}',
          * })
@@ -53,13 +53,25 @@ declare module 'jodit/config' {
          *
          * @example
          * ```javascript
-         * new Jodit('#editor', {
+         * Jodit.make('#editor', {
          *    iframe: true,
          *    iframeCSSLinks: ['styles/default.css'],
          * })
          * ```
          */
         iframeCSSLinks: string[];
+        /**
+         * Custom sandbox attribute for the iframe.
+         * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#sandbox
+         * ```javascript
+         * Jodit.make('#editor', {
+         * 		iframe: true,
+         * 		iframeSandbox: 'allow-same-origin allow-scripts'
+         * });
+         * ```
+         * Empty string value means that all restrictions are enabled.
+         */
+        iframeSandbox: string | null;
     }
 }
 export {};

package/esm/plugins/iframe/config.js

@@ -78,3 +78,4 @@ Config.prototype.iframeStyle =
         '-ms-user-select: none' +
         '}';
 Config.prototype.iframeCSSLinks = [];
+Config.prototype.iframeSandbox = null;

package/esm/plugins/iframe/iframe.js

@@ -61,6 +61,9 @@ export function iframe(editor) {
         iframe.setAttribute('allowtransparency', 'true');
         iframe.setAttribute('tabindex', opt.tabIndex.toString());
         iframe.setAttribute('frameborder', '0');
+        if (opt.iframeSandbox != null) {
+            iframe.setAttribute('sandbox', opt.iframeSandbox);
+        }
         editor.workplace.appendChild(iframe);
         editor.iframe = iframe;
         const result = editor.e.fire('generateDocumentStructure.iframe', null, editor);

package/esm/plugins/indent/helpers.d.ts

@@ -7,4 +7,4 @@
  * Get style rule key for current direction
  * @internal
  */
-export declare const getKey: (direction: string, box: HTMLElement) => 'marginLeft' | 'marginRight' | 'paddingLeft' | 'paddingRight';
+export declare const getKey: (direction: string, box: HTMLElement) => "marginLeft" | "marginRight" | "paddingLeft" | "paddingRight";

package/esm/plugins/inline-popup/config/items/a.d.ts

@@ -6,6 +6,6 @@
 /**
  * @module plugins/inline-popup
  */
-import type { IControlType, IJodit } from "../../../../types";
-declare const _default: (string | IControlType<IJodit | import("../../../../types").IViewBased<import("../../../../types").IViewOptions> | import("../../../../types").IFileBrowser<import("../../../../types").IFileBrowserOptions>, import("../../../../types").IToolbarButton>)[];
+import type { IControlType } from "../../../../types";
+declare const _default: Array<IControlType | string>;
 export default _default;

package/esm/plugins/inline-popup/config/items/cells.d.ts

@@ -7,5 +7,5 @@
  * @module plugins/inline-popup
  */
 import type { IControlType } from "../../../../types";
-declare const _default: (string | IControlType<import("../../../../types").IJodit | import("../../../../types").IViewBased<import("../../../../types").IViewOptions> | import("../../../../types").IFileBrowser<import("../../../../types").IFileBrowserOptions>, import("../../../../types").IToolbarButton>)[];
+declare const _default: Array<IControlType | string>;
 export default _default;

package/esm/plugins/inline-popup/config/items/img.d.ts

@@ -8,5 +8,5 @@
  */
 import type { IControlType, IJodit } from "../../../../types";
 export declare const align: IControlType<IJodit>;
-declare const _default: (string | IControlType<IJodit | import("../../../../types").IViewBased<import("../../../../types").IViewOptions> | import("../../../../types").IFileBrowser<import("../../../../types").IFileBrowserOptions>, import("../../../../types").IToolbarButton>)[];
+declare const _default: Array<IControlType | string>;
 export default _default;

package/esm/plugins/search/config.js

@@ -3,6 +3,7 @@
  * 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 { globalWindow } from "../../core/constants.js";
 import { Icon } from "../../core/ui/icon.js";
 import { Config } from "../../config.js";
 import "./interface.js";
@@ -10,8 +11,7 @@ import searchIcon from "./search.svg.js";
 Config.prototype.useSearch = true;
 Config.prototype.search = {
     lazyIdleTimeout: 0,
-    // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-    useCustomHighlightAPI: typeof window.Highlight !== 'undefined'
+    useCustomHighlightAPI: globalWindow && typeof globalWindow.Highlight !== 'undefined'
 };
 Icon.set('search', searchIcon);
 Config.prototype.controls.find = {

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

@@ -18,8 +18,9 @@ export declare function getSelectionWrappers(root: HTMLElement): HTMLElement[];
 /**
  * @private
  */
-export declare function clearSelectionWrappers(root: HTMLElement): void;
+export declare function clearSelectionWrappers(jodit: IJodit): void;
 /**
  * @private
  */
 export declare function clearSelectionWrappersFromHTML(root: string): string;
+export declare function clearNativeSelection(jodit: IJodit): void;

package/esm/plugins/search/helpers/highlight-text-ranges.js

@@ -3,6 +3,7 @@
  * 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 { globalWindow } from "../../../core/constants.js";
 import { Dom } from "../../../core/dom/dom.js";
 import { $$ } from "../../../core/helpers/utils/selector.js";
 /**
@@ -55,8 +56,9 @@ export function getSelectionWrappers(root) {
 /**
  * @private
  */
-export function clearSelectionWrappers(root) {
-    getSelectionWrappers(root).forEach(span => Dom.unwrap(span));
+export function clearSelectionWrappers(jodit) {
+    getSelectionWrappers(jodit.editor).forEach(span => Dom.unwrap(span));
+    clearNativeSelection(jodit);
 }
 /**
  * @private
@@ -73,14 +75,14 @@ function isSelectionWrapper(node) {
 function checkNativeSelectionMethod(jodit, rng, restRanges) {
     if (jodit.o.search.useCustomHighlightAPI &&
         // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-        typeof window.Highlight !== 'undefined') {
+        globalWindow &&
+        typeof globalWindow.Highlight !== 'undefined') {
         const ranges = [rng, ...restRanges].map(rng => {
             const range = jodit.selection.createRange();
             range.setStart(rng.startContainer, rng.startOffset);
             range.setEnd(rng.endContainer, rng.endOffset);
             return range;
         });
-        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
         const searchHighlight = new Highlight(...ranges);
         // @ts-ignore
         CSS.highlights.clear();
@@ -91,6 +93,15 @@ function checkNativeSelectionMethod(jodit, rng, restRanges) {
     }
     return false;
 }
+export function clearNativeSelection(jodit) {
+    if (jodit.o.search.useCustomHighlightAPI &&
+        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
+        globalWindow &&
+        typeof globalWindow.Highlight !== 'undefined') {
+        // @ts-ignore
+        CSS.highlights.clear();
+    }
+}
 function normalizeRanges(rng, restRanges, ci) {
     const startText = rng.startContainer.nodeValue;
     let diff = 0;

package/esm/plugins/search/search.d.ts

@@ -18,11 +18,11 @@ import "./config";
  *
  * @example
  * ```typescript
- * var jodit = Jodit.make('#editor', {
+ * const jodit = Jodit.make('#editor', {
  *  useSearch: false
  * });
  * // or
- * var jodit = Jodit.make('#editor', {
+ * const jodit = Jodit.make('#editor', {
  *  disablePlugins: 'search'
  * });
  * ```

package/esm/plugins/search/search.js

@@ -28,11 +28,11 @@ import { UISearch } from "./ui/search.js";
  *
  * @example
  * ```typescript
- * var jodit = Jodit.make('#editor', {
+ * const jodit = Jodit.make('#editor', {
  *  useSearch: false
  * });
  * // or
- * var jodit = Jodit.make('#editor', {
+ * const jodit = Jodit.make('#editor', {
  *  disablePlugins: 'search'
  * });
  * ```
@@ -111,7 +111,7 @@ export class search extends Plugin {
                 rng.deleteContents();
                 const textNode = this.j.createInside.text(this.ui.replace);
                 Dom.safeInsertNode(rng, textNode);
-                clearSelectionWrappers(this.j.editor);
+                clearSelectionWrappers(this.j);
                 this.j.s.setCursorAfter(textNode);
                 this.tryScrollToElement(textNode);
                 this.cache = {};
@@ -138,7 +138,7 @@ export class search extends Plugin {
             !getSelectionWrappers(this.j.editor).length) {
             this.drawPromise?.rejectCallback();
             this.j.async.cancelAnimationFrame(this.wrapFrameRequest);
-            clearSelectionWrappers(this.j.editor);
+            clearSelectionWrappers(this.j);
             this.drawPromise = this.__drawSelectionRanges(bounds);
         }
         this.previousQuery = query;
@@ -251,14 +251,15 @@ export class search extends Plugin {
                 this.ui.close();
             })
                 .on(this.ui, 'afterClose', () => {
-                clearSelectionWrappers(editor.editor);
+                clearSelectionWrappers(editor);
                 this.ui.currentIndex = 0;
                 this.ui.count = 0;
                 this.cache = {};
+                editor.focus();
             })
                 .on('click', () => {
                 this.ui.currentIndex = 0;
-                clearSelectionWrappers(editor.editor);
+                clearSelectionWrappers(editor);
             })
                 .on('change.search', () => {
                 this.cache = {};
@@ -269,7 +270,7 @@ export class search extends Plugin {
                     this.ui.selInfo = null;
                 }
                 if (this.ui.isOpened) {
-                    this.updateCounters();
+                    void this.updateCounters();
                 }
             }, editor.defaultTimeout))
                 .on('searchNext.search searchPrevious.search', () => {

package/esm/plugins/search/ui/search.js

@@ -91,7 +91,7 @@ let UISearch = class UISearch extends UIElement {
             return false;
         })
             .on(next, 'pointerdown', () => {
-            jodit.e.fire('searchNext');
+            void jodit.e.fire('searchNext');
             return false;
         })
             .on(prev, 'pointerdown', () => {
@@ -101,12 +101,12 @@ let UISearch = class UISearch extends UIElement {
             .on(this.queryInput, 'input', () => {
             this.setMod('empty-query', !trim(this.queryInput.value).length);
         })
-            .on(this.queryInput, 'keydown', this.j.async.debounce((e) => {
+            .on(this.queryInput, 'keydown', this.j.async.debounce(async (e) => {
             switch (e.key) {
                 case consts.KEY_ENTER:
                     e.preventDefault();
                     e.stopImmediatePropagation();
-                    if (jodit.e.fire('searchNext')) {
+                    if (await jodit.e.fire('searchNext')) {
                         this.close();
                     }
                     break;