jodit 4.17.5 → 4.18.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.17.5
+ * Version: v4.18.0
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -735,18 +735,43 @@ var ConfigPrototype = {};
         /**
 	 * 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.
+	 * chosen alignment's, which can be several separated by spaces. An
+	 * alignment can also list several such sets, to recognise each of them;
+	 * aligning writes the first. `alignClasses.img` takes its place when set.
 	 *
 	 * ```javascript
 	 * Jodit.make('#editor', {
 	 *   imageAlignClasses: {
 	 *     left: 'align-left',
 	 *     right: 'align-right',
-	 *     center: 'align-center'
+	 *     center: ['align-center', 'centered']
 	 *   }
 	 * });
 	 * ```
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(this, "imageAlignClasses", null);
+        /**
+	 * Class names to align elements with, by tag name, as `imageAlignClasses`
+	 * does for images: `img`, and `video`, `audio` and `iframe` in the media
+	 * popup. A media wrapper (see `mediaWrappers`), and Jodit's own `jodit` and
+	 * `jodit-media` wrappers, are aligned with the classes for the media in
+	 * them.
+	 *
+	 * ```javascript
+	 * const media = {
+	 *   left: 'media-left',
+	 *   right: 'media-right',
+	 *   center: 'media-center'
+	 * };
+	 *
+	 * Jodit.make('#editor', {
+	 *   alignClasses: { video: media, iframe: media }
+	 * });
+	 * ```
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(this, "alignClasses", {});
+        /**
+	 * Alignment given to the media the video popup inserts. `'normal'` leaves
+	 * them unaligned
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_2__._)(this, "mediaDefaultAlign", 'normal');
         /**
 	 * Do not display these buttons that are on the list
 	 *
@@ -2129,7 +2154,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.17.5";
+var APP_VERSION = "4.18.0";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -8609,13 +8634,16 @@ 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 */   getAlignClasses: function() { return /* binding */ getAlignClasses; },
 /* harmony export */   getHAlign: function() { return /* binding */ getHAlign; },
 /* harmony export */   hAlignElement: function() { return /* binding */ hAlignElement; }
 /* harmony export */ });
 /* 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);
+/* harmony import */ var jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17312);
+/* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7909);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80991);
+/* harmony import */ var jodit_core_helpers_utils_media_wrapper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(83314);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -8626,37 +8654,66 @@ function trimChars(value, chars) {
 
 
 
-var classNames = function classNames(value) {
-    return (value !== null && value !== void 0 ? value : '').split(/\s+/).filter(Boolean);
+
+
+// The sets of class names an alignment lists, the first being the one to write
+var classSets = function classSets(value) {
+    return ((0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_2__.isArray)(value) ? value : [
+        value !== null && value !== void 0 ? value : ''
+    ]).map(function(set) {
+        return set.split(/\s+/).filter(Boolean);
+    }).filter(function(set) {
+        return set.length;
+    });
 };
 /**
- * Align image, with `classes` (see `imageAlignClasses`) instead of inline
- * styles when they are given
+ * The class names to align `elm` with: `alignClasses` for its tag, or for the
+ * media in it when it wraps media (a `mediaWrappers` wrapper, `jodit` or
+ * `jodit-media`), falling back to `imageAlignClasses` for an image
+ */ function getAlignClasses(jodit, elm) {
+    var _ref;
+    var _jodit_o_alignClasses;
+    if (!elm) {
+        return null;
+    }
+    var media = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, new Set([
+        'jodit',
+        'jodit-media'
+    ])) ? elm.firstElementChild : (0,jodit_core_helpers_utils_media_wrapper__WEBPACK_IMPORTED_MODULE_5__.getWrappedMedia)(jodit, elm);
+    var tag = (media !== null && media !== void 0 ? media : elm).nodeName.toLowerCase();
+    return (_ref = (_jodit_o_alignClasses = jodit.o.alignClasses) === null || _jodit_o_alignClasses === void 0 ? void 0 : _jodit_o_alignClasses[tag]) !== null && _ref !== void 0 ? _ref : tag === 'img' ? jodit.o.imageAlignClasses : null;
+}
+/**
+ * Align image, with `classes` (see `alignClasses`) instead of inline styles
+ * when they are given
  */ function hAlignElement(image, align, classes) {
     if (classes) {
         var _image_classList, _image_classList1;
+        var _classSets_;
         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)));
+            return classSets(value).forEach(function(set) {
+                return (_image_classList = image.classList).remove.apply(_image_classList, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__._)(set));
+            });
         });
-        (_image_classList1 = image.classList).add.apply(_image_classList1, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__._)(classNames(classes[align || 'normal'])));
+        (_image_classList1 = image.classList).add.apply(_image_classList1, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_0__._)((_classSets_ = classSets(classes[align || 'normal'])[0]) !== null && _classSets_ !== void 0 ? _classSets_ : []));
         [
             '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);
+            if (!((_attr = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, name)) === null || _attr === void 0 ? void 0 : _attr.trim())) {
+                (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, name, null);
             }
         });
         return;
     }
     if (align && align !== 'normal') {
         if (align !== 'center') {
-            (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);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'float', align);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.clearCenterAlign)(image);
         } else {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, {
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, {
                 float: '',
                 display: 'block',
                 marginLeft: 'auto',
@@ -8664,13 +8721,13 @@ var classNames = function classNames(value) {
             });
         }
     } else {
-        if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float') && [
+        if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'float') && [
             'right',
             'left'
-        ].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', '');
+        ].indexOf((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'float').toString().toLowerCase()) !== -1) {
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(image, 'float', '');
         }
-        ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.clearCenterAlign)(image);
+        ;(0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.clearCenterAlign)(image);
     }
 }
 /**
@@ -8684,19 +8741,20 @@ var classNames = function classNames(value) {
             '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);
+            if (classSets(classes[align]).some(function(set) {
+                return set.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();
+    var float = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.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') {
+    if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(elm, 'display') === 'block' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.cssInline)(elm, 'margin-left') === 'auto' && (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.cssInline)(elm, 'margin-right') === 'auto') {
         return 'center';
     }
     return 'normal';
@@ -8706,10 +8764,10 @@ var classNames = function classNames(value) {
  */ function clearAlign(node) {
     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);
+            if ((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.cssInline)(elm, 'textAlign')) {
+                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(elm, 'textAlign', '');
+                if (!((0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(elm, 'style') || '').trim().length) {
+                    (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(elm, 'style', null);
                 }
             }
         }
@@ -8740,7 +8798,7 @@ function alignElement(command, box) {
         clearAlign(box);
         var align = ALIGN_BY_COMMAND.get(command.toLowerCase());
         if (align) {
-            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(box, 'textAlign', align);
+            (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(box, 'textAlign', align);
         }
     }
 }
@@ -9874,13 +9932,13 @@ var getClassName = function getClassName(obj) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   $$: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_24__.$$; },
+/* harmony export */   $$: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_25__.$$; },
 /* harmony export */   ConfigDeepFlatten: function() { return /* reexport safe */ _config_proto__WEBPACK_IMPORTED_MODULE_7__.ConfigDeepFlatten; },
 /* harmony export */   ConfigFlatten: function() { return /* reexport safe */ _config_proto__WEBPACK_IMPORTED_MODULE_7__.ConfigFlatten; },
 /* harmony export */   ConfigMerge: function() { return /* reexport safe */ _config_proto__WEBPACK_IMPORTED_MODULE_7__.ConfigMerge; },
 /* harmony export */   ConfigProto: function() { return /* reexport safe */ _config_proto__WEBPACK_IMPORTED_MODULE_7__.ConfigProto; },
 /* harmony export */   ConnectionError: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.ConnectionError; },
-/* harmony export */   LimitedStack: function() { return /* reexport safe */ _stack__WEBPACK_IMPORTED_MODULE_26__.LimitedStack; },
+/* harmony export */   LimitedStack: function() { return /* reexport safe */ _stack__WEBPACK_IMPORTED_MODULE_27__.LimitedStack; },
 /* harmony export */   OptionsError: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.OptionsError; },
 /* harmony export */   UNSAFE_PROTO_KEYS: function() { return /* reexport safe */ _is_unsafe_proto_key__WEBPACK_IMPORTED_MODULE_18__.UNSAFE_PROTO_KEYS; },
 /* harmony export */   abort: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.abort; },
@@ -9892,58 +9950,63 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   attrRaw: function() { return /* reexport safe */ _attr__WEBPACK_IMPORTED_MODULE_3__.attrRaw; },
 /* harmony export */   browser: function() { return /* reexport safe */ _browser__WEBPACK_IMPORTED_MODULE_4__.browser; },
 /* harmony export */   buildQuery: function() { return /* reexport safe */ _build_query__WEBPACK_IMPORTED_MODULE_5__.buildQuery; },
-/* harmony export */   call: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.call; },
-/* harmony export */   callPromise: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.callPromise; },
-/* harmony export */   callThis: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.callThis; },
+/* harmony export */   call: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.call; },
+/* harmony export */   callPromise: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.callPromise; },
+/* harmony export */   callThis: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.callThis; },
 /* harmony export */   clearAlign: function() { return /* reexport safe */ _align__WEBPACK_IMPORTED_MODULE_0__.clearAlign; },
 /* harmony export */   clearCenterAlign: function() { return /* reexport safe */ _css__WEBPACK_IMPORTED_MODULE_9__.clearCenterAlign; },
 /* harmony export */   cns: function() { return /* reexport safe */ _mark_deprecated__WEBPACK_IMPORTED_MODULE_19__.cns; },
 /* harmony export */   completeUrl: function() { return /* reexport safe */ _complete_url__WEBPACK_IMPORTED_MODULE_6__.completeUrl; },
 /* harmony export */   connection: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.connection; },
 /* harmony export */   convertMediaUrlToVideoEmbed: function() { return /* reexport safe */ _convert_media_url_to_video_embed__WEBPACK_IMPORTED_MODULE_8__.convertMediaUrlToVideoEmbed; },
+/* harmony export */   createMediaWrapper: function() { return /* reexport safe */ _media_wrapper__WEBPACK_IMPORTED_MODULE_20__.createMediaWrapper; },
 /* harmony export */   css: function() { return /* reexport safe */ _css__WEBPACK_IMPORTED_MODULE_9__.css; },
 /* harmony export */   cssInline: function() { return /* reexport safe */ _css__WEBPACK_IMPORTED_MODULE_9__.cssInline; },
