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

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

@@ -1,6 +1,21 @@
 /**
- * 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
  */
 export const unwrapListStep = (nodes, context) => {

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

@@ -1,5 +1,6 @@
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
 export const getSelectedNode = selection => {
   if (selection instanceof NodeSelection) {
@@ -49,4 +50,31 @@ export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested) => {
     return 'nestedExpand';
   }
   return nodeTypeName;
+};
+
+/**
+ * Use common expandToBlockRange function, but account for edge cases with lists.
+ *
+ * @param selection
+ * @param schema
+ * @returns
+ */
+export const expandSelectionToBlockRange = (selection, schema) => {
+  const isListInSelection = hasParentNode(node => node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList)(selection);
+  const {
+    $from,
+    $to
+  } = expandToBlockRange(selection.$from, selection.$to, node => {
+    if (!isListInSelection) {
+      return true;
+    }
+    if (node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList) {
+      return true;
+    }
+    return false;
+  });
+  return {
+    $from,
+    $to
+  };
 };

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

@@ -3,7 +3,6 @@ export const wrapStep = (nodes, context) => {
     schema,
     targetNodeTypeName
   } = context;
-  // edge case: nestedExpand
   const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
   if (outputNode) {
     return [outputNode];

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

@@ -1,7 +1,7 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
+import { expandSelectionToBlockRange } from './transform-node-utils/utils';
 import { isListNode } from './transforms/utils';
 export const transformNode = api =>
 // eslint-disable-next-line no-unused-vars
@@ -17,7 +17,7 @@ export const transformNode = api =>
     const {
       $from,
       $to
-    } = expandToBlockRange(preservedSelection.$from, preservedSelection.$to);
+    } = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema);
     const isNested = isNestedNode(preservedSelection, '');
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;

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

@@ -0,0 +1,223 @@
+/**
+ * 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
+ *   }
+ * }
+ */
+
+import { TRANSFORM_STRUCTURE_PANEL_MENU_ITEM, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM, TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM, TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM, TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM, TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM, TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM, TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM, TRANSFORM_HEADINGS_H2_MENU_ITEM, TRANSFORM_HEADINGS_H3_MENU_ITEM, TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
+/**
+ * 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"
+ */
+export const 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.
+ */
+export const TRANSFORM_SUGGESTED_ITEMS_RANK = {
+  // Paragraph suggestions
+  [BLOCK_MENU_NODE_TYPES.PARAGRAPH]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Turn into Panel
+    [TRANSFORM_HEADINGS_H2_MENU_ITEM.key]: 200,
+    // Turn into Heading 2
+    [TRANSFORM_HEADINGS_H3_MENU_ITEM.key]: 300 // Turn into Heading 3
+  },
+  // Expand suggestions
+  [BLOCK_MENU_NODE_TYPES.EXPAND]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Turn into Panel (wrap content)
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 200,
+    // Turn into Layout
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300 // Turn into Paragraph
+  },
+  // Quote block (blockquote) suggestions
+  [BLOCK_MENU_NODE_TYPES.BLOCKQUOTE]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Turn into Panel
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200,
+    // Turn into Paragraph
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 300 // Turn into Layout
+  },
+  // Layout suggestions
+  [BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap layout in panel
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 200,
+    // Make layout collapsible
+    [TRANSFORM_HEADINGS_H2_MENU_ITEM.key]: 300 // doesn't meet compatibility matrix, needs to be updated
+  },
+  // Panel suggestions
+  [BLOCK_MENU_NODE_TYPES.PANEL]: {
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 100,
+    // Turn into Paragraph
+    [TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key]: 200,
+    // Turn into Blockquote
+    [TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key]: 300 // Turn into Code Block
+  },
+  // Code block suggestions
+  [BLOCK_MENU_NODE_TYPES.CODE_BLOCK]: {
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 100,
+    // Turn into Expand
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 200,
+    // Turn into Layout
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 300 // Turn into Panel
+  },
+  // Decision suggestions
+  [BLOCK_MENU_NODE_TYPES.DECISION]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel (Decision style)
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200,
+    // Turn into Paragraph
+    [TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key]: 300 // Convert to Task List
+  },
+  // Bulleted list suggestions
+  [BLOCK_MENU_NODE_TYPES.BULLET_LIST]: {
+    [TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key]: 100,
+    // Turn into Numbered list
+    [TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key]: 200,
+    // Turn into Blockquote
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300 // Turn into Paragraph
+  },
+  // Numbered list (ordered list) suggestions
+  [BLOCK_MENU_NODE_TYPES.ORDERED_LIST]: {
+    [TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key]: 100,
+    // Turn into Bulleted list
+    [TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key]: 200,
+    // Turn into Task List
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300 // Turn into Paragraph
+  },
+  // Heading suggestions
+  // Note: For headings, the specific heading level would need to be determined at runtime
+  // This provides a general mapping, but actual implementation should consider current heading level
+  [BLOCK_MENU_NODE_TYPES.HEADING]: {
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 100,
+    // Turn into Paragraph
+    [TRANSFORM_HEADINGS_H2_MENU_ITEM.key]: 200,
+    // Turn into Heading 2
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 300 // Wrap in Panel
+  },
+  // Task list suggestions
+  [BLOCK_MENU_NODE_TYPES.TASK_LIST]: {
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 100,
+    // Turn into Paragraph
+    [TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key]: 200,
+    // Turn into Ordered list
+    [TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key]: 300 // Turn into Code Block (for technical TODOs)
+  },
+  // Media (mediaSingle) suggestions
+  [BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 200,
+    // Place into Layout
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300 // doesn't meet compatibility matrix, needs to be updated
+  },
+  // Extension (app/macro) suggestions
+  [BLOCK_MENU_NODE_TYPES.EXTENSION]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200,
+    // doesn't meet compatibility matrix, needs to be updated
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 300 // Collapse in Expand
+  },
+  // Bodied Extension suggestions (same as Extension)
+  [BLOCK_MENU_NODE_TYPES.BODIED_EXTENSION]: {
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200,
+    // doesn't meet compatibility matrix, needs to be updated
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 300 // Collapse in Expand
+  },
+  // Smart link Card suggestions
+  [BLOCK_MENU_NODE_TYPES.BLOCK_CARD]: {
+    // Note: Smart link card conversion would be rank 100 (demote to card)
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200 // doesn't meet compatibility matrix, needs to be updated
+  },
+  // Smart link Embed suggestions
+  [BLOCK_MENU_NODE_TYPES.EMBED_CARD]: {
+    // Note: Smart link embed conversion would be rank 100 (promote to embed)
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 100,
+    // Wrap in Panel
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200 // doesn't meet compatibility matrix, needs to be updated
+  },
+  // Table suggestions
+  [BLOCK_MENU_NODE_TYPES.TABLE]: {
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 100,
+    // Turn into Expand
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 200 // Turn into Layout
+  }
+};
+
+/**
+ * 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
+ */
+export const 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)
+ */
+export const getSortedSuggestedItems = nodeType => {
+  const suggestions = getSuggestedItemsForNodeType(nodeType);
+  if (!suggestions) {
+    return [];
+  }
+  return Object.entries(suggestions).sort(([, rankA], [, rankB]) => rankA - rankB).map(([key]) => key);
+};

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

