jodit 4.15.17 → 4.16.0

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.15.17
+ * Version: v4.16.0
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -728,6 +728,25 @@ var ConfigPrototype = {};
         /**
 	 * Default width (in pixels) applied to images inserted into the editor
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(this, "imageDefaultWidth", 300);
+        /**
+	 * Alignment given to images inserted into the editor. `'normal'` leaves
+	 * them unaligned
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(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'
+	 *   }
+	 * });
+	 * ```
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(this, "imageAlignClasses", null);
         /**
 	 * Do not display these buttons that are on the list
 	 *
@@ -2110,7 +2129,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.15.17";
+var APP_VERSION = "4.16.0";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -8551,11 +8570,13 @@ 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 jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27795);
-/* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7909);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80991);
+/* harmony import */ var _swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42395);
+/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27795);
+/* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7909);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80991);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -8565,15 +8586,38 @@ function trimChars(value, chars) {
  */ 
 
 
+
+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, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__._)(classNames(value)));
+        });
+        (_image_classList1 = image.classList).add.apply(_image_classList1, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__._)(classNames(classes[align || 'normal'])));
+        [
+            'class',
+            'style'
+        ].forEach(function(name) {
+            var _attr;
+            if (!((_attr = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, name)) === null || _attr === void 0 ? void 0 : _attr.trim())) {
+                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, name, null);
+            }
+        });
+        return;
+    }
     if (align && align !== 'normal') {
         if (align !== 'center') {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(image, 'float', align);
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.clearCenterAlign)(image);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float', align);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.clearCenterAlign)(image);
         } else {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(image, {
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, {
                 float: '',
                 display: 'block',
                 marginLeft: 'auto',
@@ -8581,24 +8625,52 @@ function trimChars(value, chars) {
             });
         }
     } else {
-        if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(image, 'float') && [
+        if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float') && [
             'right',
             'left'
-        ].indexOf((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(image, 'float').toString().toLowerCase()) !== -1) {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(image, 'float', '');
+        ].indexOf((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float').toString().toLowerCase()) !== -1) {
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float', '');
         }
-        ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.clearCenterAlign)(image);
+        ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.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,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(elm, 'float').toLowerCase();
+    if (float === 'left' || float === 'right') {
+        return float;
+    }
+    if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(elm, 'display') === 'block' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(elm, 'margin-left') === 'auto' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(elm, 'margin-right') === 'auto') {
+        return 'center';
+    }
+    return 'normal';
+}
 /**
  * Remove text-align style for all selected children
  */ function clearAlign(node) {
-    jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.each(node, function(elm) {
-        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isHTMLElement(elm)) {
-            if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.cssInline)(elm, 'textAlign')) {
-                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(elm, 'textAlign', '');
-                if (!((0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style') || '').trim().length) {
-                    (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style', null);
+    jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.each(node, function(elm) {
+        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isHTMLElement(elm)) {
+            if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(elm, 'textAlign')) {
+                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(elm, 'textAlign', '');
+                if (!((0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(elm, 'style') || '').trim().length) {
+                    (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(elm, 'style', null);
                 }
             }
         }
@@ -8625,11 +8697,11 @@ function trimChars(value, chars) {
     ]
 ]);
 function alignElement(command, box) {
-    if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isNode(box) && jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(box)) {
+    if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isNode(box) && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(box)) {
         clearAlign(box);
         var align = ALIGN_BY_COMMAND.get(command.toLowerCase());
         if (align) {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__.css)(box, 'textAlign', align);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(box, 'textAlign', align);
         }
     }
 }
@@ -9801,6 +9873,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   get: function() { return /* reexport safe */ _get__WEBPACK_IMPORTED_MODULE_15__.get; },
 /* harmony export */   getClassName: function() { return /* reexport safe */ _get_class_name__WEBPACK_IMPORTED_MODULE_16__.getClassName; },
 /* harmony export */   getDataTransfer: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.getDataTransfer; },
+/* harmony export */   getHAlign: function() { return /* reexport safe */ _align__WEBPACK_IMPORTED_MODULE_0__.getHAlign; },
 /* harmony export */   getPropertyDescriptor: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.getPropertyDescriptor; },
 /* harmony export */   getXPathByElement: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_24__.getXPathByElement; },
 /* harmony export */   hAlignElement: function() { return /* reexport safe */ _align__WEBPACK_IMPORTED_MODULE_0__.hAlignElement; },
@@ -9831,7 +9904,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _assert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28712);
 /* harmony import */ var _assert__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_assert__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _assert__WEBPACK_IMPORTED_MODULE_2__) if(["default","alignElement","clearAlign","hAlignElement","alreadyLoadedList","appendScriptAsync","appendStyleAsync","loadNext","loadNextStyle"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _assert__WEBPACK_IMPORTED_MODULE_2__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _assert__WEBPACK_IMPORTED_MODULE_2__) if(["default","alignElement","clearAlign","getHAlign","hAlignElement","alreadyLoadedList","appendScriptAsync","appendStyleAsync","loadNext","loadNextStyle"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _assert__WEBPACK_IMPORTED_MODULE_2__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
 /* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 /* harmony import */ var _attr__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7909);
 /* harmony import */ var _browser__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26136);
@@ -12093,11 +12166,12 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 /* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(23211);
 /* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(65946);
 /* harmony import */ var jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28686);