-/* harmony export */   cssPath: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_24__.cssPath; },
+/* harmony export */   cssPath: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_25__.cssPath; },
 /* harmony export */   ctrlKey: function() { return /* reexport safe */ _ctrl_key__WEBPACK_IMPORTED_MODULE_10__.ctrlKey; },
 /* harmony export */   dataBind: function() { return /* reexport safe */ _data_bind__WEBPACK_IMPORTED_MODULE_11__.dataBind; },
 /* harmony export */   defaultLanguage: function() { return /* reexport safe */ _default_language__WEBPACK_IMPORTED_MODULE_12__.defaultLanguage; },
 /* harmony export */   error: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.error; },
 /* harmony export */   fastClone: function() { return /* reexport safe */ _extend__WEBPACK_IMPORTED_MODULE_14__.fastClone; },
 /* harmony export */   get: function() { return /* reexport safe */ _get__WEBPACK_IMPORTED_MODULE_15__.get; },
+/* harmony export */   getAlignClasses: function() { return /* reexport safe */ _align__WEBPACK_IMPORTED_MODULE_0__.getAlignClasses; },
 /* 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 */   getDataTransfer: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.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 */   getMediaWrapper: function() { return /* reexport safe */ _media_wrapper__WEBPACK_IMPORTED_MODULE_20__.getMediaWrapper; },
+/* harmony export */   getPropertyDescriptor: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.getPropertyDescriptor; },
+/* harmony export */   getWrappedMedia: function() { return /* reexport safe */ _media_wrapper__WEBPACK_IMPORTED_MODULE_20__.getWrappedMedia; },
+/* harmony export */   getXPathByElement: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_25__.getXPathByElement; },
 /* harmony export */   hAlignElement: function() { return /* reexport safe */ _align__WEBPACK_IMPORTED_MODULE_0__.hAlignElement; },
 /* harmony export */   humanSizeToBytes: function() { return /* reexport safe */ _human_size_to_bytes__WEBPACK_IMPORTED_MODULE_17__.humanSizeToBytes; },
-/* harmony export */   inView: function() { return /* reexport safe */ _scroll_into_view__WEBPACK_IMPORTED_MODULE_23__.inView; },
+/* harmony export */   inView: function() { return /* reexport safe */ _scroll_into_view__WEBPACK_IMPORTED_MODULE_24__.inView; },
 /* harmony export */   isAtom: function() { return /* reexport safe */ _extend__WEBPACK_IMPORTED_MODULE_14__.isAtom; },
 /* harmony export */   isUnsafeProtoKey: function() { return /* reexport safe */ _is_unsafe_proto_key__WEBPACK_IMPORTED_MODULE_18__.isUnsafeProtoKey; },
 /* harmony export */   keepNames: function() { return /* reexport safe */ _get_class_name__WEBPACK_IMPORTED_MODULE_16__.keepNames; },
-/* harmony export */   keys: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.keys; },
-/* harmony export */   loadImage: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.loadImage; },
+/* harmony export */   keys: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.keys; },
+/* harmony export */   loadImage: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.loadImage; },
 /* harmony export */   loadNext: function() { return /* reexport safe */ _append_script__WEBPACK_IMPORTED_MODULE_1__.loadNext; },
 /* harmony export */   loadNextStyle: function() { return /* reexport safe */ _append_script__WEBPACK_IMPORTED_MODULE_1__.loadNextStyle; },
 /* harmony export */   markAsAtomic: function() { return /* reexport safe */ _extend__WEBPACK_IMPORTED_MODULE_14__.markAsAtomic; },
 /* harmony export */   markDeprecated: function() { return /* reexport safe */ _mark_deprecated__WEBPACK_IMPORTED_MODULE_19__.markDeprecated; },
-/* harmony export */   markOwner: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.markOwner; },
-/* harmony export */   memorizeExec: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_27__.memorizeExec; },
+/* harmony export */   markOwner: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.markOwner; },
+/* harmony export */   memorizeExec: function() { return /* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_28__.memorizeExec; },
 /* harmony export */   options: function() { return /* reexport safe */ _error__WEBPACK_IMPORTED_MODULE_13__.options; },
-/* harmony export */   parseQuery: function() { return /* reexport safe */ _parse_query__WEBPACK_IMPORTED_MODULE_20__.parseQuery; },
-/* harmony export */   previewBox: function() { return /* reexport safe */ _print__WEBPACK_IMPORTED_MODULE_21__.previewBox; },
-/* harmony export */   refs: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_24__.refs; },
-/* harmony export */   reset: function() { return /* reexport safe */ _reset__WEBPACK_IMPORTED_MODULE_22__.reset; },
-/* harmony export */   resolveElement: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_24__.resolveElement; },
-/* harmony export */   scrollIntoViewIfNeeded: function() { return /* reexport safe */ _scroll_into_view__WEBPACK_IMPORTED_MODULE_23__.scrollIntoViewIfNeeded; },
-/* harmony export */   set: function() { return /* reexport safe */ _set__WEBPACK_IMPORTED_MODULE_25__.set; }
+/* harmony export */   parseQuery: function() { return /* reexport safe */ _parse_query__WEBPACK_IMPORTED_MODULE_21__.parseQuery; },
+/* harmony export */   previewBox: function() { return /* reexport safe */ _print__WEBPACK_IMPORTED_MODULE_22__.previewBox; },
+/* harmony export */   refs: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_25__.refs; },
+/* harmony export */   reset: function() { return /* reexport safe */ _reset__WEBPACK_IMPORTED_MODULE_23__.reset; },
+/* harmony export */   resolveElement: function() { return /* reexport safe */ _selector__WEBPACK_IMPORTED_MODULE_25__.resolveElement; },
+/* harmony export */   scrollIntoViewIfNeeded: function() { return /* reexport safe */ _scroll_into_view__WEBPACK_IMPORTED_MODULE_24__.scrollIntoViewIfNeeded; },
+/* harmony export */   set: function() { return /* reexport safe */ _set__WEBPACK_IMPORTED_MODULE_26__.set; },
+/* harmony export */   wrapMedia: function() { return /* reexport safe */ _media_wrapper__WEBPACK_IMPORTED_MODULE_20__.wrapMedia; }
 /* harmony export */ });
 /* harmony import */ var _align__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16849);
 /* harmony import */ var _append_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47760);
 /* 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","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) */ for(var __WEBPACK_IMPORT_KEY__ in _assert__WEBPACK_IMPORTED_MODULE_2__) if(["default","alignElement","clearAlign","getAlignClasses","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);
@@ -9962,14 +10025,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _human_size_to_bytes__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(37427);
 /* harmony import */ var _is_unsafe_proto_key__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(78048);
 /* harmony import */ var _mark_deprecated__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(49385);
-/* harmony import */ var _parse_query__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(36310);
-/* harmony import */ var _print__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(57075);
-/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(43379);
-/* harmony import */ var _scroll_into_view__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(60898);
-/* harmony import */ var _selector__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(28723);
-/* harmony import */ var _set__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(52144);
-/* harmony import */ var _stack__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(42820);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(71125);
+/* harmony import */ var _media_wrapper__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(83314);
+/* harmony import */ var _parse_query__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(36310);
+/* harmony import */ var _print__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(57075);
+/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(43379);
+/* harmony import */ var _scroll_into_view__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(60898);
+/* harmony import */ var _selector__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(28723);
+/* harmony import */ var _set__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(52144);
+/* harmony import */ var _stack__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(42820);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(71125);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -10004,6 +10068,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 /***/ }),
@@ -10079,6 +10144,102 @@ __webpack_require__.r(__webpack_exports__);
 }
 
 
