jodit 4.11.6 → 4.11.7

package/es2021/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.11.6
+ * Version: v4.11.7
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1758,7 +1758,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.11.6";
+ */ const APP_VERSION = "4.11.7";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -3208,6 +3208,31 @@ function wait(condition) {
 	 */ static canSplitBlock(node) {
         return !(0,jodit_core_helpers_checker_is_void__WEBPACK_IMPORTED_MODULE_7__.isVoid)(node) && Dom.isHTMLElement(node) && Dom.isBlock(node) && !/^(TD|TH|CAPTION|FORM)$/.test(node.nodeName) && node.style !== undefined && !/^(fixed|absolute)/i.test(node.style.position);
     }
+    /**
+	 * Get first matched node inside root
+	 */ static first(root, condition) {
+        let first = root?.firstChild;
+        if (!first) {
+            return null;
+        }
+        do {
+            if (condition(first)) {
+                return first;
+            }
+            let next = first.firstChild;
+            if (!next) {
+                next = first.nextSibling;
+            }
+            if (!next && first.parentNode !== root) {
+                do {
+                    first = first.parentNode;
+                }while (first && !first?.nextSibling && first.parentNode !== root)
+                next = first?.nextSibling;
+            }
+            first = next;
+        }while (first)
+        return null;
+    }
     /**
 	 * Get last matched node inside root
 	 */ static last(root, condition) {
@@ -10137,7 +10162,8 @@ class Selection {
 	 */ restore() {
         let range = false;
         const markAttr = (start)=>`span[data-${jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.MARKER_CLASS}=${start ? 'start' : 'end'}]`;
-        const start = this.area.querySelector(markAttr(true)), end = this.area.querySelector(markAttr(false));
+        const start = this.area.querySelector(markAttr(true));
+        const end = this.area.querySelector(markAttr(false));
         if (!start) {
             return;
         }
@@ -10698,7 +10724,7 @@ class Selection {
 	 * Set range selection
 	 */ selectRange(range, focus = true) {
         const sel = this.sel;
-        if (focus && !this.isFocused()) {
+        if (focus && !this.isFocused() && this.j.e.current !== 'focus') {
             this.focus();
         }
         if (sel) {
@@ -25585,6 +25611,7 @@ class backspace extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__.Plugin {
             sel.focus();
         }
         if ((0,_cases_check_not_collapsed__WEBPACK_IMPORTED_MODULE_8__.checkNotCollapsed)(jodit)) {
+            jodit.e.fire('backSpaceAfterDelete', backspace);
             return false;
         }
         const range = sel.range;
@@ -29962,11 +29989,17 @@ function focus(editor) {
     }
     const focus = ()=>{
         editor.s.focus();
-        if (editor.o.cursorAfterAutofocus === 'end') {
-            const lastTextNode = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.last(editor.editor, (node)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isText(node));
-            if (lastTextNode) {
-                editor.s.setCursorIn(lastTextNode, false);
-            }
+        let textNode = null;
+        switch(editor.o.cursorAfterAutofocus){
+            case 'start':
+                textNode = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.first(editor.editor, (node)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isText(node));
+                break;
+            case 'end':
+                textNode = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.last(editor.editor, (node)=>jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isText(node));
+                break;
+        }
+        if (textNode) {
+            editor.s.setCursorIn(textNode, editor.o.cursorAfterAutofocus === 'start');
         }
     };
     editor.e.on('afterInit', ()=>{
@@ -37635,6 +37668,27 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.find = {
 /**
  * @private
  */ const TMP_ATTR = 'jd-tmp-selection';
+const HIGHLIGHT_CSS = 'background-color: var(--jd-color-background-selection); color: var(--jd-color-text-selection);';
+const injectedDocs = new WeakSet();
+function ensureHighlightStyle(doc, useHighlightAPI) {
+    if (injectedDocs.has(doc)) {
+        return;
+    }
+    injectedDocs.add(doc);
+    const rule = useHighlightAPI ? `::highlight(jodit-search-result) { ${HIGHLIGHT_CSS} }` : `[${TMP_ATTR}] { ${HIGHLIGHT_CSS} }`;
+    try {
+        const sheet = new CSSStyleSheet();
+        sheet.insertRule(rule);
+        doc.adoptedStyleSheets = [
+            ...doc.adoptedStyleSheets,
+            sheet
+        ];
+    } catch  {
+        const style = doc.createElement('style');
+        style.textContent = rule;
+        doc.head.appendChild(style);
+    }
+}
 /**
  * @private
  */ function highlightTextRanges(jodit, rng, restRanges, ci, root) {
@@ -37644,6 +37698,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.find = {
     if (checkNativeSelectionMethod(jodit, rng, restRanges)) {
         return;
     }
+    ensureHighlightStyle(jodit.ed, false);
     const span = ci.element('span', {
         [TMP_ATTR]: true
     });
@@ -37703,6 +37758,7 @@ function checkNativeSelectionMethod(jodit, rng, restRanges) {
             range.setEnd(rng.endContainer, rng.endOffset);
             return range;
         });
+        ensureHighlightStyle(jodit.ed, true);
         const searchHighlight = new Highlight(...ranges);
         // @ts-ignore
         CSS.highlights.clear();
@@ -42235,7 +42291,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
         if (!jodit.isEditorMode()) {
             return;
         }
-        let child = jodit.editor.firstChild, isChanged = false;
+        let child = jodit.editor.firstChild;
+        let isChanged = false;
         while(child){
             child = checkAloneListLeaf(child, jodit);
             if (this.isSuitableStart(child)) {
@@ -42273,7 +42330,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
         const br = jodit.createInside.element('br');
         jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.append(box, br);
         jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.append(jodit.editor, box);
-        jodit.s.isFocused() && jodit.s.setCursorBefore(br);
+        if (jodit.s.isFocused() || jodit.e.current === 'backSpaceAfterDelete') {
+            jodit.s.setCursorBefore(br);
+        }
         jodit.e.fire('internalChange');
     }
     constructor(...args){