jodit-pro 4.18.9 → 4.18.11

package/es5/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
  */
@@ -2331,7 +2331,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var APP_VERSION = "4.18.9";
+var APP_VERSION = "4.18.11";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -3139,6 +3139,8 @@ function _unsupported_iterable_to_array(o, minLen) {
  */ ;
 
 var componentRegistry = new Map();
+var decoratedClasses = new WeakSet();
+var warnedClasses = new WeakSet();
 /**
  * Decorate components and set status isReady after constructor
  * @param constructorFunction - Component constructor class
@@ -3162,11 +3164,18 @@ var 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 "'.concat(_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'));
             }
             return _this;
         }
         return newConstructorFunction;
     }(constructorFunction);
+    decoratedClasses.add(constructorFunction);
+    decoratedClasses.add(newConstructorFunction);
     var 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 "'.concat(name, '" is already registered'));
@@ -24554,6 +24563,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     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;
 
 
 
@@ -24570,7 +24580,7 @@ var EVENTS_FOR_AUTOCLOSE = [
     'backSpaceAfterDelete',
     'beforeCommandDelete'
 ];
-var Popup = /*#__PURE__*/ function(UIGroup) {
+var Popup = Popup_1 = /*#__PURE__*/ function(UIGroup) {
     "use strict";
     _inherits(Popup, UIGroup);
     function Popup(jodit) {
@@ -24614,7 +24624,7 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
             key: "updateParentElement",
             value: function updateParentElement(target) {
                 var _this = this;
-                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(function(popup) {
                         if (!target.closest(popup) && popup.isOpened) {
                             popup.close();
@@ -24663,7 +24673,7 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
                 if (parentContainer) {
                     _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(parentContainer, this.container);
                 } else {
-                    var popupContainer = (0,_global_js__WEBPACK_IMPORTED_MODULE_3__.getContainer)(this.jodit, Popup);
+                    var 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);
                     }
@@ -24799,11 +24809,11 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
                 };
                 var getMatchStrategy = function getMatchStrategy(inBox) {
                     var strategy;
-                    if (Popup.boxInView(getPointByStrategy(defaultStrategy), inBox)) {
+                    if (Popup_1.boxInView(getPointByStrategy(defaultStrategy), inBox)) {
                         strategy = defaultStrategy;
                     } else {
                         strategy = list.find(function(key) {
-                            if (Popup.boxInView(getPointByStrategy(key), inBox)) {
+                            if (Popup_1.boxInView(getPointByStrategy(key), inBox)) {
                                 return key;
                             }
                             return;
@@ -24814,7 +24824,7 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
                 // Try to find match position inside Jodit.container
                 var 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;
                 }
@@ -24869,7 +24879,7 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
                 if (!e.target) {
                     return false;
                 }
-                var box = _element_js__WEBPACK_IMPORTED_MODULE_7__.UIElement.closestElement(e.target, Popup);
+                var box = _element_js__WEBPACK_IMPORTED_MODULE_7__.UIElement.closestElement(e.target, Popup_1);
                 return Boolean(box && (this === box || box.closest(this)));
             }
         },
@@ -24952,6 +24962,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);
+
 
 
 /***/ }),
@@ -26883,7 +26897,7 @@ var Jodit = Jodit_1 = /*#__PURE__*/ function(ViewWithToolbar) {
                 commands.push(command);
                 if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.isFunction)(command)) {
                     var 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);
                     }
                 }
@@ -26897,6 +26911,10 @@ var Jodit = Jodit_1 = /*#__PURE__*/ function(ViewWithToolbar) {
             value: function registerHotkeyToCommand(hotkeys, commandName) {
                 var _this = this;
                 var shouldStop = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
+                // An empty list (e.g. `commandToHotkeys: { cmd: [] }`) turns the key off
+                if (!hotkeys || !hotkeys.length) {
+                    return;
+                }
                 var shortcuts = (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.asArray)(hotkeys).map(_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.normalizeKeyAliases).map(function(hotkey) {
                     return hotkey + '.hotkey';
                 }).join(' ');
@@ -38507,7 +38525,8 @@ var 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);
 function _assert_this_initialized(self) {
     if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return self;
@@ -38579,7 +38598,14 @@ function _type_of(obj) {
  * 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
- */ ;
+ */ 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 === "undefined" ? "undefined" : _type_of(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;
+};
+
+
 var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
     "use strict";
     _inherits(FileBrowserFiles, UIGroup);
@@ -38596,7 +38622,11 @@ var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
         }
     ]);
     return FileBrowserFiles;
-}(_core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__.UIGroup);
+}(_core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__.UIGroup);
+FileBrowserFiles = __decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.component
+], FileBrowserFiles);
+
 
 
 /***/ }),
