jodit-pro 4.15.18 → 4.15.21

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.15.18
+ * Version: v4.15.21
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -738,6 +738,25 @@ var ConfigPrototype = {};
         /**
          * Default width (in pixels) applied to images inserted into the editor
          */ this.imageDefaultWidth = 300;
+        /**
+         * Alignment given to images inserted into the editor. `'normal'` leaves
+         * them unaligned
+         */ this.imageDefaultAlign = 'normal';
+        /**
+         * Class names to align images with, instead of an inline `float` or
+         * `margin`. Aligning an image removes every class listed here and adds the
+         * chosen alignment's, which can be several separated by spaces.
+         *
+         * ```javascript
+         * Jodit.make('#editor', {
+         *   imageAlignClasses: {
+         *     left: 'align-left',
+         *     right: 'align-right',
+         *     center: 'align-center'
+         *   }
+         * });
+         * ```
+         */ this.imageAlignClasses = null;
         /**
          * Do not display these buttons that are on the list
          *
@@ -2289,7 +2308,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var APP_VERSION = "4.15.18";
+var APP_VERSION = "4.15.21";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -8085,6 +8104,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getContentWidth: function() { return /* reexport safe */ _size_index_js__WEBPACK_IMPORTED_MODULE_6__.getContentWidth; },
 /* harmony export */   getDataTransfer: function() { return /* reexport safe */ _utils_index_js__WEBPACK_IMPORTED_MODULE_8__.getDataTransfer; },
 /* harmony export */   getFixedPositionOffset: function() { return /* reexport safe */ _size_index_js__WEBPACK_IMPORTED_MODULE_6__.getFixedPositionOffset; },
+/* harmony export */   getHAlign: function() { return /* reexport safe */ _utils_index_js__WEBPACK_IMPORTED_MODULE_8__.getHAlign; },
 /* harmony export */   getPropertyDescriptor: function() { return /* reexport safe */ _utils_index_js__WEBPACK_IMPORTED_MODULE_8__.getPropertyDescriptor; },
 /* harmony export */   getScrollParent: function() { return /* reexport safe */ _size_index_js__WEBPACK_IMPORTED_MODULE_6__.getScrollParent; },
 /* harmony export */   getXPathByElement: function() { return /* reexport safe */ _utils_index_js__WEBPACK_IMPORTED_MODULE_8__.getXPathByElement; },
@@ -9189,21 +9209,71 @@ function trimChars(value, chars) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   alignElement: function() { return /* binding */ alignElement; },
 /* harmony export */   clearAlign: function() { return /* binding */ clearAlign; },