+/***/ }),
+
+/***/ 83314:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   createMediaWrapper: function() { return /* binding */ createMediaWrapper; },
+/* harmony export */   getMediaWrapper: function() { return /* binding */ getMediaWrapper; },
+/* harmony export */   getWrappedMedia: function() { return /* binding */ getWrappedMedia; },
+/* harmony export */   wrapMedia: function() { return /* binding */ wrapMedia; }
+/* harmony export */ });
+/* harmony import */ var _swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50684);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23211);
+/*!
+ * 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
+ */ /**
+ * @module helpers/utils
+ */ 
+
+var isWrapper = function isWrapper(node, wrapper) {
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isHTMLElement(node) && node.nodeName.toLowerCase() === wrapper.tag.toLowerCase() && node.classList.contains(wrapper.className);
+};
+/**
+ * The media in `elm` when `elm` is a wrapper media keep in the content (see
+ * `mediaWrappers`): an element of a type `elm` is the wrapper for
+ */ function getWrappedMedia(jodit, elm) {
+    var _jodit_o_mediaWrappers;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries((_jodit_o_mediaWrappers = jodit.o.mediaWrappers) !== null && _jodit_o_mediaWrappers !== void 0 ? _jodit_o_mediaWrappers : {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = (0,_swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_0__._)(_step.value, 2), tag = _step_value[0], wrapper = _step_value[1];
+            if (isWrapper(elm, wrapper)) {
+                var media = elm.querySelector(tag);
+                if (media) {
+                    return media;
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * The wrapper media keep in the content (see `mediaWrappers`) that is or
+ * holds `node`
+ */ function getMediaWrapper(jodit, node) {
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(node, function(elm) {
+        return Boolean(getWrappedMedia(jodit, elm));
+    }, jodit.editor);
+}
+/**
+ * An empty wrapper for media of type `tag` to keep in the content (see
+ * `mediaWrappers`), or null when there is none for it
+ */ function createMediaWrapper(jodit, tag) {
+    var _jodit_o_mediaWrappers;
+    var wrapper = (_jodit_o_mediaWrappers = jodit.o.mediaWrappers) === null || _jodit_o_mediaWrappers === void 0 ? void 0 : _jodit_o_mediaWrappers[tag.toLowerCase()];
+    if (!wrapper) {
+        return null;
+    }
+    return jodit.createInside.element(wrapper.tag, {
+        class: wrapper.className,
+        contenteditable: false,
+        draggable: true
+    });
+}
+/**
+ * Puts `element` in the wrapper for its type (see `mediaWrappers`), and
+ * returns the wrapper, or `element` when there is none for it
+ */ function wrapMedia(jodit, element) {
+    var wrapper = createMediaWrapper(jodit, element.nodeName);
+    if (!wrapper) {
+        return element;
+    }
+    if (element.parentNode) {
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.before(element, wrapper);
+    }
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.append(wrapper, element);
+    return wrapper;
+}
+
+
 /***/ }),
 
 /***/ 36310:
@@ -12309,6 +12470,12 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 
 
 
+/**
+ * A text node that is empty or holds only invisible caret placeholders.
+ */ function isBlankTextNode(node) {
+    var _node_nodeValue;
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && ((_node_nodeValue = node.nodeValue) !== null && _node_nodeValue !== void 0 ? _node_nodeValue : '').replace(jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__.INVISIBLE_SPACE_REG_EXP(), '').length === 0;
+}
 var Selection = /*#__PURE__*/ function() {
     "use strict";
     function Selection(jodit) {
@@ -12641,10 +12808,22 @@ var Selection = /*#__PURE__*/ function() {
                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.append(marker, this.j.createInside.text(jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__.INVISIBLE_SPACE));
                 if (newRange) {
                     if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isOrContains(this.area, atStart ? newRange.startContainer : newRange.endContainer)) {
-                        // Here need do unsafe inserting
-                        // Deny Dom.safeInsertNode(newRange, marker);
-                        // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
-                        newRange.insertNode(marker);
+                        var _node_nodeValue;
+                        var node = newRange.startContainer, offset = newRange.startOffset;
+                        // At either end of a text node the marker goes beside it. Splitting
+                        // the node there would leave the selection's boundary in an empty
+                        // text node, and WebKit neither repaints a selection that leaves one
+                        // nor moves a selection that follows one when it's removed.
+                        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && offset === 0) {
+                            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.before(node, marker);
+                        } else if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && offset === ((_node_nodeValue = node.nodeValue) === null || _node_nodeValue === void 0 ? void 0 : _node_nodeValue.length)) {
+                            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.after(node, marker);
+                        } else {
+                            // Here need do unsafe inserting
+                            // Deny Dom.safeInsertNode(newRange, marker);
+                            // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
+                            newRange.insertNode(marker);
+                        }
                     }
                 }
                 return marker;
@@ -13061,7 +13240,9 @@ var Selection = /*#__PURE__*/ function() {
                             }
                         ].forEach(function(getChildNode) {
                             var childNode = getChildNode();
-                            if (childNode && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isEmptyTextNode(childNode)) {
+                            // Only a text node left with nothing in it by the split
+                            // goes; one holding a space is content (`<b>a</b> |`).
+                            if (childNode && isBlankTextNode(childNode)) {
                                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(childNode);
                             }
                         });
@@ -13159,9 +13340,9 @@ 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;
+                var imageDefaultAlign = this.j.o.imageDefaultAlign;
                 if (imageDefaultAlign && imageDefaultAlign !== 'normal') {
-                    (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_13__.hAlignElement)(image, imageDefaultAlign, imageAlignClasses);
+                    (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_13__.hAlignElement)(image, imageDefaultAlign, (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_13__.getAlignClasses)(this.j, image));
                 }
                 var onload = function onload1() {
                     if (image.naturalHeight < image.offsetHeight || image.naturalWidth < image.offsetWidth) {
@@ -27105,19 +27286,27 @@ jodit_config__WEBPACK_IMPORTED_MODULE_10__.Config.prototype.history = {
 	 */ function updateStack() {
                 var replace = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
                 var newValue = this.snapshot.make();
-                if (!_snapshot__WEBPACK_IMPORTED_MODULE_12__.Snapshot.equal(newValue, this.startValue)) {
-                    var newCommand = new _command__WEBPACK_IMPORTED_MODULE_11__.Command(this.startValue, newValue, this, this.updateTick);
-                    if (replace) {
-                        var command = this.__stack.current();
-                        if (command && this.updateTick === command.tick) {
-                            this.__stack.replace(newCommand);
-                        }
-                    } else {
-                        this.__stack.push(newCommand);
-                    }
+                if (_snapshot__WEBPACK_IMPORTED_MODULE_12__.Snapshot.equal(newValue, this.startValue)) {
+                    return;
+                }
+                // Only the selection moved, for example when the selection markers
+                // went in before a switch to the source view. There is nothing to
+                // undo, but the next change has to start from this selection.
+                if (newValue.html === this.startValue.html) {
                     this.startValue = newValue;
-                    this.fireChangeStack();
+                    return;
+                }
+                var newCommand = new _command__WEBPACK_IMPORTED_MODULE_11__.Command(this.startValue, newValue, this, this.updateTick);
+                if (replace) {
+                    var command = this.__stack.current();
+                    if (command && this.updateTick === command.tick) {
+                        this.__stack.replace(newCommand);
+                    }
+                } else {
+                    this.__stack.push(newCommand);
                 }
+                this.startValue = newValue;
+                this.fireChangeStack();
             }
         },
         {
@@ -29738,6 +29927,7 @@ var INPUT_TAGS = new Set([
     'textarea',
     'select'
 ]);
+var TYPE_AHEAD_TIMEOUT = 1000;
 var FOCUSABLE_SELECTOR = [
     'button:not([disabled])',
     'a[href]',
@@ -29755,11 +29945,11 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
         var _this;
         _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, ToolbarButton, [
             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), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "state", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "trigger", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "openedPopup", void 0), _this.control = control, _this.target = target, _this.state = (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_8__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_7__._)({}, (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_29__.UIButtonState)()), {
+        ]), (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), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "state", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "trigger", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__typed", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__typedAt", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__typedTo", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "openedPopup", void 0), _this.control = control, _this.target = target, _this.state = (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_8__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_7__._)({}, (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_29__.UIButtonState)()), {
             theme: 'toolbar',
             currentValue: '',
             hasTrigger: false
-        }), _this.openedPopup = null;
+        }), _this.__typed = '', _this.__typedAt = 0, _this.__typedTo = null, _this.openedPopup = null;
         var button = _this.getElm('button');
         (0,jodit_core_helpers_utils_assert__WEBPACK_IMPORTED_MODULE_26__.assert)(button, 'Element button should exists');
         _this.button = button;
@@ -30111,12 +30301,66 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
                         items[(index + 1) % items.length].focus();
                         break;
                     default:
-                        return;
+                        if (!this.control.list || !this.__typeAhead(e.key, items, index)) {
+                            return;
+                        }
                 }
                 e.preventDefault();
                 e.stopPropagation();
             }
         },
+        {
+            key: "__onEditorKeyDown",
+            value: /**
+	 * The mouse opens a dropdown without taking the focus out of the editor.
+	 * While a dropdown list is open, typing there searches the list, as in an
+	 * open `<select>`, instead of writing into the content
+	 */ function __onEditorKeyDown(e) {
+                if (!this.openedPopup || !this.control.list || e.altKey || e.ctrlKey || e.metaKey || !this.__typeAhead(e.key, this.__popupFocusables(), -1)) {
+                    return;
+                }
+                e.preventDefault();
+                return false;
+            }
+        },
+        {
+            key: "__typeAhead",
+            value: /**
+	 * Typing in a dropdown list focuses the next item whose label starts with
+	 * the typed text, whatever their case and accents, and repeating one letter
+	 * cycles through the items that start with it, like the WAI-ARIA menu
+	 * pattern's type-ahead. The typed text starts again after a pause, or once
+	 * the focus has moved on
+	 */ function __typeAhead(key, items, index) {
+                var now = Date.now();
+                if (now - this.__typedAt > TYPE_AHEAD_TIMEOUT || items[index] !== this.__typedTo) {
+                    this.__typed = '';
+                }
+                if (key.length !== 1 || key === ' ' && !this.__typed) {
+                    return false;
+                }
+                this.__typedAt = now;
+                this.__typed += key;
+                this.__typedTo = items[index];
+                var compare = new Intl.Collator(undefined, {
+                    usage: 'search',
+                    sensitivity: 'base'
+                }).compare, typed = this.__typed, cycle = Array.from(typed).every(function(char) {
+                    return compare(char, typed[0]) === 0;
+                }), prefix = cycle ? typed[0] : typed, start = cycle ? index + 1 : Math.max(index, 0);
+                for(var i = 0; i < items.length; i += 1){
+                    var _ref;
+                    var _item_textContent;
+                    var item = items[(start + i) % items.length], label = (_ref = (_item_textContent = item.textContent) === null || _item_textContent === void 0 ? void 0 : _item_textContent.trim()) !== null && _ref !== void 0 ? _ref : '';
+                    if (compare(label.slice(0, prefix.length), prefix) === 0) {
+                        item.focus();
+                        this.__typedTo = item;
+                        break;
+                    }
+                }
+                return true;
+            }
+        },
         {
             key: "__popupFocusables",
             value: /**
@@ -30137,14 +30381,19 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
 	 * Create an open popup list
 	 */ function __openControlList(control) {
                 var _this = this;
-                var _this_jodit_options_controls;
+                var _this_jodit_options_controls, _ref, _ref1;
+                var _this_toolbar, _control_popup;
                 var controls = (_this_jodit_options_controls = this.jodit.options.controls) !== null && _this_jodit_options_controls !== void 0 ? _this_jodit_options_controls : {}, getControl = function getControl(key) {
                     return (0,jodit_core_ui_helpers_get_control_type__WEBPACK_IMPORTED_MODULE_30__.findControlType)(key, controls);
                 };
                 var list = control.list;
                 var menu = this.openPopup();
-                var toolbar = (0,_factory__WEBPACK_IMPORTED_MODULE_33__.makeCollection)(this.j);
                 menu.parentElement = this;
+                var content = (_control_popup = control.popup) === null || _control_popup === void 0 ? void 0 : _control_popup.call(control, this.j, (_ref = (_ref1 = (_this_toolbar = this.toolbar) === null || _this_toolbar === void 0 ? void 0 : _this_toolbar.getTarget(this)) !== null && _ref1 !== void 0 ? _ref1 : this.target) !== null && _ref !== void 0 ? _ref : null, this.__closePopup, this);
+                if (content) {
+                    return this.__openMenu(menu, content);
+                }
+                var toolbar = (0,_factory__WEBPACK_IMPORTED_MODULE_33__.makeCollection)(this.j);
                 toolbar.parentElement = menu;
                 toolbar.mode = 'vertical';
                 var isListItem = function isListItem(key) {
@@ -30196,7 +30445,14 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
                 toolbar.build((0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_19__.isArray)(list) ? list.map(getButton) : (0,jodit_core_helpers_utils_utils__WEBPACK_IMPORTED_MODULE_28__.keys)(list, false).map(function(key) {
                     return getButton(key, list[key]);
                 }), this.target);
-                menu.setContent(toolbar).open(function() {
+                this.__openMenu(menu, toolbar);
+            }
+        },
+        {
+            key: "__openMenu",
+            value: function __openMenu(menu, content) {
+                var _this = this;
+                menu.setContent(content).open(function() {
                     return (0,jodit_core_helpers_size__WEBPACK_IMPORTED_MODULE_24__.position)(_this.container);
                 }, false, this.j.o.allowTabNavigation ? this.container : undefined);
                 this.state.activated = true;
@@ -30218,7 +30474,7 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
             value: function openPopup() {
                 this.__closePopup();
                 this.openedPopup = new jodit_core_ui_popup_popup__WEBPACK_IMPORTED_MODULE_32__.Popup(this.j, false);
-                this.j.e.on(this.ow, 'mousedown touchstart', this.onOutsideClick).on('escape closeAllPopups', this.onOutsideClick).on(this.openedPopup.container, 'keydown', this.__onPopupKeyDown);
+                this.j.e.on(this.ow, 'mousedown touchstart', this.onOutsideClick).on('escape closeAllPopups', this.onOutsideClick).on('keydown', this.__onEditorKeyDown).on(this.openedPopup.container, 'keydown', this.__onPopupKeyDown);
                 return this.openedPopup;
             }
         },
@@ -30236,7 +30492,7 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
                 // popup while the outer `removeChild` is still running and Chrome
                 // throws NotFoundError. See #1458
                 this.openedPopup = null;
-                this.j.e.off(this.ow, 'mousedown touchstart', this.onOutsideClick).off('escape closeAllPopups', this.onOutsideClick);
+                this.j.e.off(this.ow, 'mousedown touchstart', this.onOutsideClick).off('escape closeAllPopups', this.onOutsideClick).off('keydown', this.__onEditorKeyDown);
                 // The keyboard brought the focus into the dropdown: give it back to
                 // the button, otherwise it would fall out to the document
                 var activeElement = this.od.activeElement, hadFocus = activeElement && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_18__.Dom.isOrContains(popup.container, activeElement);
@@ -30323,6 +30579,9 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_10__.__decorate)([
     jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_14__.autobind
 ], ToolbarButton.prototype, "__onPopupKeyDown", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_10__.__decorate)([
+    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_14__.autobind
+], ToolbarButton.prototype, "__onEditorKeyDown", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_10__.__decorate)([
     jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_14__.autobind
 ], ToolbarButton.prototype, "onOutsideClick", null);
@@ -38641,14 +38900,16 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('focus', focus);
 /* harmony import */ var _swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15366);
 /* harmony import */ var _swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(50684);
 /* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27795);
-/* harmony import */ var jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4040);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(80991);
-/* harmony import */ var jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(29434);
-/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(5266);
-/* harmony import */ var _icons_font_svg__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(48842);
-/* harmony import */ var _icons_font_svg__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_icons_font_svg__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(25501);
-/* harmony import */ var _icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17312);
+/* harmony import */ var jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(4040);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(80991);
+/* harmony import */ var jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(29434);
+/* harmony import */ var jodit_config__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(5266);
+/* harmony import */ var _icons_font_svg__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(48842);
+/* harmony import */ var _icons_font_svg__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_icons_font_svg__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(25501);
+/* harmony import */ var _icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _font_picker__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(80045);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -38665,11 +38926,18 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('focus', focus);
 
 
 
+
+
 /**
  * Default font-size points
- */ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.defaultFontSizePoints = 'px';
-jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_6__.Icon.set('font', (_icons_font_svg__WEBPACK_IMPORTED_MODULE_8___default())).set('fontsize', (_icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_9___default()));
-jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.fontsize = {
+ */ jodit_config__WEBPACK_IMPORTED_MODULE_8__.Config.prototype.defaultFontSizePoints = 'px';
+jodit_config__WEBPACK_IMPORTED_MODULE_8__.Config.prototype.font = {
+    googleFonts: {
+        url: ''
+    }
+};
+jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_7__.Icon.set('font', (_icons_font_svg__WEBPACK_IMPORTED_MODULE_9___default())).set('fontsize', (_icons_fontsize_svg__WEBPACK_IMPORTED_MODULE_10___default()));
+jodit_config__WEBPACK_IMPORTED_MODULE_8__.Config.prototype.controls.fontsize = {
     command: 'fontsize',
     data: {
         cssRule: 'font-size',
@@ -38715,7 +38983,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.fontsize = {
         }
         var control = button.control;
         var cssKey = ((_control_data = control.data) === null || _control_data === void 0 ? void 0 : _control_data.cssRule) || 'font-size';
-        var value = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_5__.css)(box, cssKey);
+        var value = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_6__.css)(box, cssKey);
         if (cssKey === 'font-size') {
             var numValue = parseFloat(value.toString());
             if (editor.o.defaultFontSizePoints === 'pt') {
@@ -38753,11 +39021,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.fontsize = {
         return keySet.has(normalize(value.toString()));
     }
 };
-jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.fontsize), {
+var hadSelection = new WeakSet();
+jodit_config__WEBPACK_IMPORTED_MODULE_8__.Config.prototype.controls.font = (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, jodit_config__WEBPACK_IMPORTED_MODULE_8__.Config.prototype.controls.fontsize), {
     command: 'fontname',
     textTemplate: function textTemplate(j, value) {
         var _value_split = (0,_swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_2__._)(value.split(','), 1), first = _value_split[0];
-        return (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_4__.trimChars)(first, '"\'');
+        return (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_5__.trimChars)(first, '"\'');
     },
     list: {
         '': 'Default',
@@ -38779,6 +39048,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
         } catch (unused) {}
         return '<span data-style="'.concat(key, '" style="').concat(isAvailable ? "font-family: ".concat(key, "!important;") : '', '">').concat(value, "</span>");
     },
+    popup: function popup(editor, current, close, button) {
+        return editor.o.font.googleFonts.url ? new _font_picker__WEBPACK_IMPORTED_MODULE_11__.UIFontPicker(editor, button, close) : false;
+    },
     data: {
         cssRule: 'font-family',
         normalize: function normalize(v) {
@@ -38787,19 +39059,19 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
     },
     // When no font is explicitly set, the computed font-family equals the
     // editor's own default (e.g. `-apple-system, …`). Return '' so the
-    // button shows the `Default` list entry instead of that raw stack.
-    // See #1370
-    value: function value(editor) {
-        var current = editor.s.current();
-        if (!current) {
-            return;
-        }
-        var box = jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.closest(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isElement, editor.editor);
-        if (!box) {
+    // button shows the list's `Default` entry, when it has one, instead of
+    // that raw stack. See #1370
+    value: function value(editor, button) {
+        var current = editor.s.current(), box = current && jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.closest(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isElement, editor.editor);
+        // Until there is a selection the button shows the editor's own font,
+        // and afterwards the font of the last one
+        if (box) {
+            hadSelection.add(button);
+        } else if (hadSelection.has(button)) {
             return;
         }
-        var value = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_5__.css)(box, 'font-family').toString();
-        if (value === (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_5__.css)(editor.editor, 'font-family').toString()) {
+        var value = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_6__.css)(box || editor.editor, 'font-family').toString(), list = button.control.list;
+        if (value === (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_6__.css)(editor.editor, 'font-family').toString() && ((0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__.isArray)(list) ? list.includes('') : '' in (list !== null && list !== void 0 ? list : {}))) {
             return '';
         }
         return value;
@@ -38808,6 +39080,334 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
 });
 
 
+/***/ }),
+
+/***/ 80045:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   UIFontPicker: function() { return /* binding */ UIFontPicker; }
+/* harmony export */ });
+/* harmony import */ var _swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(69262);
+/* harmony import */ var _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73104);
+/* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
+/* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25045);
+/* harmony import */ var _swc_helpers_get__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(22248);
+/* harmony import */ var _swc_helpers_get_prototype_of__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66773);
+/* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34918);
+/* harmony import */ var _swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(42395);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_decorators_component_component__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(91672);
+/* harmony import */ var jodit_core_decorators_watch_watch__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(68616);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(17312);
+/* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(7909);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(80991);
+/* harmony import */ var jodit_core_helpers_utils_utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(71125);
+/* harmony import */ var jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(96007);
+/* harmony import */ var _google_fonts__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(24939);
+/*!
+ * 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
+ */ /**
+ * @module plugins/font
+ */ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var HEADINGS = [
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6'
+];
+var GENERIC_FAMILIES = new Set([
+    'serif',
+    'sans-serif',
+    'monospace',
+    'cursive',
+    'fantasy',
+    'system-ui',
+    'ui-serif',
+    'ui-sans-serif',
+    'ui-monospace',
+    'ui-rounded'
+]);
+/**
+ * A family that names a font, not a generic family or a vendor keyword such
+ * as `-apple-system`
+ */ function isFontName(family) {
+    return Boolean(family) && !family.startsWith('-') && !GENERIC_FAMILIES.has(family);
+}
+var UIFontPicker = /*#__PURE__*/ function(UIElement) {
+    "use strict";
+    (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_6__._)(UIFontPicker, UIElement);
+    function UIFontPicker(jodit, __button, __close) {
+        (0,_swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__._)(this, UIFontPicker);
+        var _this;
+        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, UIFontPicker, [
+            jodit
+        ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__button", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__close", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__googleFonts", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__fonts", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__observer", void 0), _this.__button = __button, _this.__close = __close, _this.__fonts = new Map(), _this.__observer = null;
+        _this.__googleFonts = jodit.getInstance(_google_fonts__WEBPACK_IMPORTED_MODULE_18__.GoogleFonts);
+        _this.__render();
+        if (!_this.__googleFonts.fonts.size) {
+            _this.__googleFonts.ready.then(function() {
+                return !_this.isDestructed && _this.__render();
+            });
+        }
+        return _this;
+    }
+    ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(UIFontPicker, [
+        {
+            key: "className",
+            value: function className() {
+                return 'UIFontPicker';
+            }
+        },
+        {
+            key: "__render",
+            value: function __render() {
+                var _this = this;
+                var _ref;
+                var _control_value;
+                var control = this.__button.control, _control_list = control.list, list = _control_list === void 0 ? {} : _control_list, listed = (0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_13__.isArray)(list) ? list.map(function(key) {
+                    return {
+                        value: key.toString(),
+                        title: key.toString()
+                    };
+                }) : (0,jodit_core_helpers_utils_utils__WEBPACK_IMPORTED_MODULE_16__.keys)(list, false).map(function(key) {
+                    return {
+                        value: key,
+                        title: list[key].toString()
+                    };
+                }), google = Array.from(this.__googleFonts.fonts.values(), function(font) {
+                    return {
+                        value: _this.__googleFonts.value(font),
+                        title: font.family,
+                        font: font
+                    };
+                }), byFamily = new Map();
+                (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_7__._)(google).concat((0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_7__._)(listed)).forEach(function(entry) {
+                    return byFamily.set((0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(entry.value), entry);
+                });
+                var theme = new Map(), used = new Map();
+                // The theme's own fonts are listed too, so its body font can be chosen
+                // to take a font off
+                this.__themeFonts().forEach(function(fontFamily) {
+                    var _byFamily_get;
+                    var family = (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(fontFamily), title = fontFamily.split(',')[0].replace(/["']/g, '').trim(), entry = (_byFamily_get = byFamily.get(family)) !== null && _byFamily_get !== void 0 ? _byFamily_get : isFontName(family) ? {
+                        value: fontFamily,
+                        title: title
+                    } : undefined;
+                    entry && !theme.has(family) && theme.set(family, entry);
+                });
+                this.__usedFonts().forEach(function(fontFamily) {
+                    var family = (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(fontFamily), entry = byFamily.get(family);
+                    entry && !theme.has(family) && used.set(family, entry);
+                });
+                var defaultEntry = listed.find(function(entry) {
+                    return entry.value === '';
+                }), current = (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)((_ref = (_control_value = control.value) === null || _control_value === void 0 ? void 0 : _control_value.call(control, this.j, this.__button)) !== null && _ref !== void 0 ? _ref : '');
+                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.detach(this.container);
+                this.__fonts.clear();
+                defaultEntry && this.__append(current, [
+                    defaultEntry
+                ]);
+                this.__append(current, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_7__._)(theme.values()), 'Theme fonts');
+                this.__append(current, (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_7__._)(used.values()), 'Used fonts');
+                this.__append(current, listed.filter(function(entry) {
+                    return entry !== defaultEntry;
+                }), 'System fonts');
+                this.__append(current, google, 'Google Fonts');
+                this.__observeGoogleFonts();
+            }
+        },
+        {
+            key: "__themeFonts",
+            value: /**
+	 * The fonts the editor's styles give text and each heading
+	 */ function __themeFonts() {
+                var _this = this;
+                var editor = this.j.editor, fonts = [
+                    (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_15__.css)(editor, 'font-family').toString()
+                ];
+                HEADINGS.forEach(function(tag) {
+                    var heading = _this.j.createInside.element(tag, {
+                        style: 'display: none'
+                    });
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.append(editor, heading);
+                    fonts.push((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_15__.css)(heading, 'font-family').toString());
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.safeRemove(heading);
+                });
+                return fonts;
+            }
+        },
+        {
+            key: "__usedFonts",
+            value: /**
+	 * The fonts the content sets
+	 */ function __usedFonts() {
+                return Array.from(this.j.editor.querySelectorAll('[style*="font-family"]'), function(element) {
+                    return element.style.fontFamily;
+                });
+            }
+        },
+        {
+            key: "__append",
+            value: function __append(current, entries, heading) {
+                var _this = this;
+                if (!entries.length) {
+                    return;
+                }
+                var control = this.__button.control, group = this.j.c.div(this.getFullElName('group'));
+                if (heading) {
+                    var title = this.j.c.div(this.getFullElName('heading'), {
+                        id: "".concat(this.getFullElName('heading'), "-").concat((0,jodit_core_global__WEBPACK_IMPORTED_MODULE_12__.uniqueUid)())
+                    });
+                    title.textContent = this.i18n(heading);
+                    (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_14__.attr)(group, {
+                        role: 'group',
+                        'aria-labelledby': title.id
+                    });
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.append(group, title);
+                }
+                entries.forEach(function(entry) {
+                    var item = _this.j.c.element('button', {
+                        type: 'button',
+                        class: _this.getFullElName('item'),
+                        'data-value': entry.value,
+                        'aria-pressed': (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(entry.value) === current
+                    });
+                    if (entry.font) {
+                        item.textContent = entry.title;
+                        _this.__fonts.set(item, entry.font);
+                    } else {
+                        var _ref;
+                        var _control_childTemplate;
+                        item.innerHTML = (_ref = (_control_childTemplate = control.childTemplate) === null || _control_childTemplate === void 0 ? void 0 : _control_childTemplate.call(control, _this.j, entry.value, entry.title, _this.__button)) !== null && _ref !== void 0 ? _ref : entry.title;
+                    }
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.append(group, item);
+                });
+                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.append(this.container, group);
+            }
+        },
+        {
+            key: "__observeGoogleFonts",
+            value: /**
+	 * Shows the names of the Google Fonts in view, and those just below it,
+	 * in their own fonts. Setting every item's font up front would have the
+	 * browser look for each of the library's families among the installed
+	 * fonts the first time the list opens
+	 */ function __observeGoogleFonts() {
+                var _this = this;
+                this.j.async.requestAnimationFrame(function() {
+                    var _this___observer;
+                    (_this___observer = _this.__observer) === null || _this___observer === void 0 ? void 0 : _this___observer.disconnect();
+                    if (_this.isDestructed || !_this.__fonts.size) {
+                        return;
+                    }
+                    var observer = new IntersectionObserver(function(entries) {
+                        var fonts = [];
+                        entries.forEach(function(param) {
+                            var isIntersecting = param.isIntersecting, target = param.target;
+                            var font = _this.__fonts.get(target);
+                            if (isIntersecting && font) {
+                                fonts.push(font);
+                                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_15__.css)(target, {
+                                    fontFamily: _this.__googleFonts.value(font)
+                                });
+                                observer.unobserve(target);
+                            }
+                        });
+                        _this.__googleFonts.preview(fonts);
+                    }, {
+                        root: _this.container.parentElement,
+                        rootMargin: '0px 0px 400px 0px'
+                    });
+                    _this.__fonts.forEach(function(_, item) {
+                        return observer.observe(item);
+                    });
+                    _this.__observer = observer;
+                });
+            }
+        },
+        {
+            key: "onMouseDown",
+            value: /**
+	 * Keeps the editor's selection, as the toolbar buttons do
+	 */ function onMouseDown(e) {
+                e.preventDefault();
+            }
+        },
+        {
+            key: "onClick",
+            value: function onClick(e) {
+                var _attr;
+                var item = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.up(e.target, function(node) {
+                    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.isHTMLElement(node) && node.hasAttribute('data-value');
+                }, this.container);
+                if (!item) {
+                    return;
+                }
+                var value = (_attr = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_14__.attr)(item, 'data-value')) !== null && _attr !== void 0 ? _attr : '', font = this.__googleFonts.find(value), // The font the text has anyway is taken off rather than written
+                inherited = (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(value) === (0,_google_fonts__WEBPACK_IMPORTED_MODULE_18__.firstFamily)(this.__blockFont());
+                font && !inherited && this.__googleFonts.load(font);
+                this.j.execCommand('fontname', false, inherited ? '' : value);
+                this.__close();
+            }
+        },
+        {
+            key: "__blockFont",
+            value: /**
+	 * The font the selected text has without a font of its own: its block's
+	 */ function __blockFont() {
+                var block = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.up(this.j.s.current(), jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_11__.Dom.isBlock, this.j.editor);
+                return (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_15__.css)(block !== null && block !== void 0 ? block : this.j.editor, 'font-family').toString();
+            }
+        },
+        {
+            key: "destruct",
+            value: function destruct() {
+                var _this___observer;
+                (_this___observer = this.__observer) === null || _this___observer === void 0 ? void 0 : _this___observer.disconnect();
+                (0,_swc_helpers_get__WEBPACK_IMPORTED_MODULE_4__._)((0,_swc_helpers_get_prototype_of__WEBPACK_IMPORTED_MODULE_5__._)(UIFontPicker.prototype), "destruct", this).call(this);
+            }
+        }
+    ]);
+    return UIFontPicker;
+}(jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_17__.UIElement);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_8__.__decorate)([
+    (0,jodit_core_decorators_watch_watch__WEBPACK_IMPORTED_MODULE_10__.watch)('container:mousedown')
+], UIFontPicker.prototype, "onMouseDown", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_8__.__decorate)([
+    (0,jodit_core_decorators_watch_watch__WEBPACK_IMPORTED_MODULE_10__.watch)('container:click')
+], UIFontPicker.prototype, "onClick", null);
+UIFontPicker = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_8__.__decorate)([
+    jodit_core_decorators_component_component__WEBPACK_IMPORTED_MODULE_9__.component
+], UIFontPicker);
+
+
 /***/ }),
 
 /***/ 50294:
@@ -38818,6 +39418,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
 /* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28077);
 /* harmony import */ var jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65946);
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7433);
+/* harmony import */ var _google_fonts__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24939);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -38829,6 +39430,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
  */ 
 
 
+
 /**
  * Process commands `fontsize` and `fontname`
  */ function font(editor) {
@@ -38839,6 +39441,22 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
         name: 'fontsize',
         group: 'font'
     });
+    if (editor.o.font.googleFonts.url) {
+        var googleFonts = editor.getInstance(_google_fonts__WEBPACK_IMPORTED_MODULE_3__.GoogleFonts), loadUsed = editor.async.debounce(function() {
+            return googleFonts.loadUsed();
+        }, editor.defaultTimeout);
+        googleFonts.ready.then(loadUsed);
+        editor.e.on('afterInit afterSetMode change', loadUsed);
+    }
+    // An iframe's stylesheets can arrive after the toolbar first shows the
+    // editor's font
+    editor.e.on('afterInit', function() {
+        editor.iframe && editor.e.on(editor.ed, 'load', function() {
+            return editor.e.fire('updateToolbar');
+        }, {
+            capture: true
+        });
+    });
     var callback = function callback(command, second, third) {
         switch(command){
             case 'fontsize':
@@ -38868,6 +39486,245 @@ jodit_config__WEBPACK_IMPORTED_MODULE_7__.Config.prototype.controls.font = (0,_s
 jodit_core_global__WEBPACK_IMPORTED_MODULE_0__.pluginSystem.add('font', font);
 
 
+/***/ }),
+
+/***/ 24939:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   GoogleFonts: function() { return /* binding */ GoogleFonts; },
+/* harmony export */   firstFamily: function() { return /* binding */ firstFamily; }
+/* harmony export */ });
+/* harmony import */ var _swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(69262);
+/* harmony import */ var _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73104);
+/* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
+/* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25045);
+/* harmony import */ var _swc_helpers_get__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(22248);
+/* harmony import */ var _swc_helpers_get_prototype_of__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66773);
+/* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34918);
+/* harmony import */ var _swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(50684);
+/* harmony import */ var _swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(42395);
+/* harmony import */ var jodit_core_component_view_component__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(59609);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(17338);
+/*!
+ * 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
+ */ /**
+ * @module plugins/font
+ */ 
+
+
+
+
+
+
+
+
+
+
+
+var CSS_URL = 'https://fonts.googleapis.com/css2';
+// `cursive` and `fantasy` stand in badly for a handwriting or display font
+var GENERIC_FAMILIES = {
+    serif: 'serif',
+    monospace: 'monospace'
+};
+var libraries = new Map();
+/**
+ * The fonts of the library at `url`, fetched once for every editor on the page
+ */ function library(jodit, url) {
+    var fonts = libraries.get(url);
+    if (!fonts) {
+        var ajax = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__.Ajax({
+            url: url,
+            method: 'GET'
+        }, jodit.o.defaultAjaxOptions);
+        fonts = ajax.send().then(function(response) {
+            return response.json();
+        })// A font without a regular style can't be asked for by its name alone
+        .then(function(param) {
+            var items = param.items;
+            return items.filter(function(font) {
+                return font.variants.includes('regular');
+            });
+        }).catch(function() {
+            libraries.delete(url);
+            return [];
+        }).finally(function() {
+            return ajax.destruct();
+        });
+        libraries.set(url, fonts);
+    }
+    return fonts;
+}
+/**
+ * The first family of a `font-family` value, unquoted and in lower case for
+ * comparing
+ */ function firstFamily(fontFamily) {
+    return fontFamily.split(',')[0].replace(/["']/g, '').trim().toLowerCase();
+}
+/**
+ * Loads fonts from Google Fonts: the whole of each font the content uses into
+ * the editor's document, and just the letters of its name for the font list
+ */ var GoogleFonts = /*#__PURE__*/ function(ViewComponent) {
+    "use strict";
+    (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_6__._)(GoogleFonts, ViewComponent);
+    function GoogleFonts(jodit) {
+        (0,_swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__._)(this, GoogleFonts);
+        var _this;
+        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, GoogleFonts, [
+            jodit
+        ]), /**
+	 * The library by lower-case family, empty until it arrives
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "fonts", new Map()), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "ready", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__links", []), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__loaded", new WeakMap()), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__previewed", new Set());
+        _this.ready = library(jodit, jodit.o.font.googleFonts.url).then(function(fonts) {
+            fonts.forEach(function(font) {
+                return _this.fonts.set(font.family.toLowerCase(), font);
+            });
+        });
+        return _this;
+    }
+    ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(GoogleFonts, [
+        {
+            key: "className",
+            value: function className() {
+                return 'GoogleFonts';
+            }
+        },
+        {
+            /**
+	 * The library's font named first in a `font-family` value
+	 */ key: "find",
+            value: function find(fontFamily) {
+                return this.fonts.get(firstFamily(fontFamily));
+            }
+        },
+        {
+            /**
+	 * The `font-family` value that applies a font
+	 */ key: "value",
+            value: function value(font) {
+                var _GENERIC_FAMILIES_font_category;
+                return "'".concat(font.family, "', ").concat((_GENERIC_FAMILIES_font_category = GENERIC_FAMILIES[font.category]) !== null && _GENERIC_FAMILIES_font_category !== void 0 ? _GENERIC_FAMILIES_font_category : 'sans-serif');
+            }
+        },
+        {
+            /**
+	 * Loads the regular, italic, bold and bold italic styles that a font has
+	 * into the editor's document
+	 */ key: "load",
+            value: function load(font) {
+                var loaded = this.__loadedInto(this.j.ed);
+                if (loaded.has(font.family)) {
+                    return;
+                }
+                loaded.add(font.family);
+                var styles = [
+                    [
+                        'regular',
+                        '0,400'
+                    ],
+                    [
+                        '700',
+                        '0,700'
+                    ],
+                    [
+                        'italic',
+                        '1,400'
+                    ],
+                    [
+                        '700italic',
+                        '1,700'
+                    ]
+                ].filter(function(param) {
+                    var _param = (0,_swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_7__._)(param, 1), variant = _param[0];
+                    return font.variants.includes(variant);
+                }).map(function(param) {
+                    var _param = (0,_swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_7__._)(param, 2), style = _param[1];
+                    return style;
+                });
+                this.__append(this.j.ed, "family=".concat(this.__family(font), ":ital,wght@").concat(styles.join(';')));
+            }
+        },
+        {
+            /**
+	 * Loads every font of the library that the content uses
+	 */ key: "loadUsed",
+            value: function loadUsed() {
+                var _this = this;
+                this.j.editor.querySelectorAll('[style*="font-family"]').forEach(function(element) {
+                    var font = _this.find(element.style.fontFamily);
+                    font && _this.load(font);
+                });
+            }
+        },
+        {
+            /**
+	 * Loads into the page just the letters of each font's name, so the font
+	 * list can show the name in its font
+	 */ key: "preview",
+            value: function preview(fonts) {
+                var _this = this;
+                var loaded = this.__loadedInto(this.j.od);
+                fonts = fonts.filter(function(font) {
+                    return !_this.__previewed.has(font.family) && !loaded.has(font.family);
+                });
+                if (!fonts.length) {
+                    return;
+                }
+                fonts.forEach(function(font) {
+                    return _this.__previewed.add(font.family);
+                });
+                var families = fonts.map(function(font) {
+                    return "family=".concat(_this.__family(font));
+                }), letters = new Set(fonts.map(function(font) {
+                    return font.family;
+                }).join(''));
+                this.__append(this.j.od, "".concat(families.join('&'), "&text=").concat(encodeURIComponent((0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_8__._)(letters).join(''))));
+            }
+        },
+        {
+            key: "__loadedInto",
+            value: function __loadedInto(doc) {
+                var _this___loaded_get;
+                var loaded = (_this___loaded_get = this.__loaded.get(doc)) !== null && _this___loaded_get !== void 0 ? _this___loaded_get : new Set();
+                this.__loaded.set(doc, loaded);
+                return loaded;
+            }
+        },
+        {
+            key: "__family",
+            value: function __family(font) {
+                return encodeURIComponent(font.family).replace(/%20/g, '+');
+            }
+        },
+        {
+            key: "__append",
+            value: function __append(doc, query) {
+                var link = doc.createElement('link');
+                link.rel = 'stylesheet';
+                link.href = "".concat(CSS_URL, "?").concat(query, "&display=swap");
+                doc.head.appendChild(link);
+                this.__links.push(link);
+            }
+        },
+        {
+            key: "destruct",
+            value: function destruct() {
+                this.__links.forEach(function(link) {
+                    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(link);
+                });
+                (0,_swc_helpers_get__WEBPACK_IMPORTED_MODULE_4__._)((0,_swc_helpers_get_prototype_of__WEBPACK_IMPORTED_MODULE_5__._)(GoogleFonts.prototype), "destruct", this).call(this);
+            }
+        }
+    ]);
+    return GoogleFonts;
+}(jodit_core_component_view_component__WEBPACK_IMPORTED_MODULE_9__.ViewComponent);
+
+
 /***/ }),
 
 /***/ 96863:
@@ -40370,12 +41227,13 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imagePropertie
 /* harmony export */ });
 /* harmony import */ var _swc_helpers_async_to_generator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49376);
 /* harmony import */ var _swc_helpers_ts_generator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3233);
-/* 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);
-/* harmony import */ var _align__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26633);
-/* harmony import */ var _link__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79310);
-/* harmony import */ var _margin__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(18380);
-/* harmony import */ var _size__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57339);
+/* harmony import */ var jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16849);
+/* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7909);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80991);
+/* harmony import */ var _align__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26633);
+/* harmony import */ var _link__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(79310);
+/* harmony import */ var _margin__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(18380);
+/* harmony import */ var _size__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(57339);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -40390,6 +41248,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imagePropertie
 
 
 
+
 /**
  * Read values from image and set it to state
  * @private
@@ -40398,29 +41257,29 @@ 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, j.o.imageAlignClasses);
+            (0,_align__WEBPACK_IMPORTED_MODULE_5__.readAlign)(image, values, (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_2__.getAlignClasses)(j, image));
             // Border radius
-            values.borderRadius = parseInt((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.cssInline)(image, 'border-radius') || '0', 10) || 0;
+            values.borderRadius = parseInt((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.cssInline)(image, 'border-radius') || '0', 10) || 0;
             // Id
-            values.id = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'id') || '';
+            values.id = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'id') || '';
             // Title
-            values.imageTitle = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'title') || '';
+            values.imageTitle = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'title') || '';
             // Alt
-            values.imageAlt = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'alt') || '';
+            values.imageAlt = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'alt') || '';
             // Style
-            values.style = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'style') || '';
+            values.style = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'style') || '';
             // Classes
-            values.classes = ((0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'class') || '').replace(/jodit_focused_image[\s]*/, '');
+            values.classes = ((0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'class') || '').replace(/jodit_focused_image[\s]*/, '');
             // Margins
-            (0,_margin__WEBPACK_IMPORTED_MODULE_6__.readMargins)(image, values, state);
+            (0,_margin__WEBPACK_IMPORTED_MODULE_7__.readMargins)(image, values, state);
             // Link
-            (0,_link__WEBPACK_IMPORTED_MODULE_5__.readLink)(state, j, values);
+            (0,_link__WEBPACK_IMPORTED_MODULE_6__.readLink)(state, j, values);
             // Src
-            values.imageSrc = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(image, 'src') || '';
+            values.imageSrc = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_3__.attr)(image, 'src') || '';
             // Image size
             return [
                 2,
-                (0,_size__WEBPACK_IMPORTED_MODULE_7__.readSizes)(image, values, state)
+                (0,_size__WEBPACK_IMPORTED_MODULE_8__.readSizes)(image, values, state)
             ];
         });
     })();
@@ -41646,7 +42505,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, j.o.imageAlignClasses);
+        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.hAlignElement)(image, align, (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.getAlignClasses)(j, image));
     }
 }
 