@@ -1,37 +1,32 @@
 import { Fragment } from '@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(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);
@@ -47,24 +42,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"
@@ -95,7 +72,7 @@ export var flattenListStep = function flattenListStep(nodes, context) {
     if (listTypes.some(function (type) {
       return 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/esm/editor-commands/transform-node-utils/steps/unwrapLayoutStep.js

@@ -0,0 +1,31 @@
+import _toConsumableArray from "@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')]
+ */
+export var 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, _toConsumableArray(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

package/dist/esm/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 @@ var 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]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -84,8 +105,8 @@ export var getOutputNodes = function getOutputNodes(_ref) {
     isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  var targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  targetNodeTypeName = getTargetNodeTypeNameInContext(targetNodeTypeName, isNested);
+  var initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -100,7 +121,6 @@ export var 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/esm/editor-commands/transform-node-utils/unwrapExpandStep.js

@@ -1,4 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { unwrapStep } from './unwrapStep';
+
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -8,8 +10,11 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 export var 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;
@@ -25,12 +30,7 @@ export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
       // Add the children
       outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
-      }
+      unwrapStep([node], context);
     }
   });
   return outputNodes;

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

@@ -1,7 +1,22 @@
 import _toConsumableArray from "@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
  */
 export var unwrapListStep = function unwrapListStep(nodes, context) {

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

@@ -1,5 +1,6 @@
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
 export var getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof NodeSelection) {
@@ -48,4 +49,32 @@ export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInCont
     return 'nestedExpand';
   }
   return nodeTypeName;
+};
+
+/**
+ * Use common expandToBlockRange function, but account for edge cases with lists.
+ *
+ * @param selection
+ * @param schema
+ * @returns
+ */
+export var expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
+  var isListInSelection = hasParentNode(function (node) {
+    return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
+  })(selection);
+  var _expandToBlockRange = 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/esm/editor-commands/transform-node-utils/wrapStep.js

@@ -1,7 +1,6 @@
 export var 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/esm/editor-commands/transformNode.js

@@ -1,7 +1,7 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
+import { expandSelectionToBlockRange } from './transform-node-utils/utils';
 import { isListNode } from './transforms/utils';
 export var transformNode = function transformNode(api) {
   return (
@@ -14,9 +14,9 @@ export var transformNode = function transformNode(api) {
         if (!preservedSelection) {
           return tr;
         }
-        var _expandToBlockRange = expandToBlockRange(preservedSelection.$from, preservedSelection.$to),
-          $from = _expandToBlockRange.$from,
-          $to = _expandToBlockRange.$to;
+        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema),
+          $from = _expandSelectionToBlo.$from,
+          $to = _expandSelectionToBlo.$to;
         var isNested = isNestedNode(preservedSelection, '');
         var selectedParent = $from.parent;
         var fragment = Fragment.empty;