@atlaskit/editor-plugin-block-menu 3.0.1 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.1.0
+
+### Minor Changes
+
+- [`cebd8f9171426`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cebd8f9171426) -
+  [ux] ED-29159 Implement transform task inside lists - handle logic
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.0.2
+
+### Patch Changes
+
+- [`d6f3f3b09ebff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d6f3f3b09ebff) -
+  [ux] ED-29255 Fix layout transformation when column is empty, transform nested lists to match
+  container to list transformations and fix task list transforms when task item is empty
+
 ## 3.0.1
 
 ### Patch Changes

package/dist/cjs/editor-commands/transforms/inline-node-transforms.js

@@ -11,7 +11,7 @@ var getInlineNodeTextContent = exports.getInlineNodeTextContent = function getIn
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(function (node) {
-    if (['paragraph', 'heading'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
       node.content.forEach(function (inlineNode) {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;

package/dist/cjs/editor-commands/transforms/layout/utils.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unwrapLayoutNodesToTextNodes = exports.transformToListNode = exports.convertUnwrappedLayoutContent = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _transforms = require("@atlaskit/editor-common/transforms");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _inlineNodeTransforms = require("../inline-node-transforms");
-var _transformBetweenListTypes = require("../list/transformBetweenListTypes");
 var _utils2 = require("../utils");
 var unwrapLayoutNodesToTextNodes = exports.unwrapLayoutNodesToTextNodes = function unwrapLayoutNodesToTextNodes(context, finalTargetNodeType) {
   var tr = context.tr,
@@ -80,57 +80,104 @@ var unwrapLayoutNodesToTextNodes = exports.unwrapLayoutNodesToTextNodes = functi
   }
   return [sourceNode];
 };
-var transformToBlockNode = function transformToBlockNode(nodes, targetNodeType, schema) {
-  if (targetNodeType === schema.nodes.codeBlock) {
-    var newNodes = [];
-    nodes.forEach(function (node) {
-      if (node.isTextblock) {
-        var inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(node));
-
-        // For first node, add directly
-        if (newNodes.length === 0) {
-          newNodes.push({
-            canBeTransformed: true,
-            content: [inlineTextContent]
-          });
-        } else {
-          // Check if last node can also be transformed, if yes then append content
-          var lastItem = newNodes[newNodes.length - 1];
-          if (lastItem.canBeTransformed) {
-            newNodes[newNodes.length - 1] = {
-              content: [].concat((0, _toConsumableArray2.default)(lastItem.content), [inlineTextContent]),
-              canBeTransformed: true
-            };
-          } else {
-            newNodes.push({
-              content: [inlineTextContent],
-              canBeTransformed: true
-            });
-          }
-        }
+var transformToCodeBlock = function transformToCodeBlock(nodes, schema) {
+  var newNodes = [];
+  var addToNewNodes = function addToNewNodes(content) {
+    if (newNodes.length === 0) {
+      newNodes.push({
+        canBeTransformed: true,
+        content: content
+      });
+    } else {
+      // Check if last node can also be transformed, if yes then append content
+      var lastItem = newNodes[newNodes.length - 1];
+      if (lastItem.canBeTransformed) {
+        newNodes[newNodes.length - 1] = {
+          content: [].concat((0, _toConsumableArray2.default)(lastItem.content), (0, _toConsumableArray2.default)(content)),
+          canBeTransformed: true
+        };
       } else {
-        // If not text block, then cannot be transformed
         newNodes.push({
-          canBeTransformed: false,
-          content: node
+          content: content,
+          canBeTransformed: true
         });
       }
-    });
-    return newNodes.map(function (_ref) {
-      var canBeTransformed = _ref.canBeTransformed,
-        content = _ref.content;
-      if (canBeTransformed) {
-        var text = content.join('\n');
-        if (text === '') {
-          return undefined;
+    }
+  };
+  nodes.forEach(function (node) {
+    if (node.isTextblock) {
+      var inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(node));
+
+      // For first node, add directly
+      addToNewNodes([inlineTextContent]);
+    } else if ((0, _utils2.isListNode)(node)) {
+      var textContent = [];
+      var listItemType = node.type === schema.nodes.taskList ? schema.nodes.taskItem : schema.nodes.listItem;
+      var listItems = (0, _utils.findChildrenByType)(node, listItemType).map(function (item) {
+        return item.node;
+      });
+      listItems.forEach(function (listItem) {
+        if (listItem.type === schema.nodes.taskItem) {
+          var _inlineTextContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(listItem));
+          textContent.push(_inlineTextContent);
+        } else {
+          var _inlineTextContent2 = (0, _inlineNodeTransforms.getInlineNodeTextContent)(listItem.content);
+          textContent.push(_inlineTextContent2);
         }
-        return targetNodeType.createChecked(null, schema.text(text));
-      } else {
-        return content;
+      });
+      addToNewNodes(textContent);
+    } else {
+      // If not text block or list node, then cannot be transformed
+      newNodes.push({
+        canBeTransformed: false,
+        content: node
+      });
+    }
+  });
+  return newNodes.map(function (_ref) {
+    var canBeTransformed = _ref.canBeTransformed,
+      content = _ref.content;
+    if (canBeTransformed) {
+      var text = content.join('\n');
+      if (text === '') {
+        return undefined;
       }
-    }).filter(Boolean);
+      return schema.nodes.codeBlock.createChecked(null, schema.text(text));
+    } else {
+      return content;
+    }
+  }).filter(Boolean);
+};
+var transformToBlockNode = function transformToBlockNode(nodes, targetNodeType, schema) {
+  if (targetNodeType === schema.nodes.codeBlock) {
+    return transformToCodeBlock(nodes, schema);
   }
-  return nodes;
+  var newNodes = [];
+  nodes.forEach(function (node) {
+    if ((0, _utils2.isListNode)(node)) {
+      var listItemType = node.type === schema.nodes.taskList ? schema.nodes.taskItem : schema.nodes.listItem;
+      var listItems = (0, _utils.findChildrenByType)(node, listItemType).map(function (item) {
+        return item.node;
+      });
+      listItems.forEach(function (listItem) {
+        if (listItem.type === schema.nodes.taskItem) {
+          var inlineContent = (0, _toConsumableArray2.default)(listItem.content.content);
+          if (inlineContent.length > 0) {
+            newNodes.push(targetNodeType.createChecked(null, inlineContent));
+          }
+        } else {
+          listItem.forEach(function (child) {
+            if ((0, _utils2.isHeadingOrParagraphNode)(child)) {
+              newNodes.push(targetNodeType.createChecked(null, (0, _toConsumableArray2.default)(child.content.content)));
+            }
+          });
+        }
+      });
+    } else {
+      newNodes.push(node);
+    }
+  });
+  return newNodes;
 };
 var transformToContainerNode = function transformToContainerNode(nodes, targetNodeType) {
   var newNodes = [];
@@ -190,7 +237,7 @@ var transformToContainerNode = function transformToContainerNode(nodes, targetNo
   });
 };
 var transformToListNode = exports.transformToListNode = function transformToListNode(nodes, targetNodeType, schema) {
-  var isTargetTask = (0, _utils2.isTaskList)(targetNodeType);
+  var isTargetTask = (0, _transforms.isTaskList)(targetNodeType);
   var listItems = [];
   var listItemType = isTargetTask ? schema.nodes.taskItem : schema.nodes.listItem;
   var isValid = (0, _utils2.getContentSupportChecker)(listItemType);
@@ -206,16 +253,16 @@ var transformToListNode = exports.transformToListNode = function transformToList
 
       // If the node is a list, we may need to transform it
       if ((0, _utils2.isListNode)(node)) {
-        var isSourceBulletOrOrdered = (0, _utils2.isBulletOrOrderedList)(node.type);
-        var _isTargetTask = (0, _utils2.isTaskList)(targetNodeType);
-        var isSourceTask = (0, _utils2.isTaskList)(node.type);
-        var isTargetBulletOrOrdered = (0, _utils2.isBulletOrOrderedList)(targetNodeType);
-        var supportedListTypes = (0, _utils2.getSupportedListTypesSet)(schema.nodes);
+        var isSourceBulletOrOrdered = (0, _transforms.isBulletOrOrderedList)(node.type);
+        var _isTargetTask = (0, _transforms.isTaskList)(targetNodeType);
+        var isSourceTask = (0, _transforms.isTaskList)(node.type);
+        var isTargetBulletOrOrdered = (0, _transforms.isBulletOrOrderedList)(targetNodeType);
+        var supportedListTypes = (0, _transforms.getSupportedListTypesSet)(schema.nodes);
         if (node.type === targetNodeType) {
           // For the same list type, we can keep the structure
           newListItems = node.content.content;
         } else {
-          var newList = (0, _transformBetweenListTypes.transformListRecursively)({
+          var newList = (0, _transforms.transformListRecursively)({
             isSourceBulletOrOrdered: isSourceBulletOrOrdered,
             isSourceTask: isSourceTask,
             isTargetBulletOrOrdered: isTargetBulletOrOrdered,
@@ -276,6 +323,9 @@ var transformToListNode = exports.transformToListNode = function transformToList
   });
 };
 var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema) {
+  if (nodes.length === 1 && nodes[0].content.size === 0) {
+    return nodes;
+  }
   if ((0, _utils2.isBlockNodeType)(targetNodeType)) {
     return transformToBlockNode(nodes, targetNodeType, schema);
   }

package/dist/cjs/editor-commands/transforms/list-transforms.js

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformListToContainer = exports.transformListToBlockNodes = exports.transformListNode = exports.transformBlockToList = exports.transformBetweenListTypes = exports.liftListToBlockType = void 0;
+exports.transformListToContainer = exports.transformListToBlockNodes = exports.transformListNode = exports.transformBlockToList = exports.liftListToBlockType = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _transforms = require("@atlaskit/editor-common/transforms");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _transformBetweenListTypes = require("./list/transformBetweenListTypes");
 var _transformOrderedUnorderedListToBlockNodes = require("./list/transformOrderedUnorderedListToBlockNodes");
 var _transformTaskListToBlockNodes = require("./list/transformTaskListToBlockNodes");
 var _transformToTaskList = require("./list/transformToTaskList");
@@ -30,7 +30,7 @@ var transformBlockToList = exports.transformBlockToList = function transformBloc
     return null;
   }
   var nodes = tr.doc.type.schema.nodes;
-  var isTargetTask = (0, _utils.isTaskList)(targetNodeType);
+  var isTargetTask = (0, _transforms.isTaskList)(targetNodeType);
 
   // Handle task lists differently due to their structure
   if (isTargetTask) {
@@ -145,7 +145,7 @@ var transformListNode = exports.transformListNode = function transformListNode(c
 
   // Transform between list types
   if ((0, _utils.isListNodeType)(targetNodeType)) {
-    return transformBetweenListTypes(context);
+    return (0, _transforms.transformBetweenListTypes)(context);
   }
   return null;
 };
@@ -158,51 +158,4 @@ var liftListToBlockType = exports.liftListToBlockType = function liftListToBlock
   return null;
 };
 
-/**
- * Transform between different list types
- */
-var transformBetweenListTypes = exports.transformBetweenListTypes = function transformBetweenListTypes(context) {
-  var tr = context.tr,
-    sourceNode = context.sourceNode,
-    sourcePos = context.sourcePos,
-    targetNodeType = context.targetNodeType;
-  var nodes = tr.doc.type.schema.nodes;
-  var sourceListType = sourceNode.type;
-  var isSourceBulletOrOrdered = (0, _utils.isBulletOrOrderedList)(sourceListType);
-  var isTargetTask = (0, _utils.isTaskList)(targetNodeType);
-  var isSourceTask = (0, _utils.isTaskList)(sourceListType);
-  var isTargetBulletOrOrdered = (0, _utils.isBulletOrOrderedList)(targetNodeType);
-
-  // Check if we need structure transformation
-  var needsStructureTransform = isSourceBulletOrOrdered && isTargetTask || isSourceTask && isTargetBulletOrOrdered;
-  try {
-    if (!needsStructureTransform) {
-      // Simple type change for same structure lists (bullet <-> ordered)
-      // Apply to the main list
-      tr.setNodeMarkup(sourcePos, targetNodeType);
-
-      // Apply to nested lists
-      var listStart = sourcePos;
-      var listEnd = sourcePos + sourceNode.nodeSize;
-      var supportedListTypesSet = (0, _utils.getSupportedListTypesSet)(nodes);
-      tr.doc.nodesBetween(listStart, listEnd, function (node, pos, parent) {
-        // Only process nested lists (not the root list we already handled)
-        if (supportedListTypesSet.has(node.type) && pos !== sourcePos) {
-          var isNestedList = parent && (supportedListTypesSet.has(parent.type) || parent.type === nodes.listItem);
-          if (isNestedList) {
-            var shouldTransformNode = node.type === sourceListType || (0, _utils.isBulletOrOrderedList)(node.type) && isTargetBulletOrOrdered;
-            if (shouldTransformNode) {
-              tr.setNodeMarkup(pos, targetNodeType);
-            }
-          }
-        }
-        return true; // Continue traversing
-      });
-      return tr;
-    } else {
-      return (0, _transformBetweenListTypes.transformListStructure)(context);
-    }
-  } catch (_unused) {
-    return null;
-  }
-};
+// transformBetweenListTypes is now imported from @atlaskit/editor-common/transforms

package/dist/cjs/editor-commands/transforms/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTaskList = exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isLayoutNode = exports.isHeadingOrParagraphNode = exports.isContainerNodeType = exports.isContainerNode = exports.isBulletOrOrderedList = exports.isBlockNodeType = exports.isBlockNodeForExtraction = exports.isBlockNode = exports.getTargetNodeInfo = exports.getSupportedListTypesSet = exports.getSupportedListTypes = exports.getContentSupportChecker = exports.filterMarksForTargetNodeType = exports.convertNodeToInlineContent = exports.convertCodeBlockContentToParagraphs = void 0;
+exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isLayoutNode = exports.isHeadingOrParagraphNode = exports.isContainerNodeType = exports.isContainerNode = exports.isBlockNodeType = exports.isBlockNodeForExtraction = exports.isBlockNode = exports.getTargetNodeInfo = exports.getContentSupportChecker = exports.filterMarksForTargetNodeType = exports.convertNodeToInlineContent = exports.convertCodeBlockContentToParagraphs = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var getTargetNodeInfo = exports.getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
   switch (targetType) {
@@ -116,19 +116,8 @@ var isContainerNodeType = exports.isContainerNodeType = function isContainerNode
   return ['panel', 'expand', 'blockquote'].includes(nodeType.name);
 };
 
-// List type utilities
-var isBulletOrOrderedList = exports.isBulletOrOrderedList = function isBulletOrOrderedList(nodeType) {
-  return nodeType.name === 'bulletList' || nodeType.name === 'orderedList';
-};
-var isTaskList = exports.isTaskList = function isTaskList(nodeType) {
-  return nodeType.name === 'taskList';
-};
-var getSupportedListTypes = exports.getSupportedListTypes = function getSupportedListTypes(nodes) {
-  return [nodes.bulletList, nodes.orderedList, nodes.taskList].filter(Boolean);
-};
-var getSupportedListTypesSet = exports.getSupportedListTypesSet = function getSupportedListTypesSet(nodes) {
-  return new Set(getSupportedListTypes(nodes));
-};
+// List type utilities moved to @atlaskit/editor-common/transforms
+
 var isLayoutNodeType = exports.isLayoutNodeType = function isLayoutNodeType(nodeType) {
   return nodeType.name === 'layoutSection';
 };

package/dist/es2019/editor-commands/transforms/inline-node-transforms.js

@@ -5,7 +5,7 @@ export const getInlineNodeTextContent = sourceContent => {
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(node => {
-    if (['paragraph', 'heading'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
       node.content.forEach(inlineNode => {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;

package/dist/es2019/editor-commands/transforms/layout/utils.js

@@ -1,8 +1,8 @@
+import { transformListRecursively, isBulletOrOrderedList, isTaskList, getSupportedListTypesSet } from '@atlaskit/editor-common/transforms';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
 import { getInlineNodeTextContent } from '../inline-node-transforms';
-import { transformListRecursively } from '../list/transformBetweenListTypes';
-import { getContentSupportChecker, getSupportedListTypesSet, isBlockNode, isBlockNodeForExtraction, isBlockNodeType, isBulletOrOrderedList, isContainerNode, isContainerNodeType, isHeadingOrParagraphNode, isListNode, isListNodeType, isTaskList } from '../utils';
+import { getContentSupportChecker, isBlockNode, isBlockNodeForExtraction, isBlockNodeType, isContainerNode, isContainerNodeType, isHeadingOrParagraphNode, isListNode, isListNodeType } from '../utils';
 export const unwrapLayoutNodesToTextNodes = (context, finalTargetNodeType) => {
   const {
     tr,
@@ -62,58 +62,101 @@ export const unwrapLayoutNodesToTextNodes = (context, finalTargetNodeType) => {
   }
   return [sourceNode];
 };
-const transformToBlockNode = (nodes, targetNodeType, schema) => {
-  if (targetNodeType === schema.nodes.codeBlock) {
-    const newNodes = [];
-    nodes.forEach(node => {
-      if (node.isTextblock) {
-        const inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node));
-
-        // For first node, add directly
-        if (newNodes.length === 0) {
-          newNodes.push({
-            canBeTransformed: true,
-            content: [inlineTextContent]
-          });
-        } else {
-          // Check if last node can also be transformed, if yes then append content
-          const lastItem = newNodes[newNodes.length - 1];
-          if (lastItem.canBeTransformed) {
-            newNodes[newNodes.length - 1] = {
-              content: [...lastItem.content, inlineTextContent],
-              canBeTransformed: true
-            };
-          } else {
-            newNodes.push({
-              content: [inlineTextContent],
-              canBeTransformed: true
-            });
-          }
-        }
+const transformToCodeBlock = (nodes, schema) => {
+  const newNodes = [];
+  const addToNewNodes = content => {
+    if (newNodes.length === 0) {
+      newNodes.push({
+        canBeTransformed: true,
+        content
+      });
+    } else {
+      // Check if last node can also be transformed, if yes then append content
+      const lastItem = newNodes[newNodes.length - 1];
+      if (lastItem.canBeTransformed) {
+        newNodes[newNodes.length - 1] = {
+          content: [...lastItem.content, ...content],
+          canBeTransformed: true
+        };
       } else {
-        // If not text block, then cannot be transformed
         newNodes.push({
-          canBeTransformed: false,
-          content: node
+          content,
+          canBeTransformed: true
         });
       }
-    });
-    return newNodes.map(({
-      canBeTransformed,
-      content
-    }) => {
-      if (canBeTransformed) {
-        const text = content.join('\n');
-        if (text === '') {
-          return undefined;
+    }
+  };
+  nodes.forEach(node => {
+    if (node.isTextblock) {
+      const inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node));
+
+      // For first node, add directly
+      addToNewNodes([inlineTextContent]);
+    } else if (isListNode(node)) {
+      const textContent = [];
+      const listItemType = node.type === schema.nodes.taskList ? schema.nodes.taskItem : schema.nodes.listItem;
+      const listItems = findChildrenByType(node, listItemType).map(item => item.node);
+      listItems.forEach(listItem => {
+        if (listItem.type === schema.nodes.taskItem) {
+          const inlineTextContent = getInlineNodeTextContent(Fragment.from(listItem));
+          textContent.push(inlineTextContent);
+        } else {
+          const inlineTextContent = getInlineNodeTextContent(listItem.content);
+          textContent.push(inlineTextContent);
         }
-        return targetNodeType.createChecked(null, schema.text(text));
-      } else {
-        return content;
+      });
+      addToNewNodes(textContent);
+    } else {
+      // If not text block or list node, then cannot be transformed
+      newNodes.push({
+        canBeTransformed: false,
+        content: node
+      });
+    }
+  });
+  return newNodes.map(({
+    canBeTransformed,
+    content
+  }) => {
+    if (canBeTransformed) {
+      const text = content.join('\n');
+      if (text === '') {
+        return undefined;
       }
-    }).filter(Boolean);
+      return schema.nodes.codeBlock.createChecked(null, schema.text(text));
+    } else {
+      return content;
+    }
+  }).filter(Boolean);
+};
+const transformToBlockNode = (nodes, targetNodeType, schema) => {
+  if (targetNodeType === schema.nodes.codeBlock) {
+    return transformToCodeBlock(nodes, schema);
   }
-  return nodes;
+  const newNodes = [];
+  nodes.forEach(node => {
+    if (isListNode(node)) {
+      const listItemType = node.type === schema.nodes.taskList ? schema.nodes.taskItem : schema.nodes.listItem;
+      const listItems = findChildrenByType(node, listItemType).map(item => item.node);
+      listItems.forEach(listItem => {
+        if (listItem.type === schema.nodes.taskItem) {
+          const inlineContent = [...listItem.content.content];
+          if (inlineContent.length > 0) {
+            newNodes.push(targetNodeType.createChecked(null, inlineContent));
+          }
+        } else {
+          listItem.forEach(child => {
+            if (isHeadingOrParagraphNode(child)) {
+              newNodes.push(targetNodeType.createChecked(null, [...child.content.content]));
+            }
+          });
+        }
+      });
+    } else {
+      newNodes.push(node);
+    }
+  });
+  return newNodes;
 };
 const transformToContainerNode = (nodes, targetNodeType) => {
   const newNodes = [];
@@ -259,6 +302,9 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
   });
 };
 export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema) => {
+  if (nodes.length === 1 && nodes[0].content.size === 0) {
+    return nodes;
+  }
   if (isBlockNodeType(targetNodeType)) {
     return transformToBlockNode(nodes, targetNodeType, schema);
   }

package/dist/es2019/editor-commands/transforms/list-transforms.js

@@ -1,10 +1,10 @@
+import { transformBetweenListTypes, isTaskList } from '@atlaskit/editor-common/transforms';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
-import { transformListStructure } from './list/transformBetweenListTypes';
 import { transformOrderedUnorderedListToBlockNodes } from './list/transformOrderedUnorderedListToBlockNodes';
 import { transformTaskListToBlockNodes } from './list/transformTaskListToBlockNodes';
 import { transformToTaskList } from './list/transformToTaskList';
-import { getSupportedListTypesSet, isBulletOrOrderedList, isBlockNodeType, isContainerNodeType, isListNodeType, isTaskList } from './utils';
+import { isBlockNodeType, isContainerNodeType, isListNodeType } from './utils';
 
 /**
  * Transform selection to list type
@@ -165,55 +165,4 @@ export const liftListToBlockType = () => {
   return null;
 };
 
-/**
- * Transform between different list types
- */
-export const transformBetweenListTypes = context => {
-  const {
-    tr,
-    sourceNode,
-    sourcePos,
-    targetNodeType
-  } = context;
-  const {
-    nodes
-  } = tr.doc.type.schema;
-  const sourceListType = sourceNode.type;
-  const isSourceBulletOrOrdered = isBulletOrOrderedList(sourceListType);
-  const isTargetTask = isTaskList(targetNodeType);
-  const isSourceTask = isTaskList(sourceListType);
-  const isTargetBulletOrOrdered = isBulletOrOrderedList(targetNodeType);
-
-  // Check if we need structure transformation
-  const needsStructureTransform = isSourceBulletOrOrdered && isTargetTask || isSourceTask && isTargetBulletOrOrdered;
-  try {
-    if (!needsStructureTransform) {
-      // Simple type change for same structure lists (bullet <-> ordered)
-      // Apply to the main list
-      tr.setNodeMarkup(sourcePos, targetNodeType);
-
-      // Apply to nested lists
-      const listStart = sourcePos;
-      const listEnd = sourcePos + sourceNode.nodeSize;
-      const supportedListTypesSet = getSupportedListTypesSet(nodes);
-      tr.doc.nodesBetween(listStart, listEnd, (node, pos, parent) => {
-        // Only process nested lists (not the root list we already handled)
-        if (supportedListTypesSet.has(node.type) && pos !== sourcePos) {
-          const isNestedList = parent && (supportedListTypesSet.has(parent.type) || parent.type === nodes.listItem);
-          if (isNestedList) {
-            const shouldTransformNode = node.type === sourceListType || isBulletOrOrderedList(node.type) && isTargetBulletOrOrdered;
-            if (shouldTransformNode) {
-              tr.setNodeMarkup(pos, targetNodeType);
-            }
-          }
-        }
-        return true; // Continue traversing
-      });
-      return tr;
-    } else {
-      return transformListStructure(context);
-    }
-  } catch {
-    return null;
-  }
-};
+// transformBetweenListTypes is now imported from @atlaskit/editor-common/transforms

package/dist/es2019/editor-commands/transforms/utils.js

@@ -110,19 +110,8 @@ export const isContainerNodeType = nodeType => {
   return ['panel', 'expand', 'blockquote'].includes(nodeType.name);
 };
 
-// List type utilities
-export const isBulletOrOrderedList = nodeType => {
-  return nodeType.name === 'bulletList' || nodeType.name === 'orderedList';
-};
-export const isTaskList = nodeType => {
-  return nodeType.name === 'taskList';
-};
-export const getSupportedListTypes = nodes => {
-  return [nodes.bulletList, nodes.orderedList, nodes.taskList].filter(Boolean);
-};
-export const getSupportedListTypesSet = nodes => {
-  return new Set(getSupportedListTypes(nodes));
-};
+// List type utilities moved to @atlaskit/editor-common/transforms
+
 export const isLayoutNodeType = nodeType => {
   return nodeType.name === 'layoutSection';
 };

package/dist/esm/editor-commands/transforms/inline-node-transforms.js

@@ -5,7 +5,7 @@ export var getInlineNodeTextContent = function getInlineNodeTextContent(sourceCo
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(function (node) {
-    if (['paragraph', 'heading'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
       node.content.forEach(function (inlineNode) {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;