jodit-pro 4.13.16 → 4.13.17

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.13.16
+ * Version: v4.13.17
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2299,7 +2299,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.13.16";
+var APP_VERSION = "4.13.17";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -14724,6 +14724,164 @@ var Selection = /*#__PURE__*/ function() {
                 return '';
             }
         },
+        {
+            /**
+     * Splits the boundaries of the current selection and wraps every
+     * contiguous run of selected inline content (grouped by block) into a
+     * `<font>` element, returning those wrappers in document order.
+     *
+     * This is a pure-DOM replacement for the old
+     * `nativeExecCommand('fontsize', false, '7')` trick which relied on the
+     * browser to split the selection into `<font size="7">` fragments.
+     */ key: "__wrapSelectionFragments",
+            value: function __wrapSelectionFragments() {
+                var range = this.range;
+                this.__splitSelectionBoundaries(range);
+                var root = range.commonAncestorContainer;
+                if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(root)) {
+                    root = root.parentNode;
+                }
+                if (!root) {
+                    return [];
+                }
+                return this.__wrapSelectionRuns(this.__collectContainedNodes(root, range));
+            }
+        },
+        {
+            /**
+     * Splits the text nodes at both ends of the range so that its boundaries
+     * always fall between nodes. Afterwards every node inside the range is
+     * fully (not partially) selected.
+     */ key: "__splitSelectionBoundaries",
+            value: function __splitSelectionBoundaries(range) {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var startContainer = range.startContainer, endContainer = range.endContainer;
+                var startOffset = range.startOffset, endOffset = range.endOffset;
+                if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(endContainer) && endOffset > 0 && endOffset < ((_b = (_a = endContainer.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0)) {
+                    endContainer.splitText(endOffset);
+                    endOffset = (_d = (_c = endContainer.nodeValue) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : endOffset;
+                }
+                if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(startContainer) && startOffset > 0 && startOffset < ((_f = (_e = startContainer.nodeValue) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0)) {
+                    var middle = startContainer.splitText(startOffset);
+                    // Selection located inside a single text node - the tail we just
+                    // cut off is the actual selected fragment.
+                    if (startContainer === endContainer) {
+                        endContainer = middle;
+                        endOffset = (_h = (_g = middle.nodeValue) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0;
+                    }
+                    startContainer = middle;
+                    startOffset = 0;
+                }
+                range.setStart(startContainer, startOffset);
+                range.setEnd(endContainer, endOffset);
+                // Normalize text-edge boundaries (e.g. `(text, 0)` or `(text, length)`)
+                // to the element level so that containment checks based on
+                // `selectNode()` treat a fully selected text node as contained.
+                this.__normalizeRangeBoundary(range, true);
+                this.__normalizeRangeBoundary(range, false);
+            }
+        },
+        {
+            key: "__normalizeRangeBoundary",
+            value: function __normalizeRangeBoundary(range, atStart) {
+                var _a, _b;
+                var container = atStart ? range.startContainer : range.endContainer;
+                if (!_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(container)) {
+                    return;
+                }
+                var offset = atStart ? range.startOffset : range.endOffset;
+                var length = (_b = (_a = container.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+                if (offset === 0) {
+                    atStart ? range.setStartBefore(container) : range.setEndBefore(container);
+                } else if (offset >= length) {
+                    atStart ? range.setStartAfter(container) : range.setEndAfter(container);
+                }
+            }
+        },
+        {
+            /**
+     * Collects the highest-level nodes that are completely inside the range,
+     * descending into nodes that are only partially selected.
+     */ key: "__collectContainedNodes",
+            value: function __collectContainedNodes(root, range) {
+                var _this = this;
+                var result = [];
+                (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.toArray)(root.childNodes).forEach(function(child) {
+                    if (_this.__isFullyContained(range, child)) {
+                        result.push(child);
+                    } else if (child.childNodes.length && range.intersectsNode(child)) {
+                        var _result;
+                        (_result = result).push.apply(_result, _to_consumable_array(_this.__collectContainedNodes(child, range)));
+                    }
+                });
+                return result;
+            }
+        },
+        {
+            key: "__isFullyContained",
+            value: function __isFullyContained(range, node) {
+                var nodeRange = this.createRange();
+                nodeRange.selectNode(node);
+                return range.compareBoundaryPoints(Range.START_TO_START, nodeRange) <= 0 && range.compareBoundaryPoints(Range.END_TO_END, nodeRange) >= 0;
+            }
+        },
+        {
+            /**
+     * Wraps every contiguous run of selected inline siblings into a `<font>`
+     * element. Block-level nodes are never wrapped themselves - their inline
+     * content is wrapped instead, keeping every `<font>` inside a single block.
+     */ key: "__wrapSelectionRuns",
+            value: function __wrapSelectionRuns(nodes) {
+                var _this = this;
+                var fonts = [];
+                var run = [];
+                var flush = function flush() {
+                    if (run.length) {
+                        fonts.push(_this.__wrapRunInFont(run));
+                        run = [];
+                    }
+                };
+                nodes.forEach(function(node) {
+                    if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(node) && _this.__isOrContainsBlock(node)) {
+                        var _fonts;
+                        flush();
+                        (_fonts = fonts).push.apply(_fonts, _to_consumable_array(_this.__wrapSelectionRuns((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.toArray)(node.childNodes))));
+                    } else {
+                        if (run.length && run[run.length - 1].parentNode !== node.parentNode) {
+                            flush();
+                        }
+                        run.push(node);
+                    }
+                });
+                flush();
+                return fonts;
+            }
+        },
+        {
+            key: "__isOrContainsBlock",
+            value: function __isOrContainsBlock(node) {
+                var _this = this;
+                if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isBlock(node)) {
+                    return true;
+                }
+                return (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.toArray)(node.childNodes).some(function(child) {
+                    return _this.__isOrContainsBlock(child);
+                });
+            }
+        },
+        {
+            key: "__wrapRunInFont",
+            value: function __wrapRunInFont(run) {
+                var _a;
+                var font = this.j.createInside.element('font');
+                var _run = _sliced_to_array(run, 1), first = _run[0];
+                (_a = first.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(font, first);
+                run.forEach(function(node) {
+                    return font.appendChild(node);
+                });
+                return font;
+            }
+        },
         {
             key: "wrapInTagGen",
             value: /**
@@ -14753,20 +14911,7 @@ var Selection = /*#__PURE__*/ function() {
                                 2
                             ];
                         case 2:
-                            // fix issue https://github.com/xdan/jodit/issues/65
-                            (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('*[style*=font-size]', this.area).forEach(function(elm) {
-                                (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.attr)(elm, 'data-font-size', elm.style.fontSize.toString());
-                                elm.style.removeProperty('font-size');
-                            });
-                            this.j.nativeExecCommand('fontsize', false, '7');
-                            (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('*[data-font-size]', this.area).forEach(function(elm) {
-                                var fontSize = (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.attr)(elm, 'data-font-size');
-                                if (fontSize) {
-                                    elm.style.fontSize = fontSize;
-                                    (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.attr)(elm, 'data-font-size', null);
-                                }
-                            });
-                            elms = (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('font[size="7"]', this.area);
+                            elms = this.__wrapSelectionFragments();
                             _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                             _state.label = 3;
                         case 3:
@@ -24049,12 +24194,29 @@ var ViewWithToolbar = /*#__PURE__*/ function(View) {
                 if (!this.o.fullsize && ((0,_helpers_checker_is_string_js__WEBPACK_IMPORTED_MODULE_5__.isString)(this.o.toolbar) || _dom_dom_js__WEBPACK_IMPORTED_MODULE_3__.Dom.isHTMLElement(this.o.toolbar))) {
                     return (0,_helpers_utils_selector_js__WEBPACK_IMPORTED_MODULE_6__.resolveElement)(this.o.toolbar, this.o.shadowRoot || this.od);
                 }
-                this.o.toolbar && _dom_dom_js__WEBPACK_IMPORTED_MODULE_3__.Dom.appendChildFirst(this.container, this.__defaultToolbarContainer);
+                this.o.toolbar && this.__appendToolbarBox();
                 return this.__defaultToolbarContainer;
             }
         },
         {
             /**
+     * Keep the toolbar box as the first child of the container, except that
+     * children flagged with `data-jodit-above-toolbar` (e.g. the `above`
+     * workplace slot used for presence bars and banners) stay above it.
+     */ key: "__appendToolbarBox",
+            value: function __appendToolbarBox() {
+                var box = this.__defaultToolbarContainer;
+                var anchor = this.container.firstElementChild;
+                while(anchor && anchor !== box && anchor.hasAttribute('data-jodit-above-toolbar')){
+                    anchor = anchor.nextElementSibling;
+                }
+                if (anchor !== box) {
+                    this.container.insertBefore(box, anchor);
+                }
+            }
+        },
+        {
+            /**
      * Change panel container
      */ key: "setPanel",
             value: function setPanel(element) {
@@ -26016,6 +26178,12 @@ var Jodit = Jodit_1 = /*#__PURE__*/ function(ViewWithToolbar) {
                     element.style.display = 'none';
                 }
                 var SLOT = 'workplace-slot';
+                // A slot that always stays ABOVE the toolbar (presence bars, banners…).
+                // The `data-jodit-above-toolbar` attribute tells ViewWithToolbar to keep
+                // the toolbar box below it when (re)attaching the toolbar container.
+                var aboveSlot = this.c.div(this.getFullElName(SLOT, 'above'), NOEDIT);
+                aboveSlot.setAttribute('data-jodit-above-toolbar', '');
+                _modules_index_js__WEBPACK_IMPORTED_MODULE_7__.Dom.appendChildFirst(container, aboveSlot);
                 var topSlot = this.c.div(this.getFullElName(SLOT, 'top'), NOEDIT);
                 container.appendChild(topSlot);
                 var centerSlot = this.c.div(this.getFullElName(SLOT, 'center'), NOEDIT);
@@ -26048,6 +26216,7 @@ var Jodit = Jodit_1 = /*#__PURE__*/ function(ViewWithToolbar) {
                     container: container,
                     workplace: workplace,
                     slots: {
+                        above: aboveSlot,
                         top: topSlot,
                         bottom: bottomPanel,
                         center: centerSlot,