@atlaskit/editor-plugin-block-menu 3.0.2 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.1.1
+
+### Patch Changes
+
+- [`c30d1876a650a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c30d1876a650a) -
+  ED-29256 Transform content with indentation in layouts
+- Updated dependencies
+
+## 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

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,
@@ -20,10 +20,16 @@ var unwrapLayoutNodesToTextNodes = exports.unwrapLayoutNodesToTextNodes = functi
   var isValid = (0, _utils2.getContentSupportChecker)(finalTargetNodeType);
   var createTextNode = function createTextNode(node) {
     var isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    var nodeToTransform = node;
+    if ((0, _utils2.isContainerNodeType)(finalTargetNodeType) || (0, _utils2.isListNodeType)(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(function (mark) {
+        return !['alignment', 'indentation'].includes(mark.type.name);
+      }));
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
+    }
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if ((0, _utils2.isBlockNode)(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -190,21 +196,17 @@ var transformToContainerNode = function transformToContainerNode(nodes, targetNo
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      var nodeWithValidAttrs = node.mark(node.marks.filter(function (mark) {
-        return mark.type.name !== 'alignment';
-      }));
       var isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      var _nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      var _nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: _nodes,
@@ -237,7 +239,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);
@@ -253,16 +255,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,
@@ -322,8 +324,20 @@ var transformToListNode = exports.transformToListNode = function transformToList
     }
   });
 };
-var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema) {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !(0, _utils2.isContainerNodeType)(targetNodeType)) {
+    if ((0, _utils2.isBlockNodeType)(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if ((0, _utils2.isListNodeType)(targetNodeType)) {
+      var listItem = (0, _transforms.isTaskList)(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if ((0, _utils2.isBlockNodeType)(targetNodeType)) {

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

@@ -60,7 +60,7 @@ var transformLayoutNode = exports.transformLayoutNode = function transformLayout
         var newContent = (0, _utils.unwrapLayoutNodesToTextNodes)(context, targetNodeType);
         unwrappedContent.push.apply(unwrappedContent, (0, _toConsumableArray2.default)(newContent));
       });
-      var newColumnContent = (0, _utils.convertUnwrappedLayoutContent)(unwrappedContent, targetNodeType, schema);
+      var newColumnContent = (0, _utils.convertUnwrappedLayoutContent)(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, _model.Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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/cjs/ui/block-menu.js

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

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,
@@ -14,10 +14,14 @@ export const unwrapLayoutNodesToTextNodes = (context, finalTargetNodeType) => {
   const isValid = getContentSupportChecker(finalTargetNodeType);
   const createTextNode = node => {
     const isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    let nodeToTransform = node;
+    if (isContainerNodeType(finalTargetNodeType) || isListNodeType(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(mark => !['alignment', 'indentation'].includes(mark.type.name)));
+    }
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if (isBlockNode(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -169,19 +173,17 @@ const transformToContainerNode = (nodes, targetNodeType) => {
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      const nodeWithValidAttrs = node.mark(node.marks.filter(mark => mark.type.name !== 'alignment'));
       const isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      const nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      const nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: nodes,
@@ -301,8 +303,20 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
     }
   });
 };
-export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema) => {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema, targetAttrs) => {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {
+    if (isBlockNodeType(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if (isListNodeType(targetNodeType)) {
+      const listItem = isTaskList(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if (isBlockNodeType(targetNodeType)) {

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

@@ -56,7 +56,7 @@ export const transformLayoutNode = context => {
         const newContent = unwrapLayoutNodesToTextNodes(context, targetNodeType);
         unwrappedContent.push(...newContent);
       });
-      const newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema);
+      const newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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/es2019/ui/block-menu.js

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
 import "./block-menu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext, useEffect } from 'react';

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

@@ -1,9 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+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 var unwrapLayoutNodesToTextNodes = function unwrapLayoutNodesToTextNodes(context, finalTargetNodeType) {
   var tr = context.tr,
     sourceNode = context.sourceNode,
@@ -13,10 +13,16 @@ export var unwrapLayoutNodesToTextNodes = function unwrapLayoutNodesToTextNodes(
   var isValid = getContentSupportChecker(finalTargetNodeType);
   var createTextNode = function createTextNode(node) {
     var isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    var nodeToTransform = node;
+    if (isContainerNodeType(finalTargetNodeType) || isListNodeType(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(function (mark) {
+        return !['alignment', 'indentation'].includes(mark.type.name);
+      }));
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
+    }
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if (isBlockNode(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -183,21 +189,17 @@ var transformToContainerNode = function transformToContainerNode(nodes, targetNo
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      var nodeWithValidAttrs = node.mark(node.marks.filter(function (mark) {
-        return mark.type.name !== 'alignment';
-      }));
       var isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      var _nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      var _nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: _nodes,
@@ -315,8 +317,20 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
     }
   });
 };
-export var convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema) {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+export var convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {
+    if (isBlockNodeType(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if (isListNodeType(targetNodeType)) {
+      var listItem = isTaskList(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if (isBlockNodeType(targetNodeType)) {

package/dist/esm/editor-commands/transforms/layout-transforms.js

@@ -53,7 +53,7 @@ export var transformLayoutNode = function transformLayoutNode(context) {
         var newContent = unwrapLayoutNodesToTextNodes(context, targetNodeType);
         unwrappedContent.push.apply(unwrappedContent, _toConsumableArray(newContent));
       });
-      var newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema);
+      var newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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

@@ -1,11 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+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
@@ -152,51 +152,4 @@ export var liftListToBlockType = function liftListToBlockType() {
   return null;
 };
 
-/**
- * Transform between different list types
- */
-export var 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 = isBulletOrOrderedList(sourceListType);
-  var isTargetTask = isTaskList(targetNodeType);
-  var isSourceTask = isTaskList(sourceListType);
-  var isTargetBulletOrOrdered = 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 = 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 || isBulletOrOrderedList(node.type) && isTargetBulletOrOrdered;
-            if (shouldTransformNode) {
-              tr.setNodeMarkup(pos, targetNodeType);
-            }
-          }
-        }
-        return true; // Continue traversing
-      });
-      return tr;
-    } else {
-      return transformListStructure(context);
-    }
-  } catch (_unused) {
-    return null;
-  }
-};
+// transformBetweenListTypes is now imported from @atlaskit/editor-common/transforms

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

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

package/dist/esm/ui/block-menu.js

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
 import "./block-menu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext, useEffect } from 'react';

package/dist/types/editor-commands/transforms/container-transforms.d.ts

@@ -1,4 +1,5 @@
-import type { TransformContext, TransformFunction } from './types';
+import type { TransformContext } from '@atlaskit/editor-common/transforms';
+import type { TransformFunction } from './types';
 /**
  * Transform selection to container type
  */