@atlaskit/editor-plugin-block-menu 6.0.4 → 6.0.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.6
+
+### Patch Changes
+
+- [`27a9a5b28e8a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/27a9a5b28e8a6) -
+  [ux] Add ability to transform multiselected content to layouts
+
+## 6.0.5
+
+### Patch Changes
+
+- [`1c4801e3e64b4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1c4801e3e64b4) -
+  [ux] Add ability for multi selected block transformations to lists
+- Updated dependencies
+
 ## 6.0.4
 
 ### Patch Changes

package/dist/cjs/editor-commands/transform-node-utils/steps/convertEachNodeStep.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertEachNodeStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _transform = require("../transform");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var convertEachNodeStep = exports.convertEachNodeStep = function convertEachNodeStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName,
+    targetAttrs = context.targetAttrs;
+  var targetNodeType = schema.nodes[targetNodeTypeName];
+  if (!targetNodeType) {
+    return nodes;
+  }
+  var resultNodes = [];
+  var _iterator = _createForOfIteratorHelper(nodes),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var node = _step.value;
+      var transformedNodes = (0, _transform.convertNodesToTargetType)({
+        sourceNodes: [node],
+        targetNodeType: targetNodeType,
+        schema: schema,
+        isNested: false,
+        targetAttrs: targetAttrs
+      });
+      if (transformedNodes.length > 0) {
+        resultNodes.push.apply(resultNodes, (0, _toConsumableArray2.default)(transformedNodes));
+      } else {
+        resultNodes.push(node);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return resultNodes;
+};

package/dist/cjs/editor-commands/transform-node-utils/steps/mergeNeighbourListsStep.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeNeighbourListsStep = void 0;
+var _nodeChecks = require("../nodeChecks");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/**
+ * Merges consecutive lists of the same type into a single list.
+ * This step is useful after multiToListStep which may create multiple separate lists
+ * that should be combined.
+ *
+ * Handles both nestable lists (bulletList, orderedList, taskList) and
+ * non-nestable lists (decisionList).
+ *
+ * @example
+ * Input:
+ * - bulletList
+ *   - listItem "1"
+ * - bulletList
+ *   - listItem "2"
+ * - panel (non-list node)
+ * - bulletList
+ *   - listItem "3"
+ *
+ * Output:
+ * - bulletList
+ *   - listItem "1"
+ *   - listItem "2"
+ * - panel (non-list node)
+ * - bulletList
+ *   - listItem "3"
+ *
+ * @param nodes - The nodes to process
+ * @param context - The transformation context
+ * @returns The merged nodes
+ */
+var mergeNeighbourListsStep = exports.mergeNeighbourListsStep = function mergeNeighbourListsStep(nodes, context) {
+  if (nodes.length === 0) {
+    return nodes;
+  }
+  var schema = context.schema;
+  var resultNodes = [];
+  var currentList = null;
+
+  // Check if a node is any type of list (including decisionList)
+  var isList = function isList(node) {
+    return (0, _nodeChecks.isListWithIndentation)(node.type.name, schema) || node.type.name === 'decisionList';
+  };
+  var _iterator = _createForOfIteratorHelper(nodes),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var node = _step.value;
+      // Check if this node is any type of list
+      if (isList(node)) {
+        if (currentList && currentList.type === node.type) {
+          // Merge with the current list by combining their children
+          var mergedContent = currentList.content.append(node.content);
+          currentList = currentList.type.create(currentList.attrs, mergedContent);
+        } else {
+          // Start a new list or switch to a different list type
+          if (currentList) {
+            resultNodes.push(currentList);
+          }
+          currentList = node;
+        }
+      } else {
+        // Non-list node - push any accumulated list and then this node
+        if (currentList) {
+          resultNodes.push(currentList);
+          currentList = null;
+        }
+        resultNodes.push(node);
+      }
+    }
+
+    // Don't forget the last list if we ended with one
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (currentList) {
+    resultNodes.push(currentList);
+  }
+  return resultNodes;
+};

package/dist/cjs/editor-commands/transform-node-utils/steps/wrapBlockquoteToDecisionListStep.js

@@ -4,17 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapBlockquoteToDecisionListStep = void 0;
-var _types = require("../types");
-/**
- * Determines if a node is a text node (heading or paragraph).
- * Only text nodes should have their inline content extracted for decisionItem.
- * All other nodes should break out.
- */
-var isTextNode = function isTextNode(node) {
-  var category = _types.NODE_CATEGORY_BY_TYPE[node.type.name];
-  return category === 'text';
-};
-
+var _utils = require("../utils");
 /**
  * Creates a decisionItem with the given inline content.
  */
