jodit 4.13.15 → 4.13.17

package/es2015/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.13.15
+ * Version: v4.13.17
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1849,7 +1849,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.13.15";
+ */ const APP_VERSION = "4.13.17";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -9096,7 +9096,12 @@ const map = {};
     while(el && el !== root && el.parentNode){
         el = el.parentNode;
         rect = el.getBoundingClientRect();
-        if (!(top <= rect.bottom)) {
+        // The element's bottom is clipped by the container's bottom edge: a
+        // caret sitting on that line is invisible, so the element is not in
+        // view even though its top still fits. The `top > rect.top` guard keeps
+        // elements taller than the container (which can never fully fit) from
+        // being treated as always out of view. See #1300
+        if (top + height > rect.bottom && top > rect.top) {
             return false;
         }
         // Check if the element is out of view due to a container scrolling
@@ -9104,19 +9109,24 @@ const map = {};
             return false;
         }
     }
-    // Check it's within the document viewport: the element must not be below
-    // the viewport bottom, and (its bottom) must not be above the viewport top —
-    // the latter guard was missing, so an element scrolled above the top was
-    // wrongly reported as visible and never scrolled to. See #1279
+    // Check it's within the document viewport: the element must fit above the
+    // viewport bottom (same clipped-bottom rule as above), and its bottom must
+    // not be above the viewport top — the latter guard was missing, so an
+    // element scrolled above the top was wrongly reported as visible and never
+    // scrolled to. See #1279
     const clientHeight = doc.documentElement && doc.documentElement.clientHeight || 0;
-    return top <= clientHeight && top + height >= 0;
+    return (top + height <= clientHeight || top <= 0) && top + height >= 0;
 }
 /**
  * Scroll element into view if it is not in view
  */ function scrollIntoViewIfNeeded(elm, root, doc) {
     if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isHTMLElement(elm) && !inView(elm, root, doc)) {
         if (root.clientHeight !== root.scrollHeight) {
-            root.scrollTop = elm.offsetTop;
+            // Scroll the minimal distance: when the element is below the
+            // visible area align it to the bottom (natural typing flow),
+            // otherwise align it to the top. See #1300
+            const alignBottom = elm.offsetTop + elm.offsetHeight - root.clientHeight;
+            root.scrollTop = root.scrollTop < alignBottom ? alignBottom : elm.offsetTop;
         }
         if (!inView(elm, root, doc)) {
             elm.scrollIntoView();
@@ -25167,6 +25177,7 @@ function processOldBrowserDrag(self, cData, handlerSuccess, handlerError, onFina
     return Promise.all(promises);
 }
 function readImagesWithReader(fileList, imagesExtensions, promises, uploader, handlerSuccess, defaultHandlerSuccess) {
+    const readerPromises = [];
     let file, i;
     for(i = 0; i < fileList.length; i += 1){
         file = fileList[i];
@@ -25177,7 +25188,7 @@ function readImagesWithReader(fileList, imagesExtensions, promises, uploader, ha
                 continue;
             }
             const reader = new FileReader();
-            promises.push(uploader.j.async.promise((resolve, reject)=>{
+            const readerPromise = uploader.j.async.promise((resolve, reject)=>{
                 reader.onerror = reject;
                 reader.onloadend = ()=>{
                     const resp = {
@@ -25194,10 +25205,21 @@ function readImagesWithReader(fileList, imagesExtensions, promises, uploader, ha
                     resolve(resp);
                 };
                 reader.readAsDataURL(file);
-            }));
+            });
+            readerPromises.push(readerPromise);
+            promises.push(readerPromise);
             fileList[i] = null;
         }
     }
+    // Images inserted as base64 never reach the server branch in `sendFiles`,
+    // which is the only other place that fires `filesWereUploaded`
+    if (readerPromises.length) {
+        Promise.all(readerPromises).then(()=>{
+            uploader.j.events && uploader.j.e.fire('filesWereUploaded');
+        }).catch(()=>{
+        // Read errors are propagated to the caller via `promises`
+        });
+    }
 }
 
 
@@ -31297,8 +31319,17 @@ function brBefore(start) {
         }
         return;
     }
-    const newP = sel.splitSelection(block, fake);
-    (0,jodit_core_helpers_utils_scroll_into_view__WEBPACK_IMPORTED_MODULE_1__.scrollIntoViewIfNeeded)(newP, jodit.editor, jodit.ed);
+    // Inserting the left half above the caret can trigger the browser's
+    // scroll anchoring and shift the visible area — keep it stable. See #1300
+    const { scrollTop } = jodit.editor;
+    sel.splitSelection(block, fake);
+    if (jodit.editor.scrollTop !== scrollTop) {
+        jodit.editor.scrollTop = scrollTop;
+    }
+    // After the split the caret stays inside `block` (the right half) —
+    // `splitSelection` returns the left half, which is above the caret and
+    // usually already visible. Follow the caret, not the left half. See #1300
+    (0,jodit_core_helpers_utils_scroll_into_view__WEBPACK_IMPORTED_MODULE_1__.scrollIntoViewIfNeeded)(block, jodit.editor, jodit.ed);
 }