@contentful/field-editor-rich-text 2.0.0-next.25 → 2.0.0-next.26

package/dist/field-editor-rich-text.esm.js

@@ -3861,37 +3861,44 @@ var moveListItems = function moveListItems(editor, _temp) {
  * Credit: Modified version of Plate's list plugin
  * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
  */
-var listTypes = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
+
+function hasUnliftedListItems(editor, at) {
+  return Editor.nodes(editor, {
+    at: at,
+    match: function match(node, path) {
+      return Element.isElement(node) && node.type === BLOCKS.LIST_ITEM && path.length >= 2;
+    }
+  }).next().done;
+}
+
 var unwrapList = function unwrapList(editor, _temp) {
   var _ref = _temp === void 0 ? {} : _temp,
       at = _ref.at;
 
   Editor.withoutNormalizing(editor, function () {
     do {
-      unwrapNodes(editor, {
+      // lift list items to the root level
+      Transforms.liftNodes(editor, {
         at: at,
-        match: {
-          type: BLOCKS.LIST_ITEM
-        },
-        split: true
-      });
-      unwrapNodes(editor, {
-        at: at,
-        match: {
-          type: listTypes
+        match: function match(node) {
+          return Element.isElement(node) && node.type === BLOCKS.LIST_ITEM;
         },
-        split: true
+        mode: 'lowest'
       });
-    } while (getAbove(editor, {
+    } while (!hasUnliftedListItems(editor, at)); // finally unwrap all lifted items
+
+
+    unwrapNodes(editor, {
+      at: at,
       match: {
-        type: listTypes,
-        at: at
-      }
-    }));
+        type: BLOCKS.LIST_ITEM
+      },
+      split: false
+    });
   });
 };
 
-var listTypes$1 = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
+var listTypes = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
 var toggleList = function toggleList(editor, _ref) {
   var type = _ref.type;
   return Editor.withoutNormalizing(editor, function () {
@@ -3912,7 +3919,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n) {
-              return listTypes$1.includes(n.type);
+              return listTypes.includes(n.type);
             },
             mode: 'lowest'
           });
@@ -3953,19 +3960,25 @@ var toggleList = function toggleList(editor, _ref) {
 
       var commonEntry = Node.common(editor, startPoint.path, endPoint.path);
 
-      if (listTypes$1.includes(commonEntry[0].type) || commonEntry[0].type === BLOCKS.LIST_ITEM) {
-        if (commonEntry[0].type !== type) {
+      if (listTypes.includes(commonEntry[0].type) || commonEntry[0].type === BLOCKS.LIST_ITEM) {
+        var listType = commonEntry[0].type;
+
+        if (commonEntry[0].type === BLOCKS.LIST_ITEM) {
+          listType = Editor.parent(editor, commonEntry[1])[0].type;
+        }
+
+        if (listType !== type) {
           var startList = findNode(editor, {
             at: Range.start(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
           var endList = findNode(editor, {
             at: Range.end(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
@@ -3980,7 +3993,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n, path) {
-              return listTypes$1.includes(n.type) && path.length >= rangeLength;
+              return listTypes.includes(n.type) && path.length >= rangeLength;
             },
             mode: 'all'
           });
@@ -3998,7 +4011,7 @@ var toggleList = function toggleList(editor, _ref) {
         }).reverse();
 
         _nodes.forEach(function (n) {
-          if (listTypes$1.includes(n[0].type)) {
+          if (listTypes.includes(n[0].type)) {
             setNodes(editor, {
               type: type
             }, {