@atlaskit/editor-plugin-block-menu 3.1.4 → 3.1.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.1.6
+
+### Patch Changes
+
+- [`f1e12e7cf00ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f1e12e7cf00ba) -
+  ED-29083: Fixed copying code block only copy texts
+- Updated dependencies
+
+## 3.1.5
+
+### Patch Changes
+
+- [`6087f73c2a306`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6087f73c2a306) -
+  [ux] ED-29309 Insert unsupported content from lists when transformed
+- Updated dependencies
+
 ## 3.1.4
 
 ### Patch Changes

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

@@ -311,7 +311,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
   var splits = [];
   var children = sourceNode.content.content;
   var currentTextContent = [];
-
+  var invalidContent = [];
   // Handle expand title - add as first text if source is expand with title
   if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
     currentTextContent.push(sourceNode.attrs.title);
@@ -336,7 +336,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        var text = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(childNode));
+        var text = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(childNode)).inlineTextContent;
         if (text.trim()) {
           currentTextContent.push(text);
         }
@@ -350,9 +350,13 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
       var listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
       var listItems = (0, _utils.findChildrenByType)(childNode, listItemType);
       listItems.forEach(function (listItem) {
-        var inlineContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(isTaskList ? _model.Fragment.from(listItem.node) : listItem.node.content);
-        if (inlineContent.trim()) {
-          currentTextContent.push(inlineContent);
+        var content = isTaskList ? _model.Fragment.from(listItem.node) : listItem.node.content;
+        var inlineContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(content);
+        if (inlineContent.inlineTextContent.trim()) {
+          currentTextContent.push(inlineContent.inlineTextContent);
+        }
+        if (inlineContent.invalidContent.length > 0) {
+          invalidContent.push.apply(invalidContent, (0, _toConsumableArray2.default)(inlineContent.invalidContent));
         }
       });
     } else {
@@ -366,7 +370,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
 
   // Flush any remaining text content as a codeBlock
   flushCurrentCodeBlock();
-  return splits;
+  return [].concat(splits, invalidContent);
 };
 
 /**

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

@@ -4,14 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getInlineNodeTextNode = exports.getInlineNodeTextContent = void 0;
+var _utils = require("./utils");
 var getInlineNodeTextContent = exports.getInlineNodeTextContent = function getInlineNodeTextContent(sourceContent) {
   var validTransformedContent = '';
+  var invalidContent = [];
   if (sourceContent.content.length < 1) {
-    return '';
+    return {
+      inlineTextContent: '',
+      invalidContent: invalidContent
+    };
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(function (node) {
-    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem', 'codeBlock'].includes(node.type.name)) {
       node.content.forEach(function (inlineNode) {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;
@@ -19,11 +24,16 @@ var getInlineNodeTextContent = exports.getInlineNodeTextContent = function getIn
           validTransformedContent += "".concat(inlineNode.textContent);
         }
       });
+    } else if (!(0, _utils.isListNodeType)(node.type)) {
+      invalidContent.push(node);
     }
   });
-  return validTransformedContent;
+  return {
+    inlineTextContent: validTransformedContent,
+    invalidContent: invalidContent
+  };
 };
 var getInlineNodeTextNode = exports.getInlineNodeTextNode = function getInlineNodeTextNode(sourceContent, schema) {
-  var text = getInlineNodeTextContent(sourceContent);
+  var text = getInlineNodeTextContent(sourceContent).inlineTextContent;
   return schema.text(text);
 };

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

@@ -112,9 +112,7 @@ var transformToCodeBlock = function transformToCodeBlock(nodes, schema) {
   };
   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
+      var inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(node)).inlineTextContent;
       addToNewNodes([inlineTextContent]);
     } else if ((0, _utils2.isListNode)(node)) {
       var textContent = [];
@@ -124,10 +122,10 @@ var transformToCodeBlock = function transformToCodeBlock(nodes, schema) {
       });
       listItems.forEach(function (listItem) {
         if (listItem.type === schema.nodes.taskItem) {
-          var _inlineTextContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(listItem));
+          var _inlineTextContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(listItem)).inlineTextContent;
           textContent.push(_inlineTextContent);
         } else {
-          var _inlineTextContent2 = (0, _inlineNodeTransforms.getInlineNodeTextContent)(listItem.content);
+          var _inlineTextContent2 = (0, _inlineNodeTransforms.getInlineNodeTextContent)(listItem.content).inlineTextContent;
           textContent.push(_inlineTextContent2);
         }
       });
@@ -242,6 +240,10 @@ var transformToListNode = exports.transformToListNode = function transformToList
   var isTargetTask = (0, _transforms.isTaskList)(targetNodeType);
   var listItems = [];
   var listItemType = isTargetTask ? schema.nodes.taskItem : schema.nodes.listItem;
+  var unsupportedContent = [];
+  var onhandleUnsupportedContent = function onhandleUnsupportedContent(content) {
+    unsupportedContent.push(content);
+  };
   var isValid = (0, _utils2.getContentSupportChecker)(listItemType);
   nodes.forEach(function (node) {
     // Append unsupported nodes as is
@@ -273,7 +275,7 @@ var transformToListNode = exports.transformToListNode = function transformToList
             schema: schema,
             supportedListTypes: supportedListTypes,
             targetNodeType: targetNodeType
-          });
+          }, onhandleUnsupportedContent);
           newListItems = (0, _toConsumableArray2.default)(newList.content.content);
         }
       } else if ((0, _utils2.isHeadingOrParagraphNode)(node) || isValid(node)) {
@@ -314,7 +316,7 @@ var transformToListNode = exports.transformToListNode = function transformToList
       }
     }
   });
-  return listItems.map(function (_ref3) {
+  return [].concat((0, _toConsumableArray2.default)(listItems.map(function (_ref3) {
     var node = _ref3.node,
       canBeTransformed = _ref3.canBeTransformed;
     if (canBeTransformed) {
@@ -322,7 +324,7 @@ var transformToListNode = exports.transformToListNode = function transformToList
     } else {
       return node;
     }
-  });
+  })), unsupportedContent);
 };
 var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
   if (nodes.length === 1 && nodes[0].content.size === 0 && !(0, _utils2.isContainerNodeType)(targetNodeType)) {

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

@@ -1,11 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformOrderedUnorderedListToBlockNodes = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _inlineNodeTransforms = require("../inline-node-transforms");
+var _utils2 = require("../utils");
 var transformOrderedUnorderedListToBlockNodes = exports.transformOrderedUnorderedListToBlockNodes = function transformOrderedUnorderedListToBlockNodes(context) {
   var tr = context.tr,
     targetNodeType = context.targetNodeType,
@@ -14,38 +18,76 @@ var transformOrderedUnorderedListToBlockNodes = exports.transformOrderedUnordere
     sourcePos = context.sourcePos;
   var selection = tr.selection;
   var schema = selection.$from.doc.type.schema;
-  // find all paragraph nodes inside the list node
-  var paragraphs = (0, _utils.findChildrenByType)(sourceNode, schema.nodes.paragraph);
-  var paragraphNodes = paragraphs.map(function (paragraph) {
-    return paragraph.node;
-  });
-  var targetNodes = paragraphNodes;
+  var targetNodes = [];
+  // find all list items inside the list node
+  var listItems = (0, _utils.findChildrenByType)(sourceNode, schema.nodes.listItem);
+  var textContent = [];
+  var flushTextContent = function flushTextContent() {
+    if (targetNodeType !== schema.nodes.codeBlock) {
+      return;
+    }
+    if (textContent.length > 0) {
+      var inlineText = textContent.join('\n');
+      targetNodes.push(schema.nodes.codeBlock.createChecked({}, inlineText !== '' ? schema.text(inlineText) : null));
+      textContent = [];
+    }
+  };
+  listItems.forEach(function (listItem) {
+    // Convert paragraphs to headings if target is heading
+    var content = listItem.node.content.content;
+    content.forEach(function (node) {
+      var isValid = (0, _utils2.getContentSupportChecker)(targetNodeType)(node);
+      if ((0, _utils2.isListNode)(node)) {
+        // Skip nested lists as it will return listItems that we will deal with separately
+        return;
+      }
 
-  // Convert paragraphs to headings if target is heading
-  if (targetNodeType === schema.nodes.heading && targetAttrs) {
-    var targetHeadingLevel = targetAttrs.level;
-    targetNodes = paragraphNodes.map(function (paragraphNode) {
-      return schema.nodes.heading.createChecked({
-        level: targetHeadingLevel
-      }, paragraphNode.content);
-    });
-  }
+      // Deal with the case where targetNode and node are both codeBlocks, then append text content
+      if (targetNodeType === schema.nodes.codeBlock && node.type === schema.nodes.codeBlock) {
+        var inlineContent = node.textContent;
+        textContent = [].concat((0, _toConsumableArray2.default)(textContent), [inlineContent]);
+        return;
+      }
 
-  // Convert paragraphs to code block if target is code block
-  if (targetNodeType === schema.nodes.codeBlock) {
-    // convert the paragraphNodes to one code block
-    var listItemsResult = (0, _utils.findChildrenByType)(sourceNode, schema.nodes.listItem);
-    var listItems = listItemsResult.map(function (item) {
-      return item.node;
-    });
-    var listItemFragments = listItems.map(function (listItem) {
-      return listItem.content;
+      // If the node is not valid for the target container,
+      // flush any existing text content if target is codeBlock
+      // and extract the node without any conversion
+      if (!isValid && !node.isTextblock) {
+        flushTextContent();
+        targetNodes.push(node);
+        return;
+      }
+
+      // If the target is codeBlock, accumulate text content
+      if (targetNodeType === schema.nodes.codeBlock) {
+        var _inlineContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(node)).inlineTextContent;
+        textContent = [].concat((0, _toConsumableArray2.default)(textContent), [_inlineContent]);
+        return;
+      }
+
+      // Convert codeblocks to block nodes
+      if (node.type === schema.nodes.codeBlock) {
+        var _targetAttrs$level;
+        var _textContent = node.textContent.split('\n');
+        var attributes = targetNodeType === schema.nodes.heading ? {
+          level: (_targetAttrs$level = targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.level) !== null && _targetAttrs$level !== void 0 ? _targetAttrs$level : 1
+        } : null;
+        _textContent.forEach(function (textLine) {
+          targetNodes.push(targetNodeType.createChecked(attributes, textLine ? schema.text(textLine) : null));
+        });
+        return;
+      }
+      if (targetNodeType === schema.nodes.heading && targetAttrs) {
+        var targetHeadingLevel = targetAttrs.level;
+        targetNodes.push(schema.nodes.heading.createChecked({
+          level: targetHeadingLevel
+        }, node.content));
+        return;
+      }
+      targetNodes.push(node);
     });
-    var codeBlockContent = listItemFragments.map(function (fragment) {
-      return fragment.textBetween(0, fragment.size, '\n');
-    }).join('\n');
-    targetNodes = [schema.nodes.codeBlock.createChecked({}, schema.text(codeBlockContent))];
-  }
+  });
+  flushTextContent();
   var fragment = _model.Fragment.fromArray(targetNodes);
   var slice = new _model.Slice(fragment, 0, 0);
   var rangeStart = sourcePos !== null ? sourcePos : selection.from;

package/dist/cjs/ui/copy-block.js

@@ -33,7 +33,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       var schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof _state.TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         var fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -46,6 +46,15 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
           var layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || _model.Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          var expandNode = fragment.firstChild;
+          var actualNodeToCopy = expandNode.firstChild;
+          fragment = _model.Fragment.from(actualNodeToCopy) || _model.Fragment.empty;
+        }
         var domNode = toDOMFromFragment(fragment, schema);
         var div = document.createElement('div');
         div.appendChild(domNode);
@@ -66,6 +75,13 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       // for other nodes
       if (selection instanceof _state.NodeSelection) {
         var _nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          _nodeType.inlineContent = false;
+        }
         var _domNode2 = (0, _copyButton.toDOM)(selection.node, schema);
         (0, _copyButton.copyDomNode)(_domNode2, _nodeType, selection);
       }

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

@@ -312,7 +312,7 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
   const splits = [];
   const children = sourceNode.content.content;
   let currentTextContent = [];
-
+  const invalidContent = [];
   // Handle expand title - add as first text if source is expand with title
   if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
     currentTextContent.push(sourceNode.attrs.title);
@@ -337,7 +337,7 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        const text = getInlineNodeTextContent(Fragment.from(childNode));
+        const text = getInlineNodeTextContent(Fragment.from(childNode)).inlineTextContent;
         if (text.trim()) {
           currentTextContent.push(text);
         }
@@ -351,9 +351,13 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
       const listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
       const listItems = findChildrenByType(childNode, listItemType);
       listItems.forEach(listItem => {
-        const inlineContent = getInlineNodeTextContent(isTaskList ? Fragment.from(listItem.node) : listItem.node.content);
-        if (inlineContent.trim()) {
-          currentTextContent.push(inlineContent);
+        const content = isTaskList ? Fragment.from(listItem.node) : listItem.node.content;
+        const inlineContent = getInlineNodeTextContent(content);
+        if (inlineContent.inlineTextContent.trim()) {
+          currentTextContent.push(inlineContent.inlineTextContent);
+        }
+        if (inlineContent.invalidContent.length > 0) {
+          invalidContent.push(...inlineContent.invalidContent);
         }
       });
     } else {
@@ -367,7 +371,7 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
 
   // Flush any remaining text content as a codeBlock
   flushCurrentCodeBlock();
-  return splits;
+  return [...splits, ...invalidContent];
 };
 
 /**

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

@@ -1,11 +1,16 @@
+import { isListNodeType } from './utils';
 export const getInlineNodeTextContent = sourceContent => {
   let validTransformedContent = '';
+  const invalidContent = [];
   if (sourceContent.content.length < 1) {
-    return '';
+    return {
+      inlineTextContent: '',
+      invalidContent
+    };
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(node => {
-    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem', 'codeBlock'].includes(node.type.name)) {
       node.content.forEach(inlineNode => {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;
@@ -13,11 +18,16 @@ export const getInlineNodeTextContent = sourceContent => {
           validTransformedContent += `${inlineNode.textContent}`;
         }
       });
+    } else if (!isListNodeType(node.type)) {
+      invalidContent.push(node);
     }
   });
-  return validTransformedContent;
+  return {
+    inlineTextContent: validTransformedContent,
+    invalidContent
+  };
 };
 export const getInlineNodeTextNode = (sourceContent, schema) => {
-  const text = getInlineNodeTextContent(sourceContent);
+  const text = getInlineNodeTextContent(sourceContent).inlineTextContent;
   return schema.text(text);
 };

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

@@ -92,9 +92,7 @@ const transformToCodeBlock = (nodes, schema) => {
   };
   nodes.forEach(node => {
     if (node.isTextblock) {
-      const inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node));
-
-      // For first node, add directly
+      const inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node)).inlineTextContent;
       addToNewNodes([inlineTextContent]);
     } else if (isListNode(node)) {
       const textContent = [];
@@ -102,10 +100,10 @@ const transformToCodeBlock = (nodes, schema) => {
       const listItems = findChildrenByType(node, listItemType).map(item => item.node);
       listItems.forEach(listItem => {
         if (listItem.type === schema.nodes.taskItem) {
-          const inlineTextContent = getInlineNodeTextContent(Fragment.from(listItem));
+          const inlineTextContent = getInlineNodeTextContent(Fragment.from(listItem)).inlineTextContent;
           textContent.push(inlineTextContent);
         } else {
-          const inlineTextContent = getInlineNodeTextContent(listItem.content);
+          const inlineTextContent = getInlineNodeTextContent(listItem.content).inlineTextContent;
           textContent.push(inlineTextContent);
         }
       });
@@ -220,6 +218,10 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
   const isTargetTask = isTaskList(targetNodeType);
   const listItems = [];
   const listItemType = isTargetTask ? schema.nodes.taskItem : schema.nodes.listItem;
+  const unsupportedContent = [];
+  const onhandleUnsupportedContent = content => {
+    unsupportedContent.push(content);
+  };
   const isValid = getContentSupportChecker(listItemType);
   nodes.forEach(node => {
     // Append unsupported nodes as is
@@ -251,7 +253,7 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
             schema,
             supportedListTypes,
             targetNodeType
-          });
+          }, onhandleUnsupportedContent);
           newListItems = [...newList.content.content];
         }
       } else if (isHeadingOrParagraphNode(node) || isValid(node)) {
@@ -292,7 +294,7 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
       }
     }
   });
-  return listItems.map(({
+  return [...listItems.map(({
     node,
     canBeTransformed
   }) => {
@@ -301,7 +303,7 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
     } else {
       return node;
     }
-  });
+  }), ...unsupportedContent];
 };
 export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema, targetAttrs) => {
   if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {

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

@@ -1,5 +1,7 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { getInlineNodeTextContent } from '../inline-node-transforms';
+import { getContentSupportChecker, isListNode } from '../utils';
 export const transformOrderedUnorderedListToBlockNodes = context => {
   const {
     tr,
@@ -12,28 +14,76 @@ export const transformOrderedUnorderedListToBlockNodes = context => {
     selection
   } = tr;
   const schema = selection.$from.doc.type.schema;
-  // find all paragraph nodes inside the list node
-  const paragraphs = findChildrenByType(sourceNode, schema.nodes.paragraph);
-  const paragraphNodes = paragraphs.map(paragraph => paragraph.node);
-  let targetNodes = paragraphNodes;
+  const targetNodes = [];
+  // find all list items inside the list node
+  const listItems = findChildrenByType(sourceNode, schema.nodes.listItem);
+  let textContent = [];
+  const flushTextContent = () => {
+    if (targetNodeType !== schema.nodes.codeBlock) {
+      return;
+    }
+    if (textContent.length > 0) {
+      const inlineText = textContent.join('\n');
+      targetNodes.push(schema.nodes.codeBlock.createChecked({}, inlineText !== '' ? schema.text(inlineText) : null));
+      textContent = [];
+    }
+  };
+  listItems.forEach(listItem => {
+    // Convert paragraphs to headings if target is heading
+    const content = listItem.node.content.content;
+    content.forEach(node => {
+      const isValid = getContentSupportChecker(targetNodeType)(node);
+      if (isListNode(node)) {
+        // Skip nested lists as it will return listItems that we will deal with separately
+        return;
+      }
 
-  // Convert paragraphs to headings if target is heading
-  if (targetNodeType === schema.nodes.heading && targetAttrs) {
-    const targetHeadingLevel = targetAttrs.level;
-    targetNodes = paragraphNodes.map(paragraphNode => schema.nodes.heading.createChecked({
-      level: targetHeadingLevel
-    }, paragraphNode.content));
-  }
+      // Deal with the case where targetNode and node are both codeBlocks, then append text content
+      if (targetNodeType === schema.nodes.codeBlock && node.type === schema.nodes.codeBlock) {
+        const inlineContent = node.textContent;
+        textContent = [...textContent, inlineContent];
+        return;
+      }
 
-  // Convert paragraphs to code block if target is code block
-  if (targetNodeType === schema.nodes.codeBlock) {
-    // convert the paragraphNodes to one code block
-    const listItemsResult = findChildrenByType(sourceNode, schema.nodes.listItem);
-    const listItems = listItemsResult.map(item => item.node);
-    const listItemFragments = listItems.map(listItem => listItem.content);
-    const codeBlockContent = listItemFragments.map(fragment => fragment.textBetween(0, fragment.size, '\n')).join('\n');
-    targetNodes = [schema.nodes.codeBlock.createChecked({}, schema.text(codeBlockContent))];
-  }
+      // If the node is not valid for the target container,
+      // flush any existing text content if target is codeBlock
+      // and extract the node without any conversion
+      if (!isValid && !node.isTextblock) {
+        flushTextContent();
+        targetNodes.push(node);
+        return;
+      }
+
+      // If the target is codeBlock, accumulate text content
+      if (targetNodeType === schema.nodes.codeBlock) {
+        const inlineContent = getInlineNodeTextContent(Fragment.from(node)).inlineTextContent;
+        textContent = [...textContent, inlineContent];
+        return;
+      }
+
+      // Convert codeblocks to block nodes
+      if (node.type === schema.nodes.codeBlock) {
+        var _targetAttrs$level;
+        const textContent = node.textContent.split('\n');
+        const attributes = targetNodeType === schema.nodes.heading ? {
+          level: (_targetAttrs$level = targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.level) !== null && _targetAttrs$level !== void 0 ? _targetAttrs$level : 1
+        } : null;
+        textContent.forEach(textLine => {
+          targetNodes.push(targetNodeType.createChecked(attributes, textLine ? schema.text(textLine) : null));
+        });
+        return;
+      }
+      if (targetNodeType === schema.nodes.heading && targetAttrs) {
+        const targetHeadingLevel = targetAttrs.level;
+        targetNodes.push(schema.nodes.heading.createChecked({
+          level: targetHeadingLevel
+        }, node.content));
+        return;
+      }
+      targetNodes.push(node);
+    });
+  });
+  flushTextContent();
   const fragment = Fragment.fromArray(targetNodes);
   const slice = new Slice(fragment, 0, 0);
   const rangeStart = sourcePos !== null ? sourcePos : selection.from;

package/dist/es2019/ui/copy-block.js

@@ -28,7 +28,7 @@ const CopyBlockMenuItem = ({
       const schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         let fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -41,6 +41,15 @@ const CopyBlockMenuItem = ({
           const layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          const expandNode = fragment.firstChild;
+          const actualNodeToCopy = expandNode.firstChild;
+          fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;
+        }
         const domNode = toDOMFromFragment(fragment, schema);
         const div = document.createElement('div');
         div.appendChild(domNode);
@@ -61,6 +70,13 @@ const CopyBlockMenuItem = ({
       // for other nodes
       if (selection instanceof NodeSelection) {
         const nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          nodeType.inlineContent = false;
+        }
         const domNode = toDOM(selection.node, schema);
         copyDomNode(domNode, nodeType, selection);
       }

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

@@ -304,7 +304,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
   var splits = [];
   var children = sourceNode.content.content;
   var currentTextContent = [];
-
+  var invalidContent = [];
   // Handle expand title - add as first text if source is expand with title
   if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
     currentTextContent.push(sourceNode.attrs.title);
@@ -329,7 +329,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        var text = getInlineNodeTextContent(Fragment.from(childNode));
+        var text = getInlineNodeTextContent(Fragment.from(childNode)).inlineTextContent;
         if (text.trim()) {
           currentTextContent.push(text);
         }
@@ -343,9 +343,13 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
       var listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
       var listItems = findChildrenByType(childNode, listItemType);
       listItems.forEach(function (listItem) {
-        var inlineContent = getInlineNodeTextContent(isTaskList ? Fragment.from(listItem.node) : listItem.node.content);
-        if (inlineContent.trim()) {
-          currentTextContent.push(inlineContent);
+        var content = isTaskList ? Fragment.from(listItem.node) : listItem.node.content;
+        var inlineContent = getInlineNodeTextContent(content);
+        if (inlineContent.inlineTextContent.trim()) {
+          currentTextContent.push(inlineContent.inlineTextContent);
+        }
+        if (inlineContent.invalidContent.length > 0) {
+          invalidContent.push.apply(invalidContent, _toConsumableArray(inlineContent.invalidContent));
         }
       });
     } else {
@@ -359,7 +363,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
 
   // Flush any remaining text content as a codeBlock
   flushCurrentCodeBlock();
-  return splits;
+  return [].concat(splits, invalidContent);
 };
 
 /**

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

@@ -1,11 +1,16 @@
+import { isListNodeType } from './utils';
 export var getInlineNodeTextContent = function getInlineNodeTextContent(sourceContent) {
   var validTransformedContent = '';
+  var invalidContent = [];
   if (sourceContent.content.length < 1) {
-    return '';
+    return {
+      inlineTextContent: '',
+      invalidContent: invalidContent
+    };
   }
   // Headings are not valid inside headings so convert heading nodes to paragraphs
   sourceContent.forEach(function (node) {
-    if (['paragraph', 'heading', 'taskItem'].includes(node.type.name)) {
+    if (['paragraph', 'heading', 'taskItem', 'codeBlock'].includes(node.type.name)) {
       node.content.forEach(function (inlineNode) {
         if (inlineNode.type.name === 'status') {
           validTransformedContent += inlineNode.attrs.text;
@@ -13,11 +18,16 @@ export var getInlineNodeTextContent = function getInlineNodeTextContent(sourceCo
           validTransformedContent += "".concat(inlineNode.textContent);
         }
       });
+    } else if (!isListNodeType(node.type)) {
+      invalidContent.push(node);
     }
   });
-  return validTransformedContent;
+  return {
+    inlineTextContent: validTransformedContent,
+    invalidContent: invalidContent
+  };
 };
 export var getInlineNodeTextNode = function getInlineNodeTextNode(sourceContent, schema) {
-  var text = getInlineNodeTextContent(sourceContent);
+  var text = getInlineNodeTextContent(sourceContent).inlineTextContent;
   return schema.text(text);
 };

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

@@ -105,9 +105,7 @@ var transformToCodeBlock = function transformToCodeBlock(nodes, schema) {
   };
   nodes.forEach(function (node) {
     if (node.isTextblock) {
-      var inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node));
-
-      // For first node, add directly
+      var inlineTextContent = node.type === schema.nodes.codeBlock ? node.textContent : getInlineNodeTextContent(Fragment.from(node)).inlineTextContent;
       addToNewNodes([inlineTextContent]);
     } else if (isListNode(node)) {
       var textContent = [];
@@ -117,10 +115,10 @@ var transformToCodeBlock = function transformToCodeBlock(nodes, schema) {
       });
       listItems.forEach(function (listItem) {
         if (listItem.type === schema.nodes.taskItem) {
-          var _inlineTextContent = getInlineNodeTextContent(Fragment.from(listItem));
+          var _inlineTextContent = getInlineNodeTextContent(Fragment.from(listItem)).inlineTextContent;
           textContent.push(_inlineTextContent);
         } else {
-          var _inlineTextContent2 = getInlineNodeTextContent(listItem.content);
+          var _inlineTextContent2 = getInlineNodeTextContent(listItem.content).inlineTextContent;
           textContent.push(_inlineTextContent2);
         }
       });
@@ -235,6 +233,10 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
   var isTargetTask = isTaskList(targetNodeType);
   var listItems = [];
   var listItemType = isTargetTask ? schema.nodes.taskItem : schema.nodes.listItem;
+  var unsupportedContent = [];
+  var onhandleUnsupportedContent = function onhandleUnsupportedContent(content) {
+    unsupportedContent.push(content);
+  };
   var isValid = getContentSupportChecker(listItemType);
   nodes.forEach(function (node) {
     // Append unsupported nodes as is
@@ -266,7 +268,7 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
             schema: schema,
             supportedListTypes: supportedListTypes,
             targetNodeType: targetNodeType
-          });
+          }, onhandleUnsupportedContent);
           newListItems = _toConsumableArray(newList.content.content);
         }
       } else if (isHeadingOrParagraphNode(node) || isValid(node)) {
@@ -307,7 +309,7 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
       }
     }
   });
-  return listItems.map(function (_ref3) {
+  return [].concat(_toConsumableArray(listItems.map(function (_ref3) {
     var node = _ref3.node,
       canBeTransformed = _ref3.canBeTransformed;
     if (canBeTransformed) {
@@ -315,7 +317,7 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
     } else {
       return node;
     }
-  });
+  })), unsupportedContent);
 };
 export var convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
   if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {

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

@@ -1,5 +1,8 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { getInlineNodeTextContent } from '../inline-node-transforms';
+import { getContentSupportChecker, isListNode } from '../utils';
 export var transformOrderedUnorderedListToBlockNodes = function transformOrderedUnorderedListToBlockNodes(context) {
   var tr = context.tr,
     targetNodeType = context.targetNodeType,
@@ -8,38 +11,76 @@ export var transformOrderedUnorderedListToBlockNodes = function transformOrdered
     sourcePos = context.sourcePos;
   var selection = tr.selection;
   var schema = selection.$from.doc.type.schema;
-  // find all paragraph nodes inside the list node
-  var paragraphs = findChildrenByType(sourceNode, schema.nodes.paragraph);
-  var paragraphNodes = paragraphs.map(function (paragraph) {
-    return paragraph.node;
-  });
-  var targetNodes = paragraphNodes;
+  var targetNodes = [];
+  // find all list items inside the list node
+  var listItems = findChildrenByType(sourceNode, schema.nodes.listItem);
+  var textContent = [];
+  var flushTextContent = function flushTextContent() {
+    if (targetNodeType !== schema.nodes.codeBlock) {
+      return;
+    }
+    if (textContent.length > 0) {
+      var inlineText = textContent.join('\n');
+      targetNodes.push(schema.nodes.codeBlock.createChecked({}, inlineText !== '' ? schema.text(inlineText) : null));
+      textContent = [];
+    }
+  };
+  listItems.forEach(function (listItem) {
+    // Convert paragraphs to headings if target is heading
+    var content = listItem.node.content.content;
+    content.forEach(function (node) {
+      var isValid = getContentSupportChecker(targetNodeType)(node);
+      if (isListNode(node)) {
+        // Skip nested lists as it will return listItems that we will deal with separately
+        return;
+      }
 
-  // Convert paragraphs to headings if target is heading
-  if (targetNodeType === schema.nodes.heading && targetAttrs) {
-    var targetHeadingLevel = targetAttrs.level;
-    targetNodes = paragraphNodes.map(function (paragraphNode) {
-      return schema.nodes.heading.createChecked({
-        level: targetHeadingLevel
-      }, paragraphNode.content);
-    });
-  }
+      // Deal with the case where targetNode and node are both codeBlocks, then append text content
+      if (targetNodeType === schema.nodes.codeBlock && node.type === schema.nodes.codeBlock) {
+        var inlineContent = node.textContent;
+        textContent = [].concat(_toConsumableArray(textContent), [inlineContent]);
+        return;
+      }
 
-  // Convert paragraphs to code block if target is code block
-  if (targetNodeType === schema.nodes.codeBlock) {
-    // convert the paragraphNodes to one code block
-    var listItemsResult = findChildrenByType(sourceNode, schema.nodes.listItem);
-    var listItems = listItemsResult.map(function (item) {
-      return item.node;
-    });
-    var listItemFragments = listItems.map(function (listItem) {
-      return listItem.content;
+      // If the node is not valid for the target container,
+      // flush any existing text content if target is codeBlock
+      // and extract the node without any conversion
+      if (!isValid && !node.isTextblock) {
+        flushTextContent();
+        targetNodes.push(node);
+        return;
+      }
+
+      // If the target is codeBlock, accumulate text content
+      if (targetNodeType === schema.nodes.codeBlock) {
+        var _inlineContent = getInlineNodeTextContent(Fragment.from(node)).inlineTextContent;
+        textContent = [].concat(_toConsumableArray(textContent), [_inlineContent]);
+        return;
+      }
+
+      // Convert codeblocks to block nodes
+      if (node.type === schema.nodes.codeBlock) {
+        var _targetAttrs$level;
+        var _textContent = node.textContent.split('\n');
+        var attributes = targetNodeType === schema.nodes.heading ? {
+          level: (_targetAttrs$level = targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.level) !== null && _targetAttrs$level !== void 0 ? _targetAttrs$level : 1
+        } : null;
+        _textContent.forEach(function (textLine) {
+          targetNodes.push(targetNodeType.createChecked(attributes, textLine ? schema.text(textLine) : null));
+        });
+        return;
+      }
+      if (targetNodeType === schema.nodes.heading && targetAttrs) {
+        var targetHeadingLevel = targetAttrs.level;
+        targetNodes.push(schema.nodes.heading.createChecked({
+          level: targetHeadingLevel
+        }, node.content));
+        return;
+      }
+      targetNodes.push(node);
     });
-    var codeBlockContent = listItemFragments.map(function (fragment) {
-      return fragment.textBetween(0, fragment.size, '\n');
-    }).join('\n');
-    targetNodes = [schema.nodes.codeBlock.createChecked({}, schema.text(codeBlockContent))];
-  }
+  });
+  flushTextContent();
   var fragment = Fragment.fromArray(targetNodes);
   var slice = new Slice(fragment, 0, 0);
   var rangeStart = sourcePos !== null ? sourcePos : selection.from;

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

@@ -26,7 +26,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       var schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         var fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -39,6 +39,15 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
           var layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          var expandNode = fragment.firstChild;
+          var actualNodeToCopy = expandNode.firstChild;
+          fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;
+        }
         var domNode = toDOMFromFragment(fragment, schema);
         var div = document.createElement('div');
         div.appendChild(domNode);
@@ -59,6 +68,13 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       // for other nodes
       if (selection instanceof NodeSelection) {
         var _nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          _nodeType.inlineContent = false;
+        }
         var _domNode2 = toDOM(selection.node, schema);
         copyDomNode(_domNode2, _nodeType, selection);
       }

package/dist/types/editor-commands/transforms/inline-node-transforms.d.ts

@@ -1,3 +1,6 @@
-import type { Fragment, Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const getInlineNodeTextContent: (sourceContent: Fragment) => string;
-export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => import("prosemirror-model").Node;
+import type { Fragment, Schema, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment) => {
+    inlineTextContent: string;
+    invalidContent: PMNode[];
+};
+export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => PMNode;

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

@@ -1,3 +1,6 @@
-import type { Fragment, Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const getInlineNodeTextContent: (sourceContent: Fragment) => string;
-export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => import("prosemirror-model").Node;
+import type { Fragment, Schema, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment) => {
+    inlineTextContent: string;
+    invalidContent: PMNode[];
+};
+export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => PMNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "3.1.4",
+	"version": "3.1.6",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 	"dependencies": {
 		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
-		"@atlaskit/editor-plugin-block-controls": "^6.2.0",
+		"@atlaskit/editor-plugin-block-controls": "^6.3.0",
 		"@atlaskit/editor-plugin-decorations": "^5.0.0",
 		"@atlaskit/editor-plugin-selection": "^5.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^3.0.0",
@@ -38,16 +38,16 @@
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.9.0",
-		"@atlaskit/icon": "^28.1.0",
+		"@atlaskit/icon": "^28.2.0",
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.14.0",
-		"@atlaskit/tmp-editor-statsig": "^12.21.0",
+		"@atlaskit/tmp-editor-statsig": "^12.23.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.6.0",
+		"@atlaskit/editor-common": "^109.8.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},