jodit 4.18.6 → 4.18.7

package/es5/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
  */
@@ -2152,7 +2152,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.18.6";
+var APP_VERSION = "4.18.7";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -2893,6 +2893,8 @@ function cacheHTML(target, _, descriptor) {
 
 
 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
@@ -2916,11 +2918,18 @@ var componentRegistry = new Map();
                     Object.setPrototypeOf(_this, newConstructorFunction.prototype);
                 }
                 _this.setStatus('ready');
+            } else if (!jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.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,jodit_core_helpers_utils_get_class_name__WEBPACK_IMPORTED_MODULE_6__.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,jodit_core_helpers_utils_get_class_name__WEBPACK_IMPORTED_MODULE_6__.getClassName)(constructorFunction.prototype);
     if (componentRegistry.has(name) && !jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.IS_PROD) {
         throw new Error('Component with name "'.concat(name, '" is already registered'));
@@ -21249,6 +21258,9 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_10__.__decorate)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_12__.autobind
 ], Popup.prototype, "__closeOnOutsideClick", null);
+Popup = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_10__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_12__.component
+], Popup);
 
 
 /***/ }),
@@ -22707,7 +22719,7 @@ var Jodit = /*#__PURE__*/ function(ViewWithToolbar) {
                 commands.push(command);
                 if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_15__.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);
                     }
                 }
@@ -22721,6 +22733,10 @@ var Jodit = /*#__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,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_15__.asArray)(hotkeys).map(jodit_core_helpers__WEBPACK_IMPORTED_MODULE_15__.normalizeKeyAliases).map(function(hotkey) {
                     return hotkey + '.hotkey';
                 }).join(' ');
@@ -27302,7 +27318,10 @@ var DEFAULT_SOURCE_NAME = 'default';
 /* harmony import */ var _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73104);
 /* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34918);
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4099);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4099);
+
 
 
 
@@ -27313,6 +27332,7 @@ var DEFAULT_SOURCE_NAME = 'default';
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
  */ 
 
+
 var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_3__._)(FileBrowserFiles, UIGroup);
@@ -27329,7 +27349,10 @@ var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
         }
     ]);
     return FileBrowserFiles;
-}(jodit_core_ui__WEBPACK_IMPORTED_MODULE_4__.UIGroup);
+}(jodit_core_ui__WEBPACK_IMPORTED_MODULE_6__.UIGroup);
+FileBrowserFiles = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_5__.component
+], FileBrowserFiles);
 
 
 /***/ }),
@@ -27367,7 +27390,10 @@ var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
 /* harmony import */ var _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73104);
 /* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34918);
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4099);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4099);
+
 
 
 
@@ -27378,6 +27404,7 @@ var FileBrowserFiles = /*#__PURE__*/ function(UIGroup) {
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
  */ 
 
+
 var FileBrowserTree = /*#__PURE__*/ function(UIGroup) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_3__._)(FileBrowserTree, UIGroup);
@@ -27394,7 +27421,10 @@ var FileBrowserTree = /*#__PURE__*/ function(UIGroup) {
         }
     ]);
     return FileBrowserTree;
-}(jodit_core_ui__WEBPACK_IMPORTED_MODULE_4__.UIGroup);
+}(jodit_core_ui__WEBPACK_IMPORTED_MODULE_6__.UIGroup);
+FileBrowserTree = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_5__.component
+], FileBrowserTree);
 
 
 /***/ }),
@@ -34362,9 +34392,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 step = backspace ? -1 : 1;
     var anotherSibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, !backspace);
     var sibling = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.sibling(fakeNode, backspace);
@@ -34383,6 +34415,9 @@ function checkRemoveChar(jodit, fakeNode, backspace, mode) {
             break;
         }
         if ((_sibling_nodeValue = sibling.nodeValue) === null || _sibling_nodeValue === void 0 ? void 0 : _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;
@@ -34490,10 +34525,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);
+    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,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.toArray)(value);
+    var step = backspace ? -1 : 1;
+    var 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;
+}
 
 
 /***/ }),
@@ -34883,7 +34934,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.
@@ -34891,13 +34943,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'
@@ -34909,7 +34966,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: [
@@ -41739,8 +41796,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
                     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();
@@ -41754,10 +41815,20 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
                     ],
                     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 || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.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,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.markOwner)(j, dialog.container);
@@ -41795,6 +41866,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(function(resolve, reject) {
                     return (0,_readers__WEBPACK_IMPORTED_MODULE_19__.readValuesFromImage)(_this.j, _this.state).then(resolve, reject);
                 }).catch(function(e) {
@@ -41807,6 +41879,21 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.image = {
                 return false;
             }
         },
+        {
+            key: "__focusFirstField",
+            value: /**
+	 * 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
+	 */ function __focusFirstField() {
+                var _fields_concat_find;
+                var fields = function fields(box) {
+                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.toArray)(box.querySelectorAll('input, select, textarea'));
+                };
+                (_fields_concat_find = fields(this.form.getElm('tabsBox')).concat(fields(this.form.container)).find(function(field) {
+                    return field.offsetParent != null;
+                })) === null || _fields_concat_find === void 0 ? void 0 : _fields_concat_find.focus();
+            }
+        },
         {
             key: "__lock",
             value: function __lock() {
@@ -46910,9 +46997,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 _editor_container_parentElement;
     var toolbar = editor.o.toolbar;
@@ -46922,7 +47011,7 @@ var isButtonSeparator = function isButtonSeparator(item) {
             return width;
         }
     }
-    return ((_editor_container_parentElement = editor.container.parentElement) !== null && _editor_container_parentElement !== void 0 ? _editor_container_parentElement : editor.container).offsetWidth;
+    return editor.container.offsetWidth || ((_editor_container_parentElement = editor.container.parentElement) !== null && _editor_container_parentElement !== void 0 ? _editor_container_parentElement : editor.container).offsetWidth;
 }
 /**
  * Rebuild toolbar in depends on editor's width

package/es5/jodit.min.css

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