jodit 4.11.6 → 4.11.7

package/es5/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
  */
@@ -2022,7 +2022,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.11.6";
+var APP_VERSION = "4.11.7";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -3703,6 +3703,34 @@ function wait(condition) {
                 return !(0,jodit_core_helpers_checker_is_void__WEBPACK_IMPORTED_MODULE_13__.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);
             }
         },
+        {
+            key: "first",
+            value: /**
+	 * Get first matched node inside root
+	 */ function first(root, condition) {
+                var first = root === null || root === void 0 ? void 0 : root.firstChild;
+                if (!first) {
+                    return null;
+                }
+                do {
+                    if (condition(first)) {
+                        return first;
+                    }
+                    var next = first.firstChild;
+                    if (!next) {
+                        next = first.nextSibling;
+                    }
+                    if (!next && first.parentNode !== root) {
+                        do {
+                            first = first.parentNode;
+                        }while (first && !(first === null || first === void 0 ? void 0 : first.nextSibling) && first.parentNode !== root);
+                        next = first === null || first === void 0 ? void 0 : first.nextSibling;
+                    }
+                    first = next;
+                }while (first);
+                return null;
+            }
+        },
         {
             key: "last",
             value: /**
@@ -11546,7 +11574,8 @@ var Selection = /*#__PURE__*/ function() {
                 var markAttr = function markAttr(start) {
                     return "span[data-".concat(jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.MARKER_CLASS, "=").concat(start ? 'start' : 'end', "]");
                 };
-                var start = this.area.querySelector(markAttr(true)), end = this.area.querySelector(markAttr(false));
+                var start = this.area.querySelector(markAttr(true));
+                var end = this.area.querySelector(markAttr(false));
                 if (!start) {
                     return;
                 }
@@ -12201,7 +12230,7 @@ var Selection = /*#__PURE__*/ function() {
             value: function selectRange(range) {
                 var focus = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
                 var sel = this.sel;
-                if (focus && !this.isFocused()) {
+                if (focus && !this.isFocused() && this.j.e.current !== 'focus') {
                     this.focus();
                 }
                 if (sel) {
@@ -30955,6 +30984,7 @@ var backspace = /*#__PURE__*/ function(Plugin) {
                     sel.focus();
                 }
                 if ((0,_cases_check_not_collapsed__WEBPACK_IMPORTED_MODULE_13__.checkNotCollapsed)(jodit)) {
+                    jodit.e.fire('backSpaceAfterDelete', backspace);
                     return false;
                 }
                 var range = sel.range;
@@ -35734,13 +35764,21 @@ function focus(editor) {
     }
     var _$focus = function focus() {
         editor.s.focus();
-        if (editor.o.cursorAfterAutofocus === 'end') {
-            var lastTextNode = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.last(editor.editor, function(node) {
-                return jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isText(node);
-            });
-            if (lastTextNode) {
-                editor.s.setCursorIn(lastTextNode, false);
-            }
+        var textNode = null;
+        switch(editor.o.cursorAfterAutofocus){
+            case 'start':
+                textNode = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.first(editor.editor, function(node) {
+                    return 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, function(node) {
+                    return 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', function() {
@@ -44688,6 +44726,26 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.find = {
 /**
  * @private
  */ var TMP_ATTR = 'jd-tmp-selection';
+var HIGHLIGHT_CSS = 'background-color: var(--jd-color-background-selection); color: var(--jd-color-text-selection);';
+var injectedDocs = new WeakSet();
+function ensureHighlightStyle(doc, useHighlightAPI) {
+    if (injectedDocs.has(doc)) {
+        return;
+    }
+    injectedDocs.add(doc);
+    var rule = useHighlightAPI ? "::highlight(jodit-search-result) { ".concat(HIGHLIGHT_CSS, " }") : "[".concat(TMP_ATTR, "] { ").concat(HIGHLIGHT_CSS, " }");
+    try {
+        var sheet = new CSSStyleSheet();
+        sheet.insertRule(rule);
+        doc.adoptedStyleSheets = (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_2__._)(doc.adoptedStyleSheets).concat([
+            sheet
+        ]);
+    } catch (unused) {
+        var style = doc.createElement('style');
+        style.textContent = rule;
+        doc.head.appendChild(style);
+    }
+}
 /**
  * @private
  */ function highlightTextRanges(jodit, rng, restRanges, ci, root) {
@@ -44697,6 +44755,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.find = {
     if (checkNativeSelectionMethod(jodit, rng, restRanges)) {
         return;
     }
+    ensureHighlightStyle(jodit.ed, false);
     var span = ci.element('span', (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_1__._)({}, TMP_ATTR, true));
     jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.markTemporary(span);
     normalizeRanges(rng, restRanges, ci);
@@ -44755,6 +44814,7 @@ function checkNativeSelectionMethod(jodit, rng, restRanges) {
             range.setEnd(rng.endContainer, rng.endOffset);
             return range;
         });
+        ensureHighlightStyle(jodit.ed, true);
         var searchHighlight = (0,_swc_helpers_construct__WEBPACK_IMPORTED_MODULE_0__._)(Highlight, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_2__._)(ranges));
         // @ts-ignore
         CSS.highlights.clear();
@@ -50265,7 +50325,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
                 if (!jodit.isEditorMode()) {
                     return;
                 }
-                var child = jodit.editor.firstChild, isChanged = false;
+                var child = jodit.editor.firstChild;
+                var isChanged = false;
                 while(child){
                     child = checkAloneListLeaf(child, jodit);
                     if (this.isSuitableStart(child)) {
@@ -50306,7 +50367,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.wrapNodes = {
                 var br = jodit.createInside.element('br');
                 jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(box, br);
                 jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.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');
             }
         }