jodit 4.15.16 → 4.15.17

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.15.16
+ * Version: v4.15.17
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1780,7 +1780,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.16";
+ */ const APP_VERSION = "4.15.17";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -31983,14 +31983,28 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('file', file);
  */ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.saveSelectionOnBlur = true;
 function focus(editor) {
     if (editor.o.saveSelectionOnBlur) {
+        // A click that brings focus back places the caret itself, and Chrome
+        // has already placed it when focus fires, so restoring would move it
+        // back to the old selection. The saved markers are dropped instead.
+        let focusByPointer = false;
         editor.e.on('blur', ()=>{
+            // A press that never brought the focus back must not decide
+            // what the next focus does
+            focusByPointer = false;
             if (editor.isEditorMode()) {
                 editor.s.save(true);
             }
+        }).on('mousedown touchstart', ()=>{
+            focusByPointer = !editor.editorIsActive;
         }).on('focus', ()=>{
             if (editor.isEditorMode()) {
-                editor.s.restore();
+                if (focusByPointer) {
+                    editor.s.removeMarkers();
+                } else {
+                    editor.s.restore();
+                }
             }
+            focusByPointer = false;
         });
     }
     const focus = ()=>{
@@ -33016,11 +33030,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(81937);
 /* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91206);
-/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23112);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(51034);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91206);
+/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(23112);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(51034);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -33037,11 +33052,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 
 
 
+
 const JODIT_IMAGE_PROCESSOR_BINDED = '__jodit_imageprocessor_binded';
 const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
 /**
  * Change editor's size after load all images
- */ class imageProcessor extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_5__.Plugin {
+ */ class imageProcessor extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugin {
     afterInit(jodit) {}
     beforeDestruct(jodit) {
         const buffer = (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.cached)(jodit, 'buffer');
@@ -33079,9 +33095,9 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
         if (!editor.editor) {
             return;
         }
-        ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.$$)('img', editor.editor).forEach((elm)=>{
-            if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
-                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
+        ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.$$)('img', editor.editor).forEach((elm)=>{
+            if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
+                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
                 if (!elm.complete) {
                     editor.e.on(elm, 'load', function ElementOnLoad() {
                         !editor.isInDestruct && editor.e?.fire('resize');
@@ -33092,6 +33108,7 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                     replaceDataURIToBlobUUID(editor, elm);
                 }
                 editor.e.on(elm, 'mousedown touchstart', ()=>{
+                    removeCaretText(elm);
                     editor.s.select(elm);
                 });
             }
@@ -33112,6 +33129,23 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
     ]),
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.debounce)()
 ], imageProcessor.prototype, "afterChange", null);
+/**
+ * Remove the invisible-space text beside an image, which only held a caret.
+ * Selecting the image replaces the caret, and with the text still after a
+ * block image, Safari highlights the rest of the image's line. See #1512
+ */ function removeCaretText(elm) {
+    for (const side of [
+        'previousSibling',
+        'nextSibling'
+    ]){
+        let node = elm[side];
+        while(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isText(node) && !node.nodeValue?.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.INVISIBLE_SPACE_REG_EXP)(), '')){
+            const next = node[side];
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(node);
+            node = next;
+        }
+    }
+}
 function replaceDataURIToBlobUUID(editor, elm) {
     if (!editor.o.imageProcessor.replaceDataURIToBlobIdInView) {
         return;
@@ -33122,7 +33156,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     const dataUri = elm.src;
     let blob;
     try {
-        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_6__.dataURItoBlob)(dataUri);
+        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_7__.dataURItoBlob)(dataUri);
     } catch  {
         // A data URI the browser accepts but we cannot decode is not worth
         // breaking the editor over — keep the image as it is
@@ -33135,7 +33169,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     list[elm.src] = dataUri;
     editor.buffer.set(JODIT_IMAGE_BLOB_ID, list);
 }
-jodit_core_global__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('imageProcessor', imageProcessor);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('imageProcessor', imageProcessor);
 
 
 /***/ }),
@@ -34609,10 +34643,12 @@ UIImagePositionTab = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__
         marginBottom,
         marginLeft
     ];
+    // Compared with the inline value, which is what `readMargins` showed, so a
+    // margin from a stylesheet is not overwritten when the field is unchanged
     const applyMargin = (key, value)=>{
-        const oldValue = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key);
+        const oldValue = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, key) || 0);
         const v = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)(value);
-        if (oldValue.toString() !== v.toString()) {
+        if (oldValue !== v) {
             (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key, v);
         }
     };
@@ -35437,6 +35473,14 @@ const align = {
             'Normal'
         ],
         tooltip: 'Vertical align',
+        // `vertical-align` only moves an image in the line, not a floated or block one
+        isDisabled: (editor, button)=>{
+            const image = button.target;
+            return Boolean(image && ([
+                'left',
+                'right'
+            ].includes((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float')) || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'display') === 'block'));
+        },
         exec: (editor, image, { control })=>{
             if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(image, 'img')) {
                 return;