jodit 4.12.23 → 4.12.24

package/es2021/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.12.23
+ * Version: v4.12.24
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1810,7 +1810,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.12.23";
+ */ const APP_VERSION = "4.12.24";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -22019,12 +22019,17 @@ class ImageEditor extends jodit_core_component__WEBPACK_IMPORTED_MODULE_2__.View
                                     self.j.alert('The name should not be empty');
                                     return false;
                                 }
+                                self.j.e.fire('afterImageEditorSave', data, name);
                                 self.onSave(name, data, self.hide, (e)=>{
                                     self.j.alert(e.message);
                                 });
                             });
                             break;
                         case self.buttons.save:
+                            // Notify listeners that a crop/resize was applied,
+                            // passing the action box (action + box dimensions).
+                            // See https://github.com/xdan/jodit/issues/820
+                            self.j.e.fire('afterImageEditorSave', data);
                             self.onSave(undefined, data, self.hide, (e)=>{
                                 self.j.alert(e.message);
                             });
@@ -24524,6 +24529,15 @@ function processOldBrowserDrag(self, cData, handlerSuccess, handlerError, onFina
     if (!fileList.length) {
         return Promise.reject((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.error)('Need files'));
     }
+    // Client-side validation hook — returning `false` aborts the upload.
+    // See https://github.com/xdan/jodit/issues/1329
+    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.isFunction)(o.beforeUpload)) {
+        if (o.beforeUpload.call(uploader, fileList) === false) {
+            const err = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.error)('Upload canceled');
+            (handlerError || o.defaultHandlerError).call(uploader, err);
+            return Promise.reject(err);
+        }
+    }
     const promises = [];
     if (o.insertImageAsBase64URI) {
         readImagesWithReader(fileList, o.imagesExtensions, promises, uploader, handlerSuccess, o.defaultHandlerSuccess);
@@ -26185,10 +26199,14 @@ class backspace extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__.Plugin {
                 return false;
             }
             (0,jodit_core_selection_helpers__WEBPACK_IMPORTED_MODULE_6__.moveNodeInsideStart)(jodit, fakeNode, backspace);
-            if (_cases__WEBPACK_IMPORTED_MODULE_9__.cases.some((func)=>{
+            const disabled = jodit.o.delete.disableCases;
+            if (_cases__WEBPACK_IMPORTED_MODULE_9__.casesMap.some(([key, func])=>{
+                if (disabled && disabled.has(key)) {
+                    return;
+                }
                 if ((0,jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_4__.isFunction)(func) && func(jodit, fakeNode, backspace, mode)) {
                     if (!jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.IS_PROD) {
-                        console.info('Remove case:', func.name);
+                        console.info('Remove case:', key);
                     }
                     return true;
                 }
@@ -26877,8 +26895,9 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   cases: function() { return /* binding */ cases; }
+/* harmony export */   casesMap: function() { return /* binding */ casesMap; }
 /* harmony export */ });
+/* unused harmony export cases */
 /* harmony import */ var _check_join_neighbors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26106);
 /* harmony import */ var _check_join_two_lists__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80951);
 /* harmony import */ var _check_remove_char__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(58881);
@@ -26904,18 +26923,52 @@ function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed
 
 
 /**
+ * Ordered delete/backspace cases with stable keys. The first one returning
+ * `true` wins. The keys are stable across minified builds (function names are
+ * mangled by terser) so they can be referenced by `delete.disableCases`.
  * @private
- */ const cases = [
-    _check_remove_unbreakable_element__WEBPACK_IMPORTED_MODULE_6__.checkRemoveUnbreakableElement,
-    _check_remove_content_not_editable__WEBPACK_IMPORTED_MODULE_3__.checkRemoveContentNotEditable,
-    _check_remove_char__WEBPACK_IMPORTED_MODULE_2__.checkRemoveChar,
-    _check_table_cell__WEBPACK_IMPORTED_MODULE_7__.checkTableCell,
-    _check_remove_empty_parent__WEBPACK_IMPORTED_MODULE_5__.checkRemoveEmptyParent,
-    _check_remove_empty_neighbor__WEBPACK_IMPORTED_MODULE_4__.checkRemoveEmptyNeighbor,
-    _check_join_two_lists__WEBPACK_IMPORTED_MODULE_1__.checkJoinTwoLists,
-    _check_join_neighbors__WEBPACK_IMPORTED_MODULE_0__.checkJoinNeighbors,
-    _check_unwrap_first_list_item__WEBPACK_IMPORTED_MODULE_8__.checkUnwrapFirstListItem
+ */ const casesMap = [
+    [
+        'remove-unbreakable',
+        _check_remove_unbreakable_element__WEBPACK_IMPORTED_MODULE_6__.checkRemoveUnbreakableElement
+    ],
+    [
+        'remove-not-editable',
+        _check_remove_content_not_editable__WEBPACK_IMPORTED_MODULE_3__.checkRemoveContentNotEditable
+    ],
+    [
+        'remove-char',
+        _check_remove_char__WEBPACK_IMPORTED_MODULE_2__.checkRemoveChar
+    ],
+    [
+        'table-cell',
+        _check_table_cell__WEBPACK_IMPORTED_MODULE_7__.checkTableCell
+    ],
+    [
+        'remove-empty-parent',
+        _check_remove_empty_parent__WEBPACK_IMPORTED_MODULE_5__.checkRemoveEmptyParent
+    ],
+    [
+        'remove-empty-neighbor',
+        _check_remove_empty_neighbor__WEBPACK_IMPORTED_MODULE_4__.checkRemoveEmptyNeighbor
+    ],
+    [
+        'join-two-lists',
+        _check_join_two_lists__WEBPACK_IMPORTED_MODULE_1__.checkJoinTwoLists
+    ],
+    [
+        'join-neighbors',
+        _check_join_neighbors__WEBPACK_IMPORTED_MODULE_0__.checkJoinNeighbors
+    ],
+    [
+        'unwrap-first-list-item',
+        _check_unwrap_first_list_item__WEBPACK_IMPORTED_MODULE_8__.checkUnwrapFirstListItem
+    ]
 ];
+/**
+ * @private
+ * @deprecated Use `casesMap` to also get the stable case keys.
+ */ const cases = casesMap.map(([, fn])=>fn);
 
 
 /***/ }),
@@ -27397,6 +27450,18 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(iframe);
         return false;
     }
+    /**
+	 * Collapse a value that holds only a single empty block (e.g.
+	 * `<p><br></p>` left after deleting all content) to an empty string —
+	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
+	 */ onAfterGetValueFromEditor(data) {
+        if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
+            return;
+        }
+        if (/^<([a-z][a-z0-9]*)\b[^>]*>(?:<br\/?>)?<\/\1>$/i.test(data.value.trim())) {
+            data.value = '';
+        }
+    }
     onSafeHTML(sandBox) {
         const sanitizer = this.j.o.cleanHTML.sanitizer;
         if (sanitizer) {
@@ -27436,6 +27501,9 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':beforeSetNativeEditorValue')
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':afterGetValueFromEditor')
+], cleanHtml.prototype, "onAfterGetValueFromEditor", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':safeHTML')
 ], cleanHtml.prototype, "onSafeHTML", null);
