jodit 4.18.11 → 4.18.12

package/es2015/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
  */
@@ -1829,7 +1829,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.18.11";
+ */ const APP_VERSION = "4.18.12";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -13294,7 +13294,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) {
+ */ function toggleOrderedList(commitStyle, li, jodit, mode, collapsed = false) {
     if (!li) {
         return mode;
     }
@@ -13323,16 +13323,36 @@ 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) {
-            const wrapper = unwrapList(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, list, li, jodit, commitStyle);
-            const newList = (0,_wrap_list__WEBPACK_IMPORTED_MODULE_7__.wrapList)(commitStyle, wrapper, jodit);
+            // With just a caret, Word converts the whole list
+            const items = collapsed && !isSameList ? Array.from(list.children).filter((item)=>jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(item)) : [
+                li
+            ];
+            let newList;
+            for (const item of items){
+                newList = keepNumbering(item, (itemList)=>(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));
+            }
             hook(jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE, newList, commitStyle);
             return jodit_core_selection_style_constants__WEBPACK_IMPORTED_MODULE_6__.REPLACE;
         }
     }
-    const wrapper = unwrapList((/* inlined export .UNWRAP */"unwrap"), list, li, jodit, commitStyle);
+    const wrapper = keepNumbering(li, (itemList)=>unwrapList((/* inlined export .UNWRAP */"unwrap"), itemList, li, jodit, commitStyle));
     hook((/* inlined export .UNWRAP */"unwrap"), wrapper, commitStyle);
     return (/* inlined export .UNWRAP */"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) {
+    const list = item.parentElement;
+    const rest = item.nextElementSibling;
+    const 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;
+    const result = takeOut(list);
+    const 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
@@ -14107,7 +14127,7 @@ const transactions = {
     [states.TOGGLE_LIST]: {
         exec (value) {
             return (0,_swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_1__._)((0,_swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_0__._)({}, value), {
-                mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_5__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode),
+                mode: (0,jodit_core_selection_style_api__WEBPACK_IMPORTED_MODULE_5__.toggleOrderedList)(value.style, value.element, value.jodit, value.mode, value.collapsed),
                 next: states.END
             });
         }