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

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

@@ -0,0 +1,135 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NODE_CATEGORY_BY_TYPE } from './types';
+import { unwrapStep } from './unwrapStep';
+
+/**
+ * Determines if a node can be flattened (unwrapped and its contents merged).
+ *
+ * According to the text transformations list, flattenable nodes are:
+ * - Bulleted list, Numbered list, Task list
+ * - Text nodes (heading, paragraph)
+ *
+ * Containers (panels, expands, layouts, blockquotes) and atomic nodes (tables, media, macros) break out.
+ */
+const canFlatten = node => {
+  const category = NODE_CATEGORY_BY_TYPE[node.type.name];
+  // Text and list nodes can be flattened (converted to simpler forms)
+  return category === 'text' || category === 'list';
+};
+
+/**
+ * Flattens a node by extracting its contents using the appropriate unwrap step.
+ * This is only called for text and list nodes that can be converted to simpler forms.
+ * Uses unwrapStep to extract children from list containers.
+ */
+const flattenNode = (node, context) => {
+  return unwrapStep([node], context);
+};
+
+/**
+ * Determines if a node can be wrapped in the target container type.
+ * 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
+ */
+const 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
+  try {
+    return targetNodeType.validContent(Fragment.from(node));
+  } catch {
+    return false;
+  }
+};
+
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out they must be converted.
+ */
+const convertNestedExpandToExpand = (node, schema) => {
+  var _node$attrs;
+  const expandType = schema.nodes.expand;
+  if (!expandType) {
+    return null;
+  }
+  return expandType.createAndFill({
+    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
+  }, node.content);
+};
+
+/**
+ * A wrap step that handles mixed content according to the Compatibility Matrix:
+ * - Wraps consecutive compatible nodes into the target container
+ * - 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
+ * - Atomic nodes (tables, media, macros) break out
+ *
+ * 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 → expand: tables/media stay inside (expands can contain them)
+ *
+ * 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'))]
+ */
+export const wrapMixedContentStep = (nodes, context) => {
+  const {
+    schema,
+    targetNodeTypeName
+  } = context;
+  const targetNodeType = schema.nodes[targetNodeTypeName];
+  if (!targetNodeType) {
+    return nodes;
+  }
+  const result = [];
+  let currentContainerContent = [];
+  const flushCurrentContainer = () => {
+    if (currentContainerContent.length > 0) {
+      const containerNode = targetNodeType.createAndFill({}, Fragment.fromArray(currentContainerContent));
+      if (containerNode) {
+        result.push(containerNode);
+      }
+      currentContainerContent = [];
+    }
+  };
+  nodes.forEach(node => {
+    if (canWrapInTarget(node, targetNodeType, targetNodeTypeName)) {
+      // Node can be wrapped - add to current container content
+      currentContainerContent.push(node);
+    } 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 (node.type.name === 'nestedExpand') {
+      // NestedExpand can't be wrapped and can't exist outside an expand
+      // Convert to regular expand and break out
+      flushCurrentContainer();
+      const expandNode = convertNestedExpandToExpand(node, schema);
+      if (expandNode) {
+        result.push(expandNode);
+      }
+    } else if (canFlatten(node)) {
+      // Node cannot be wrapped but CAN be flattened - flatten and add to container
+      const flattenedNodes = flattenNode(node, context);
+      currentContainerContent.push(...flattenedNodes);
+    } else {
+      // Node cannot be wrapped AND cannot be flattened (containers, tables, media, macros) - break out
+      flushCurrentContainer();
+      result.push(node);
+    }
+  });
+
+  // Flush any remaining content into a container
+  flushCurrentContainer();
+  return result.length > 0 ? result : nodes;
+};

