jodit 4.12.44 → 4.13.5

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.12.44
+ * Version: v4.13.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1843,7 +1843,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.12.44";
+ */ const APP_VERSION = "4.13.5";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -6156,7 +6156,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])) {
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(foreign[i]);
         }
     }
@@ -6264,7 +6264,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,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', location.protocol + '//' + href);
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'http:';
+        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', protocol + '//' + href);
         effected = true;
     }
     if (safeJavaScriptLink) {
@@ -11306,6 +11307,128 @@ 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 (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.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) {
+        let { startContainer, endContainer } = range;
+        let { startOffset, endOffset } = range;
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(endContainer) && endOffset > 0 && endOffset < (endContainer.nodeValue?.length ?? 0)) {
+            endContainer.splitText(endOffset);
+            endOffset = endContainer.nodeValue?.length ?? endOffset;
+        }
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(startContainer) && startOffset > 0 && startOffset < (startContainer.nodeValue?.length ?? 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 = middle.nodeValue?.length ?? 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) {
+        const container = atStart ? range.startContainer : range.endContainer;
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(container)) {
+            return;
+        }
+        const offset = atStart ? range.startOffset : range.endOffset;
+        const length = container.nodeValue?.length ?? 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,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.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 (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isElement(node) && this.__isOrContainsBlock(node)) {
+                flush();
+                fonts.push(...this.__wrapSelectionRuns((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.toArray)(node.childNodes)));
+            } else {
+                if (run.length && run[run.length - 1].parentNode !== node.parentNode) {
+                    flush();
+                }
+                run.push(node);
+            }
+        });
+        flush();
+        return fonts;
+    }
+    __isOrContainsBlock(node) {
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isBlock(node)) {
+            return true;
+        }
+        return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.toArray)(node.childNodes).some((child)=>this.__isOrContainsBlock(child));
+    }
+    __wrapRunInFont(run) {
+        const font = this.j.createInside.element('font');
+        const [first] = run;
+        first.parentNode?.insertBefore(font, first);
+        run.forEach((node)=>font.appendChild(node));
+        return font;
+    }
     /**
 	 * Wrap all selected fragments inside Tag or apply some callback
 	 */ *wrapInTagGen(fakes) {
@@ -11319,20 +11442,7 @@ class Selection {
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.unwrap(font);
             return;
         }
-        // fix issue https://github.com/xdan/jodit/issues/65
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.$$)('*[style*=font-size]', this.area).forEach((elm)=>{
-            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(elm, 'data-font-size', elm.style.fontSize.toString());
-            elm.style.removeProperty('font-size');
-        });
-        this.j.nativeExecCommand('fontsize', false, '7');
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.$$)('*[data-font-size]', this.area).forEach((elm)=>{
-            const fontSize = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(elm, 'data-font-size');
-            if (fontSize) {
-                elm.style.fontSize = fontSize;
-                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.attr)(elm, 'data-font-size', null);
-            }
-        });
-        const elms = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.$$)('font[size="7"]', this.area);
+        const elms = this.__wrapSelectionFragments();
         for (const font of elms){
             const { firstChild, lastChild } = font;
             if (firstChild && firstChild === lastChild && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_6__.isMarker)(firstChild)) {
@@ -16528,9 +16638,23 @@ class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_11__
         if (!this.o.fullsize && ((0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_7__.isString)(this.o.toolbar) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_5__.Dom.isHTMLElement(this.o.toolbar))) {
             return (0,jodit_core_helpers_utils_selector__WEBPACK_IMPORTED_MODULE_8__.resolveElement)(this.o.toolbar, this.o.shadowRoot || this.od);
         }
-        this.o.toolbar && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_5__.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) {
@@ -17804,6 +17928,12 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_9__.ViewWithToolbar {
             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', '');
+        jodit_modules__WEBPACK_IMPORTED_MODULE_9__.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);
@@ -17836,6 +17966,7 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_9__.ViewWithToolbar {
             container,
             workplace,
             slots: {
+                above: aboveSlot,
                 top: topSlot,
                 bottom: bottomPanel,
                 center: centerSlot,