jodit 4.18.11 → 4.18.12

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.18.11
+ * Version: v4.18.12
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2153,7 +2153,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.18.11";
+var APP_VERSION = "4.18.12";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -15209,6 +15209,7 @@ function elementsEqualAttributes(elm1, elm2) {
  * Replaces `ul->ol` or `ol->ul`, apply styles to the list, or remove a list item from it
  * @private
  */ function toggleOrderedList(commitStyle, li, jodit, mode) {
+    var collapsed = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
     if (!li) {
         return mode;
     }
@@ -15237,16 +15238,60 @@ function elementsEqualAttributes(elm1, elm2) {
         }
         // ul => ol, ol => ul or ul => ul.class1
         if (mode === jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE || isChangeMode || !isSameList) {
-            var wrapper = unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, list, li, jodit, commitStyle);
-            var newList = (0,_wrap_list__WEBPACK_IMPORTED_MODULE_7__.wrapList)(commitStyle, wrapper, jodit);
+            // With just a caret, Word converts the whole list
+            var items = collapsed && !isSameList ? Array.from(list.children).filter(function(item) {
+                return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(item);
+            }) : [
+                li
+            ];
+            var newList;
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                var _loop = function() {
+                    var item = _step.value;
+                    newList = keepNumbering(item, function(itemList) {
+                        return (0,_wrap_list__WEBPACK_IMPORTED_MODULE_7__.wrapList)(commitStyle, unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, itemList, item, jodit, commitStyle), jodit);
+                    });
+                };
+                for(var _iterator = items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
             hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, newList, commitStyle);
             return jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE;
         }
     }
-    var wrapper1 = unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, list, li, jodit, commitStyle);
-    hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, wrapper1, commitStyle);
+    var wrapper = keepNumbering(li, function(itemList) {
+        return unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, itemList, li, jodit, commitStyle);
+    });
+    hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP, wrapper, commitStyle);
     return jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.UNWRAP;
 }
+/**
+ * Takes `item` out of its list with `takeOut`, and carries a numbered list's
+ * count on past it, as Word does: 1, a bullet, then 2
+ */ function keepNumbering(item, takeOut) {
+    var list = item.parentElement;
+    var rest = item.nextElementSibling;
+    var next = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(list, 'ol') ? (parseInt(list.getAttribute('start') || '1', 10) || 1) + Array.from(list.children).indexOf(item) : 0;
+    var result = takeOut(list);
+    var restList = rest === null || rest === void 0 ? void 0 : rest.parentElement;
+    if (next && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(restList, 'ol')) {
+        next > 1 ? restList.setAttribute('start', String(next)) : restList.removeAttribute('start');
+    }
+    return result;
+}
 /**
  * Other attributes, such as a class, still move the items into a new list,
  * where the `beforeWrapList` hook can add markup to each of them
@@ -16117,7 +16162,7 @@ var transactions = (_obj = {}, (0,_swc_helpers_define_property__WEBPACK_IMPORTED
 }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(_obj, states.TOGGLE_LIST, {
     exec: function exec(value) {
         return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_2__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_1__._)({}, value), {
-            mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_6__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode),
+            mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_6__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode, value.collapsed),
             next: states.END
         });
     }

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.18.11
+ * Version: v4.18.12
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
 	/*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.18.11
+ * Version: v4.18.12
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */