@atlaskit/editor-plugin-block-menu 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 1.0.8
+
+### Patch Changes
+
+- [`b3e1332c170a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3e1332c170a6) -
+  Container to container transform with unsupportted content
+- Updated dependencies
+
+## 1.0.7
+
+### Patch Changes
+
+- [`34871606f04ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/34871606f04ba) -
+  [ux] Updates unwrapAndConvertToList to support codeBlock to list case and cases where contnent is
+  not textblock.
+
 ## 1.0.6
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unwrapAndConvertToList = exports.unwrapAndConvertToBlockType = exports.transformToContainer = exports.transformContainerNode = void 0;
+exports.unwrapAndConvertToList = exports.unwrapAndConvertToBlockType = exports.transformToContainer = exports.transformContainerNode = exports.transformBetweenContainerTypes = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("./utils");
@@ -84,8 +84,13 @@ var transformContainerNode = exports.transformContainerNode = function transform
 
   // Transform between container types
   if ((0, _utils.isContainerNodeType)(targetNodeType)) {
-    tr.setNodeMarkup(sourcePos, targetNodeType, targetAttrs);
-    return tr;
+    return transformBetweenContainerTypes({
+      tr: tr,
+      sourceNode: sourceNode,
+      sourcePos: sourcePos,
+      targetNodeType: targetNodeType,
+      targetAttrs: targetAttrs
+    });
   }
   return null;
 };
@@ -171,18 +176,16 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     sourcePos = _ref3.sourcePos,
     targetNodeType = _ref3.targetNodeType,
     targetAttrs = _ref3.targetAttrs;
-  if (sourcePos === null) {
-    return tr;
-  }
   var schema = tr.doc.type.schema;
   var _schema$nodes2 = schema.nodes,
     listItem = _schema$nodes2.listItem,
     paragraph = _schema$nodes2.paragraph,
     taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem;
+    taskItem = _schema$nodes2.taskItem,
+    heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
-  var createListItemFromInline = function createListItemFromInline(inlineFrag) {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  var createListItemFromInline = function createListItemFromInline(content) {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   var getInlineContent = function getInlineContent(textblock) {
     var inlineContent = [];
@@ -191,30 +194,134 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     });
     return inlineContent;
   };
