jodit-pro 4.18.9 → 4.18.11

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.18.9
+ * Version: v4.18.11
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1814,7 +1814,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.9";
+ */ const APP_VERSION = "4.18.11";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -2532,6 +2532,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
@@ -2548,9 +2550,16 @@ const componentRegistry = new Map();
                     Object.setPrototypeOf(this, newConstructorFunction.prototype);
                 }
                 this.setStatus('ready');
+            } else if (!_constants_js__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,_helpers_utils_get_class_name_js__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,_helpers_utils_get_class_name_js__WEBPACK_IMPORTED_MODULE_1__.getClassName)(constructorFunction.prototype);
     if (componentRegistry.has(name) && !_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_PROD) {
         throw new Error(`Component with name "${name}" is already registered`);
@@ -17628,6 +17637,7 @@ function _object_spread_props(target, source) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var Popup_1;
 
 
 
@@ -17644,7 +17654,7 @@ const EVENTS_FOR_AUTOCLOSE = [
     'backSpaceAfterDelete',
     'beforeCommandDelete'
 ];
-class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
+let Popup = Popup_1 = class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
     className() {
         return 'Popup';
     }
@@ -17654,7 +17664,7 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(content, childContainer);
     }
     updateParentElement(target) {
-        if (target !== this && _component_component_js__WEBPACK_IMPORTED_MODULE_0__.Component.isInstanceOf(target, Popup)) {
+        if (target !== this && _component_component_js__WEBPACK_IMPORTED_MODULE_0__.Component.isInstanceOf(target, Popup_1)) {
             this.__childrenPopups.forEach((popup)=>{
                 if (!target.closest(popup) && popup.isOpened) {
                     popup.close();
@@ -17696,7 +17706,7 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         if (parentContainer) {
             _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(parentContainer, this.container);
         } else {
-            const popupContainer = (0,_global_js__WEBPACK_IMPORTED_MODULE_3__.getContainer)(this.jodit, Popup);
+            const popupContainer = (0,_global_js__WEBPACK_IMPORTED_MODULE_3__.getContainer)(this.jodit, Popup_1);
             if (parentContainer !== this.container.parentElement) {
                 _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(popupContainer, this.container);
             }
@@ -17808,11 +17818,11 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         };
         const getMatchStrategy = (inBox)=>{
             let strategy;
-            if (Popup.boxInView(getPointByStrategy(defaultStrategy), inBox)) {
+            if (Popup_1.boxInView(getPointByStrategy(defaultStrategy), inBox)) {
                 strategy = defaultStrategy;
             } else {
                 strategy = list.find((key)=>{
-                    if (Popup.boxInView(getPointByStrategy(key), inBox)) {
+                    if (Popup_1.boxInView(getPointByStrategy(key), inBox)) {
                         return key;
                     }
                     return;
@@ -17823,7 +17833,7 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         // Try to find match position inside Jodit.container
         let strategy = getMatchStrategy((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.position)(this.j.container, this.j));
         // If not found or is not inside window view
-        if (!strategy || !Popup.boxInView(getPointByStrategy(strategy), view)) {
+        if (!strategy || !Popup_1.boxInView(getPointByStrategy(strategy), view)) {
             // Find match strategy inside window view
             strategy = getMatchStrategy(view) || strategy || defaultStrategy;
         }
@@ -17873,7 +17883,7 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         if (!e.target) {
             return false;
         }
-        const box = _element_js__WEBPACK_IMPORTED_MODULE_7__.UIElement.closestElement(e.target, Popup);
+        const box = _element_js__WEBPACK_IMPORTED_MODULE_7__.UIElement.closestElement(e.target, Popup_1);
         return Boolean(box && (this === box || box.closest(this)));
     }
     __addGlobalListeners() {
@@ -17928,7 +17938,7 @@ class Popup extends _group_group_js__WEBPACK_IMPORTED_MODULE_8__.UIGroup {
         this.__childrenPopups = new Set();
         (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.attr)(this.container, 'role', 'popup');
     }
-}
+};
 __decorate([
     _decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Popup.prototype, "updatePosition", null);
@@ -17942,6 +17952,10 @@ __decorate([
 __decorate([
     _decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], Popup.prototype, "__closeOnOutsideClick", null);
+Popup = Popup_1 = __decorate([
+    _decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.component
+], Popup);
+
 
 
 /***/ }),
@@ -19165,7 +19179,7 @@ let Jodit = Jodit_1 = class Jodit extends _modules_index_js__WEBPACK_IMPORTED_MO
         commands.push(command);
         if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.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 === null || options === void 0 ? void 0 : options.stopPropagation);
             }
         }
@@ -19174,6 +19188,10 @@ let Jodit = Jodit_1 = class Jodit extends _modules_index_js__WEBPACK_IMPORTED_MO
     /**
      * 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,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.asArray)(hotkeys).map(_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.normalizeKeyAliases).map((hotkey)=>hotkey + '.hotkey').join(' ');
         this.e.off(shortcuts).on(shortcuts, (type, stop)=>{
             if (stop) {
@@ -29513,17 +29531,29 @@ const DEFAULT_SOURCE_NAME = 'default';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FileBrowserFiles: function() { return /* binding */ FileBrowserFiles; }
 /* harmony export */ });
-/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(67510);
+/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(65478);
+/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67510);
 /*!
  * 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 _core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__.UIGroup {
+ */ var __decorate = undefined && undefined.__decorate || function(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+
+let FileBrowserFiles = class FileBrowserFiles extends _core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__.UIGroup {
     className() {
         return 'FileBrowserFiles';
     }
-}
+};
+FileBrowserFiles = __decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.component
+], FileBrowserFiles);
+
 
 
 /***/ }),
@@ -29555,17 +29585,29 @@ class FileBrowserFiles extends _core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__.UI
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FileBrowserTree: function() { return /* binding */ FileBrowserTree; }
 /* harmony export */ });
-/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(67510);
+/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(65478);
+/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67510);
 /*!
  * 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 _core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__.UIGroup {
+ */ var __decorate = undefined && undefined.__decorate || function(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+
+let FileBrowserTree = class FileBrowserTree extends _core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__.UIGroup {
     className() {
         return 'FileBrowserTree';
     }
-}
+};
+FileBrowserTree = __decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.component
+], FileBrowserTree);
+
 
 
 /***/ }),
@@ -35617,9 +35659,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) {
     var _a, _b;
     const step = backspace ? -1 : 1;
     const anotherSibling = _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, !backspace);
@@ -35638,6 +35681,9 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
             break;
         }
         if ((_a = sibling.nodeValue) === null || _a === void 0 ? void 0 : _a.length) {
+            if (stopBeforeSpace && isSpace(nextChar(sibling.nodeValue, backspace))) {
+                break;
+            }
             removed = tryRemoveChar(sibling, backspace, step, anotherSibling);
             if (!sibling.nodeValue.length && _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isInlineBlock(sibling.parentNode)) {
                 sibling.nodeValue = _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE;
@@ -35745,9 +35791,25 @@ function replaceSpaceOnNBSP(anotherSibling, backspace, value) {
 }
 function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit) {
     ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__.call)(backspace ? _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.after : _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.before, sibling, fakeNode);
-    if (mode === 'sentence' || mode === 'word' && removed !== ' ' && removed !== _core_constants_js__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,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__.toArray)(value);
+    const step = backspace ? -1 : 1;
+    let index = backspace ? chars.length - 1 : 0;
+    while(chars[index] === _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE){
+        index += step;
     }
+    return chars[index];
+}
+function isSpace(char) {
+    return char === ' ' || char === _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.NBSP_SPACE;
 }
 
 
@@ -36110,7 +36172,8 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
 /***/ 32496:
 /***/ (function(__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6441);
+/* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82758);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6441);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -36118,13 +36181,18 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
  */ /**
  * @module plugins/backspace
  */ 
-_config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.delete = {
+
+_config_js__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.delete = {
     hotkeys: {
-        delete: [
+        delete: _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [
+            'delete'
+        ] : [
             'delete',
             'cmd+backspace'
         ],
-        deleteWord: [
+        deleteWord: _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [
+            'ctrl+delete'
+        ] : [
             'ctrl+delete',
             'cmd+alt+backspace',
             'ctrl+alt+backspace'
@@ -36136,7 +36204,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.delete = {
         backspace: [
             'backspace'
         ],
-        backspaceWord: [
+        backspaceWord: _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_MAC ? [] : [
             'ctrl+backspace'
         ],
         backspaceSentence: [
@@ -42247,8 +42315,12 @@ function _async_to_generator(fn) {
             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();
@@ -42262,10 +42334,20 @@ function _async_to_generator(fn) {
             ],
             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 || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.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,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.markOwner)(j, dialog.container);
@@ -42296,6 +42378,7 @@ function _async_to_generator(fn) {
         this.activeTabState.activeTab = 'Image';
         this.__lock();
         this.dialog.open().setModal(true).setPosition();
+        this.__focusFirstField();
         this.async.promise((resolve, reject)=>(0,_readers_index_js__WEBPACK_IMPORTED_MODULE_10__.readValuesFromImage)(this.j, this.state).then(resolve, reject)).catch((e)=>{
             if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.isAbortError)(e)) {
                 this.dialog.message.error(e.message);
@@ -42303,6 +42386,14 @@ function _async_to_generator(fn) {
         }).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() {
+        var _a;
+        const fields = (box)=>(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.toArray)(box.querySelectorAll('input, select, textarea'));
+        (_a = fields(this.form.getElm('tabsBox')).concat(fields(this.form.container)).find((field)=>field.offsetParent != null)) === null || _a === void 0 ? void 0 : _a.focus();
+    }
     __lock() {
         this.dialog.lock();
         this.form.setMod('lock', true);
@@ -46903,9 +46994,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) {
     var _a;
     const { toolbar } = editor.o;
@@ -46915,7 +47008,7 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
             return width;
         }
     }
-    return ((_a = editor.container.parentElement) !== null && _a !== void 0 ? _a : editor.container).offsetWidth;
+    return editor.container.offsetWidth || ((_a = editor.container.parentElement) !== null && _a !== void 0 ? _a : editor.container).offsetWidth;
 }
 /**
  * Rebuild toolbar in depends on editor's width