@@ -42520,6 +43379,7 @@ var cmd = function cmd(control) {
 /* 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);
+/* harmony import */ var jodit_core_helpers_utils_media_wrapper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(83314);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -42531,11 +43391,7 @@ 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;
-};
+
 // A Normal image sits where the text of its line is aligned (#1531)
 var lineAlign = function lineAlign(editor, elm) {
     var block = elm && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(elm, jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, editor.editor) || editor.editor;
@@ -42557,7 +43413,7 @@ var lineAlign = function lineAlign(editor, elm) {
     }
 };
 var currentAlign = function currentAlign(editor, elm) {
-    return elm ? (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getHAlign)(elm, alignClasses(editor, elm)) : 'normal';
+    return elm ? (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getHAlign)(elm, (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getAlignClasses)(editor, elm)) : 'normal';
 };
 var align = {
     name: 'left',
@@ -42584,23 +43440,25 @@ var align = {
     },
     exec: function exec(editor, elm, param) {
         var control = param.control;
-        if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, new Set([
+        // A media wrapper kept in the content (`mediaWrappers`) is aligned itself
+        if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isHTMLElement(elm) || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, new Set([
             'img',
             'jodit',
             'jodit-media'
-        ]))) {
+        ])) && (0,jodit_core_helpers_utils_media_wrapper__WEBPACK_IMPORTED_MODULE_5__.getMediaWrapper)(editor, elm) !== elm) {
             return;
         }
         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_3__.hAlignElement)(elm, command, alignClasses(editor, elm));
+        ;(0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.hAlignElement)(elm, command, (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getAlignClasses)(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_3__.hAlignElement)(elm.firstElementChild, command);
+            var media = elm.firstElementChild;
+            (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.hAlignElement)(media, command, (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getAlignClasses)(editor, media));
         }
         editor.synchronizeValues();
         editor.e.fire('recalcPositionPopup');
@@ -42713,17 +43571,18 @@ var align = {
 /* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25045);
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34918);
-/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31635);
-/* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38574);
-/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(27795);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(91206);
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(4099);
-/* harmony import */ var jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(56490);
-/* harmony import */ var jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(4274);
-/* harmony import */ var _config_config__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(89873);
+/* harmony import */ var _swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(42395);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(31635);
+/* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(38574);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(27795);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91206);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(4099);
+/* harmony import */ var jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(56490);
+/* harmony import */ var jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(4274);
+/* harmony import */ var _config_config__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(89873);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -42749,6 +43608,7 @@ var align = {
 
 
 
+
 /**
  * Plugin for show inline popup dialog
  */ var inlinePopup = /*#__PURE__*/ function(Plugin) {
@@ -42761,7 +43621,7 @@ var align = {
 	 * The user pressed a button inside the selection toolbar — after the
 	 * command fires `closeAllPopups`, the toolbar should be shown again
 	 * while the selection is still there. See #1238
-	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__reopenSelectionPopup", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "snapRange", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "elmsList", (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.keys)(_this.j.o.popup, false).filter(function(s) {
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__reopenSelectionPopup", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "snapRange", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "elmsList", (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.keys)(_this.j.o.popup, false).filter(function(s) {
             return !_this.isExcludedTarget(s);
         }));
         return _this;
@@ -42770,24 +43630,26 @@ var align = {
         {
             key: "popup",
             get: function get() {
-                return new jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_13__.Popup(this.jodit, false);
+                return new jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_14__.Popup(this.jodit, false);
             }
         },
         {
             key: "toolbar",
             get: function get() {
-                return (0,jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_14__.makeCollection)(this.jodit, this.popup);
+                return (0,jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_15__.makeCollection)(this.jodit, this.popup);
             }
         },
         {
             key: "onClick",
             value: function onClick(node) {
                 var _this = this;
-                var elements = this.elmsList, target = jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isTag(node, 'img') ? node : jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.closest(node, elements, this.j.editor);
-                if (target && this.canShowPopupForType(target.nodeName.toLowerCase())) {
+                var elements = this.elmsList, mediaWrapper = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.getMediaWrapper)(this.j, node), target = mediaWrapper !== null && mediaWrapper !== void 0 ? mediaWrapper : jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(node, 'img') ? node : jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.closest(node, elements, this.j.editor);
+                // A media wrapper kept in the content gets the media popup
+                var type = mediaWrapper ? 'jodit-media' : target === null || target === void 0 ? void 0 : target.nodeName.toLowerCase();
+                if (target && type && this.canShowPopupForType(type)) {
                     this.showPopup(function() {
-                        return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.position)(target, _this.j);
-                    }, target.nodeName.toLowerCase(), target);
+                        return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.position)(target, _this.j);
+                    }, type, target);
                     return false;
                 }
             }
@@ -42807,15 +43669,15 @@ var align = {
                     this.previousTarget = target;
                     var data = this.j.o.popup[type];
                     var content;
-                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isFunction)(data)) {
+                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isFunction)(data)) {
                         content = data(this.j, target, this.popup.close);
                     } else {
                         content = data;
                     }
-                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isArray)(content)) {
+                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isArray)(content)) {
                         var disabled = this.j.o.toolbarInlineDisabledButtons;
                         this.toolbar.build(disabled.length ? content.filter(function(item) {
-                            var name = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isString)(item) ? item : item.name;
+                            var name = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(item) ? item : item.name;
                             return !disabled.includes(name !== null && name !== void 0 ? name : '');
                         }) : content, target);
                         this.toolbar.buttonSize = this.j.o.toolbarButtonSize;
@@ -42833,7 +43695,7 @@ var align = {
             value: /**
 	 * Hide opened popup
 	 */ function hidePopup(type) {
-                if (this.popup.isOpened && (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isString)(type) || type === this.type)) {
+                if (this.popup.isOpened && (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(type) || type === this.type)) {
                     this.popup.close();
                 }
             }
@@ -42861,7 +43723,7 @@ var align = {
             value: /**
 	 * For some elements do not show popup
 	 */ function isExcludedTarget(type) {
-                return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.splitArray)(this.j.o.toolbarInlineDisableFor).map(function(a) {
+                return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.splitArray)(this.j.o.toolbarInlineDisableFor).map(function(a) {
                     return a.toLowerCase();
                 }).includes(type.toLowerCase());
             }
@@ -42873,15 +43735,15 @@ var align = {
                 this.j.e.on('getDiffButtons.mobile', function(toolbar) {
                     if (_this.toolbar === toolbar) {
                         var names = _this.toolbar.getButtonsNames();
-                        return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.toArray)(jodit.registeredButtons).filter(function(btn) {
+                        return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.toArray)(jodit.registeredButtons).filter(function(btn) {
                             return !_this.j.o.toolbarInlineDisabledButtons.includes(btn.name);
                         }).filter(function(item) {
-                            var name = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isString)(item) ? item : item.name;
+                            var name = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(item) ? item : item.name;
                             return name && name !== '|' && name !== '\n' && !names.includes(name);
                         });
                     }
                 }).on('hidePopup', this.hidePopup).on('showInlineToolbar', this.showInlineToolbar).on('showPopup', function(elm, rect, type) {
-                    _this.showPopup(rect, type || ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isString)(elm) ? elm : elm.nodeName), (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.isString)(elm) ? undefined : elm);
+                    _this.showPopup(rect, type || ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(elm) ? elm : elm.nodeName), (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(elm) ? undefined : elm);
                 }).on('mousedown keydown', this.onSelectionStart).on('change', function() {
                     if (_this.popup.isOpened && _this.previousTarget && !_this.previousTarget.parentNode) {
                         _this.hidePopup();
@@ -42900,7 +43762,7 @@ var align = {
         {
             key: "__onDocumentMouseDown",
             value: function __onDocumentMouseDown(e) {
-                if (this.popup.isOpened && this.type === 'selection' && e.target && jodit_core_ui__WEBPACK_IMPORTED_MODULE_12__.UIElement.closestElement(e.target, jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_13__.Popup)) {
+                if (this.popup.isOpened && this.type === 'selection' && e.target && jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.UIElement.closestElement(e.target, jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_14__.Popup)) {
                     this.__reopenSelectionPopup = true;
                 }
             }
@@ -42939,7 +43801,7 @@ var align = {
                 var rect = this.j.s.range.getBoundingClientRect();
                 var left = rect.left, top = rect.top;
                 if (this.j.iframe) {
-                    var offset = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.position)(this.j.iframe, this.j, true);
+                    var offset = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.position)(this.j.iframe, this.j, true);
                     left += offset.left;
                     top += offset.top;
                 }
@@ -42960,7 +43822,7 @@ var align = {
         {
             key: "onSelectionEnd",
             value: function onSelectionEnd(e) {
-                if (e && e.target && jodit_core_ui__WEBPACK_IMPORTED_MODULE_12__.UIElement.closestElement(e.target, jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_13__.Popup)) {
+                if (e && e.target && jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.UIElement.closestElement(e.target, jodit_core_ui_popup__WEBPACK_IMPORTED_MODULE_14__.Popup)) {
                     return;
                 }
                 var snapRange = this.snapRange, range = this.j.s.range;
@@ -43002,7 +43864,7 @@ var align = {
 	 * In not collapsed selection - only one image
 	 */ function isSelectedTarget(r) {
                 var sc = r.startContainer;
-                return jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isElement(sc) && sc === r.endContainer && jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isTag(sc.childNodes[r.startOffset], new Set((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.keys)(this.j.o.popup, false))) && r.startOffset === r.endOffset - 1;
+                return jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isElement(sc) && sc === r.endContainer && jodit_core_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.isTag(sc.childNodes[r.startOffset], new Set((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.keys)(this.j.o.popup, false))) && r.startOffset === r.endOffset - 1;
             }
         },
         {
@@ -43026,11 +43888,17 @@ var align = {
         {
             key: "_eventsList",
             value: function _eventsList() {
-                var el = this.elmsList;
+                var _this_j_o_mediaWrappers;
+                // Clicks on a media wrapper kept in the content (`mediaWrappers`)
+                var wrapperTags = Object.values((_this_j_o_mediaWrappers = this.j.o.mediaWrappers) !== null && _this_j_o_mediaWrappers !== void 0 ? _this_j_o_mediaWrappers : {}).map(function(param) {
+                    var tag = param.tag;
+                    return tag.toLowerCase();
+                });
+                var el = (0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_5__._)(new Set(this.elmsList.concat(wrapperTags)));
                 return el.map(function(e) {
-                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.camelCase)("click_".concat(e));
+                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.camelCase)("click_".concat(e));
                 }).concat(el.map(function(e) {
-                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.camelCase)("touchstart_".concat(e));
+                    return (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.camelCase)("touchstart_".concat(e));
                 })).join(' ');
             }
         },
@@ -43063,56 +43931,56 @@ var align = {
         }
     ]);
     return inlinePopup;
-}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_6__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_11__.Plugin));
+}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__.Plugin));
 (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(inlinePopup, "requires", [
     'select'
 ]);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.cache
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.cache
 ], inlinePopup.prototype, "popup", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.cache
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.cache
 ], inlinePopup.prototype, "toolbar", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "onClick", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.wait)(function(ctx) {
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.wait)(function(ctx) {
         return !ctx.j.isLocked;
     })
 ], inlinePopup.prototype, "showPopup", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.watch)([
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)([
         ':clickEditor',
         ':beforeCommandDelete',
         ':backSpaceAfterDelete'
     ]),
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "hidePopup", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.watch)(':outsideClick')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':outsideClick')
 ], inlinePopup.prototype, "onOutsideClick", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "__onDocumentMouseDown", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "__onCloseAllPopups", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "onSelectionStart", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "onSelectionEnd", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.debounce)(function(ctx) {
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.debounce)(function(ctx) {
         return ctx.defaultTimeout;
     })
 ], inlinePopup.prototype, "onSelectionChange", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_7__.autobind
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], inlinePopup.prototype, "showInlineToolbar", null);
-jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('inlinePopup', inlinePopup);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_10__.pluginSystem.add('inlinePopup', inlinePopup);
 
 
 /***/ }),