package/dist/es2019/ui/block-menu-components.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
+import { BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { CopyLinkDropdownItem } from './copy-link';
 import { CopySection } from './copy-section';
@@ -9,6 +9,7 @@ import { FormatMenuComponent } from './format-menu-nested';
 import { FormatMenuSection } from './format-menu-section';
 import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
+import { SuggestedItemsRenderer } from './suggested-items-renderer';
 const getMoveUpMoveDownMenuComponents = api => {
   return [{
     type: 'block-menu-item',
@@ -60,14 +61,16 @@ const getTurnIntoMenuComponents = api => {
       key: TRANSFORM_MENU_ITEM.key,
       rank: TRANSFORM_MENU_ITEM_RANK[TRANSFORM_SUGGESTED_MENU_SECTION.key]
     },
-    component: ({
-      children
-    } = {
-      children: null
-    }) => {
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Suggested"
-      }, children);
+    component: () => /*#__PURE__*/React.createElement(SuggestedItemsRenderer, {
+      api: api
+    })
+  }, {
+    type: 'block-menu-item',
+    key: TRANSFORM_SUGGESTED_MENU_ITEM.key,
+    parent: {
+      type: 'block-menu-section',
+      key: TRANSFORM_SUGGESTED_MENU_SECTION.key,
+      rank: TRANSFORM_SUGGESTED_MENU_SECTION_RANK[TRANSFORM_SUGGESTED_MENU_ITEM.key]
     }
   }, {
     type: 'block-menu-section',

package/dist/es2019/ui/block-menu-provider.js

@@ -1,6 +1,9 @@
-import React, { useCallback, createContext, useContext } from 'react';
+import React, { useCallback, createContext, useContext, useRef } from 'react';
 const BlockMenuContext = /*#__PURE__*/createContext({
-  onDropdownOpenChanged: () => {}
+  onDropdownOpenChanged: () => {},
+  moveFocusTo: () => {},
+  moveDownRef: /*#__PURE__*/React.createRef(),
+  moveUpRef: /*#__PURE__*/React.createRef()
 });
 export const useBlockMenu = () => {
   const context = useContext(BlockMenuContext);
@@ -13,6 +16,8 @@ export const BlockMenuProvider = ({
   children,
   api
 }) => {
+  const moveUpRef = useRef(null);
+  const moveDownRef = useRef(null);
   const onDropdownOpenChanged = useCallback(isOpen => {
     if (!isOpen) {
       // On Dropdown closed, return focus to editor
@@ -23,9 +28,21 @@ export const BlockMenuProvider = ({
       }), 1);
     }
   }, [api]);
+  const moveFocusTo = useCallback(direction => {
+    if (direction === 'moveUp') {
+      var _moveUpRef$current;
+      (_moveUpRef$current = moveUpRef.current) === null || _moveUpRef$current === void 0 ? void 0 : _moveUpRef$current.focus();
+    } else if (direction === 'moveDown') {
+      var _moveDownRef$current;
+      (_moveDownRef$current = moveDownRef.current) === null || _moveDownRef$current === void 0 ? void 0 : _moveDownRef$current.focus();
+    }
+  }, []);
   return /*#__PURE__*/React.createElement(BlockMenuContext.Provider, {
     value: {
-      onDropdownOpenChanged
+      onDropdownOpenChanged,
+      moveFocusTo,
+      moveDownRef,
+      moveUpRef
     }
   }, children);
 };

package/dist/es2019/ui/move-down.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
@@ -6,6 +6,7 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
+import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 const MoveDownDropdownItemContent = ({
   api
@@ -13,6 +14,10 @@ const MoveDownDropdownItemContent = ({
   const {
     formatMessage
   } = useIntl();
+  const {
+    moveFocusTo,
+    moveDownRef
+  } = useBlockMenu();
   const {
     canMoveDown
   } = useSharedPluginStateWithSelector(api, ['blockControls'], ({
@@ -23,11 +28,20 @@ const MoveDownDropdownItemContent = ({
       canMoveDown: blockControlsState === null || blockControlsState === void 0 ? void 0 : (_blockControlsState$b = blockControlsState.blockMenuOptions) === null || _blockControlsState$b === void 0 ? void 0 : _blockControlsState$b.canMoveDown
     };
   });
+  useEffect(() => {
+    const moveDownElement = moveDownRef.current;
+    if (!moveDownElement) {
+      return;
+    }
+    if (!canMoveDown && moveDownElement === document.activeElement) {
+      moveFocusTo('moveUp');
+    }
+  }, [canMoveDown, moveFocusTo, moveDownRef]);
   const handleClick = () => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
     }) => {
-      var _api$analytics, _api$analytics$action, _api$blockControls, _api$blockControls$co, _api$blockControls2, _api$blockControls2$c;
+      var _api$analytics, _api$analytics$action, _api$blockControls, _api$blockControls$co;
       const payload = {
         action: ACTION.CLICKED,
         actionSubject: ACTION_SUBJECT.BLOCK_MENU_ITEM,
@@ -40,15 +54,11 @@ const MoveDownDropdownItemContent = ({
       api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.moveNodeWithBlockMenu(DIRECTION.DOWN)({
         tr
       });
-      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.toggleBlockMenu({
-        closeMenu: true
-      })({
-        tr
-      });
       return tr;
     });
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
       label: ""

package/dist/es2019/ui/move-up.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
@@ -6,6 +6,7 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
+import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 const MoveUpDropdownItemContent = ({
   api
@@ -13,6 +14,10 @@ const MoveUpDropdownItemContent = ({
   const {
     formatMessage
   } = useIntl();
+  const {
+    moveFocusTo,
+    moveUpRef
+  } = useBlockMenu();
   const {
     canMoveUp
   } = useSharedPluginStateWithSelector(api, ['blockControls'], ({
@@ -23,11 +28,20 @@ const MoveUpDropdownItemContent = ({
       canMoveUp: blockControlsState === null || blockControlsState === void 0 ? void 0 : (_blockControlsState$b = blockControlsState.blockMenuOptions) === null || _blockControlsState$b === void 0 ? void 0 : _blockControlsState$b.canMoveUp
     };
   });
+  useEffect(() => {
+    const moveUpElement = moveUpRef.current;
+    if (!moveUpElement) {
+      return;
+    }
+    if (!canMoveUp && moveUpElement === document.activeElement) {
+      moveFocusTo('moveDown');
+    }
+  }, [canMoveUp, moveFocusTo, moveUpRef]);
   const handleClick = () => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
     }) => {
-      var _api$analytics, _api$analytics$action, _api$blockControls, _api$blockControls$co, _api$blockControls2, _api$blockControls2$c;
+      var _api$analytics, _api$analytics$action, _api$blockControls, _api$blockControls$co;
       const payload = {
         action: ACTION.CLICKED,
         actionSubject: ACTION_SUBJECT.BLOCK_MENU_ITEM,
@@ -40,15 +54,11 @@ const MoveUpDropdownItemContent = ({
       api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.moveNodeWithBlockMenu(DIRECTION.UP)({
         tr
       });
-      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.toggleBlockMenu({
-        closeMenu: true
-      })({
-        tr
-      });
       return tr;
     });
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    triggerRef: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
       label: ""

package/dist/es2019/ui/suggested-items-renderer.js

@@ -0,0 +1,48 @@
+import React, { useMemo } from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { getSelectedNode } from '../editor-commands/transform-node-utils/utils';
+import { getSortedSuggestedItems } from './utils/suggested-items-rank';
+export const SuggestedItemsRenderer = /*#__PURE__*/React.memo(({
+  api
+}) => {
+  var _api$blockMenu;
+  const {
+    preservedSelection
+  } = useSharedPluginStateWithSelector(api, ['blockControls'], states => {
+    var _states$blockControls;
+    return {
+      preservedSelection: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.preservedSelection
+    };
+  });
+  const blockMenuComponents = api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+  const menuItemsMap = useMemo(() => {
+    if (!blockMenuComponents) {
+      return new Map();
+    }
+    return new Map(blockMenuComponents.filter(c => c.type === 'block-menu-item').map(item => [item.key, item]));
+  }, [blockMenuComponents]);
+  const suggestedItems = useMemo(() => {
+    if (!preservedSelection || menuItemsMap.size === 0) {
+      return [];
+    }
+    const selectedNode = getSelectedNode(preservedSelection);
+    if (!selectedNode) {
+      return [];
+    }
+    const nodeTypeName = selectedNode.node.type.name;
+    const sortedKeys = getSortedSuggestedItems(nodeTypeName);
+    return sortedKeys.map(key => menuItemsMap.get(key)).filter(item => item !== undefined);
+  }, [menuItemsMap, preservedSelection]);
+  if (suggestedItems.length === 0) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    title: "Suggested"
+  }, suggestedItems.map(item => {
+    const ItemComponent = item.component;
+    return ItemComponent ? /*#__PURE__*/React.createElement(ItemComponent, {
+      key: item.key
+    }) : null;
+  }));
+});

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

@@ -15,22 +15,6 @@
  */
 
 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',
@@ -50,170 +34,93 @@ export const BLOCK_MENU_NODE_TYPES = {
   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
+    [TRANSFORM_HEADINGS_H3_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_HEADINGS_H2_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 300
   },
-  // 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)
+    [TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 300
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200
   },
-  // 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
+    [TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key]: 200
   },
-  // 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
+    [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
- */
 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) {

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

@@ -8,6 +8,7 @@ import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapListStep } from './unwrapListStep';
 import { unwrapStep } from './unwrapStep';
 import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
+import { wrapMixedContentStep } from './wrapMixedContentStep';
 import { wrapStep } from './wrapStep';
 
 // Exampled step for overrides:
@@ -57,15 +58,15 @@ var TRANSFORM_STEPS_OVERRIDE = {
     codeBlock: [unwrapStep, flattenStep, wrapStep]
   },
   expand: {
-    panel: [unwrapExpandStep, wrapStep],
-    blockquote: [unwrapExpandStep, wrapStep],
+    panel: [unwrapExpandStep, wrapMixedContentStep],
+    blockquote: [unwrapExpandStep, wrapMixedContentStep],
     layoutSection: [unwrapExpandStep, wrapIntoLayoutStep],
     paragraph: [unwrapExpandStep],
     codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
   },
   nestedExpand: {
-    panel: [unwrapExpandStep, wrapStep],
-    blockquote: [unwrapExpandStep, wrapStep],
+    panel: [unwrapExpandStep, wrapMixedContentStep],
+    blockquote: [unwrapExpandStep, wrapMixedContentStep],
     paragraph: [unwrapExpandStep],
     codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
   },