-  var items = [];
-
+  var resultContent = [];
+  var currentListItems = [];
+  var targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     var title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       var titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (var i = 0; i < sourceNode.childCount; i++) {
-    var node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  var createListAndAddToContent = function createListAndAddToContent() {
+    if (currentListItems.length) {
+      var currentList = targetNodeType.create(targetAttrs || null, _model.Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
     }
-    var inline = _model.Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    var codeText = sourceNode.textContent;
+    if (codeText) {
+      var lines = codeText.split('\n');
+      // Remove empty lines
+      var nonEmptyLines = lines.filter(function (line) {
+        return line.trim().length > 0;
+      });
+      nonEmptyLines.forEach(function (line) {
+        var lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
+    }
+  } else {
+    sourceNode.forEach(function (child) {
+      if (targetListItemType.validContent(_model.Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        var inline = _model.Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
   }
-  if (!items.length) {
-    return tr;
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
+  }
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, _model.Fragment.from(resultContent));
+};
+var transformBetweenContainerTypes = exports.transformBetweenContainerTypes = function transformBetweenContainerTypes(context) {
+  var tr = context.tr,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs;
+
+  // Get content validation for target container type
+  var isContentSupported = (0, _utils.getContentSupportChecker)(targetNodeType);
+
+  // Process content and collect splits
+  var contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+
+  // Replace the original node with the first split
+  var insertPos = sourcePos;
+  contentSplits.forEach(function (splitNode, index) {
+    if (index === 0) {
+      // Replace the original node with the first split
+      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      insertPos = sourcePos + splitNode.nodeSize;
+    } else {
+      // Insert additional splits after
+      tr.insert(insertPos, splitNode);
+      insertPos += splitNode.nodeSize;
+    }
+  });
+  return tr;
+};
+
+/**
+ * Split content around unsupported block nodes, creating separate containers
+ * for content before and after each unsupported block
+ */
+var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) {
+  var _sourceNode$attrs3;
+  var splits = [];
+  var children = sourceNode.content.content;
+  var currentContainerContent = [];
+
+  // Handle expand title - add as first paragraph if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    var titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
+    currentContainerContent.push(titleParagraph);
   }
-  var list = targetNodeType.create(targetAttrs || null, _model.Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  var flushCurrentContainer = function flushCurrentContainer() {
+    if (currentContainerContent.length > 0) {
+      var containerNode = targetNodeType.create(targetAttrs, _model.Fragment.fromArray(currentContainerContent));
+      splits.push(containerNode);
+      currentContainerContent = [];
+    }
+  };
+  children.forEach(function (childNode) {
+    if (isContentSupported(childNode)) {
+      // Supported content - add to current container
+      currentContainerContent.push(childNode);
+    } else if ((0, _utils.isBlockNodeForExtraction)(childNode)) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
+    } else if (childNode.type.name === targetNodeType.name) {
+      // Same type of container merge contents
+      childNode.content.forEach(function (child) {
+        currentContainerContent.push(child);
+      });
+    } else {
+      // Unsupported inline content - convert to paragraph and add to container
+      var inlineContent = (0, _utils.convertNodeToInlineContent)(childNode, schema);
+      if (inlineContent.length > 0) {
+        var paragraph = schema.nodes.paragraph.create({}, _model.Fragment.fromArray(inlineContent));
+        currentContainerContent.push(paragraph);
+      }
+    }
+  });
+
+  // Flush any remaining container content
+  flushCurrentContainer();
+  return splits;
 };

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

@@ -47,6 +47,11 @@ function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
     if ((0, _utils.isLayoutNodeType)(targetNodeType)) {
       return (0, _layoutTransforms.convertToLayout)(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && (0, _utils.isListNodeType)(targetNodeType)) {
+      return (0, _containerTransforms.unwrapAndConvertToList)(transformationContext);
+    }
     if ((0, _utils.isBlockNode)(sourceNode)) {
       return (0, _blockTransforms.transformBlockNode)(transformationContext);
     }

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

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTaskList = exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isContainerNodeType = exports.isContainerNode = exports.isBulletOrOrderedList = exports.isBlockNodeType = exports.isBlockNode = exports.getTargetNodeInfo = exports.getSupportedListTypesSet = exports.getSupportedListTypes = void 0;
+exports.isTaskList = exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isContainerNodeType = exports.isContainerNode = exports.isBulletOrOrderedList = exports.isBlockNodeType = exports.isBlockNodeForExtraction = exports.isBlockNode = exports.getTargetNodeInfo = exports.getSupportedListTypesSet = exports.getSupportedListTypes = exports.getContentSupportChecker = exports.convertNodeToInlineContent = void 0;
+var _model = require("@atlaskit/editor-prosemirror/model");
 var getTargetNodeInfo = exports.getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
   switch (targetType) {
     case 'heading1':
@@ -127,4 +128,50 @@ var getSupportedListTypesSet = exports.getSupportedListTypesSet = function getSu
 };
 var isLayoutNodeType = exports.isLayoutNodeType = function isLayoutNodeType(nodeType) {
   return nodeType.name === 'layoutSection';
+};
+
+/**
+ * Check if a node should be extracted as a standalone block node
+ * rather than converted to inline content
+ */
+var isBlockNodeForExtraction = exports.isBlockNodeForExtraction = function isBlockNodeForExtraction(node) {
+  var blockNodesForExtraction = ['table', 'mediaSingle', 'extension', 'bodiedExtension', 'blockCard', 'embedCard'];
+  return blockNodesForExtraction.includes(node.type.name);
+};
+
+/**
+ * Get a function that checks if content is supported in the target container type
+ */
+var getContentSupportChecker = exports.getContentSupportChecker = function getContentSupportChecker(targetNodeType) {
+  return function (node) {
+    // Check if the target container type can contain this node
+    try {
+      return targetNodeType.validContent(_model.Fragment.from(node));
+    } catch (_unused) {
+      return false;
+    }
+  };
+};
+
+/**
+ * Convert a node to inline content that can be placed in a paragraph
+ */
+var convertNodeToInlineContent = exports.convertNodeToInlineContent = function convertNodeToInlineContent(node, schema) {
+  // Extract text and inline nodes from any complex node
+  var inlineNodes = [];
+  node.descendants(function (childNode) {
+    if (childNode.isText) {
+      inlineNodes.push(childNode);
+    } else if (childNode.isInline) {
+      inlineNodes.push(childNode);
+    }
+    return true; // Continue traversing
+  });
+
+  // If no inline content was found but the node has text content,
+  // create a text node with the full text content
+  if (inlineNodes.length === 0 && node.textContent) {
+    return [schema.text(node.textContent)];
+  }
+  return inlineNodes;
 };

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

@@ -1,5 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { isBlockNodeType, isListNodeType, isContainerNodeType } from './utils';
+import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker } from './utils';
 const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validNodeType, withMarks) => {
   const validTransformedContent = [];
   // Headings are not valid inside headings so convert heading nodes to paragraphs
@@ -78,8 +78,13 @@ export const transformContainerNode = ({
 
   // Transform between container types
   if (isContainerNodeType(targetNodeType)) {
-    tr.setNodeMarkup(sourcePos, targetNodeType, targetAttrs);
-    return tr;
+    return transformBetweenContainerTypes({
+      tr,
+      sourceNode,
+      sourcePos,
+      targetNodeType,
+      targetAttrs
+    });
   }
   return null;
 };
@@ -167,9 +172,6 @@ export const unwrapAndConvertToList = ({
   targetNodeType,
   targetAttrs
 }) => {
-  if (sourcePos === null) {
-    return tr;
-  }
   const {
     schema
   } = tr.doc.type;
@@ -177,11 +179,12 @@ export const unwrapAndConvertToList = ({
     listItem,
     paragraph,
     taskList,
-    taskItem
+    taskItem,
+    heading
   } = schema.nodes;
   const isTargetTaskList = targetNodeType === taskList;
-  const createListItemFromInline = inlineFrag => {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  const createListItemFromInline = content => {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   const getInlineContent = textblock => {
     const inlineContent = [];
@@ -190,30 +193,134 @@ export const unwrapAndConvertToList = ({
     });
     return inlineContent;
   };
-  const items = [];
-
+  const resultContent = [];
+  let currentListItems = [];
+  const targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     const title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       const titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (let i = 0; i < sourceNode.childCount; i++) {
-    const node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  const createListAndAddToContent = () => {
+    if (currentListItems.length) {
+      const currentList = targetNodeType.create(targetAttrs || null, Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
     }
-    const inline = Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    const codeText = sourceNode.textContent;
+    if (codeText) {
+      const lines = codeText.split('\n');
+      // Remove empty lines
+      const nonEmptyLines = lines.filter(line => line.trim().length > 0);
+      nonEmptyLines.forEach(line => {
+        const lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
+    }
+  } else {
+    sourceNode.forEach(child => {
+      if (targetListItemType.validContent(Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        const inline = Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
+  }
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
   }
-  if (!items.length) {
-    return tr;
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, Fragment.from(resultContent));
+};
+export const transformBetweenContainerTypes = context => {
+  const {
+    tr,
+    sourceNode,
+    sourcePos,
+    targetNodeType,
+    targetAttrs
+  } = context;
+
+  // Get content validation for target container type
+  const isContentSupported = getContentSupportChecker(targetNodeType);
+
+  // Process content and collect splits
+  const contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+
+  // Replace the original node with the first split
+  let insertPos = sourcePos;
+  contentSplits.forEach((splitNode, index) => {
+    if (index === 0) {
+      // Replace the original node with the first split
+      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      insertPos = sourcePos + splitNode.nodeSize;
+    } else {
+      // Insert additional splits after
+      tr.insert(insertPos, splitNode);
+      insertPos += splitNode.nodeSize;
+    }
+  });
+  return tr;
+};
+
+/**
+ * Split content around unsupported block nodes, creating separate containers
+ * for content before and after each unsupported block
+ */
+const splitContentAroundUnsupportedBlocks = (sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) => {
+  var _sourceNode$attrs3;
+  const splits = [];
+  const children = sourceNode.content.content;
+  let currentContainerContent = [];
+
+  // Handle expand title - add as first paragraph if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    const titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
+    currentContainerContent.push(titleParagraph);
   }
-  const list = targetNodeType.create(targetAttrs || null, Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  const flushCurrentContainer = () => {
+    if (currentContainerContent.length > 0) {
+      const containerNode = targetNodeType.create(targetAttrs, Fragment.fromArray(currentContainerContent));
+      splits.push(containerNode);
+      currentContainerContent = [];
+    }
+  };
+  children.forEach(childNode => {
+    if (isContentSupported(childNode)) {
+      // Supported content - add to current container
+      currentContainerContent.push(childNode);
+    } else if (isBlockNodeForExtraction(childNode)) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
+    } else if (childNode.type.name === targetNodeType.name) {
+      // Same type of container merge contents
+      childNode.content.forEach(child => {
+        currentContainerContent.push(child);
+      });
+    } else {
+      // Unsupported inline content - convert to paragraph and add to container
+      const inlineContent = convertNodeToInlineContent(childNode, schema);
+      if (inlineContent.length > 0) {
+        const paragraph = schema.nodes.paragraph.create({}, Fragment.fromArray(inlineContent));
+        currentContainerContent.push(paragraph);
+      }
+    }
+  });
+
+  // Flush any remaining container content
+  flushCurrentContainer();
+  return splits;
 };

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

@@ -1,8 +1,8 @@
 import { transformBlockNode } from './block-transforms';
-import { transformContainerNode } from './container-transforms';
+import { transformContainerNode, unwrapAndConvertToList } from './container-transforms';
 import { convertToLayout } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode, isLayoutNodeType } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   const {
     nodes
@@ -45,6 +45,11 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
     if (isLayoutNodeType(targetNodeType)) {
       return convertToLayout(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && isListNodeType(targetNodeType)) {
+      return unwrapAndConvertToList(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

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

@@ -1,3 +1,4 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 export const getTargetNodeInfo = (targetType, nodes) => {
   switch (targetType) {
     case 'heading1':
@@ -121,4 +122,50 @@ export const getSupportedListTypesSet = nodes => {
 };
 export const isLayoutNodeType = nodeType => {
   return nodeType.name === 'layoutSection';
+};
+
+/**
+ * Check if a node should be extracted as a standalone block node
+ * rather than converted to inline content
+ */
+export const isBlockNodeForExtraction = node => {
+  const blockNodesForExtraction = ['table', 'mediaSingle', 'extension', 'bodiedExtension', 'blockCard', 'embedCard'];
+  return blockNodesForExtraction.includes(node.type.name);
+};
+
+/**
+ * Get a function that checks if content is supported in the target container type
+ */
+export const getContentSupportChecker = targetNodeType => {
+  return node => {
+    // Check if the target container type can contain this node
+    try {
+      return targetNodeType.validContent(Fragment.from(node));
+    } catch {
+      return false;
+    }
+  };
+};
+
+/**
+ * Convert a node to inline content that can be placed in a paragraph
+ */
+export const convertNodeToInlineContent = (node, schema) => {
+  // Extract text and inline nodes from any complex node
+  const inlineNodes = [];
+  node.descendants(childNode => {
+    if (childNode.isText) {
+      inlineNodes.push(childNode);
+    } else if (childNode.isInline) {
+      inlineNodes.push(childNode);
+    }
+    return true; // Continue traversing
+  });
+
+  // If no inline content was found but the node has text content,
+  // create a text node with the full text content
+  if (inlineNodes.length === 0 && node.textContent) {
+    return [schema.text(node.textContent)];
+  }
+  return inlineNodes;
 };

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { isBlockNodeType, isListNodeType, isContainerNodeType } from './utils';
+import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker } from './utils';
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
   var validTransformedContent = [];
   // Headings are not valid inside headings so convert heading nodes to paragraphs
@@ -77,8 +77,13 @@ export var transformContainerNode = function transformContainerNode(_ref2) {
 
   // Transform between container types
   if (isContainerNodeType(targetNodeType)) {
-    tr.setNodeMarkup(sourcePos, targetNodeType, targetAttrs);
-    return tr;
+    return transformBetweenContainerTypes({
+      tr: tr,
+      sourceNode: sourceNode,
+      sourcePos: sourcePos,
+      targetNodeType: targetNodeType,
+      targetAttrs: targetAttrs
+    });
   }
   return null;
 };
@@ -164,18 +169,16 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     sourcePos = _ref3.sourcePos,
     targetNodeType = _ref3.targetNodeType,
     targetAttrs = _ref3.targetAttrs;
-  if (sourcePos === null) {
-    return tr;
-  }
   var schema = tr.doc.type.schema;
   var _schema$nodes2 = schema.nodes,
     listItem = _schema$nodes2.listItem,
     paragraph = _schema$nodes2.paragraph,
     taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem;
+    taskItem = _schema$nodes2.taskItem,
+    heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
-  var createListItemFromInline = function createListItemFromInline(inlineFrag) {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  var createListItemFromInline = function createListItemFromInline(content) {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   var getInlineContent = function getInlineContent(textblock) {
     var inlineContent = [];
@@ -184,30 +187,134 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     });
     return inlineContent;
   };
-  var items = [];
-
+  var resultContent = [];
+  var currentListItems = [];
+  var targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     var title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       var titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (var i = 0; i < sourceNode.childCount; i++) {
-    var node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  var createListAndAddToContent = function createListAndAddToContent() {
+    if (currentListItems.length) {
+      var currentList = targetNodeType.create(targetAttrs || null, Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
     }
-    var inline = Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    var codeText = sourceNode.textContent;
+    if (codeText) {
+      var lines = codeText.split('\n');
+      // Remove empty lines
+      var nonEmptyLines = lines.filter(function (line) {
+        return line.trim().length > 0;
+      });
+      nonEmptyLines.forEach(function (line) {
+        var lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
+    }
+  } else {
+    sourceNode.forEach(function (child) {
+      if (targetListItemType.validContent(Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        var inline = Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
   }
-  if (!items.length) {
-    return tr;
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
+  }
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, Fragment.from(resultContent));
+};
+export var transformBetweenContainerTypes = function transformBetweenContainerTypes(context) {
+  var tr = context.tr,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs;
+
+  // Get content validation for target container type
+  var isContentSupported = getContentSupportChecker(targetNodeType);
+
+  // Process content and collect splits
+  var contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+
+  // Replace the original node with the first split
+  var insertPos = sourcePos;
+  contentSplits.forEach(function (splitNode, index) {
+    if (index === 0) {
+      // Replace the original node with the first split
+      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      insertPos = sourcePos + splitNode.nodeSize;
+    } else {
+      // Insert additional splits after
+      tr.insert(insertPos, splitNode);
+      insertPos += splitNode.nodeSize;
+    }
+  });
+  return tr;
+};
+
+/**
+ * Split content around unsupported block nodes, creating separate containers
+ * for content before and after each unsupported block
+ */
+var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) {
+  var _sourceNode$attrs3;
+  var splits = [];
+  var children = sourceNode.content.content;
+  var currentContainerContent = [];
+
+  // Handle expand title - add as first paragraph if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    var titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
+    currentContainerContent.push(titleParagraph);
   }
-  var list = targetNodeType.create(targetAttrs || null, Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  var flushCurrentContainer = function flushCurrentContainer() {
+    if (currentContainerContent.length > 0) {
+      var containerNode = targetNodeType.create(targetAttrs, Fragment.fromArray(currentContainerContent));
+      splits.push(containerNode);
+      currentContainerContent = [];
+    }
+  };
+  children.forEach(function (childNode) {
+    if (isContentSupported(childNode)) {
+      // Supported content - add to current container
+      currentContainerContent.push(childNode);
+    } else if (isBlockNodeForExtraction(childNode)) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
+    } else if (childNode.type.name === targetNodeType.name) {
+      // Same type of container merge contents
+      childNode.content.forEach(function (child) {
+        currentContainerContent.push(child);
+      });
+    } else {
+      // Unsupported inline content - convert to paragraph and add to container
+      var inlineContent = convertNodeToInlineContent(childNode, schema);
+      if (inlineContent.length > 0) {
+        var paragraph = schema.nodes.paragraph.create({}, Fragment.fromArray(inlineContent));
+        currentContainerContent.push(paragraph);
+      }
+    }
+  });
+
+  // Flush any remaining container content
+  flushCurrentContainer();
+  return splits;
 };

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

@@ -1,8 +1,8 @@
 import { transformBlockNode } from './block-transforms';
-import { transformContainerNode } from './container-transforms';
+import { transformContainerNode, unwrapAndConvertToList } from './container-transforms';
 import { convertToLayout } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode, isLayoutNodeType } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   var nodes = tr.doc.type.schema.nodes;
   var targetNodeInfo = getTargetNodeInfo(targetType, nodes);
@@ -41,6 +41,11 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
     if (isLayoutNodeType(targetNodeType)) {
       return convertToLayout(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && isListNodeType(targetNodeType)) {
+      return unwrapAndConvertToList(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

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

@@ -1,3 +1,4 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 export var getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
   switch (targetType) {
     case 'heading1':
@@ -121,4 +122,50 @@ export var getSupportedListTypesSet = function getSupportedListTypesSet(nodes) {
 };
 export var isLayoutNodeType = function isLayoutNodeType(nodeType) {
   return nodeType.name === 'layoutSection';
+};
+
+/**
+ * Check if a node should be extracted as a standalone block node
+ * rather than converted to inline content
+ */
+export var isBlockNodeForExtraction = function isBlockNodeForExtraction(node) {
+  var blockNodesForExtraction = ['table', 'mediaSingle', 'extension', 'bodiedExtension', 'blockCard', 'embedCard'];
+  return blockNodesForExtraction.includes(node.type.name);
+};
+
+/**
+ * Get a function that checks if content is supported in the target container type
+ */
+export var getContentSupportChecker = function getContentSupportChecker(targetNodeType) {
+  return function (node) {
+    // Check if the target container type can contain this node
+    try {
+      return targetNodeType.validContent(Fragment.from(node));
+    } catch (_unused) {
+      return false;
+    }
+  };
+};
+
+/**
+ * Convert a node to inline content that can be placed in a paragraph
+ */
+export var convertNodeToInlineContent = function convertNodeToInlineContent(node, schema) {
+  // Extract text and inline nodes from any complex node
+  var inlineNodes = [];
+  node.descendants(function (childNode) {
+    if (childNode.isText) {
+      inlineNodes.push(childNode);
+    } else if (childNode.isInline) {
+      inlineNodes.push(childNode);
+    }
+    return true; // Continue traversing
+  });
+
+  // If no inline content was found but the node has text content,
+  // create a text node with the full text content
+  if (inlineNodes.length === 0 && node.textContent) {
+    return [schema.text(node.textContent)];
+  }
+  return inlineNodes;
 };

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

@@ -14,4 +14,5 @@ export declare const unwrapAndConvertToBlockType: (context: TransformContext) =>
 /**
  * Unwrap container node and convert content to list
  */
-export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction;
+export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;
+export declare const transformBetweenContainerTypes: (context: TransformContext) => import("prosemirror-state").Transaction;

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

@@ -1,4 +1,4 @@
-import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { FormatNodeTargetType } from './types';
 export declare const getTargetNodeInfo: (targetType: FormatNodeTargetType, nodes: Record<string, NodeType>) => {
     attrs?: Record<string, unknown>;
@@ -15,3 +15,16 @@ export declare const isTaskList: (nodeType: NodeType) => boolean;
 export declare const getSupportedListTypes: (nodes: Record<string, NodeType>) => NodeType[];
 export declare const getSupportedListTypesSet: (nodes: Record<string, NodeType>) => Set<NodeType>;
 export declare const isLayoutNodeType: (nodeType: NodeType) => boolean;
+/**
+ * Check if a node should be extracted as a standalone block node
+ * rather than converted to inline content
+ */
+export declare const isBlockNodeForExtraction: (node: PMNode) => boolean;
+/**
+ * Get a function that checks if content is supported in the target container type
+ */
+export declare const getContentSupportChecker: (targetNodeType: NodeType) => ((node: PMNode) => boolean);
+/**
+ * Convert a node to inline content that can be placed in a paragraph
+ */
+export declare const convertNodeToInlineContent: (node: PMNode, schema: Schema) => PMNode[];

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

@@ -14,4 +14,5 @@ export declare const unwrapAndConvertToBlockType: (context: TransformContext) =>
 /**
  * Unwrap container node and convert content to list
  */
-export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction;
+export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;
+export declare const transformBetweenContainerTypes: (context: TransformContext) => import("prosemirror-state").Transaction;

package/dist/types-ts4.5/editor-commands/transforms/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { FormatNodeTargetType } from './types';
 export declare const getTargetNodeInfo: (targetType: FormatNodeTargetType, nodes: Record<string, NodeType>) => {
     attrs?: Record<string, unknown>;
@@ -15,3 +15,16 @@ export declare const isTaskList: (nodeType: NodeType) => boolean;
 export declare const getSupportedListTypes: (nodes: Record<string, NodeType>) => NodeType[];
 export declare const getSupportedListTypesSet: (nodes: Record<string, NodeType>) => Set<NodeType>;
 export declare const isLayoutNodeType: (nodeType: NodeType) => boolean;
+/**
+ * Check if a node should be extracted as a standalone block node
+ * rather than converted to inline content
+ */
+export declare const isBlockNodeForExtraction: (node: PMNode) => boolean;
+/**
+ * Get a function that checks if content is supported in the target container type
+ */
+export declare const getContentSupportChecker: (targetNodeType: NodeType) => ((node: PMNode) => boolean);
+/**
+ * Convert a node to inline content that can be placed in a paragraph
+ */
+export declare const convertNodeToInlineContent: (node: PMNode, schema: Schema) => PMNode[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.6",
+	"version": "1.0.8",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/css": "^0.13.0",
+		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-block-controls": "^5.0.0",
 		"@atlaskit/editor-plugin-decorations": "^4.0.0",
@@ -41,8 +41,8 @@
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.13.0",
-		"@atlaskit/tokens": "^6.2.0",
+		"@atlaskit/primitives": "^14.14.0",
+		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {