jodit-pro 4.13.16 → 4.13.18

package/es2015/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.18
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1838,7 +1838,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.13.16";
+ */ const APP_VERSION = "4.13.18";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -6031,7 +6031,7 @@ const HTML_NAMESPACE = 'http://www.w3.org/1999/xhtml';
     // markup into a live node.
     const foreign = box.querySelectorAll('math *, svg *');
     for(let i = 0; i < foreign.length; i++){
-        if (foreign[i].isConnected && isSmuggledForeignHtml(foreign[i])) {
+        if (box.contains(foreign[i]) && isSmuggledForeignHtml(foreign[i])) {
             _dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(foreign[i]);
         }
     }
@@ -6139,7 +6139,8 @@ function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
     // scheme (e.g. `java\tscript:`) — all of which the browser still resolves to
     // `javascript:` on click. See GHSA-j839-gqq4-gf9j.
     if (safeJavaScriptLink && href && isDangerousUrl(href, tagName)) {
-        (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', location.protocol + '//' + href);
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'http:';
+        (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', protocol + '//' + href);
         effected = true;
     }
     if (safeJavaScriptLink) {
@@ -11319,6 +11320,131 @@ class Selection {
         }
         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.
+     */ __wrapSelectionFragments() {
+        const range = this.range;
+        this.__splitSelectionBoundaries(range);
+        let 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.
+     */ __splitSelectionBoundaries(range) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let { startContainer, endContainer } = range;
+        let { startOffset, endOffset } = range;
+        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)) {
+            const 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);
+    }
+    __normalizeRangeBoundary(range, atStart) {
+        var _a, _b;
+        const container = atStart ? range.startContainer : range.endContainer;
+        if (!_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(container)) {
+            return;
+        }
+        const offset = atStart ? range.startOffset : range.endOffset;
+        const 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.
+     */ __collectContainedNodes(root, range) {
+        const result = [];
+        (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.toArray)(root.childNodes).forEach((child)=>{
+            if (this.__isFullyContained(range, child)) {
+                result.push(child);
+            } else if (child.childNodes.length && range.intersectsNode(child)) {
+                result.push(...this.__collectContainedNodes(child, range));
+            }
+        });
+        return result;
+    }
+    __isFullyContained(range, node) {
+        const 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.
+     */ __wrapSelectionRuns(nodes) {
+        const fonts = [];
+        let run = [];
+        const flush = ()=>{
+            if (run.length) {
+                fonts.push(this.__wrapRunInFont(run));
+                run = [];
+            }
+        };
+        nodes.forEach((node)=>{
+            if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(node) && this.__isOrContainsBlock(node)) {
+                flush();
+                fonts.push(...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;
+    }
+    __isOrContainsBlock(node) {
+        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((child)=>this.__isOrContainsBlock(child));
+    }
+    __wrapRunInFont(run) {
+        var _a;
+        const font = this.j.createInside.element('font');
+        const [first] = run;
+        (_a = first.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(font, first);
+        run.forEach((node)=>font.appendChild(node));
+        return font;
+    }
     /**
      * Wrap all selected fragments inside Tag or apply some callback
      */ *wrapInTagGen(fakes) {
@@ -11332,20 +11458,7 @@ class Selection {
             _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.unwrap(font);
             return;
         }
-        // fix issue https://github.com/xdan/jodit/issues/65
-        (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('*[style*=font-size]', this.area).forEach((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((elm)=>{
-            const 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);
-            }
-        });
-        const elms = (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('font[size="7"]', this.area);
+        const elms = this.__wrapSelectionFragments();
         for (const font of elms){
             const { firstChild, lastChild } = font;
             if (firstChild && firstChild === lastChild && (0,_helpers_checker_index_js__WEBPACK_IMPORTED_MODULE_4__.isMarker)(firstChild)) {
@@ -16910,9 +17023,23 @@ class ViewWithToolbar extends _view_js__WEBPACK_IMPORTED_MODULE_9__.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.
+     */ __appendToolbarBox() {
+        const box = this.__defaultToolbarContainer;
+        let 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
      */ setPanel(element) {
@@ -18308,6 +18435,12 @@ let Jodit = Jodit_1 = class Jodit extends _modules_index_js__WEBPACK_IMPORTED_MO
             element.style.display = 'none';
         }
         const 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.
+        const 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);
         const topSlot = this.c.div(this.getFullElName(SLOT, 'top'), NOEDIT);
         container.appendChild(topSlot);
         const centerSlot = this.c.div(this.getFullElName(SLOT, 'center'), NOEDIT);
@@ -18340,6 +18473,7 @@ let Jodit = Jodit_1 = class Jodit extends _modules_index_js__WEBPACK_IMPORTED_MO
             container,
             workplace,
             slots: {
+                above: aboveSlot,
                 top: topSlot,
                 bottom: bottomPanel,
                 center: centerSlot,