@@ -27465,6 +27533,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     timeout: 300,
     removeEmptyElements: true,
     fillEmptyParagraph: true,
+    collapseEmptyValueToEmptyString: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -30877,6 +30946,25 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.font = {
             return v.toLowerCase().replace(/['"]+/g, '').replace(/[^a-z0-9-]+/g, ',');
         }
     },
+    // When no font is explicitly set, the computed font-family equals the
+    // editor's own default (e.g. `-apple-system, …`). Return '' so the
+    // button shows the `Default` list entry instead of that raw stack.
+    // See #1370
+    value: (editor)=>{
+        const current = editor.s.current();
+        if (!current) {
+            return;
+        }
+        const box = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement, editor.editor);
+        if (!box) {
+            return;
+        }
+        const value = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(box, 'font-family').toString();
+        if (value === (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(editor.editor, 'font-family').toString()) {
+            return '';
+        }
+        return value;
+    },
     tooltip: 'Font family'
 };
 
@@ -35350,6 +35438,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.link = {
     noFollowCheckbox: true,
     openInNewTabCheckbox: true,
     openInNewTabCheckboxDefaultChecked: false,
+    ariaLabelInput: false,
     modeClassName: 'input',
     selectMultipleClassName: true,
     preventReadOnlyNavigation: true,
@@ -35505,7 +35594,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
         const currentElement = current;
         const isImageContent = jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isImage(currentElement);
         let { content_input } = elements;
-        const { className_input } = elements, { className_select } = elements;
+        const { className_input } = elements, { className_select } = elements, { aria_label_input } = elements;
         if (!content_input) {
             content_input = jodit.c.element('input', {
                 type: 'hidden',
@@ -35528,6 +35617,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
         if (!isImageContent && current) {
             content_input.value = getSelectionText();
         }
+        if (aria_label_input) {
+            aria_label_input.value = link ? (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(link, 'aria-label') || '' : '';
+        }
         if (link) {
             url_input.value = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(link, 'href') || '';
             if (modeClassName) {
@@ -35615,6 +35707,10 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                     }
                     (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(a, 'rel', relParts.length ? relParts.join(' ') : null);
                 }
+                if (aria_label_input) {
+                    const ariaLabel = aria_label_input.value.trim();
+                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(a, 'aria-label', ariaLabel || null);
+                }
                 jodit.e.fire('applyLink', jodit, a, form);
             });
             jodit.synchronizeValues();
@@ -35754,7 +35850,7 @@ function writeImage(a, content_input, textWasChanged, url_input) {
  */ 
 
 const formTemplate = (editor)=>{
-    const { openInNewTabCheckbox, noFollowCheckbox, modeClassName, selectSizeClassName, selectMultipleClassName, selectOptionsClassName } = editor.o.link;
+    const { openInNewTabCheckbox, noFollowCheckbox, ariaLabelInput, modeClassName, selectSizeClassName, selectMultipleClassName, selectOptionsClassName } = editor.o.link;
     return new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIForm(editor, [
         new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIBlock(editor, [
             new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIInput(editor, {
@@ -35766,6 +35862,13 @@ const formTemplate = (editor)=>{
                 required: true
             })
         ]),
+        ariaLabelInput ? new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIBlock(editor, [
+            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIInput(editor, {
+                name: 'ariaLabel',
+                ref: 'aria_label_input',
+                label: 'Aria label'
+            })
+        ]) : null,
         new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIBlock(editor, [
             new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_1__.UIInput(editor, {
                 name: 'content',
@@ -39387,15 +39490,36 @@ class selectCells extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin
     }
     /**
 	 * Mouse click inside the table
-	 */ onStartSelection(cell) {
+	 */ onStartSelection(cell, event) {
         if (this.j.o.readonly) {
             return;
         }
+        const table = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.closest(cell, 'table', this.j.editor);
+        // Ctrl/Cmd + click toggles a single cell into the existing selection
+        // instead of resetting it — non-contiguous multi-cell selection.
+        // See https://github.com/xdan/jodit/issues/1163
+        if ((event?.ctrlKey || event?.metaKey) && cell !== this.j.editor && table && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isCell(cell)) {
+            if (this.__tableModule.getAllSelectedCells().includes(cell)) {
+                this.__tableModule.removeSelection(cell);
+            } else {
+                if (!cell.firstChild) {
+                    cell.appendChild(this.j.createInside.element('br'));
+                }
+                this.__tableModule.addSelection(cell);
+            }
+            this.__selectedCell = cell;
+            this.j.s.sel?.removeAllRanges();
+            if (this.__tableModule.getAllSelectedCells().length) {
+                this.j.e.fire('showPopup', table, ()=>(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.position)(cell, this.j), 'cells');
+            } else {
+                this.j.e.fire('hidePopup', 'cells');
+            }
+            return false;
+        }
         this.unselectCells();
         if (cell === this.j.editor) {
             return;
         }
-        const table = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.closest(cell, 'table', this.j.editor);
         if (!cell || !table) {
             return;
         }