@atlaskit/editor-plugin-block-menu 5.1.5 → 5.1.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.1.7
+
+### Patch Changes
+
+- [`65ef204463ce4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65ef204463ce4) -
+  Add predicate param to expandBlockRange, add logic to cater for selection being broken in lists
+- Updated dependencies
+
+## 5.1.6
+
+### Patch Changes
+
+- [`a202e97c73f3a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a202e97c73f3a) -
+  Adds base transform cases for codeBlock, layout, blockquote.
+
 ## 5.1.5
 
 ### Patch Changes

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

@@ -5,39 +5,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.flattenListStep = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
-var extractNestedLists = function extractNestedLists(node, listTypes, itemTypes) {
+var extractNestedLists = function extractNestedLists(node, listTypes, itemTypes, schema) {
   var items = [];
+  var paragraph = schema.nodes.paragraph;
   var _extract = function extract(currentNode) {
     currentNode.forEach(function (child) {
-      // list item -> take content without nested lists, then recurse into nested lists
       if (itemTypes.some(function (type) {
         return child.type === type;
       })) {
-        // Filter out nested list nodes from the list item's content
         var contentWithoutNestedLists = [];
         var nestedLists = [];
         child.forEach(function (grandChild) {
           if (listTypes.some(function (type) {
             return grandChild.type === type;
           })) {
-            // This is a nested list - collect it for later processing
             nestedLists.push(grandChild);
           } else {
-            // This is regular content (paragraph, etc.) - keep it
-            contentWithoutNestedLists.push(grandChild);
+            if (grandChild.isText) {
+              contentWithoutNestedLists.push(paragraph.createAndFill({}, grandChild));
+            } else {
+              contentWithoutNestedLists.push(grandChild);
+            }
           }
         });
-
-        // Add the list item with only its non-list content
         items.push(child.copy(_model.Fragment.from(contentWithoutNestedLists)));
-
-        // Now process nested lists to maintain document order
         nestedLists.forEach(function (nestedList) {
           _extract(nestedList);
         });
-      }
-      // lists -> keep operating
-      else if (listTypes.some(function (type) {
+      } else if (listTypes.some(function (type) {
         return child.type === type;
       })) {
         _extract(child);
@@ -53,24 +48,6 @@ var extractNestedLists = function extractNestedLists(node, listTypes, itemTypes)
  * to it's first ancestor list, maintaining document order.
  *
  * @example
- * Input:
- * - bulletList
- *   - listItem "A"
- *   - listItem "B"
- *     - bulletList
- *       - listItem "C"
- *       - listItem "D"
- *   - listItem "E"
- *
- * Output:
- * - bulletList
- *   - listItem "A"
- *   - listItem "B"
- *   - listItem "C"
- *   - listItem "D"
- *   - listItem "E"
- *
- * @example
  * Input (deeply nested):
  * - bulletList
  *   - listItem "1"
@@ -101,7 +78,7 @@ var flattenListStep = exports.flattenListStep = function flattenListStep(nodes,
     if (listTypes.some(function (type) {
       return node.type === type;
     })) {
-      return node.copy(_model.Fragment.from(extractNestedLists(node, listTypes, [context.schema.nodes.listItem, context.schema.nodes.taskItem])));
+      return node.copy(_model.Fragment.from(extractNestedLists(node, listTypes, [context.schema.nodes.listItem, context.schema.nodes.taskItem], context.schema)));
     }
     return node;
   });

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

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unwrapLayoutStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+var unwrapLayoutStep = exports.unwrapLayoutStep = function unwrapLayoutStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    var isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(function (column) {
+        var isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -7,6 +7,7 @@ exports.getOutputNodes = void 0;
 var _utils = require("../transform-node-utils/utils");
 var _flattenListStep = require("./flattenListStep");
 var _flattenStep = require("./flattenStep");
+var _unwrapLayoutStep = require("./steps/unwrapLayoutStep");
 var _stubStep = require("./stubStep");
 var _types = require("./types");
 var _unwrapExpandStep = require("./unwrapExpandStep");
@@ -72,6 +73,26 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
     paragraph: [_unwrapExpandStep.unwrapExpandStep],
     codeBlock: [_unwrapExpandStep.unwrapExpandStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  blockquote: {
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  layoutSection: {
+    blockquote: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    expand: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    panel: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    codeBlock: [_unwrapLayoutStep.unwrapLayoutStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
+    paragraph: [_unwrapLayoutStep.unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [_wrapStep.wrapStep],
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    panel: [_wrapStep.wrapStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -89,8 +110,8 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = (0, _types.toNodeTypeValue)(sourceNode.type.name);
-  var targetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
-  targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(targetNodeTypeName, isNested);
+  var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
+  var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -105,7 +126,6 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     return;
   }
   return steps.reduce(function (nodes, step) {
-    var result = step(nodes, context);
-    return result;
+    return step(nodes, context);
   }, nodesToReplace);
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unwrapExpandStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _unwrapStep = require("./unwrapStep");
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -15,8 +16,11 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
   var outputNodes = [];
+  var _schema$nodes = schema.nodes,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
   nodes.forEach(function (node) {
-    var isExpand = node.type.name === 'expand' || node.type.name === 'nestedExpand';
+    var isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
     if (isExpand) {
       var _node$attrs;
       var title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
@@ -32,12 +36,7 @@ var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(node
       // Add the children
       outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
-      }
+      (0, _unwrapStep.unwrapStep)([node], context);
     }
   });
   return outputNodes;

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

@@ -7,8 +7,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.unwrapListStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 /**
- * Given an array of nodes, returns an array with the flattened children of any list nodes.
+ * Given an array of nodes, processes each list removing all parent list nodes and
+ * just returning their child contents.
+ *
+ * @example
+ * Input:
+ * - bulletList
+ *   - listItem "1"
+ *     - paragraph "1"
+ *   - listItem "2"
+ *     - paragraph "2"
+ *
+ * Output:
+ * - paragraph "1"
+ * - paragraph "2"
+ *
  * @param nodes
+ * @param context
  * @returns
  */
 var unwrapListStep = exports.unwrapListStep = function unwrapListStep(nodes, context) {

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

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = void 0;
+exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.expandSelectionToBlockRange = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -54,4 +55,32 @@ var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = fu
     return 'nestedExpand';
   }
   return nodeTypeName;
+};
+
+/**
+ * Use common expandToBlockRange function, but account for edge cases with lists.
+ *
+ * @param selection
+ * @param schema
+ * @returns
+ */
+var expandSelectionToBlockRange = exports.expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
+  var isListInSelection = (0, _utils.hasParentNode)(function (node) {
+    return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
+  })(selection);
+  var _expandToBlockRange = (0, _selection.expandToBlockRange)(selection.$from, selection.$to, function (node) {
+      if (!isListInSelection) {
+        return true;
+      }
+      if (node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList) {
+        return true;
+      }
+      return false;
+    }),
+    $from = _expandToBlockRange.$from,
+    $to = _expandToBlockRange.$to;
+  return {
+    $from: $from,
+    $to: $to
+  };
 };

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

@@ -7,7 +7,6 @@ exports.wrapStep = void 0;
 var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
-  // edge case: nestedExpand
   var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
   if (outputNode) {
     return [outputNode];

package/dist/cjs/editor-commands/transformNode.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformNode = void 0;
-var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _isNestedNode = require("../ui/utils/isNestedNode");
 var _transform = require("./transform-node-utils/transform");
-var _utils = require("./transforms/utils");
+var _utils = require("./transform-node-utils/utils");
+var _utils2 = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
@@ -20,13 +20,13 @@ var transformNode = exports.transformNode = function transformNode(api) {
         if (!preservedSelection) {
           return tr;
         }
-        var _expandToBlockRange = (0, _selection.expandToBlockRange)(preservedSelection.$from, preservedSelection.$to),
-          $from = _expandToBlockRange.$from,
-          $to = _expandToBlockRange.$to;
+        var _expandSelectionToBlo = (0, _utils.expandSelectionToBlockRange)(preservedSelection, tr.doc.type.schema),
+          $from = _expandSelectionToBlo.$from,
+          $to = _expandSelectionToBlo.$to;
         var isNested = (0, _isNestedNode.isNestedNode)(preservedSelection, '');
         var selectedParent = $from.parent;
         var fragment = _model.Fragment.empty;
-        var isList = (0, _utils.isListNode)(selectedParent);
+        var isList = (0, _utils2.isListNode)(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
         slice.content.forEach(function (node) {
           var outputNode = (0, _transform.getOutputNodes)({

package/dist/cjs/ui/utils/suggested-items-rank.js

@@ -0,0 +1,107 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSuggestedItemsForNodeType = exports.getSortedSuggestedItems = exports.TRANSFORM_SUGGESTED_ITEMS_RANK = exports.BLOCK_MENU_NODE_TYPES = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _blockMenu = require("@atlaskit/editor-common/block-menu");
+var _TRANSFORM_SUGGESTED_;
+/**
+ * Suggested transformations mapping for each block type.
+ * Based on the Block Menu Compatibility Matrix:
+ * https://hello.atlassian.net/wiki/spaces/egcuc/pages/5868774224/Block+Menu+Compatibility+Matrix#Suggested-for-each-block-type
+ *
+ * This mapping defines which transform items should appear in the TRANSFORM_SUGGESTED_MENU_SECTION
+ * for each block type, ranked by priority (lower rank = higher priority).
+ *
+ * Structure:
+ * {
+ *   [sourceNodeType]: {
+ *     [targetMenuItemKey]: rank
+ *   }
+ * }
+ */
+/**
+ * Node type keys that map to ProseMirror node types from the ADF schema.
+ * These values must match the NodeTypeName type.
+ *
+ * TypeScript will enforce that all values are valid NodeTypeName values.
+ * If a new node type is added, it must be added to NodeTypeName first.
+ *
+ * Reference: packages/editor/editor-plugin-block-menu/src/editor-commands/transform-node-utils/types.ts
+ *
+ * Note: 'heading' represents all heading levels (1-6) as a single node type.
+ * The specific level is determined by the node's `attrs.level` property at runtime.
+ *
+ * @example
+ * // Usage:
+ * const nodeType = BLOCK_MENU_NODE_TYPES.PARAGRAPH; // Type: "paragraph"
+ */
+var BLOCK_MENU_NODE_TYPES = exports.BLOCK_MENU_NODE_TYPES = {
+  PARAGRAPH: 'paragraph',
+  EXPAND: 'expand',
+  BLOCKQUOTE: 'blockquote',
+  LAYOUT_SECTION: 'layoutSection',
+  PANEL: 'panel',
+  CODE_BLOCK: 'codeBlock',
+  DECISION: 'decisionList',
+  BULLET_LIST: 'bulletList',
+  ORDERED_LIST: 'orderedList',
+  HEADING: 'heading',
+  TASK_LIST: 'taskList',
+  MEDIA_SINGLE: 'mediaSingle',
+  EXTENSION: 'extension',
+  BODIED_EXTENSION: 'bodiedExtension',
+  BLOCK_CARD: 'blockCard',
+  EMBED_CARD: 'embedCard',
+  TABLE: 'table'
+};
+
+/**
+ * Type for node type values extracted from BLOCK_MENU_NODE_TYPES
+ */
+
+/**
+ * Type for the suggested items rank mapping
+ */
+
+/**
+ * Mapping of source node types to suggested transformation menu items with their ranks.
+ * Lower rank number = higher priority in the suggested menu section.
+ */
+var TRANSFORM_SUGGESTED_ITEMS_RANK = exports.TRANSFORM_SUGGESTED_ITEMS_RANK = (_TRANSFORM_SUGGESTED_ = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.PARAGRAPH, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_HEADINGS_H3_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXPAND, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCKQUOTE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.PANEL, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.CODE_BLOCK, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.DECISION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BULLET_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.ORDERED_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.HEADING, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.TASK_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXTENSION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BODIED_EXTENSION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCK_CARD, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200)), BLOCK_MENU_NODE_TYPES.EMBED_CARD, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 200)), BLOCK_MENU_NODE_TYPES.TABLE, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200)));
+
+/**
+ * Get suggested menu items for a given node type
+ * @param nodeType - The source node type (e.g., 'paragraph', 'heading')
+ * @returns Object mapping menu item keys to their ranks, or undefined if no suggestions
+ */
+var getSuggestedItemsForNodeType = exports.getSuggestedItemsForNodeType = function getSuggestedItemsForNodeType(nodeType) {
+  return TRANSFORM_SUGGESTED_ITEMS_RANK[nodeType];
+};
+
+/**
+ * Get sorted suggested menu item keys for a given node type
+ * @param nodeType - The source node type
+ * @returns Array of menu item keys sorted by rank (highest priority first)
+ */
+var getSortedSuggestedItems = exports.getSortedSuggestedItems = function getSortedSuggestedItems(nodeType) {
+  var suggestions = getSuggestedItemsForNodeType(nodeType);
+  if (!suggestions) {
+    return [];
+  }
+  return Object.entries(suggestions).sort(function (_ref, _ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref, 2),
+      rankA = _ref3[1];
+    var _ref4 = (0, _slicedToArray2.default)(_ref2, 2),
+      rankB = _ref4[1];
+    return rankA - rankB;
+  }).map(function (_ref5) {
+    var _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
+      key = _ref6[0];
+    return key;
+  });
+};

package/dist/es2019/editor-commands/transform-node-utils/flattenListStep.js

@@ -1,33 +1,28 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-const extractNestedLists = (node, listTypes, itemTypes) => {
+const extractNestedLists = (node, listTypes, itemTypes, schema) => {
   const items = [];
+  const paragraph = schema.nodes.paragraph;
   const extract = currentNode => {
     currentNode.forEach(child => {
-      // list item -> take content without nested lists, then recurse into nested lists
       if (itemTypes.some(type => child.type === type)) {
-        // Filter out nested list nodes from the list item's content
         const contentWithoutNestedLists = [];
         const nestedLists = [];
         child.forEach(grandChild => {
           if (listTypes.some(type => grandChild.type === type)) {
-            // This is a nested list - collect it for later processing
             nestedLists.push(grandChild);
           } else {
-            // This is regular content (paragraph, etc.) - keep it
-            contentWithoutNestedLists.push(grandChild);
+            if (grandChild.isText) {
+              contentWithoutNestedLists.push(paragraph.createAndFill({}, grandChild));
+            } else {
+              contentWithoutNestedLists.push(grandChild);
+            }
           }
         });
-
-        // Add the list item with only its non-list content
         items.push(child.copy(Fragment.from(contentWithoutNestedLists)));
-
-        // Now process nested lists to maintain document order
         nestedLists.forEach(nestedList => {
           extract(nestedList);
         });
-      }
-      // lists -> keep operating
-      else if (listTypes.some(type => child.type === type)) {
+      } else if (listTypes.some(type => child.type === type)) {
         extract(child);
       }
     });
@@ -41,24 +36,6 @@ const extractNestedLists = (node, listTypes, itemTypes) => {
  * to it's first ancestor list, maintaining document order.
  *
  * @example
- * Input:
- * - bulletList
- *   - listItem "A"
- *   - listItem "B"
- *     - bulletList
- *       - listItem "C"
- *       - listItem "D"
- *   - listItem "E"
- *
- * Output:
- * - bulletList
- *   - listItem "A"
- *   - listItem "B"
- *   - listItem "C"
- *   - listItem "D"
- *   - listItem "E"
- *
- * @example
  * Input (deeply nested):
  * - bulletList
  *   - listItem "1"
@@ -87,7 +64,7 @@ export const flattenListStep = (nodes, context) => {
   const listTypes = [context.schema.nodes.bulletList, context.schema.nodes.orderedList, context.schema.nodes.taskList];
   return nodes.map(node => {
     if (listTypes.some(type => node.type === type)) {
-      return node.copy(Fragment.from(extractNestedLists(node, listTypes, [context.schema.nodes.listItem, context.schema.nodes.taskItem])));
+      return node.copy(Fragment.from(extractNestedLists(node, listTypes, [context.schema.nodes.listItem, context.schema.nodes.taskItem], context.schema)));
     }
     return node;
   });

package/dist/es2019/editor-commands/transform-node-utils/steps/unwrapLayoutStep.js

@@ -0,0 +1,30 @@
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export const unwrapLayoutStep = nodes => {
+  const outputNodes = [];
+  nodes.forEach(node => {
+    const isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(column => {
+        const isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push(...column.children);
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -1,6 +1,7 @@
 import { getTargetNodeTypeNameInContext } from '../transform-node-utils/utils';
 import { flattenListStep } from './flattenListStep';
 import { flattenStep } from './flattenStep';
+import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
@@ -67,6 +68,26 @@ const TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [unwrapExpandStep, wrapStep],
     paragraph: [unwrapExpandStep],
     codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  blockquote: {
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  layoutSection: {
+    blockquote: [unwrapLayoutStep, wrapStep],
+    expand: [unwrapLayoutStep, wrapStep],
+    panel: [unwrapLayoutStep, wrapStep],
+    codeBlock: [unwrapLayoutStep, flattenStep, wrapStep],
+    paragraph: [unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [wrapStep],
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    panel: [wrapStep]
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {
@@ -85,8 +106,8 @@ export const getOutputNodes = ({
 }) => {
   const nodesToReplace = [sourceNode];
   const selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  let targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  targetNodeTypeName = getTargetNodeTypeNameInContext(targetNodeTypeName, isNested);
+  const initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -101,7 +122,6 @@ export const getOutputNodes = ({
     return;
   }
   return steps.reduce((nodes, step) => {
-    const result = step(nodes, context);
-    return result;
+    return step(nodes, context);
   }, nodesToReplace);
 };

package/dist/es2019/editor-commands/transform-node-utils/unwrapExpandStep.js

@@ -1,3 +1,5 @@
+import { unwrapStep } from './unwrapStep';
+
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -9,8 +11,12 @@ export const unwrapExpandStep = (nodes, context) => {
     schema
   } = context;
   const outputNodes = [];
+  const {
+    expand,
+    nestedExpand
+  } = schema.nodes;
   nodes.forEach(node => {
-    const isExpand = node.type.name === 'expand' || node.type.name === 'nestedExpand';
+    const isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
     if (isExpand) {
       var _node$attrs;
       const title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
@@ -26,12 +32,7 @@ export const unwrapExpandStep = (nodes, context) => {
       // Add the children
       outputNodes.push(...node.children);
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push(...node.children);
-      }
+      unwrapStep([node], context);
     }
   });
   return outputNodes;