@@ -38628,7 +38658,8 @@ var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
 /* 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);
 function _assert_this_initialized(self) {
     if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return self;
@@ -38700,7 +38731,14 @@ function _type_of(obj) {
  * 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
- */ ;
+ */ 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 === "undefined" ? "undefined" : _type_of(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;
+};
+
+
 var FileBrowserTree = /*#__PURE__*/ function(UIGroup) {
     "use strict";
     _inherits(FileBrowserTree, UIGroup);
@@ -38717,7 +38755,11 @@ var FileBrowserTree = /*#__PURE__*/ function(UIGroup) {
         }
     ]);
     return FileBrowserTree;
-}(_core_ui_index_js__WEBPACK_IMPORTED_MODULE_0__.UIGroup);
+}(_core_ui_index_js__WEBPACK_IMPORTED_MODULE_1__.UIGroup);
+FileBrowserTree = __decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.component
+], FileBrowserTree);
+
 
 
 /***/ }),
@@ -47560,9 +47602,11 @@ 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) {
+    var stopBeforeSpace = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
     var _a, _b;
     var step = backspace ? -1 : 1;
     var anotherSibling = _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, !backspace);
@@ -47581,6 +47625,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;
@@ -47688,10 +47735,26 @@ 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);
+    var 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) {
+    var chars = (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__.toArray)(value);
+    var step = backspace ? -1 : 1;
+    var 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;
+}
 
 
 /***/ }),
@@ -48103,7 +48166,8 @@ function _unsupported_iterable_to_array(o, minLen) {
 /***/ 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.
@@ -48111,13 +48175,18 @@ function _unsupported_iterable_to_array(o, minLen) {
  */ /**
  * @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'
@@ -48129,7 +48198,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: [
@@ -56663,8 +56732,12 @@ function _wrap_native_super(Class) {
                     dialog.close();
                 });
                 buttons.remove.onAction(function() {
+                    var 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(function() {
                     dialog.close();
@@ -56678,10 +56751,20 @@ function _wrap_native_super(Class) {
                     ],
                     buttons.check
                 ]);
-                j.e.on(dialog, 'afterClose', function() {
-                    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', function() {
+                    var sourceImage = _this.state.sourceImage;
+                    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;
+                    }
+                    var 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);
@@ -56719,6 +56802,7 @@ function _wrap_native_super(Class) {
                 this.activeTabState.activeTab = 'Image';
                 this.__lock();
                 this.dialog.open().setModal(true).setPosition();
+                this.__focusFirstField();
                 this.async.promise(function(resolve, reject) {
                     return (0,_readers_index_js__WEBPACK_IMPORTED_MODULE_10__.readValuesFromImage)(_this.j, _this.state).then(resolve, reject);
                 }).catch(function(e) {
@@ -56731,6 +56815,21 @@ function _wrap_native_super(Class) {
                 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
+     */ key: "__focusFirstField",
+            value: function __focusFirstField() {
+                var _a;
+                var fields = function fields(box) {
+                    return (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(function(field) {
+                    return field.offsetParent != null;
+                })) === null || _a === void 0 ? void 0 : _a.focus();
+            }
+        },
         {
             key: "__lock",
             value: function __lock() {
@@ -63386,9 +63485,11 @@ var isButtonSeparator = function isButtonSeparator(item) {
     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;
     var toolbar = editor.o.toolbar;
@@ -63398,7 +63499,7 @@ var isButtonSeparator = function isButtonSeparator(item) {
             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

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * 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
  */
 	/*!
  * 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
  */