jodit 4.15.6 → 4.15.8

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.15.6
+ * Version: v4.15.8
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1779,7 +1779,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.6";
+ */ const APP_VERSION = "4.15.8";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -28255,7 +28255,8 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 
 /**
  * Clean HTML after removeFormat and insertHorizontalRule command
- */ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
+ */ const TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
+class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
     /** @override */ afterInit(jodit) {}
     get isEditMode() {
         return !(this.j.isInDestruct || !this.j.isEditorMode() || this.j.getReadOnly());
@@ -28314,6 +28315,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ onAfterGetValueFromEditor(data) {
         this.__singleQuotesInFontFamily(data);
+        this.__removeTrailingBr(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -28328,7 +28330,38 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * `style="font-family: "Open Sans", …"` — broken markup. Single quotes
 	 * survive that round trip. Names that already contain an apostrophe are
 	 * left alone.
-	 */ __singleQuotesInFontFamily(data) {
+	 */ /**
+	 * Drop a `<br>` that is the last node of a block (or of the value) and
+	 * follows other content — the caret placeholder browsers leave behind
+	 * after typing into an empty block. An empty block (`<p><br></p>`) and a
+	 * deliberate empty line (`text<br><br>`) are kept.
+	 */ __removeTrailingBr(data) {
+        if (!this.j.o.cleanHTML.removeTrailingBr || !/<br/i.test(data.value)) {
+            return;
+        }
+        const box = this.j.c.div();
+        box.innerHTML = data.value;
+        const blocks = [
+            box,
+            ...box.querySelectorAll(TRAILING_BR_BLOCKS)
+        ];
+        blocks.forEach((block)=>{
+            const last = block.lastChild;
+            if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(last, 'br')) {
+                return;
+            }
+            const prev = last.previousSibling;
+            if (!prev || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(prev, 'br')) {
+                return;
+            }
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isText(prev) && !prev.nodeValue?.trim() && !prev.previousSibling) {
+                return;
+            }
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(last);
+        });
+        data.value = box.innerHTML;
+    }
+    __singleQuotesInFontFamily(data) {
         if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
             return;
         }
@@ -28415,6 +28448,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
     singleQuotesInFontFamily: true,
+    removeTrailingBr: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -29278,7 +29312,14 @@ function filterStyleProperties(style, allowed) {
     // a pending-format marker the user is about to type into (#1291). `current`
     // is captured before a click moves the caret, so also check the live caret.
     const liveCaret = jodit.s.isCollapsed() ? jodit.s.range.startContainer : null;
-    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current)) && (liveCaret == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, liveCaret));
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && !isFragmentTarget(node) && (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current)) && (liveCaret == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, liveCaret));
+}
+/**
+ * An element with an `id`, or an `<a>` with a `name`, is where an in-page link
+ * (`#fragment`) lands. It is usually empty (`<a name="top"></a>`), and removing
+ * it silently breaks every link that points at it.
+ */ function isFragmentTarget(element) {
+    return element.hasAttribute('id') || element.nodeName === 'A' && element.hasAttribute('name');
 }
 
 
@@ -30197,6 +30238,11 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
             this.state = 2;
         }
         this.j.e.fire('hidePopup hideResizer');
+        // The ghost lives in the top document (position: fixed), but the
+        // mousemove comes from the editor document. In iframe mode those are
+        // different viewports, so the iframe's own offset has to be added or
+        // the ghost trails the pointer by exactly that distance (#1455).
+        const offset = this.__ghostOffset();
         if (!this.draggable.parentNode) {
             const target = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(this.draggable, 'target');
             (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.css)(this.draggable, {
@@ -30206,19 +30252,35 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
                 position: 'fixed',
                 opacity: 0.7,
                 display: 'inline-block',
-                left: event.clientX,
-                top: event.clientY,
+                left: event.clientX + offset.left,
+                top: event.clientY + offset.top,
                 width: target?.offsetWidth ?? 100,
                 height: target?.offsetHeight ?? 100
             });
             jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.append((0,jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.getContainer)(this.j, dragAndDropElement), this.draggable);
         }
         ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.css)(this.draggable, {
-            left: event.clientX,
-            top: event.clientY
+            left: event.clientX + offset.left,
+            top: event.clientY + offset.top
         });
+        // The caret goes into the editor document, so it keeps the raw
+        // (iframe-relative) coordinates.
         this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
     }
+    __ghostOffset() {
+        const iframe = this.j.iframe;
+        if (!iframe) {
+            return {
+                left: 0,
+                top: 0
+            };
+        }
+        const rect = iframe.getBoundingClientRect();
+        return {
+            left: rect.left,
+            top: rect.top
+        };
+    }
     /**
 	 * Mouseup handler in any place
 	 */ onDragEnd() {
@@ -36558,10 +36620,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.dots = {
 
 "use strict";
 /* unused harmony export mobile */
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2496);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3244);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(85932);
+/* harmony import */ var jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2496);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3244);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -36574,6 +36638,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.dots = {
 
 
 
+
+
 const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n';
 /**
  * Constrain a responsive breakpoint set (`buttonsMD/SM/XS`) to the buttons the
@@ -36587,13 +36653,13 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
  * the standard grouped mobile layout — groups, separators and `dots` — is
  * preserved. See #1389.
  */ function fitToButtons(list, editor) {
-    const allowed = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__.flatButtonsSet)((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttons), editor);
+    const allowed = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__.flatButtonsSet)((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttons), editor);
     const groups = editor.getRegisteredButtonGroups();
     let changed = false;
     let hadDots = false;
     const flat = [];
     for (const item of list){
-        if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__.isButtonGroup)(item)) {
+        if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__.isButtonGroup)(item)) {
             const members = [
                 ...item.buttons,
                 ...groups[item.group] ?? []
@@ -36630,17 +36696,31 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
     // Keep the "show all" overflow button only if some requested button is still
     // hidden at this breakpoint.
     if (hadDots) {
-        const shown = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__.flatButtonsSet)(cleaned, editor);
-        if ((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.toArray)(allowed).some((button)=>!shown.has(button))) {
+        const shown = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__.flatButtonsSet)(cleaned, editor);
+        if ((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.toArray)(allowed).some((button)=>!shown.has(button))) {
             cleaned.push('dots');
         }
     }
     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.
+ */ 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)) {
+        const width = editor.toolbarContainer.offsetWidth;
+        if (width) {
+            return width;
+        }
+    }
+    return (editor.container.parentElement ?? editor.container).offsetWidth;
+}
 /**
  * Rebuild toolbar in depends on editor's width
  */ function mobile(editor) {
-    let timeout = 0, store = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttons);
+    let timeout = 0, store = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttons);
     if (editor.o.mobileTapTimeout) {
         // Emulate double tap
         editor.e.on('touchend', (e)=>{
@@ -36657,8 +36737,8 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
     }
     editor.e.on('getDiffButtons.mobile', (toolbar)=>{
         if (toolbar === editor.toolbar) {
-            const buttons = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__.flatButtonsSet)((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttons), editor), flatStore = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_2__.flatButtonsSet)(store, editor);
-            return (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.toArray)(buttons).reduce((acc, item)=>{
+            const buttons = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__.flatButtonsSet)((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttons), editor), flatStore = (0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_4__.flatButtonsSet)(store, editor);
+            return (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.toArray)(buttons).reduce((acc, item)=>{
                 if (!flatStore.has(item)) {
                     acc.push(item);
                 }
@@ -36671,18 +36751,21 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
             if (!editor.o.toolbar) {
                 return;
             }
-            const width = (editor.container.parentElement ?? editor.container).offsetWidth;
             const newStore = (()=>{
-                if (editor.isFullSize || width >= editor.o.sizeLG) {
-                    return (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttons);
+                if (editor.isFullSize) {
+                    return (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttons);
+                }
+                const width = adaptiveWidth(editor);
+                if (width >= editor.o.sizeLG) {
+                    return (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttons);
                 }
                 if (width >= editor.o.sizeMD) {
-                    return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttonsMD), editor);
+                    return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttonsMD), editor);
                 }
                 if (width >= editor.o.sizeSM) {
-                    return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttonsSM), editor);
+                    return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttonsSM), editor);
                 }
-                return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.splitArray)(editor.o.buttonsXS), editor);
+                return fitToButtons((0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_2__.splitArray)(editor.o.buttonsXS), editor);
             })();
             if (newStore.toString() !== store.toString()) {
                 store = newStore;
@@ -36692,7 +36775,7 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
         }).on(editor.ow, 'load resize', ()=>editor.e.fire('recalcAdaptive'));
     }
 }
-jodit_core_global__WEBPACK_IMPORTED_MODULE_0__.pluginSystem.add('mobile', mobile);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('mobile', mobile);
 
 
 /***/ }),