jodit 4.17.3 → 4.17.5

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.17.3
+ * Version: v4.17.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1799,7 +1799,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.17.3";
+ */ const APP_VERSION = "4.17.5";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -10957,6 +10957,16 @@ class Selection {
             }
         });
     }
+    /**
+	 * How many ranges the browser's own selection holds right now, as opposed
+	 * to the composed view that [[sel]] may answer from.
+	 */ __nativeRangeCount() {
+        const { shadowRoot } = this.j.o;
+        if (shadowRoot && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_6__.isFunction)(shadowRoot.getSelection)) {
+            return shadowRoot.getSelection()?.rangeCount ?? 0;
+        }
+        return this.win.getSelection()?.rangeCount ?? 0;
+    }
     /**
 	 * Return first selected range or create new
 	 */ get range() {
@@ -11751,6 +11761,16 @@ class Selection {
             if (backward && ranges.length === 1) {
                 const range = ranges[0];
                 sel.setBaseAndExtent(range.endContainer, range.endOffset, range.startContainer, range.startOffset);
+            } else if (ranges.length === 1 && !this.__nativeRangeCount() && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_6__.isFunction)(sel.setBaseAndExtent)) {
+                // `addRange` is specified to ignore a range whose root is not
+                // the document, which is every range inside a shadow tree.
+                // Chrome's `ShadowRoot.getSelection()` takes them anyway, but
+                // Safari has only the window selection, so after
+                // `removeAllRanges` the caret is simply gone: a character was
+                // deleted and nothing was left to type into. `setBaseAndExtent`
+                // does accept nodes inside a shadow tree.
+                const range = ranges[0];
+                sel.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset);
             }
         }
         /**
@@ -20788,6 +20808,16 @@ const DOCS_URL = 'https://xdsoft.net/jodit/docs/modules/file_browser.html';
     });
     return resp;
 }
+/**
+ * Actions that only read from the connector. A newer request for one of them
+ * makes the older one pointless, so it is aborted; every other action changes
+ * server state and must be allowed to finish.
+ */ const REPLACEABLE_ACTIONS = new Set([
+    'items',
+    'folder',
+    'permissions',
+    'getLocalFileByUrl'
+]);
 class DataProvider {
     /**
 	 * Alias for options
@@ -20796,10 +20826,19 @@ class DataProvider {
     }
     get(name) {
         const instances = this.__ajaxInstances;
-        if (instances.has(name)) {
-            const ajax = instances.get(name);
+        // A listing asked for again supersedes the one still loading, so the
+        // earlier request is aborted. That must never happen to a request
+        // that changes something on the server: aborting it does not undo it,
+        // the caller just never hears the result. Removing several files at
+        // once used to send one `fileRemove` per file and abort all but the
+        // last, so only the last one was ever removed. Mutating requests get a
+        // key of their own and run side by side.
+        const replaceable = REPLACEABLE_ACTIONS.has(name);
+        const key = replaceable ? name : `${name}#${++this.__requestSerial}`;
+        if (replaceable && instances.has(key)) {
+            const ajax = instances.get(key);
             ajax?.abort();
-            instances.delete(name);
+            instances.delete(key);
         }
         const opts = (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_8__.ConfigProto)(this.options[name] !== undefined ? this.options[name] : {}, (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_8__.ConfigProto)({
             onProgress: this.progressHandler
@@ -20808,11 +20847,11 @@ class DataProvider {
             opts.data = opts.prepareData.call(this, opts.data);
         }
         const ajax = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__.Ajax(opts);
-        instances.set(name, ajax);
+        instances.set(key, ajax);
         const promise = ajax.send();
         promise.finally(()=>{
             ajax.destruct();
-            instances.delete(name);
+            instances.delete(key);
             this.progressHandler(100);
         }).catch(()=>null);
         return promise.then((resp)=>resp.json()).then((resp)=>{
@@ -21117,11 +21156,13 @@ class DataProvider {
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "options", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__currentPermissions", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__ajaxInstances", void 0);
+        (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__requestSerial", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "progressHandler", void 0);
         this.parent = parent;
         this.options = options;
         this.__currentPermissions = null;
         this.__ajaxInstances = new Map();
+        this.__requestSerial = 0;
         this.progressHandler = (ignore)=>{};
     }
 }
@@ -41755,13 +41796,22 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
             j.e.fire(e.type + 'Editor', target, e);
         }
     }
+    onOutsidePress(e) {
+        this.__pressTarget = e.target;
+    }
     /**
 	 * @event outsideClick(e) - when user clicked on the outside of editor
 	 */ onOutsideClick(e) {
-        const node = e.target;
+        const node = e.target, pressed = this.__pressTarget;
+        this.__pressTarget = null;
         if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.up(node, (elm)=>elm === this.j.editor)) {
             return;
         }
+        // Selecting the text of a popup input with the mouse and releasing
+        // the button past the popup's edge is not a click outside of it.
+        if (pressed && jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.UIElement.closestElement(pressed, jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.Popup)) {
+            return;
+        }
         const box = jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.UIElement.closestElement(node, jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.Popup);
         if (!box) {
             this.j.e.fire('outsideClick', e);
@@ -41865,12 +41915,22 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
             'touchstart',
             'mouseup',
             'touchend'
-        ]);
+        ]), /**
+	 * Where the last press started. Chrome reports a drag that begins in one
+	 * element and ends in another as a `click` on their common ancestor, so a
+	 * press inside a popup is remembered to tell such a drag from a real click.
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__pressTarget", null);
     }
 }
 ;(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.autobind
 ], select.prototype, "onStartSelection", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
+        'ow:mousedown',
+        'ow:touchstart'
+    ])
+], select.prototype, "onOutsidePress", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)('ow:click')
 ], select.prototype, "onOutsideClick", null);