+/* harmony export */   getHAlign: function() { return /* binding */ getHAlign; },
 /* harmony export */   hAlignElement: function() { return /* binding */ hAlignElement; }
 /* harmony export */ });
 /* harmony import */ var _dom_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22732);
 /* harmony import */ var _attr_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29960);
 /* harmony import */ var _css_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(41180);
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) {
+        return Array.from(iter);
+    }
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
- */ 
+ */ ;
 
 
+var classNames = function classNames(value) {
+    return (value !== null && value !== void 0 ? value : '').split(/\s+/).filter(Boolean);
+};
 /**
- * Align image
- */ function hAlignElement(image, align) {
+ * Align image, with `classes` (see `imageAlignClasses`) instead of inline
+ * styles when they are given
+ */ function hAlignElement(image, align, classes) {
+    if (classes) {
+        var _image_classList, _image_classList1;
+        hAlignElement(image, 'normal');
+        Object.values(classes).forEach(function(value) {
+            return (_image_classList = image.classList).remove.apply(_image_classList, _to_consumable_array(classNames(value)));
+        });
+        (_image_classList1 = image.classList).add.apply(_image_classList1, _to_consumable_array(classNames(classes[align || 'normal'])));
+        [
+            'class',
+            'style'
+        ].forEach(function(name) {
+            var _a;
+            if (!((_a = (0,_attr_js__WEBPACK_IMPORTED_MODULE_1__.attr)(image, name)) === null || _a === void 0 ? void 0 : _a.trim())) {
+                (0,_attr_js__WEBPACK_IMPORTED_MODULE_1__.attr)(image, name, null);
+            }
+        });
+        return;
+    }
     if (align && align !== 'normal') {
         if (align !== 'center') {
             (0,_css_js__WEBPACK_IMPORTED_MODULE_2__.css)(image, 'float', align);
@@ -9226,6 +9296,34 @@ function trimChars(value, chars) {
         ;(0,_css_js__WEBPACK_IMPORTED_MODULE_2__.clearCenterAlign)(image);
     }
 }
+/**
+ * The alignment `hAlignElement` has set on an element
+ */ function getHAlign(elm, classes) {
+    if (classes) {
+        for(var _i = 0, _iter = [
+            'left',
+            'right',
+            'center',
+            'normal'
+        ]; _i < _iter.length; _i++){
+            var align = _iter[_i];
+            var names = classNames(classes[align]);
+            if (names.length && names.every(function(name) {
+                return elm.classList.contains(name);
+            })) {
+                return align;
+            }
+        }
+    }
+    var float = (0,_css_js__WEBPACK_IMPORTED_MODULE_2__.cssInline)(elm, 'float').toLowerCase();
+    if (float === 'left' || float === 'right') {
+        return float;
+    }
+    if ((0,_css_js__WEBPACK_IMPORTED_MODULE_2__.css)(elm, 'display') === 'block' && (0,_css_js__WEBPACK_IMPORTED_MODULE_2__.cssInline)(elm, 'margin-left') === 'auto' && (0,_css_js__WEBPACK_IMPORTED_MODULE_2__.cssInline)(elm, 'margin-right') === 'auto') {
+        return 'center';
+    }
+    return 'normal';
+}
 /**
  * Remove text-align style for all selected children
  */ function clearAlign(node) {
@@ -10731,6 +10829,7 @@ var getClassName = function getClassName(obj) {
 /* harmony export */   get: function() { return /* reexport safe */ _get_js__WEBPACK_IMPORTED_MODULE_15__.get; },
 /* harmony export */   getClassName: function() { return /* reexport safe */ _get_class_name_js__WEBPACK_IMPORTED_MODULE_16__.getClassName; },
 /* harmony export */   getDataTransfer: function() { return /* reexport safe */ _utils_js__WEBPACK_IMPORTED_MODULE_27__.getDataTransfer; },
+/* harmony export */   getHAlign: function() { return /* reexport safe */ _align_js__WEBPACK_IMPORTED_MODULE_0__.getHAlign; },
 /* harmony export */   getPropertyDescriptor: function() { return /* reexport safe */ _utils_js__WEBPACK_IMPORTED_MODULE_27__.getPropertyDescriptor; },
 /* harmony export */   getXPathByElement: function() { return /* reexport safe */ _selector_js__WEBPACK_IMPORTED_MODULE_24__.getXPathByElement; },
 /* harmony export */   hAlignElement: function() { return /* reexport safe */ _align_js__WEBPACK_IMPORTED_MODULE_0__.hAlignElement; },
@@ -13630,10 +13729,11 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 /* harmony import */ var _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2748);
 /* harmony import */ var _helpers_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21537);
 /* harmony import */ var _helpers_checker_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(27613);
-/* harmony import */ var _helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(38837);
-/* harmony import */ var _helpers_move_the_node_along_the_edge_outward_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(43463);
-/* harmony import */ var _style_commit_style_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(25639);
-/* harmony import */ var _helpers_index_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(45124);
+/* harmony import */ var _helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25726);
+/* harmony import */ var _helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38837);
+/* harmony import */ var _helpers_move_the_node_along_the_edge_outward_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(43463);
+/* harmony import */ var _style_commit_style_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(25639);
+/* harmony import */ var _helpers_index_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(45124);
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -13835,6 +13935,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 
 
 
+
 var Selection = /*#__PURE__*/ function() {
     "use strict";
     function Selection(jodit) {
@@ -14414,7 +14515,7 @@ var Selection = /*#__PURE__*/ function() {
                     return node;
                 }
                 if (!_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(node)) {
-                    var ret = (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_8__.findCorrectCurrentNode)(node, range, rightMode, sel.isCollapsed, checkChild, child);
+                    var ret = (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_9__.findCorrectCurrentNode)(node, range, rightMode, sel.isCollapsed, checkChild, child);
                     node = ret.node;
                     rightMode = ret.rightMode;
                 }
@@ -14575,6 +14676,10 @@ var Selection = /*#__PURE__*/ function() {
                 if (styles && (typeof styles === "undefined" ? "undefined" : _type_of(styles)) === 'object') {
                     (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.css)(image, styles);
                 }
+                var _this_j_o = this.j.o, imageDefaultAlign = _this_j_o.imageDefaultAlign, imageAlignClasses = _this_j_o.imageAlignClasses;
+                if (imageDefaultAlign && imageDefaultAlign !== 'normal') {
+                    (0,_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_5__.hAlignElement)(image, imageDefaultAlign, imageAlignClasses);
+                }
                 var onload = function onload1() {
                     if (image.naturalHeight < image.offsetHeight || image.naturalWidth < image.offsetWidth) {
                         (0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.css)(image, {
@@ -14730,7 +14835,7 @@ var Selection = /*#__PURE__*/ function() {
                 };
                 // check right offset
                 if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(container)) {
-                    if ((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_8__.cursorInTheEdgeOfString)(container, offset, start, end)) {
+                    if ((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_9__.cursorInTheEdgeOfString)(container, offset, start, end)) {
                         return false;
                     }
                 } else {
@@ -15341,8 +15446,8 @@ var Selection = /*#__PURE__*/ function() {
      * ```
      */ key: "commitStyle",
             value: function commitStyle(options) {
-                ;(0,_helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_5__.assert)((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.size)(options) > 0, 'Need to pass at least one option');
-                var styleElm = new _style_commit_style_js__WEBPACK_IMPORTED_MODULE_7__.CommitStyle(options);
+                ;(0,_helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_6__.assert)((0,_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.size)(options) > 0, 'Need to pass at least one option');
+                var styleElm = new _style_commit_style_js__WEBPACK_IMPORTED_MODULE_8__.CommitStyle(options);
                 styleElm.apply(this.j);
             }
         },
@@ -15403,7 +15508,7 @@ var Selection = /*#__PURE__*/ function() {
                             return _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isEmptyTextNode(node) && _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.safeRemove(node);
                         });
                     };
-                    (0,_helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_5__.assert)(currentBox.parentNode, 'Splitting fails');
+                    (0,_helpers_utils_assert_js__WEBPACK_IMPORTED_MODULE_6__.assert)(currentBox.parentNode, 'Splitting fails');
                     try {
                         clearEmpties(fragment);
                         clearEmpties(currentBox);
@@ -15466,7 +15571,7 @@ var Selection = /*#__PURE__*/ function() {
                     var r = range.cloneRange();
                     r.collapse(start);
                     _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.safeInsertNode(r, fake);
-                    (0,_helpers_move_the_node_along_the_edge_outward_js__WEBPACK_IMPORTED_MODULE_6__.moveTheNodeAlongTheEdgeOutward)(fake, start, _this.j.editor);
+                    (0,_helpers_move_the_node_along_the_edge_outward_js__WEBPACK_IMPORTED_MODULE_7__.moveTheNodeAlongTheEdgeOutward)(fake, start, _this.j.editor);
                     return fake;
                 };
                 var leftFake = moveMaxEdgeFake(true);
@@ -47554,7 +47659,10 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
                 if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
                     return;
                 }
-                if (/^<([a-z][a-z0-9]*)\b[^>]*>(?:<br\/?>)?<\/\1>$/i.test(data.value.trim())) {
+                // Only a text block can be an empty caret container; a lone video,
+                // iframe or icon has no children but is content in itself
+                var lone = /^<([a-z][a-z0-9]*)\b[^>]*>(?:<br\/?>)?<\/\1>$/i.exec(data.value.trim());
+                if (lone && /^(p|div|h[1-6]|blockquote|pre)$/i.test(lone[1])) {
                     data.value = '';
                 }
             }
@@ -48904,6 +49012,15 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_0__.pluginSystem.add('color', color);
 
 
 _core_ui_icon_js__WEBPACK_IMPORTED_MODULE_2__.Icon.set('brush', _brush_svg_js__WEBPACK_IMPORTED_MODULE_5__["default"]);
+/**
+ * Set a color style; an empty value removes it, and with it the `style`
+ * attribute once nothing else is left in it
+ */ function setColorStyle(elm, key, value) {
+    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(elm, key, value);
+    if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style')) {
+        (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style', null);
+    }
+}
 _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brushCell = {
     isVisible: function isVisible(editor) {
         return !editor.o.disablePlugins.includes('color');
@@ -48920,7 +49037,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brushCell = {
         var makeColorPicker = function makeColorPicker(key) {
             return (0,_modules_widget_index_js__WEBPACK_IMPORTED_MODULE_4__.ColorPickerWidget)(editor, function(value) {
                 selected.forEach(function(cell) {
-                    ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(cell, key, value);
+                    setColorStyle(cell, key, value);
                 });
                 editor.lock();
                 editor.synchronizeValues();
@@ -49007,7 +49124,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
             if (!currentElement) {
                 editor.execCommand('background', false, value);
             } else {
-                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(currentElement, 'backgroundColor', value);
+                setColorStyle(currentElement, 'backgroundColor', value);
             }
             ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color', value);
             (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color-mode', 'background');
@@ -49017,7 +49134,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
             if (!currentElement) {
                 editor.execCommand('forecolor', false, value);
             } else {
-                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(currentElement, 'color', value);
+                setColorStyle(currentElement, 'color', value);
             }
             ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color', value);
             (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color-mode', 'color');
@@ -49047,10 +49164,10 @@ _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
         if (current && current !== jodit.editor && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isNode(current) && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(current)) {
             switch(mode){
                 case 'color':
-                    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(current, 'color', color);
+                    setColorStyle(current, 'color', color);
                     break;
                 case 'background':
-                    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.css)(current, 'backgroundColor', color);
+                    setColorStyle(current, 'backgroundColor', color);
                     break;
             }
         } else {
@@ -51824,14 +51941,28 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('file', file);
  */ _config_js__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.
+        var focusByPointer = false;
         editor.e.on('blur', function() {
+            // 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', function() {
+            focusByPointer = !editor.editorIsActive;
         }).on('focus', function() {
             if (editor.isEditorMode()) {
-                editor.s.restore();
+                if (focusByPointer) {
+                    editor.s.removeMarkers();
+                } else {
+                    editor.s.restore();
+                }
             }
+            focusByPointer = false;
         });
     }
     var _$focus = function focus() {
@@ -53093,11 +53224,12 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 /* unused harmony export imageProcessor */
 /* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82758);
 /* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65478);
-/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(580);
-/* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21537);
-/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(50911);
-/* harmony import */ var _modules_uploader_helpers_data_uri_to_blob_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74569);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(85745);
+/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2748);
+/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
+/* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21537);
+/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50911);
+/* harmony import */ var _modules_uploader_helpers_data_uri_to_blob_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(74569);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(85745);
 function _assert_this_initialized(self) {
     if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return self;
@@ -53350,6 +53482,7 @@ function _wrap_native_super(Class) {
 
 
 
+
 var JODIT_IMAGE_PROCESSOR_BINDED = '__jodit_imageprocessor_binded';
 var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
 /**
@@ -53452,9 +53585,9 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                                 2
                             ];
                         }
-                        ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.$$)('img', editor.editor).forEach(function(elm) {
-                            if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
-                                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
+                        ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.$$)('img', editor.editor).forEach(function(elm) {
+                            if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
+                                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
                                 if (!elm.complete) {
                                     editor.e.on(elm, 'load', function ElementOnLoad() {
                                         var _a;
@@ -53466,6 +53599,7 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                                     replaceDataURIToBlobUUID(editor, elm);
                                 }
                                 editor.e.on(elm, 'mousedown touchstart', function() {
+                                    removeCaretText(elm);
                                     editor.s.select(elm);
                                 });
                             }
@@ -53479,7 +53613,7 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
         }
     ]);
     return imageProcessor;
-}(_wrap_native_super(_core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plugin));
+}(_wrap_native_super(_core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__.Plugin));
 __decorate([
     (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)(':afterGetValueFromEditor')
 ], imageProcessor.prototype, "onAfterGetValueFromEditor", null);
@@ -53494,6 +53628,25 @@ __decorate([
     ]),
     (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.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) {
+    var _a;
+    for(var _i = 0, _iter = [
+        'previousSibling',
+        'nextSibling'
+    ]; _i < _iter.length; _i++){
+        var side = _iter[_i];
+        var node = elm[side];
+        while(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(node) && !((_a = node.nodeValue) === null || _a === void 0 ? void 0 : _a.replace((0,_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP)(), ''))){
+            var next = node[side];
+            _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.safeRemove(node);
+            node = next;
+        }
+    }
+}
 function replaceDataURIToBlobUUID(editor, elm) {
     if (!editor.o.imageProcessor.replaceDataURIToBlobIdInView) {
         return;
@@ -53504,7 +53657,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     var dataUri = elm.src;
     var blob;
     try {
-        blob = (0,_modules_uploader_helpers_data_uri_to_blob_js__WEBPACK_IMPORTED_MODULE_5__.dataURItoBlob)(dataUri);
+        blob = (0,_modules_uploader_helpers_data_uri_to_blob_js__WEBPACK_IMPORTED_MODULE_6__.dataURItoBlob)(dataUri);
     } catch (_a) {
         // A data URI the browser accepts but we cannot decode is not worth
         // breaking the editor over — keep the image as it is
@@ -53517,7 +53670,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     list[elm.src] = dataUri;
     editor.buffer.set(JODIT_IMAGE_BLOB_ID, list);
 }
-_core_global_js__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('imageProcessor', imageProcessor);
+_core_global_js__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('imageProcessor', imageProcessor);
 
 
 /***/ }),
@@ -54157,7 +54310,7 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('imageProperties',
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   readAlign: function() { return /* binding */ readAlign; }
 /* harmony export */ });
-/* harmony import */ var _core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(41180);
+/* harmony import */ var _core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25726);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -54165,20 +54318,9 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('imageProperties',
  */ 
 /**
  * @private
- */ function readAlign(image, values) {
-    // Align
-    if ((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'float') && [
-        'left',
-        'right'
-    ].indexOf((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'float').toLowerCase()) !== -1) {
-        values.align = (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.css)(image, 'float');
-    } else {
-        if ((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.css)(image, 'display') === 'block' && (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'margin-left') === 'auto' && (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'margin-right') === 'auto') {
-            values.align = 'center';
-        } else {
-            values.align = '';
-        }
-    }
+ */ function readAlign(image, values, classes) {
+    var align = (0,_core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_0__.getHAlign)(image, classes);
+    values.align = align === 'normal' ? '' : align;
 }
 
 
@@ -54339,7 +54481,7 @@ function _ts_generator(thisArg, body) {
         var image, values;
         return _ts_generator(this, function(_state) {
             image = state.sourceImage, values = state.values;
-            (0,_align_js__WEBPACK_IMPORTED_MODULE_2__.readAlign)(image, values);
+            (0,_align_js__WEBPACK_IMPORTED_MODULE_2__.readAlign)(image, values, j.o.imageAlignClasses);
             // Border radius
             values.borderRadius = parseInt((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_1__.cssInline)(image, 'border-radius') || '0', 10) || 0;
             // Id
@@ -56267,7 +56409,7 @@ function _ts_generator(thisArg, body) {
         (0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(image, 'id', id || null);
     }
     if (opt.image.editAlign) {
-        (0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.hAlignElement)(image, align);
+        (0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.hAlignElement)(image, align, j.o.imageAlignClasses);
     }
 }
 
@@ -56334,10 +56476,12 @@ function _ts_generator(thisArg, body) {
         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
     var applyMargin = function applyMargin(key, value) {
-        var oldValue = (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.css)(image, key);
+        var oldValue = (0,_utils_utils_js__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, key) || 0);
         var v = (0,_utils_utils_js__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)(value);
-        if (oldValue.toString() !== v.toString()) {
+        if (oldValue !== v) {
             (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_0__.css)(image, key, v);
         }
     };
@@ -57158,14 +57302,68 @@ var cmd = function cmd(control) {
 /* harmony import */ var _core_helpers_checker_is_string_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(70799);
 /* harmony import */ var _core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(25726);
 /* harmony import */ var _core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(41180);
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
- */ 
+ */ ;
 
 
 
+// Images align with `imageAlignClasses`; the wrappers of iframes and media
+// keep inline styles
+var alignClasses = function alignClasses(editor, elm) {
+    return _core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, 'img') ? editor.o.imageAlignClasses : null;
+};
+var currentAlign = function currentAlign(editor, elm) {
+    return elm ? (0,_core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_2__.getHAlign)(elm, alignClasses(editor, elm)) : 'normal';
+};
 var align = {
     name: 'left',
     childTemplate: function childTemplate(_, __, value) {
@@ -57177,6 +57375,18 @@ var align = {
         'Center',
         'Normal'
     ],
+    update: function update(editor, button) {
+        var current = currentAlign(editor, button.target);
+        button.state.icon.name = current === 'normal' ? 'left' : current;
+    },
+    isActive: function isActive(editor, button) {
+        return currentAlign(editor, button.target) !== 'normal';
+    },
+    isChildActive: function isChildActive(editor, button) {
+        var _a;
+        var _ref = _sliced_to_array((_a = button.control.args) !== null && _a !== void 0 ? _a : [], 1), value = _ref[0];
+        return (0,_core_helpers_checker_is_string_js__WEBPACK_IMPORTED_MODULE_1__.isString)(value) && currentAlign(editor, button.target) === value.toLowerCase();
+    },
     exec: function exec(editor, elm, param) {
         var control = param.control;
         if (!_core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, new Set([
@@ -57190,7 +57400,7 @@ var align = {
         if (!command) {
             return false;
         }
-        ;(0,_core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_2__.hAlignElement)(elm, command);
+        ;(0,_core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_2__.hAlignElement)(elm, command, alignClasses(editor, elm));
         if (_core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, new Set([
             'jodit',
             'jodit-media'
@@ -57230,6 +57440,14 @@ var align = {
             'Normal'
         ],
         tooltip: 'Vertical align',
+        // `vertical-align` only moves an image in the line, not a floated or block one
+        isDisabled: function isDisabled(editor, button) {
+            var image = button.target;
+            return Boolean(image && ([
+                'left',
+                'right'
+            ].includes((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float')) || (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'display') === 'block'));
+        },
         exec: function exec(editor, image, param) {
             var control = param.control;
             if (!_core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(image, 'img')) {
@@ -62219,7 +62437,7 @@ function _wrap_native_super(Class) {
                 _this.placeholderElm.innerHTML = (0,_core_helpers_utils_attr_js__WEBPACK_IMPORTED_MODULE_5__.attr)(editor.element, 'placeholder') || '';
             }
             editor.e.fire('placeholder', _this.placeholderElm.innerHTML);
-            editor.e.off('.placeholder').on('changePlace.placeholder', _this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder', _this.toggle).on(window, 'load', _this.toggle);
+            editor.e.off('.placeholder').on('changePlace.placeholder', _this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder', _this.toggle).on(window, 'load', _this.toggle);
             _this.addNativeListeners();
             _this.toggle();
         };

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.15.18
+ * Version: v4.15.21
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
 	/*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.15.18
+ * Version: v4.15.21
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */