jodit 4.18.6 → 4.18.7

package/es2021.en/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.18.6
+ * Version: v4.18.7
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1822,7 +1822,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.6";
+ */ const APP_VERSION = "4.18.7";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -2560,6 +2560,8 @@ function cacheHTML(target, _, descriptor) {
  */ 
 
 const componentRegistry = new Map();
+const decoratedClasses = new WeakSet();
+const warnedClasses = new WeakSet();
 /**
  * Decorate components and set status isReady after constructor
  * @param constructorFunction - Component constructor class
@@ -2576,9 +2578,16 @@ const componentRegistry = new Map();
                     Object.setPrototypeOf(this, newConstructorFunction.prototype);
                 }
                 this.setStatus('ready');
+            } else if (!jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_PROD && !decoratedClasses.has(this.constructor) && !warnedClasses.has(this.constructor)) {
+                // Only the outermost class's decorator sets `ready`, so a subclass
+                // without its own decorator stays in `beforeInit`. See #1685
+                warnedClasses.add(this.constructor);
+                console.warn(`Component "${this.constructor.name || (0,jodit_core_helpers_utils_get_class_name__WEBPACK_IMPORTED_MODULE_1__.getClassName)(this)}" extends a @component class without being decorated itself, so it never becomes ready and its @watch, @debounce, @throttle and @hook handlers never run`);
             }
         }
     }
+    decoratedClasses.add(constructorFunction);
+    decoratedClasses.add(newConstructorFunction);
     const name = (0,jodit_core_helpers_utils_get_class_name__WEBPACK_IMPORTED_MODULE_1__.getClassName)(constructorFunction.prototype);
     if (componentRegistry.has(name) && !jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_PROD) {
         throw new Error(`Component with name "${name}" is already registered`);
@@ -17560,6 +17569,9 @@ class Popup extends jodit_core_ui_group_group__WEBPACK_IMPORTED_MODULE_10__.UIGr
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.autobind
 ], Popup.prototype, "__closeOnOutsideClick", null);
+Popup = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.component
+], Popup);
 
 
 /***/ }),
@@ -18671,7 +18683,7 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_10__.ViewWithToolbar
         commands.push(command);
         if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.isFunction)(command)) {
             const hotkeys = this.o.commandToHotkeys[commandName] || this.o.commandToHotkeys[commandNameOriginal] || command.hotkeys;
-            if (hotkeys) {
+            if (hotkeys && hotkeys.length) {
                 this.registerHotkeyToCommand(hotkeys, commandName, options?.stopPropagation);
             }
         }
@@ -18680,6 +18692,10 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_10__.ViewWithToolbar
     /**
 	 * Register hotkey for command
 	 */ registerHotkeyToCommand(hotkeys, commandName, shouldStop = true) {
+        // An empty list (e.g. `commandToHotkeys: { cmd: [] }`) turns the key off
+        if (!hotkeys || !hotkeys.length) {
+            return;
+        }
         const shortcuts = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.asArray)(hotkeys).map(jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.normalizeKeyAliases).map((hotkey)=>hotkey + '.hotkey').join(' ');
         this.e.off(shortcuts).on(shortcuts, (type, stop)=>{
             if (stop) {
@@ -22580,18 +22596,25 @@ const DEFAULT_SOURCE_NAME = 'default';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FileBrowserFiles: function() { return /* binding */ FileBrowserFiles; }
 /* harmony export */ });
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4099);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4099);
+
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
  */ 
 
-class FileBrowserFiles extends jodit_core_ui__WEBPACK_IMPORTED_MODULE_0__.UIGroup {
+
+class FileBrowserFiles extends jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.UIGroup {
     className() {
         return 'FileBrowserFiles';
     }
 }
+FileBrowserFiles = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.component
+], FileBrowserFiles);
 
 
 /***/ }),
@@ -22625,18 +22648,25 @@ class FileBrowserFiles extends jodit_core_ui__WEBPACK_IMPORTED_MODULE_0__.UIGrou
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FileBrowserTree: function() { return /* binding */ FileBrowserTree; }
 /* harmony export */ });
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4099);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4099);
+
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
  */ 
 
-class FileBrowserTree extends jodit_core_ui__WEBPACK_IMPORTED_MODULE_0__.UIGroup {
+
+class FileBrowserTree extends jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.UIGroup {
     className() {
         return 'FileBrowserTree';
     }
 }
+FileBrowserTree = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_1__.component
+], FileBrowserTree);
 
 
 /***/ }),
@@ -28423,9 +28453,10 @@ function moveContentAndRemoveEmpty(jodit, mainClosestBox, sibling, backspace) {
  * ```html
  * t|st
  * ```
+ * With `stopBeforeSpace`, nothing is removed when the next char is a space.
  * @private
  */ // eslint-disable-next-line complexity
-function checkRemoveChar(jodit, fakeNode, backspace, mode) {
+function checkRemoveChar(jodit, fakeNode, backspace, mode, stopBeforeSpace = false) {
     const step = backspace ? -1 : 1;
     const anotherSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, !backspace);
     let sibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, backspace);
@@ -28443,6 +28474,9 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
             break;
         }
         if (sibling.nodeValue?.length) {
+            if (stopBeforeSpace && isSpace(nextChar(sibling.nodeValue, backspace))) {
+                break;
+            }
             removed = tryRemoveChar(sibling, backspace, step, anotherSibling);
             if (!sibling.nodeValue.length && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isInlineBlock(sibling.parentNode)) {
                 sibling.nodeValue = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE;
@@ -28549,10 +28583,26 @@ function replaceSpaceOnNBSP(anotherSibling, backspace, value) {
 }
 function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit) {
     ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.call)(backspace ? jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.after : jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before, sibling, fakeNode);
-    if (mode === 'sentence' || mode === 'word' && removed !== ' ' && removed !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE) {
-        checkRemoveChar(jodit, fakeNode, backspace, mode);
+    const wordChar = mode === 'word' && !isSpace(removed);
+    // Backspace by word removes the spaces before the caret, then the word, and keeps the space in front of it
+    if (mode === 'sentence' || wordChar || mode === 'word' && backspace) {
+        checkRemoveChar(jodit, fakeNode, backspace, mode, wordChar && backspace);
     }
 }
+/**
+ * The char tryRemoveChar would remove next
+ */ function nextChar(value, backspace) {
+    const chars = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.toArray)(value);
+    const step = backspace ? -1 : 1;
+    let index = backspace ? chars.length - 1 : 0;
+    while(chars[index] === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE){
+        index += step;
+    }
+    return chars[index];
+}
+function isSpace(char) {
+    return char === ' ' || char === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE;
+}
 
 
 /***/ }),
@@ -28935,7 +28985,8 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
 /***/ (function(__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5266);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(81937);
+/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5266);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -28943,13 +28994,18 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
  */ /**
  * @module plugins/backspace
  */ 
-jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.delete = {
+
+jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.delete = {
     hotkeys: {
-        delete: [
+        delete: jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [
+            'delete'
+        ] : [
             'delete',
             'cmd+backspace'
         ],
-        deleteWord: [
+        deleteWord: jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [
+            'ctrl+delete'
+        ] : [
             'ctrl+delete',
             'cmd+alt+backspace',
             'ctrl+alt+backspace'
@@ -28961,7 +29017,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.delete = {
         backspace: [
             'backspace'
         ],
-        backspaceWord: [
+        backspaceWord: jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [] : [
             'ctrl+backspace'
         ],
         backspaceSentence: [
@@ -34647,8 +34703,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
             dialog.close();
         });
         buttons.remove.onAction(()=>{
+            const caret = j.s.createRange();
+            caret.setStartBefore(this.state.sourceImage);
+            caret.collapse(true);
             j.s.removeNode(this.state.sourceImage);
             dialog.close();
+            j.s.selectRange(caret);
         });
         buttons.cancel.onAction(()=>{
             dialog.close();
@@ -34662,10 +34722,20 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
             ],
             buttons.check
         ]);
-        j.e.on(dialog, 'afterClose', ()=>{
-            if (this.state.image.parentNode && j.o.image.selectImageAfterClose) {
-                j.s.select(this.state.sourceImage);
+        // The dialog fires `afterClose` on its own emitter, not the editor's
+        dialog.e.on(dialog, 'afterClose', ()=>{
+            const { sourceImage } = this.state;
+            if (j.isInDestruct || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isOrContains(j.editor, sourceImage)) {
+                return;
             }
+            if (j.o.image.selectImageAfterClose) {
+                j.s.select(sourceImage);
+                return;
+            }
+            const caret = j.s.createRange();
+            caret.setStartAfter(sourceImage);
+            caret.collapse(true);
+            j.s.selectRange(caret);
         });
         dialog.setSize(j.o.image.dialogWidth);
         (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.markOwner)(j, dialog.container);
@@ -34696,6 +34766,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
         this.activeTabState.activeTab = 'Image';
         this.__lock();
         this.dialog.open().setModal(true).setPosition();
+        this.__focusFirstField();
         this.async.promise((resolve, reject)=>(0,_readers__WEBPACK_IMPORTED_MODULE_12__.readValuesFromImage)(this.j, this.state).then(resolve, reject)).catch((e)=>{
             if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.isAbortError)(e)) {
                 this.dialog.message.error(e.message);
@@ -34703,6 +34774,13 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
         }).finally(()=>this.__unlock());
         return false;
     }
+    /**
+	 * Keys typed while the dialog is open must not reach the editor behind it,
+	 * so focus the active tab's first field, or else the first field shown
+	 */ __focusFirstField() {
+        const fields = (box)=>(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.toArray)(box.querySelectorAll('input, select, textarea'));
+        fields(this.form.getElm('tabsBox')).concat(fields(this.form.container)).find((field)=>field.offsetParent != null)?.focus();
+    }
     __lock() {
         this.dialog.lock();
         this.form.setMod('lock', true);
@@ -38788,9 +38866,11 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
     return cleaned;
 }
 /**
- * The width that decides which breakpoint set the toolbar uses. A toolbar
- * rendered into an external container (`toolbar` set to an element or a
- * selector) lays out in that container, so its width is what matters there.
+ * The width that decides which breakpoint set the toolbar uses: the editor's
+ * own width, or its parent's while the editor has none yet (for example
+ * while hidden at init). A toolbar rendered into an external container
+ * (`toolbar` set to an element or a selector) lays out in that container, so
+ * its width is what matters there.
  */ function adaptiveWidth(editor) {
     const { toolbar } = editor.o;
     if ((0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_3__.isString)(toolbar) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isHTMLElement(toolbar)) {
@@ -38799,7 +38879,7 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
             return width;
         }
     }
-    return (editor.container.parentElement ?? editor.container).offsetWidth;
+    return editor.container.offsetWidth || (editor.container.parentElement ?? editor.container).offsetWidth;
 }
 /**
  * Rebuild toolbar in depends on editor's width