@@ -44074,7 +44942,7 @@ var lineHeight = /*#__PURE__*/ function(Plugin) {
                 try {
                     if (s.isCollapsed()) {
                         var fake = c.fake();
-                        s.insertNode(fake, false, false);
+                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.safeInsertNode(s.range, fake);
                         apply(fake);
                         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.safeRemove(fake);
                     } else {
@@ -44733,6 +45601,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.mediaBlocks = [
     'video',
     'audio'
 ];
+jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.mediaWrappers = {};
 
 
 /***/ }),
@@ -44768,11 +45637,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.mediaBlocks = [
  * Process `video` and `audio`
  */ function media(editor) {
     var keyFake = 'jodit_fake_wrapper';
-    var _editor_options = editor.options, mediaFakeTag = _editor_options.mediaFakeTag, mediaBlocks = _editor_options.mediaBlocks, mediaInFakeBlock = _editor_options.mediaInFakeBlock;
+    var _editor_options = editor.options, mediaFakeTag = _editor_options.mediaFakeTag, mediaBlocks = _editor_options.mediaBlocks, mediaInFakeBlock = _editor_options.mediaInFakeBlock, mediaWrappers = _editor_options.mediaWrappers;
     var wrap = function wrap(element) {
         if (element.parentNode && (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_4__.attr)(element.parentNode, 'data-jodit_iframe_wrapper')) {
             element = element.parentNode;
-        } else {
+        } else if (mediaWrappers[element.nodeName.toLowerCase()]) {
+            var _getMediaWrapper;
+            element = (_getMediaWrapper = (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_4__.getMediaWrapper)(editor, element)) !== null && _getMediaWrapper !== void 0 ? _getMediaWrapper : (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_4__.wrapMedia)(editor, element);
+        } else if (mediaInFakeBlock) {
             var wrapper = editor.createInside.element(mediaFakeTag, (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)({
                 'data-jodit-temp': 1,
                 contenteditable: false,
@@ -44789,12 +45661,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.mediaBlocks = [
             }
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__.Dom.append(wrapper, element);
             element = wrapper;
+        } else {
+            return;
         }
         editor.e.off(element, 'mousedown.select touchstart.select').on(element, 'mousedown.select touchstart.select', function() {
             editor.s.setCursorAfter(element);
         });
     };
-    if (mediaInFakeBlock) {
+    if (mediaInFakeBlock || Object.keys(mediaWrappers).length) {
         editor.e.on('afterGetValueFromEditor', function(data) {
             var rxp = new RegExp("<".concat(mediaFakeTag, "[^>]+data-").concat(keyFake, "[^>]+>([^]+?)</").concat(mediaFakeTag, ">"), 'ig');
             if (rxp.test(data.value)) {
@@ -46374,7 +47248,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.useInputsPlaceholder
                 _this.placeholderElm.innerHTML = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_12__.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 ' + 'internalChange.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 afterCommand.placeholder', _this.toggle).on(window, 'load', _this.toggle);
             _this.addNativeListeners();
             _this.toggle();
         });
@@ -50396,10 +51270,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 /* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25045);
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34918);
-/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(81937);
-/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23211);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(65946);
-/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(94193);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(49574);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(65946);
+/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(94193);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -50415,6 +51291,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 
 
 
+
+
 var AceEditor = /*#__PURE__*/ function(SourceEditor) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__._)(AceEditor, SourceEditor);
@@ -50429,7 +51307,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             _this.j.e.fire('focus', e);
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "proxyOnMouseDown", function(e) {
             _this.j.e.fire('mousedown', e);
-        });
+        }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__settingValue", false);
         return _this;
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(AceEditor, [
@@ -50511,7 +51389,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                         return;
                     }
                     var fakeMirror = _this.j.c.div('jodit-source__mirror-fake');
-                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_6__.Dom.append(_this.container, fakeMirror);
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(_this.container, fakeMirror);
                     var ace = editor.ow.ace;
                     _this.instance = ace.edit(fakeMirror);
                     if (editor.o.direction === 'rtl') {
@@ -50532,15 +51410,15 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                     _this.instance.setOption('wrap', editor.o.sourceEditorNativeOptions.wrap);
                     _this.instance.getSession().setUseWorker(false);
                     _this.instance.$blockScrolling = Infinity;
-                    _this.instance.on('change', _this.toWYSIWYG);
+                    _this.instance.on('change', _this.__onChange);
                     _this.instance.on('focus', _this.proxyOnFocus);
                     _this.instance.on('mousedown', _this.proxyOnMouseDown);
                     _this.instance.on('blur', _this.proxyOnBlur);
-                    if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_WYSIWYG) {
+                    if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_WYSIWYG) {
                         _this.setValue(_this.getValue());
                     }
                     var onResize = _this.j.async.throttle(function() {
-                        if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_WYSIWYG) {
+                        if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_WYSIWYG) {
                             return;
                         }
                         var hasFocus = _this.instance.isFocused();
@@ -50558,7 +51436,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                 };
                 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) {
+                    if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_SPLIT) {
                         return;
                     }
                     // ACE (~400 KiB from the CDN) is only needed once the source view
@@ -50567,7 +51445,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                     if (!_this.aceExists()) {
                         if (!loading) {
                             loading = true;
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
+                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
                                 return null;
                             });
                         }
@@ -50585,7 +51463,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             key: "destruct",
             value: function destruct() {
                 var _this_j_events, _this_j;
-                this.instance.off('change', this.toWYSIWYG);
+                this.instance.off('change', this.__onChange);
                 this.instance.off('focus', this.proxyOnFocus);
                 this.instance.off('mousedown', this.proxyOnMouseDown);
                 this.instance.destroy();
@@ -50597,14 +51475,33 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             value: function setValue(value) {
                 if (!this.j.o.editHTMLDocumentMode && this.j.o.beautifyHTML) {
                     var html = this.j.e.fire('beautifyHTML', value);
-                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.isString)(html)) {
+                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.isString)(html)) {
                         value = html;
                     }
                 }
-                this.instance.setValue(value);
+                // ACE reports its own `setValue` as two changes, the removal of the
+                // old text and the insertion of the new one. Fed back into the
+                // editor they became two history entries, `content -> ''` and
+                // `'' -> content`, so the first undo after a switch to the source
+                // view and back emptied the editor. The text came from the editor
+                // in the first place, so there is nothing to send back.
+                this.__settingValue = true;
+                try {
+                    this.instance.setValue(value);
+                } finally{
+                    this.__settingValue = false;
+                }
                 this.instance.clearSelection();
             }
         },
+        {
+            key: "__onChange",
+            value: function __onChange() {
+                if (!this.__settingValue) {
+                    this.toWYSIWYG();
+                }
+            }
+        },
         {
             key: "getValue",
             value: function getValue() {
@@ -50707,7 +51604,10 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
         }
     ]);
     return AceEditor;
-}(jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_8__.SourceEditor);
+}(jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_10__.SourceEditor);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
+    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_7__.autobind
+], AceEditor.prototype, "__onChange", null);
 
 
 /***/ }),
@@ -54005,16 +54905,34 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('toolbarNavigat
 
 
 
+// Media the popup inserts go in their wrapper (see `mediaWrappers`), aligned
+// with `mediaDefaultAlign`
+function prepareMedia(jodit, element) {
+    var media = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.wrapMedia)(jodit, element);
+    var mediaDefaultAlign = jodit.o.mediaDefaultAlign;
+    if (mediaDefaultAlign && mediaDefaultAlign !== 'normal') {
+        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.hAlignElement)(media, mediaDefaultAlign, (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.getAlignClasses)(jodit, media));
+    }
+    return media;
+}
 function insertVideos(data) {
     var _this = this;
     var _data_files;
     (_data_files = data.files) === null || _data_files === void 0 ? void 0 : _data_files.forEach(function(file) {
-        _this.s.insertNode(_this.createInside.element('video', {
+        _this.s.insertNode(prepareMedia(_this, _this.createInside.element('video', {
             controls: '',
             src: data.baseurl + file
-        }));
+        })));
     });
 }
+// Embed code that is one element is prepared as media; other code goes in as
+// it is
+function prepareEmbedCode(jodit, code) {
+    var box = jodit.createInside.div();
+    box.innerHTML = code.trim();
+    var element = box.firstElementChild;
+    return element && box.childNodes.length === 1 ? prepareMedia(jodit, element) : code;
+}
 jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.video = {
     parseUrlToVideoEmbed: jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed,
     defaultWidth: 400,
@@ -54056,7 +54974,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.video = {
             ])
         ]), tabs = [], insertCode = function insertCode(code) {
             jodit.s.restore();
-            jodit.s.insertHTML(code);
+            jodit.s.insertHTML(prepareEmbedCode(jodit, code));
             close();
         };
         jodit.s.save();