-/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28712);
-/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var jodit_core_selection_helpers_move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(7470);
-/* harmony import */ var _style_commit_style__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(84578);
-/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(42259);
+/* harmony import */ var jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(16849);
+/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(28712);
+/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var jodit_core_selection_helpers_move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(7470);
+/* harmony import */ var _style_commit_style__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(84578);
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(42259);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -12125,6 +12199,7 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 
 
 
+
 var Selection = /*#__PURE__*/ function() {
     "use strict";
     function Selection(jodit) {
@@ -12709,7 +12784,7 @@ var Selection = /*#__PURE__*/ function() {
                     return node;
                 }
                 if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node)) {
-                    var ret = (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.findCorrectCurrentNode)(node, range, rightMode, sel.isCollapsed, checkChild, child);
+                    var ret = (0,_helpers__WEBPACK_IMPORTED_MODULE_17__.findCorrectCurrentNode)(node, range, rightMode, sel.isCollapsed, checkChild, child);
                     node = ret.node;
                     rightMode = ret.rightMode;
                 }
@@ -12870,6 +12945,10 @@ var Selection = /*#__PURE__*/ function() {
                 if (styles && (typeof styles === "undefined" ? "undefined" : (0,_swc_helpers_type_of__WEBPACK_IMPORTED_MODULE_7__._)(styles)) === 'object') {
                     (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.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,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_13__.hAlignElement)(image, imageDefaultAlign, imageAlignClasses);
+                }
                 var onload = function onload1() {
                     if (image.naturalHeight < image.offsetHeight || image.naturalWidth < image.offsetWidth) {
                         (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.css)(image, {
@@ -13025,7 +13104,7 @@ var Selection = /*#__PURE__*/ function() {
                 };
                 // check right offset
                 if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(container)) {
-                    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_16__.cursorInTheEdgeOfString)(container, offset, start, end)) {
+                    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_17__.cursorInTheEdgeOfString)(container, offset, start, end)) {
                         return false;
                     }
                 } else {
@@ -13639,8 +13718,8 @@ var Selection = /*#__PURE__*/ function() {
 	 * ```
 	 */ key: "commitStyle",
             value: function commitStyle(options) {
-                ;(0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_13__.assert)((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.size)(options) > 0, 'Need to pass at least one option');
-                var styleElm = new _style_commit_style__WEBPACK_IMPORTED_MODULE_15__.CommitStyle(options);
+                ;(0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_14__.assert)((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.size)(options) > 0, 'Need to pass at least one option');
+                var styleElm = new _style_commit_style__WEBPACK_IMPORTED_MODULE_16__.CommitStyle(options);
                 styleElm.apply(this.j);
             }
         },
@@ -13701,7 +13780,7 @@ var Selection = /*#__PURE__*/ function() {
                             return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isEmptyTextNode(node) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(node);
                         });
                     };
-                    (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_13__.assert)(currentBox.parentNode, 'Splitting fails');
+                    (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_14__.assert)(currentBox.parentNode, 'Splitting fails');
                     try {
                         clearEmpties(fragment);
                         clearEmpties(currentBox);
@@ -13764,7 +13843,7 @@ var Selection = /*#__PURE__*/ function() {
                     var r = range.cloneRange();
                     r.collapse(start);
                     jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeInsertNode(r, fake);
-                    (0,jodit_core_selection_helpers_move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_14__.moveTheNodeAlongTheEdgeOutward)(fake, start, _this.j.editor);
+                    (0,jodit_core_selection_helpers_move_the_node_along_the_edge_outward__WEBPACK_IMPORTED_MODULE_15__.moveTheNodeAlongTheEdgeOutward)(fake, start, _this.j.editor);
                     return fake;
                 };
                 var leftFake = moveMaxEdgeFake(true);
@@ -17046,6 +17125,7 @@ var UIButton = /*#__PURE__*/ function(UIElement) {
                 this.name = this.state.name;
                 (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.container, 'data-ref', this.state.name);
                 (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.container, 'ref', this.state.name);
+                this.updateAriaLabel();
             }
         },
         {
@@ -17063,9 +17143,12 @@ var UIButton = /*#__PURE__*/ function(UIElement) {
             key: "updateAriaLabel",
             value: function updateAriaLabel() {
                 var hasText = this.state.text.trim().length > 0;
-                var i8nTooltip = this.state.tooltip ? this.jodit.i18n(this.state.tooltip) : null;
-                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.container, 'aria-label', i8nTooltip);
-                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.button, 'aria-label', !hasText ? i8nTooltip : null);
+                // An icon-only button without a tooltip would have no accessible
+                // name at all — fall back to its raw name (not translated: control
+                // names are identifiers, not i18n keys).
+                var label = this.state.tooltip ? this.jodit.i18n(this.state.tooltip) : !hasText && this.state.name ? this.state.name : null;
+                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.container, 'aria-label', label);
+                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_16__.attr)(this.button, 'aria-label', !hasText ? label : null);
             }
         },
         {
@@ -18473,7 +18556,7 @@ var UIFileInput = /*#__PURE__*/ function(UIInput1) {
         {
             key: "createNativeInput",
             value: function createNativeInput(options) {
-                return this.j.create.fromHTML('<input\n			type="file"\n			accept="'.concat(options.onlyImages ? 'image/*' : '*', '"\n			tabindex="-1"\n			dir="auto"\n			multiple=""\n		/>'));
+                return this.j.create.fromHTML('<input\n			type="file"\n			accept="'.concat(options.onlyImages ? 'image/*' : '*', '"\n			aria-label="').concat(this.j.i18n(options.tooltip || 'Upload'), '"\n			tabindex="-1"\n			dir="auto"\n			multiple=""\n		/>'));
             }
         }
     ]);
@@ -19118,9 +19201,12 @@ var UIGroup = /*#__PURE__*/ function(UIElement) {
         },
         {
             key: "getRole",
-            value: function getRole() {
+            value: /**
+	 * A generic container: `group` allows any children. Toolbar button groups
+	 * are lists of `listitem`s and get `role="list"` explicitly from `UIList`.
+	 */ function getRole() {
                 var _this_options;
-                return ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.role) || 'list';
+                return ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.role) || 'group';
             }
         },
         {
@@ -19384,10 +19470,11 @@ var UIList = /*#__PURE__*/ function(UIGroup1) {
             key: "makeGroup",
             value: /**
 	 * Make new group and append it in list of elements
-	 */ function makeGroup(role) {
-                return new jodit_core_ui_group_group__WEBPACK_IMPORTED_MODULE_13__.UIGroup(this.jodit, [], role ? {
+	 */ function makeGroup() {
+                var role = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 'list';
+                return new jodit_core_ui_group_group__WEBPACK_IMPORTED_MODULE_13__.UIGroup(this.jodit, [], {
                     role: role
-                } : undefined);
+                });
             }
         },
         {
@@ -23214,13 +23301,14 @@ ContextMenu = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__.__decorat
 /* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(28077);
 /* harmony import */ var jodit_core_helpers_array__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(45664);
 /* harmony import */ var jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(28686);
-/* harmony import */ var jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(93640);
-/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(28712);
-/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__);
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(4099);
-/* harmony import */ var jodit_core_view_view__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(35099);
-/* harmony import */ var jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(2222);
-/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(5266);
+/* harmony import */ var jodit_core_helpers_html_strip_tags__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(22852);
+/* harmony import */ var jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(93640);
+/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(28712);
+/* harmony import */ var jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(4099);
+/* harmony import */ var jodit_core_view_view__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(35099);
+/* harmony import */ var jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(2222);
+/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(5266);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -23251,7 +23339,8 @@ ContextMenu = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_4__.__decorat
 
 
 
-jodit_config__WEBPACK_IMPORTED_MODULE_22__.Config.prototype.dialog = {
+
+jodit_config__WEBPACK_IMPORTED_MODULE_23__.Config.prototype.dialog = {
     namespace: '',
     extraButtons: [],
     /**
@@ -23267,7 +23356,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_22__.Config.prototype.dialog = {
     toolbarButtonSize: 'middle',
     zIndex: 'inherit'
 };
-jodit_config__WEBPACK_IMPORTED_MODULE_22__.Config.prototype.controls.dialog = {
+jodit_config__WEBPACK_IMPORTED_MODULE_23__.Config.prototype.controls.dialog = {
     close: {
         icon: 'cancel',
         exec: function exec(dialog) {
@@ -23307,7 +23396,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
 	 * True, if dialog was opened
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "isOpened", false);
         var self1 = _this;
-        self1.options = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.ConfigProto)(options, (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.ConfigProto)(jodit_config__WEBPACK_IMPORTED_MODULE_22__.Config.prototype.dialog, Dialog.defaultOptions));
+        self1.options = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.ConfigProto)(options, (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.ConfigProto)(jodit_config__WEBPACK_IMPORTED_MODULE_23__.Config.prototype.dialog, Dialog.defaultOptions));
         // Attach event handlers passed via `options.events` to the dialog's own
         // emitter (as FileBrowser already does), so a consumer — e.g. a plugin
         // forwarding the editor's `events` config — can observe `afterOpen` /
@@ -23316,38 +23405,38 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
         self1.attachEvents(self1.options);
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_13__.Dom.safeRemove(self1.container);
         var n = _this.getFullElName.bind(_this);
-        self1.container = _this.c.fromHTML('<div class="jodit jodit-dialog '.concat(_this.componentName, '">\n				<div class="').concat(n('overlay'), '"></div>\n				<div class="').concat(_this.getFullElName('panel'), '">\n					<div class="').concat(n('header'), '">\n						<div class="').concat(n('header-title'), '"></div>\n						<div class="').concat(n('header-toolbar'), '"></div>\n					</div>\n					<div class="').concat(n('content'), '"></div>\n					<div class="').concat(n('footer'), '"></div>\n					<div class="').concat(n('resizer'), '">').concat(jodit_core_ui__WEBPACK_IMPORTED_MODULE_19__.Icon.get('resize_handler'), "</div>\n				</div>\n			</div>"));
+        self1.container = _this.c.fromHTML('<div class="jodit jodit-dialog '.concat(_this.componentName, '">\n				<div class="').concat(n('overlay'), '"></div>\n				<div class="').concat(_this.getFullElName('panel'), '">\n					<div class="').concat(n('header'), '">\n						<div class="').concat(n('header-title'), '"></div>\n						<div class="').concat(n('header-toolbar'), '"></div>\n					</div>\n					<div class="').concat(n('content'), '"></div>\n					<div class="').concat(n('footer'), '"></div>\n					<div class="').concat(n('resizer'), '">').concat(jodit_core_ui__WEBPACK_IMPORTED_MODULE_20__.Icon.get('resize_handler'), "</div>\n				</div>\n			</div>"));
         if (self1.options.direction === 'rtl') {
-            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(self1.container, 'direction', 'rtl');
-            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.attr)(self1.container, 'dir', 'rtl');
+            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(self1.container, 'direction', 'rtl');
+            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.attr)(self1.container, 'dir', 'rtl');
         }
         if (_this.o.zIndex) {
-            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(_this.container, 'zIndex', _this.o.zIndex.toString());
+            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(_this.container, 'zIndex', _this.o.zIndex.toString());
         }
-        ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.attr)(self1.container, 'role', 'dialog');
+        ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.attr)(self1.container, 'role', 'dialog');
         Object.defineProperty(self1.container, 'component', {
             value: _this
         });
         self1.setMod('theme', self1.o.theme || 'default').setMod('resizable', Boolean(self1.o.resizable));
         var dialog = self1.getElm('panel');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(dialog != null, 'Panel element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(dialog != null, 'Panel element does not exist');
         var resizer = self1.getElm('resizer');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(resizer != null, 'Resizer element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(resizer != null, 'Resizer element does not exist');
         var dialogbox_header = self1.getElm('header-title');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(dialogbox_header != null, 'header-title element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(dialogbox_header != null, 'header-title element does not exist');
         var dialogbox_content = self1.getElm('content');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(dialogbox_content != null, 'Content element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(dialogbox_content != null, 'Content element does not exist');
         var dialogbox_footer = self1.getElm('footer');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(dialogbox_footer != null, 'Footer element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(dialogbox_footer != null, 'Footer element does not exist');
         var dialogbox_toolbar = self1.getElm('header-toolbar');
-        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(dialogbox_toolbar != null, 'header-toolbar element does not exist');
+        (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(dialogbox_toolbar != null, 'header-toolbar element does not exist');
         _this.dialog = dialog;
         _this.resizer = resizer;
         _this.dialogbox_header = dialogbox_header;
         _this.dialogbox_content = dialogbox_content;
         _this.dialogbox_footer = dialogbox_footer;
         _this.dialogbox_toolbar = dialogbox_toolbar;
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(self1.dialog, {
+        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(self1.dialog, {
             maxWidth: self1.options.maxWidth,
             minHeight: self1.options.minHeight,
             minWidth: self1.options.minWidth
@@ -23360,7 +23449,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
         _this.e.on(self1.container, 'close_dialog', self1.close).on(_this.ow, 'keydown', _this.__onEsc).on(_this.ow, 'resize', _this.__onResize);
         if (_this.o.closeOnClickOverlay) {
             var overlay = self1.getElm('overlay');
-            (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_18__.assert)(overlay != null, 'Overlay element does not exist');
+            (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_19__.assert)(overlay != null, 'Overlay element does not exist');
             _this.e.on(overlay, 'click', self1.close);
         }
         return _this;
@@ -23444,8 +23533,8 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
                 this.draggable = true;
                 this.startX = e.clientX;
                 this.startY = e.clientY;
-                this.startPoint.x = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.dialog, 'left');
-                this.startPoint.y = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.dialog, 'top');
+                this.startPoint.x = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.dialog, 'left');
+                this.startPoint.y = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.dialog, 'top');
                 this.setMaxZIndex();
                 if (e.cancelable) {
                     e.preventDefault();
@@ -23553,7 +23642,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
                 if (h == null) {
                     h = this.dialog.offsetHeight;
                 }
-                ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.dialog, {
+                ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.dialog, {
                     width: w,
                     height: h
                 });
@@ -23593,7 +23682,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
                     this.moved = Math.abs(x - left) > 100 || Math.abs(y - top) > 100;
                 }
                 // strings on purpose: `css()` would truncate fractional pixels
-                ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.dialog, {
+                ;(0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.dialog, {
                     left: (x || left) + 'px',
                     top: (y || top) + 'px'
                 });
@@ -23616,6 +23705,12 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
 	 */ key: "setHeader",
             value: function setHeader(content) {
                 this.setElements(this.dialogbox_header, content);
+                // `role="dialog"` needs an accessible name; a text title is the
+                // natural one (element titles are left to the caller).
+                if ((0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_16__.isString)(content)) {
+                    var name = (0,jodit_core_helpers_html_strip_tags__WEBPACK_IMPORTED_MODULE_17__.stripTags)(content, this.od).trim();
+                    (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.attr)(this.container, 'aria-label', name || null);
+                }
                 return this;
             }
         },
@@ -23682,7 +23777,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
 	 * Get zIndex from dialog
 	 */ key: "getZIndex",
             value: function getZIndex() {
-                return parseInt((0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.container, 'zIndex'), 10) || 0;
+                return parseInt((0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.container, 'zIndex'), 10) || 0;
             }
         },
         {
@@ -23711,7 +23806,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
                 this.__openedSiblings().forEach(function(dialog) {
                     maxZIndex = Math.max(dialog.getZIndex(), maxZIndex);
                 });
-                (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.container, 'zIndex', (maxZIndex + 1).toString());
+                (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.container, 'zIndex', (maxZIndex + 1).toString());
             }
         },
         {
@@ -23767,7 +23862,7 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
                     this.setPosition(this.offsetX, this.offsetY);
                     this.setMaxZIndex();
                 } else {
-                    (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_17__.css)(this.container, 'zIndex', null);
+                    (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_18__.css)(this.container, 'zIndex', null);
                 }
                 if (this.o.fullsize) {
                     this.toggleFullSize(true);
@@ -23872,12 +23967,12 @@ var Dialog = /*#__PURE__*/ function(ViewWithToolbar) {
         }
     ]);
     return Dialog;
-}(jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_21__.ViewWithToolbar);
+}(jodit_core_view_view_with_toolbar__WEBPACK_IMPORTED_MODULE_22__.ViewWithToolbar);
 /**
 	 * Registry of the currently opened dialogs. Replaces a DOM scan of the
 	 * whole `destination` (usually `document.body`) for every z-index update.
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(Dialog, "__opened", new Set());
-(0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(Dialog, "defaultOptions", (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_8__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_7__._)({}, jodit_core_view_view__WEBPACK_IMPORTED_MODULE_20__.View.defaultOptions), {
+(0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(Dialog, "defaultOptions", (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_8__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_7__._)({}, jodit_core_view_view__WEBPACK_IMPORTED_MODULE_21__.View.defaultOptions), {
     closeOnClickOverlay: false,
     closeOnEsc: true
 }));
@@ -30046,7 +30141,6 @@ var ToolbarContent = /*#__PURE__*/ function(UIButton) {
             jodit
         ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "control", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "target", void 0), _this.control = control, _this.target = target;
         _this.container.classList.add("".concat(_this.componentName, "_").concat(_this.clearName(control.name)));
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.attr)(_this.container, 'role', 'content');
         return _this;
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(ToolbarContent, [
@@ -30056,6 +30150,19 @@ var ToolbarContent = /*#__PURE__*/ function(UIButton) {
                 return 'ToolbarContent';
             }
         },
+        {
+            key: "getRole",
+            value: /** A toolbar item like `ToolbarButton`: the parent group is a `list`. */ function getRole() {
+                return 'listitem';
+            }
+        },
+        {
+            key: "onChangeActivated",
+            value: /**
+	 * Arbitrary content is not a toggle button — `aria-pressed` is not
+	 * allowed on a `listitem`.
+	 */ function onChangeActivated() {}
+        },
         {
             key: "update",
             value: /** @override */ function update() {
@@ -39899,7 +40006,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imagePropertie
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   readAlign: function() { return /* binding */ readAlign; }
 /* harmony export */ });
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80991);
+/* harmony import */ var jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16849);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -39909,20 +40016,9 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imagePropertie
  */ 
 /**
  * @private
- */ function readAlign(image, values) {
-    // Align
-    if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'float') && [
-        'left',
-        'right'
-    ].indexOf((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'float').toLowerCase()) !== -1) {
-        values.align = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, 'float');
-    } else {
-        if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, 'display') === 'block' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'margin-left') === 'auto' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, 'margin-right') === 'auto') {
-            values.align = 'center';
-        } else {
-            values.align = '';
-        }
-    }
+ */ function readAlign(image, values, classes) {
+    var align = (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_0__.getHAlign)(image, classes);
+    values.align = align === 'normal' ? '' : align;
 }
 
 
@@ -39965,7 +40061,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imagePropertie
         var image, values;
         return (0,_swc_helpers_ts_generator__WEBPACK_IMPORTED_MODULE_1__._)(this, function(_state) {
             image = state.sourceImage, values = state.values;
-            (0,_align__WEBPACK_IMPORTED_MODULE_4__.readAlign)(image, values);
+            (0,_align__WEBPACK_IMPORTED_MODULE_4__.readAlign)(image, values, j.o.imageAlignClasses);
             // Border radius
             values.borderRadius = parseInt((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(image, 'border-radius') || '0', 10) || 0;
             // Id
@@ -41213,7 +41309,7 @@ UIImagePositionTab = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__
         (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(image, 'id', id || null);
     }
     if (opt.image.editAlign) {
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.hAlignElement)(image, align);
+        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.hAlignElement)(image, align, j.o.imageAlignClasses);
     }
 }
 
@@ -42082,10 +42178,11 @@ var cmd = function cmd(control) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   align: function() { return /* binding */ align; }
 /* harmony export */ });
-/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27795);
-/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(85932);
-/* harmony import */ var jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16849);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80991);
+/* harmony import */ var _swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50684);
+/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27795);
+/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85932);
+/* harmony import */ var jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16849);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80991);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -42096,6 +42193,15 @@ var cmd = function cmd(control) {
 
 
 
+
+// Images align with `imageAlignClasses`; the wrappers of iframes and media
+// keep inline styles
+var alignClasses = function alignClasses(editor, elm) {
+    return jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, 'img') ? editor.o.imageAlignClasses : null;
+};
+var currentAlign = function currentAlign(editor, elm) {
+    return elm ? (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getHAlign)(elm, alignClasses(editor, elm)) : 'normal';
+};
 var align = {
     name: 'left',
     childTemplate: function childTemplate(_, __, value) {
@@ -42107,25 +42213,37 @@ 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 _button_control_args;
+        var _ref = (0,_swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_0__._)((_button_control_args = button.control.args) !== null && _button_control_args !== void 0 ? _button_control_args : [], 1), value = _ref[0];
+        return (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_2__.isString)(value) && currentAlign(editor, button.target) === value.toLowerCase();
+    },
     exec: function exec(editor, elm, param) {
         var control = param.control;
-        if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, new Set([
+        if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, new Set([
             'img',
             'jodit',
             'jodit-media'
         ]))) {
             return;
         }
-        var command = control.args && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_1__.isString)(control.args[0]) ? control.args[0].toLowerCase() : '';
+        var command = control.args && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_2__.isString)(control.args[0]) ? control.args[0].toLowerCase() : '';
         if (!command) {
             return false;
         }
-        ;(0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_2__.hAlignElement)(elm, command);
-        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, new Set([
+        ;(0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.hAlignElement)(elm, command, alignClasses(editor, elm));
+        if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, new Set([
             'jodit',
             'jodit-media'
         ])) && elm.firstElementChild) {
-            (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_2__.hAlignElement)(elm.firstElementChild, command);
+            (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.hAlignElement)(elm.firstElementChild, command);
         }
         editor.synchronizeValues();
         editor.e.fire('recalcPositionPopup');
@@ -42166,18 +42284,18 @@ var align = {
             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'));
+            ].includes((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'float')) || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'display') === 'block'));
         },
         exec: function exec(editor, image, param) {
             var control = param.control;
-            if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(image, 'img')) {
+            if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(image, 'img')) {
                 return;
             }
-            var command = control.args && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_1__.isString)(control.args[0]) ? control.args[0].toLowerCase() : '';
+            var command = control.args && (0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_2__.isString)(control.args[0]) ? control.args[0].toLowerCase() : '';
             if (!command) {
                 return false;
             }
-            ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'vertical-align', command === 'normal' ? '' : command);
+            ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'vertical-align', command === 'normal' ? '' : command);
             editor.e.fire('recalcPositionPopup');
         }
     },
@@ -50059,21 +50177,28 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                     onResize();
                     _this.onReady();
                 };
-                var initAceEditor = function initAceEditor() {
+                var loading = false;
+                var initAceEditor = function initAceEditor1() {
                     if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_SPLIT) {
                         return;
                     }
+                    // ACE (~400 KiB from the CDN) is only needed once the source view
+                    // is actually shown — a page that stays in WYSIWYG must not
+                    // download it.
+                    if (!_this.aceExists()) {
+                        if (!loading) {
+                            loading = true;
+                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
+                                return null;
+                            });
+                        }
+                        return;
+                    }
                     _this.fromWYSIWYG();
                     tryInitAceEditor();
                 };
                 editor.e.on('afterSetMode', initAceEditor);
                 initAceEditor();
-                // global add ace editor in browser
-                if (!this.aceExists()) {
-                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
-                        return null;
-                    });
-                }
             }
         },
         {
@@ -50819,9 +50944,26 @@ var SourceEditor = /*#__PURE__*/ function() {
                         return false;
                     };
                     if (!addEventListener()) {
-                        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(addEventListener, function() {
-                            return null;
-                        });
+                        // js-beautify is only needed once the source view is shown —
+                        // do not download it for a page that stays in WYSIWYG.
+                        var loading = false;
+                        var loadBeautify = function loadBeautify() {
+                            if (loading || editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_7__.MODE_SPLIT) {
+                                return;
+                            }
+                            loading = true;
+                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(function() {
+                                // The source view was filled before the
+                                // beautifier arrived — format it now.
+                                if (addEventListener()) {
+                                    _this.syncValueFromWYSIWYG(true);
+                                }
+                            }, function() {
+                                return null;
+                            });
+                        };
+                        editor.e.on('afterSetMode.source', loadBeautify);
+                        loadBeautify();
                     }
                 }
                 this.syncValueFromWYSIWYG(true);