@atlaskit/editor-plugin-block-menu 5.2.8 → 5.2.10

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

@@ -1,148 +1,122 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isListType } from '../utils';
 
 /**
- * Converts FROM taskList structure TO bulletList/orderedList structure.
- */
-var convertFromTaskListStructure = function convertFromTaskListStructure(node, targetListType, targetItemType) {
-  var schema = node.type.schema;
-  var targetListNodeType = schema.nodes[targetListType];
-  var convertedItems = [];
-  node.content.forEach(function (child) {
-    if (isListType(child, schema)) {
-      // This is a nested list - it should become a child of the previous item
-      if (convertedItems.length > 0) {
-        var previousItem = convertedItems[convertedItems.length - 1];
-        // Convert the nested list and add it to the previous item's content
-        var convertedNestedList = _transformList(child, targetListType, targetItemType);
-        var newContent = previousItem.content.append(Fragment.from([convertedNestedList]));
-        var updatedItem = previousItem.type.create(previousItem.attrs, newContent);
-        convertedItems[convertedItems.length - 1] = updatedItem;
-      }
-      // If there's no previous item, skip this nested list (orphaned)
-    } else {
-      var convertedItem = transformListItem(child, targetItemType, targetListType);
-      if (convertedItem) {
-        convertedItems.push(convertedItem);
-      }
-    }
-  });
-  return targetListNodeType.create(node.attrs, Fragment.from(convertedItems));
-};
-
-/**
- * Converts FROM bulletList/orderedList structure TO taskList structure.
+ * Recursively converts nested lists to the target list type.
+ * This function handles the conversion of both the list container and its items,
+ * including any nested lists within those items.
+ *
+ * Important: taskList has a different nesting structure than bulletList/orderedList:
+ * - taskList: nested taskLists are SIBLINGS of taskItems in the parent taskList
+ * - bulletList/orderedList: nested lists are CHILDREN of listItems
  */