@@ -74,7 +64,7 @@ var wrapBlockquoteToDecisionListStep = exports.wrapBlockquoteToDecisionListStep
     }
   };
   nodes.forEach(function (node) {
-    var decisionItem = isTextNode(node) ? createDecisionItem(node.content, schema) : null;
+    var decisionItem = (0, _utils.isTextNode)(node) ? createDecisionItem(node.content, schema) : null;
     if (decisionItem) {
       // Accumulate consecutive decisionItems
       currentDecisionItems.push(decisionItem);

package/dist/cjs/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -10,33 +10,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _marks = require("../marks");
 var _types = require("../types");
 var _utils = require("../utils");
-/**
- * Determines if a node is a text node (heading or paragraph).
- * Text nodes can have their content converted to paragraphs when they can't be wrapped directly.
- */
-var isTextNode = function isTextNode(node) {
-  var category = _types.NODE_CATEGORY_BY_TYPE[node.type.name];
-  return category === 'text';
-};
-
-/**
- * Determines if a node can be wrapped in the target container type, removes block marks from the node during check.
- * Uses the schema's validContent to check if the target container can hold this node.
- *
- * Note: What can be wrapped depends on the target container type - for example:
- * - Tables and media CAN go inside expand nodes
- * - Tables CANNOT go inside panels or blockquotes
- */
-var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeTypeName) {
-  // Same-type containers should break out as separate containers
-  if (node.type.name === targetNodeTypeName) {
-    return false;
-  }
-
-  // Use the schema to determine if this node can be contained in the target
-  return targetNodeType.validContent(_model.Fragment.from((0, _marks.removeDisallowedMarks)([node], targetNodeType)));
-};
-
 /**
  * Handles the edge case where transforming from a container to another container results in
  * all content breaking out (no valid children for the target). In this case, creates an empty
@@ -75,18 +48,33 @@ var handleEmptyContainerEdgeCase = function handleEmptyContainerEdgeCase(result,
  * - Same-type containers break out as separate containers (preserved as-is)
  * - NestedExpands break out as regular expands (converted since nestedExpand can't exist outside expand)
  * - Container structures that can't be nested in target break out (not flattened)
- * - Text/list nodes that can't be wrapped are flattened and merged into the container
+ * - Text/list nodes that can't be wrapped are converted to paragraphs and merged into the container
  * - Atomic nodes (tables, media, macros) break out
  *
+ * Special handling for layouts:
+ * - Layout sections break out as separate layouts (preserved as-is, not wrapped)
+ * - Other nodes (including headings, paragraphs, lists) are wrapped into layout columns within a layout section
+ * - Layouts always require layoutColumns as children (never paragraphs directly)
+ * - Layout columns can contain most block content including headings, paragraphs, lists, etc.
+ *
+ * Edge case handling:
+ * - For regular containers: If all content breaks out (container → container transform with no
+ *   valid children), an empty container with a paragraph is created to ensure the target type exists
+ * - For layouts: Edge case handling is skipped because layouts require columns, not direct paragraphs.
+ *   If all content breaks out, only the broken-out nodes are returned (no empty layout created)
+ *
  * What can be wrapped depends on the target container's schema:
  * - expand → panel: tables break out, nestedExpands convert to expands and break out
- * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out
+ * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out, headings converted to paragraphs
  * - expand → expand: tables/media stay inside (expands can contain them)
+ * - multi → layoutSection: layout sections break out, headings/paragraphs/lists wrapped into layout columns
  *
  * Example: expand(p('a'), table(), p('b')) → panel: [panel(p('a')), table(), panel(p('b'))]
  * Example: expand(p('a'), panel(p('x')), p('b')) → panel: [panel(p('a')), panel(p('x')), panel(p('b'))]
  * Example: expand(p('a'), nestedExpand({title: 'inner'})(p('x')), p('b')) → panel: [panel(p('a')), expand({title: 'inner'})(p('x')), panel(p('b'))]
  * Example: expand(nestedExpand()(p())) → panel: [panel(), expand()(p())] (empty panel when all content breaks out)
+ * Example: [p('a'), layoutSection(...), p('b')] → layoutSection: [layoutSection(layoutColumn(p('a'))), layoutSection(...), layoutSection(layoutColumn(p('b')))]
+ * Example: [h1('heading'), p('para')] → layoutSection: [layoutSection(layoutColumn(h1('heading'), p('para')))] (headings stay as headings in layouts)
  */
 var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedContentStep(nodes, context) {
   var schema = context.schema,
@@ -96,49 +84,78 @@ var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedCont
   if (!targetNodeType) {
     return nodes;
   }
+  var isLayout = targetNodeTypeName === 'layoutSection';
+  var _schema$nodes = schema.nodes,
+    layoutSection = _schema$nodes.layoutSection,
+    layoutColumn = _schema$nodes.layoutColumn;
   var result = [];
   var currentContainerContent = [];
   var hasCreatedContainer = false;
   var flushCurrentContainer = function flushCurrentContainer() {
-    if (currentContainerContent.length > 0) {
-      var containerNode = targetNodeType.createAndFill({}, _model.Fragment.fromArray(currentContainerContent));
-      if (containerNode) {
-        result.push(containerNode);
+    if (currentContainerContent.length === 0) {
+      return;
+    }
+    if (isLayout) {
+      // For layouts, create layoutSection with two layoutColumns
+      var columnOne = layoutColumn.createAndFill({}, (0, _marks.removeDisallowedMarks)(currentContainerContent, layoutColumn));
+      var columnTwo = layoutColumn.createAndFill();
+      if (!columnOne || !columnTwo) {
+        currentContainerContent = [];
+        return;
+      }
+      var layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
+      if (layout) {
+        result.push(layout);
         hasCreatedContainer = true;
       }
       currentContainerContent = [];
+      return;
     }
+
+    // For regular containers, create directly
+    var containerNode = targetNodeType.createAndFill({}, currentContainerContent);
+    if (containerNode) {
+      result.push(containerNode);
+      hasCreatedContainer = true;
+    }
+    currentContainerContent = [];
   };
-  nodes.forEach(function (node) {
-    if (canWrapInTarget(node, targetNodeType, targetNodeTypeName)) {
+  var processNode = function processNode(node) {
+    var validationType = isLayout ? layoutColumn : targetNodeType;
+    var canWrapNode = validationType.validContent(_model.Fragment.from((0, _marks.removeDisallowedMarks)([node], validationType)));
+
+    // Node can be wrapped - add to current container content
+    if (canWrapNode) {
       var _currentContainerCont;
-      // Node can be wrapped - add to current container content
       // remove marks from node as nested nodes don't usually support block marks
-      (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, (0, _toConsumableArray2.default)((0, _marks.removeDisallowedMarks)([node], targetNodeType)));
-    } else if (node.type.name === targetNodeTypeName) {
-      // Same-type container - breaks out as a separate container (preserved as-is)
-      // This handles: "If there's a panel in the expand, it breaks out into a separate panel"
-      flushCurrentContainer();
-      result.push(node);
-    } else if (isTextNode(node)) {
-      // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
-      // Example: heading can't go in blockquote, so convert to paragraph with same content
+      (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, (0, _toConsumableArray2.default)((0, _marks.removeDisallowedMarks)([node], validationType)));
+      return;
+    }
+
+    // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
+    // Example: heading can't go in blockquote, so convert to paragraph with same content
+    if ((0, _utils.isTextNode)(node)) {
       var paragraph = (0, _utils.convertTextNodeToParagraph)(node, schema);
       if (paragraph) {
         currentContainerContent.push(paragraph);
       }
-    } else {
-      // All other nodes that cannot be wrapped (lists, containers, tables, media, macros) - break out
-      // This includes list nodes like taskList that can't be placed in certain containers
-      flushCurrentContainer();
-      result.push(node);
+      return;
     }
-  });
+
+    // All other nodes that cannot be wrapped in the target node - break out
+    // Examples: same-type containers, tables in panels, layoutSections in layouts
+    flushCurrentContainer();
+    result.push(node);
+  };
+  nodes.forEach(processNode);
 
   // Flush any remaining content into a container
   flushCurrentContainer();
 
-  // Handle edge case: create empty container if all content broke out
+  // Skip edge case handling for layouts since layouts always have columns
+  if (isLayout) {
+    return result.length > 0 ? result : nodes;
+  }
   var finalResult = handleEmptyContainerEdgeCase(result, hasCreatedContainer, fromNode, targetNodeType, targetNodeTypeName, schema);
   return finalResult.length > 0 ? finalResult : nodes;
 };

package/dist/cjs/editor-commands/transform-node-utils/transform.js

@@ -3,14 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTransformDisabledBasedOnStepsConfig = exports.getOutputNodes = void 0;
+exports.isTransformDisabledBasedOnStepsConfig = exports.convertNodesToTargetType = void 0;
 var _utils = require("../transform-node-utils/utils");
 var _flattenStep = require("./flattenStep");
 var _applyTargetTextTypeStep = require("./steps/applyTargetTextTypeStep");
+var _convertEachNodeStep = require("./steps/convertEachNodeStep");
 var _decisionListToListStep = require("./steps/decisionListToListStep");
 var _flattenListStep = require("./steps/flattenListStep");
 var _listToDecisionListStep = require("./steps/listToDecisionListStep");
 var _listToListStep = require("./steps/listToListStep");
+var _mergeNeighbourListsStep = require("./steps/mergeNeighbourListsStep");
 var _unwrapLayoutStep = require("./steps/unwrapLayoutStep");
 var _unwrapListStep = require("./steps/unwrapListStep");
 var _wrapBlockquoteToDecisionListStep = require("./steps/wrapBlockquoteToDecisionListStep");
@@ -19,7 +21,6 @@ var _wrapTextToCodeblock = require("./steps/wrapTextToCodeblock");
 var _types = require("./types");
 var _unwrapExpandStep = require("./unwrapExpandStep");
 var _unwrapStep = require("./unwrapStep");
-var _wrapIntoLayoutStep = require("./wrapIntoLayoutStep");
 var _wrapIntoListStep = require("./wrapIntoListStep");
 var _wrapStep = require("./wrapStep");
 // Transform steps for combinations of node categories (block/container/list/text)
@@ -55,10 +56,8 @@ var TRANSFORM_STEPS = {
   multi: {
     atomic: undefined,
     container: [_wrapMixedContentStep.wrapMixedContentStep],
-    // TODO: EDITOR-4137 - Implement multi list transform
-    list: undefined,
-    // TODO: EDITOR-4140 - Implement multi text transform
-    text: undefined,
+    list: [_convertEachNodeStep.convertEachNodeStep, _mergeNeighbourListsStep.mergeNeighbourListsStep],
+    text: [_convertEachNodeStep.convertEachNodeStep],
     multi: undefined
   }
 };
@@ -70,15 +69,15 @@ var TRANSFORM_STEPS_OVERRIDE = {
   paragraph: {
     paragraph: null,
     codeBlock: [_wrapTextToCodeblock.wrapTextToCodeblockStep],
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep]
   },
   heading: {
     codeBlock: [_wrapTextToCodeblock.wrapTextToCodeblockStep],
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep]
   },
   panel: {
     panel: null,
-    layoutSection: [_unwrapStep.unwrapStep, _wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_unwrapStep.unwrapStep, _wrapMixedContentStep.wrapMixedContentStep],
     codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
     blockquote: [_unwrapStep.unwrapStep, _wrapMixedContentStep.wrapMixedContentStep],
     taskList: null,
@@ -90,7 +89,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     expand: null,
     panel: [_unwrapExpandStep.unwrapExpandStep, _wrapMixedContentStep.wrapMixedContentStep],
     blockquote: [_unwrapExpandStep.unwrapExpandStep, _wrapMixedContentStep.wrapMixedContentStep],
-    layoutSection: [_unwrapExpandStep.unwrapExpandStep, _wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_unwrapExpandStep.unwrapExpandStep, _wrapMixedContentStep.wrapMixedContentStep],
     paragraph: [_unwrapExpandStep.unwrapExpandStep],
     codeBlock: null,
     heading: null
@@ -108,7 +107,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: null,
     expand: [_wrapStep.wrapStep],
     nestedExpand: [_wrapStep.wrapStep],
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     codeBlock: null,
     decisionList: [_unwrapStep.unwrapStep, _wrapBlockquoteToDecisionListStep.wrapBlockquoteToDecisionListStep]
   },
@@ -126,34 +125,34 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [_wrapStep.wrapStep],
     expand: [_wrapStep.wrapStep],
     nestedExpand: [_wrapStep.wrapStep],
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     panel: [_wrapStep.wrapStep],
     heading: null
   },
   bulletList: {
     bulletList: null,
     codeBlock: null,
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     decisionList: [_flattenListStep.flattenListStep, _listToDecisionListStep.listToDecisionListStep],
     heading: null
   },
   orderedList: {
     orderedList: null,
     codeBlock: null,
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     decisionList: [_flattenListStep.flattenListStep, _listToDecisionListStep.listToDecisionListStep],
     heading: null
   },
   taskList: {
     blockquote: null,
     codeBlock: null,
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     decisionList: [_flattenListStep.flattenListStep, _listToDecisionListStep.listToDecisionListStep],
     heading: null,
     taskList: null
   },
   table: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     blockquote: null,
     panel: null,
     codeBlock: null,
@@ -163,13 +162,13 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   mediaSingle: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     taskList: null
   },
   mediaGroup: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     bulletList: null,
@@ -181,10 +180,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: [_decisionListToListStep.decisionListToListStep],
     orderedList: [_decisionListToListStep.decisionListToListStep],
     taskList: [_decisionListToListStep.decisionListToListStep],
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep]
   },
   blockCard: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     blockquote: null,
     codeBlock: null,
     orderedList: null,
@@ -193,7 +192,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   embedCard: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     blockquote: null,
     panel: null,
     codeBlock: null,
@@ -203,7 +202,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   extension: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     taskList: null,
@@ -211,7 +210,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: null
   },
   bodiedExtension: {
-    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     blockquote: null,
     expand: null,
     panel: null,
@@ -222,8 +221,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   multi: {
-    // TODO: EDITOR-4138 - Implement multi content to layout transform
-    layoutSection: undefined
+    // TODO: EDITOR-4140 - Implement multiple paragraphs/headings/codeblocks to heading transform
+    heading: null,
+    // TODO: EDITOR-4141 - Implement multiple codeblocks/headings to paragraph transform
+    paragraph: null
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -237,7 +238,22 @@ var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selec
   var steps = overrideSteps !== null && overrideSteps !== void 0 ? overrideSteps : TRANSFORM_STEPS[fromCategory][toCategory];
   return steps;
 };
-var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
+/**
+ * Convert a list of nodes to a target node type.
+ * If no steps are found, the source nodes are returned unchanged.
+ * If steps are found, they are applied to the source nodes in order.
+ * If a step returns an empty array, the source nodes are returned.
+ * If a step returns a non-empty array, that array is returned.
+ * @param args - The conversion arguments
+ * @param args.sourceNodes - The list of nodes to convert
+ * @param args.targetNodeType - The type of node to convert into
+ * @param args.schema - The schema to use for the conversion
+ * @param args.isNested - Whether the conversion is nested
+ * @param args.targetAttrs - The attributes to use for the conversion
+ * @param args.parentNode - The parent node of the selected node
+ * @returns The converted list of nodes
+ */
+var convertNodesToTargetType = exports.convertNodesToTargetType = function convertNodesToTargetType(_ref) {
   var sourceNodes = _ref.sourceNodes,
     targetNodeType = _ref.targetNodeType,
     schema = _ref.schema,
@@ -246,14 +262,13 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     parentNode = _ref.parentNode;
   var sourceNode = sourceNodes.at(0);
   if (!sourceNode) {
-    return;
+    return sourceNodes;
   }
   var selectedNodeTypeName = (0, _types.toNodeTypeValue)((0, _types.getNodeName)(sourceNodes));
   var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
   var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested, parentNode);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
-    // We may decide to return an empty array or undefined here
-    return;
+    return sourceNodes;
   }
   var steps = getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName);
   var context = {
@@ -264,7 +279,7 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     targetAttrs: targetAttrs
   };
   if (!steps || steps.length === 0) {
-    return;
+    return sourceNodes;
   }
   return steps.reduce(function (nodes, step) {
     return step(nodes, context);

package/dist/cjs/editor-commands/transform-node-utils/utils.js

@@ -3,10 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertTextNodeToParagraph = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
+exports.isTextNode = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertTextNodeToParagraph = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
+var _types = require("./types");
+/**
+ * Determines if a node is a text node (heading or paragraph).
+ * Text nodes can have their content converted to paragraphs when they can't be wrapped directly.
+ */
+var isTextNode = exports.isTextNode = function isTextNode(node) {
+  var category = _types.NODE_CATEGORY_BY_TYPE[node.type.name];
+  return category === 'text';
+};
 var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof _state.NodeSelection) {
     return {