jodit 4.15.7 → 4.15.8

package/es2015/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.7
+ * Version: v4.15.8
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1785,7 +1785,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.7";
+ */ const APP_VERSION = "4.15.8";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -29598,7 +29598,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');
 }
 
 
@@ -37632,10 +37639,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.
@@ -37648,6 +37657,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
@@ -37661,13 +37672,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)) {
             var _groups_item_group;
             const members = [
                 ...item.buttons,
@@ -37705,17 +37716,32 @@ 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) {
+    var _editor_container_parentElement;
+    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.parentElement) !== null && _editor_container_parentElement !== void 0 ? _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)=>{
@@ -37732,8 +37758,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);
                 }
@@ -37743,22 +37769,24 @@ const isButtonSeparator = (item)=>item === '|' || item === '---' || item === '\n
     });
     if (editor.o.toolbarAdaptive) {
         editor.e.on('resize afterInit recalcAdaptive changePlace afterAddPlace', ()=>{
-            var _editor_container_parentElement;
             if (!editor.o.toolbar) {
                 return;
             }
-            const width = ((_editor_container_parentElement = editor.container.parentElement) !== null && _editor_container_parentElement !== void 0 ? _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()) {
                 var _editor_toolbar;
@@ -37769,7 +37797,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);
 
 
 /***/ }),