-var convertToTaskListStructure = function convertToTaskListStructure(node, targetListType, targetItemType) {
+var _transformList = function transformList(node, targetListType, targetItemType, unsupportedContent) {
   var schema = node.type.schema;
-  var targetListNodeType = schema.nodes[targetListType];
-  var transformedContent = [];
-  node.content.forEach(function (itemNode) {
-    var transformedItem = transformListItem(itemNode, targetItemType, targetListType, true);
-    if (transformedItem) {
-      transformedContent.push(transformedItem);
-    }
-    itemNode.content.forEach(function (child) {
+  var taskListType = schema.nodes.taskList;
+  var isSourceTaskList = node.type === taskListType;
+  var isTargetTaskList = targetListType === 'taskList';
+  var convertFromTaskListStructure = function convertFromTaskListStructure(node, targetListType, targetItemType) {
+    var schema = node.type.schema;
+    var targetListNodeType = schema.nodes[targetListType];
+    var transformedContent = [];
+    node.forEach(function (child) {
       if (isListType(child, schema)) {
-        var transformedNestedList = _transformList(child, targetListType, targetItemType);
-        transformedContent.push(transformedNestedList);
+        // This is a nested list - it should become a child of the previous item
+        if (transformedContent.length > 0) {
+          var previousItem = transformedContent[transformedContent.length - 1];
+          // Convert the nested list and add it to the previous item's content
+          var transformedNestedList = _transformList(child, targetListType, targetItemType, unsupportedContent);
+          var newContent = previousItem.content.append(Fragment.from([transformedNestedList]));
+          var updatedItem = previousItem.type.create(previousItem.attrs, newContent);
+          transformedContent[transformedContent.length - 1] = updatedItem;
+        }
+        // If there's no previous item, skip this nested list (orphaned)
+      } else {
+        var transformedItem = transformListItem(child, targetItemType, targetListType);
+        if (transformedItem) {
+          transformedContent.push(transformedItem);
+        }
       }
     });
-  });
-  return targetListNodeType.create(node.attrs, Fragment.from(transformedContent));
-};
-
-/**
- * Converts a single list item (listItem or taskItem) to the target item type.
- * Handles content transformation based on the target type's requirements.
- * @param itemNode - The list item node to convert
- * @param targetItemType - The target item type (listItem or taskItem)
- * @param targetListType - The target list type (bulletList, orderedList, or taskList)
- * @param excludeNestedLists - When true, nested lists are excluded from the item's content
- *                             (used when converting to taskList where nested lists become siblings)
- */
-var transformListItem = function transformListItem(itemNode, targetItemType, targetListType) {
-  var excludeNestedLists = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var schema = itemNode.type.schema;
-  var targetItemNodeType = schema.nodes[targetItemType];
-  var isTargetTaskItem = targetItemType === 'taskItem';
-  var isSourceTaskItem = itemNode.type.name === 'taskItem';
-  var paragraphType = schema.nodes.paragraph;
-  if (!targetItemNodeType) {
-    return null;
-  }
-  if (isTargetTaskItem) {
-    var inlineContent = [];
-    itemNode.content.forEach(function (child) {
-      if (child.type === paragraphType) {
-        child.content.forEach(function (inline) {
-          inlineContent.push(inline);
-        });
-      }
-      if (child.isText) {
-        inlineContent.push(child);
+    return targetListNodeType.create(node.attrs, transformedContent);
+  };
+  var convertToTaskListStructure = function convertToTaskListStructure(node, targetListType, targetItemType) {
+    var schema = node.type.schema;
+    var targetListNodeType = schema.nodes[targetListType];
+    var transformedContent = [];
+    node.forEach(function (itemNode) {
+      var transformedItem = transformListItem(itemNode, targetItemType, targetListType, true);
+      if (transformedItem) {
+        transformedContent.push(transformedItem);
       }
-      // TODO: EDITOR-3887 - Skip mediaSingle, codeBlock, and nested lists
-      // Nested lists will be extracted and placed as siblings in the taskList
+      itemNode.forEach(function (child) {
+        if (isListType(child, schema)) {
+          transformedContent.push(_transformList(child, targetListType, targetItemType, unsupportedContent));
+        }
+      });
     });
-    return targetItemNodeType.create({}, Fragment.from(inlineContent));
-  } else {
-    var newContent = [];
+    return targetListNodeType.create(node.attrs, transformedContent);
+  };
+  var transformListItem = function transformListItem(itemNode, targetItemType, targetListType) {
+    var excludeNestedLists = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    var schema = itemNode.type.schema;
+    var targetItemNodeType = schema.nodes[targetItemType];
+    var isTargetTaskItem = targetItemType === 'taskItem';
+    var isSourceTaskItem = itemNode.type.name === 'taskItem';
+    var paragraphType = schema.nodes.paragraph;
+    if (isTargetTaskItem) {
+      var inlineContent = [];
+      itemNode.forEach(function (child) {
+        if (child.type === paragraphType) {
+          inlineContent.push.apply(inlineContent, _toConsumableArray(child.children));
+        } else if (child.isText) {
+          inlineContent.push(child);
+          // Nested lists will be extracted and placed as siblings in the taskList
+        } else if (!isListType(child, schema)) {
+          unsupportedContent.push(child);
+        }
+      });
+      return targetItemNodeType.create({}, inlineContent);
+    }
+    var transformedContent = [];
     if (isSourceTaskItem) {
-      newContent.push(paragraphType.create(null, itemNode.content));
+      transformedContent.push(paragraphType.create(null, itemNode.content));
     } else {
-      itemNode.content.forEach(function (child) {
+      itemNode.forEach(function (child) {
         if (isListType(child, schema)) {
           if (excludeNestedLists) {
             // Skip nested lists - they will be handled separately as siblings
             return;
           }
-          newContent.push(_transformList(child, targetListType, targetItemType));
+          transformedContent.push(_transformList(child, targetListType, targetItemType, unsupportedContent));
         } else {
-          newContent.push(child);
+          transformedContent.push(child);
         }
       });
     }
-    if (newContent.length === 0) {
-      newContent.push(paragraphType.create());
+    if (transformedContent.length === 0) {
+      transformedContent.push(paragraphType.create());
     }
-    return targetItemNodeType.create({}, Fragment.from(newContent));
-  }
-};
-
-/**
- * Recursively converts nested lists to the target list type.
- * This function handles the conversion of both the list container and its items,
- * including any nested lists within those items.
- *
- * Important: taskList has a different nesting structure than bulletList/orderedList:
- * - taskList: nested taskLists are SIBLINGS of taskItems in the parent taskList
- * - bulletList/orderedList: nested lists are CHILDREN of listItems
- */
-var _transformList = function transformList(node, targetListType, targetItemType) {
-  var schema = node.type.schema;
-  var targetListNodeType = schema.nodes[targetListType];
-  var targetItemNodeType = schema.nodes[targetItemType];
-  var taskListType = schema.nodes.taskList;
-  if (!targetListNodeType || !targetItemNodeType) {
-    return node;
-  }
-  var isSourceTaskList = node.type === taskListType;
-  var isTargetTaskList = targetListType === 'taskList';
+    return targetItemNodeType.create({}, transformedContent);
+  };
+  var convertList = function convertList(node, schema, targetListType, targetItemType) {
+    var targetListNodeType = schema.nodes[targetListType];
+    var transformedContent = [];
+    node.forEach(function (childNode) {
+      var transformedItem = isListType(childNode, schema) ? _transformList(childNode, targetListType, targetItemType, unsupportedContent) : transformListItem(childNode, targetItemType, targetListType);
+      if (transformedItem) {
+        transformedContent.push(transformedItem);
+      }
+    });
+    return targetListNodeType.create(node.attrs, transformedContent);
+  };
   if (isSourceTaskList && !isTargetTaskList) {
     return convertFromTaskListStructure(node, targetListType, targetItemType);
   } else if (!isSourceTaskList && isTargetTaskList) {
     return convertToTaskListStructure(node, targetListType, targetItemType);
-  } else {
-    var transformedItems = [];
-    node.content.forEach(function (childNode) {
-      var transformedItem = isListType(childNode, schema) ? _transformList(childNode, targetListType, targetItemType) : transformListItem(childNode, targetItemType, targetListType);
-      if (transformedItem) {
-        transformedItems.push(transformedItem);
-      }
-    });
-    return targetListNodeType.create(node.attrs, Fragment.from(transformedItems));
   }
+  return convertList(node, schema, targetListType, targetItemType);
 };
 
 /**
@@ -211,11 +185,13 @@ var _transformList = function transformList(node, targetListType, targetItemType
 export var listToListStep = function listToListStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
-  return nodes.map(function (node) {
+  var unsupportedContent = [];
+  var transformedNodes = nodes.map(function (node) {
     if (isListType(node, schema)) {
       var targetItemType = targetNodeTypeName === 'taskList' ? 'taskItem' : 'listItem';
-      return _transformList(node, targetNodeTypeName, targetItemType);
+      return _transformList(node, targetNodeTypeName, targetItemType, unsupportedContent);
     }
     return node;
   });
+  return [].concat(_toConsumableArray(transformedNodes), unsupportedContent);
 };

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

@@ -43,21 +43,6 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   return targetNodeType.validContent(Fragment.from(node));
 };
 
-/**
- * Converts a nestedExpand to a regular expand node.
- * NestedExpands can only exist inside expands, so when breaking out they must be converted.
- */
-var convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
-  var _node$attrs;
-  var 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
@@ -103,14 +88,6 @@ export var wrapMixedContentStep = function wrapMixedContentStep(nodes, context)
       // 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();
-      var expandNode = convertNestedExpandToExpand(node, schema);
-      if (expandNode) {
-        result.push(expandNode);
-      }
     } 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

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

@@ -1,11 +1,16 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { unwrapStep } from './unwrapStep';
+import { convertNestedExpandToExpand } from './utils';
 
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
@@ -27,8 +32,20 @@ export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
         }
       }
 
-      // Add the children
-      outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
+      // Add the children, converting any nestedExpands to regular expands
+      // since nestedExpand can only exist inside an expand
+      node.children.forEach(function (child) {
+        if (child.type.name === nestedExpand.name) {
+          var expandNode = convertNestedExpandToExpand(child, schema);
+          if (expandNode) {
+            outputNodes.push(expandNode);
+          } else {
+            outputNodes.push(child);
+          }
+        } else {
+          outputNodes.push(child);
+        }
+      });
     } else {
       unwrapStep([node], context);
     }

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

@@ -106,6 +106,22 @@ export var isListType = function isListType(node, schema) {
     return list === node.type;
   });
 };
+
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export var convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
+  var _node$attrs;
+  var 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);
+};
 export var getBlockNodesInRange = function getBlockNodesInRange(range) {
   if (range.endIndex - range.startIndex <= 1) {
     return [range.parent.child(range.startIndex)];

package/dist/types/editor-commands/transform-node-utils/unwrapExpandStep.d.ts

@@ -3,6 +3,11 @@ import type { TransformStep } from './types';
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export declare const unwrapExpandStep: TransformStep;

package/dist/types/editor-commands/transform-node-utils/utils.d.ts

@@ -16,4 +16,10 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/dist/types-ts4.5/editor-commands/transform-node-utils/unwrapExpandStep.d.ts

@@ -3,6 +3,11 @@ import type { TransformStep } from './types';
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export declare const unwrapExpandStep: TransformStep;

package/dist/types-ts4.5/editor-commands/transform-node-utils/utils.d.ts

@@ -16,4 +16,10 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.8",
+	"version": "5.2.10",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,11 +45,11 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/tmp-editor-statsig": "^15.10.0",
-		"@atlaskit/tokens": "^8.4.0",
+		"@atlaskit/tokens": "^8.5.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.42.0",
+		"@atlaskit/editor-common": "^110.43.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},