@atlaskit/editor-plugin-block-menu 5.2.7 → 5.2.9

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/transform.js

@@ -13,6 +13,7 @@ import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapStep } from './unwrapStep';
 import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
+import { wrapIntoListStep } from './wrapIntoListStep';
 import { wrapStep } from './wrapStep';
 
 // Exampled step for overrides:
@@ -28,7 +29,7 @@ var TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
     container: [wrapStep],
-    list: undefined,
+    list: [wrapIntoListStep],
     text: undefined
   },
   container: {
@@ -116,7 +117,12 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: [flattenListStep, listToDecisionListStep]
   },
   table: {
-    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaSingle: {
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaGroup: {
     layoutSection: [wrapIntoLayoutStep]
   },
   decisionList: {

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

@@ -70,13 +70,29 @@ export var expandSelectionToBlockRange = function expandSelectionToBlockRange(se
     var table = findTable(selection);
     if (table) {
       var $from = selection.$from.doc.resolve(table.pos);
-      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
+      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize);
       return {
         $from: $from,
         $to: $to
       };
     }
   }
+
+  // when selecting a file, selection is on media
+  // need to find media group and return its pos
+  if (selection instanceof NodeSelection) {
+    if (selection.node.type === nodes.media) {
+      var mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
+      if (mediaGroup) {
+        var _$from = selection.$from.doc.resolve(mediaGroup.pos);
+        var _$to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
+        return {
+          $from: _$from,
+          $to: _$to
+        };
+      }
+    }
+  }
   return expandToBlockRange(selection.$from, selection.$to, function (node) {
     if (nodesNeedToExpandRange.includes(node.type)) {
       return false;

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

@@ -0,0 +1,11 @@
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export var wrapIntoListStep = function wrapIntoListStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+  var listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -1,4 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
 import { expandSelectionToBlockRange } from './transform-node-utils/utils';
@@ -14,7 +15,9 @@ export var transformNode = function transformNode(api) {
         if (!preservedSelection) {
           return tr;
         }
-        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema),
+        var schema = tr.doc.type.schema;
+        var nodes = schema.nodes;
+        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, schema),
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var isNested = isNestedNode(preservedSelection, '');
@@ -33,9 +36,15 @@ export var transformNode = function transformNode(api) {
             fragment = fragment.append(Fragment.fromArray(outputNode));
           }
         });
-
-        // TODO: ED-12345 - selection is broken post transaction, to fix.
-        tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        var nodesToDeleteAndInsert = [nodes.mediaSingle];
+        if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
+          // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
+          tr.deleteRange($from.pos, $to.pos);
+          tr.insert($from.pos, fragment);
+        } else {
+          // TODO: ED-12345 - selection is broken post transaction, to fix.
+          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        }
         return tr;
       };
     }

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

@@ -0,0 +1,3 @@
+import type { TransformStep } from './types';
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export declare const wrapIntoListStep: TransformStep;

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

@@ -0,0 +1,3 @@
+import type { TransformStep } from './types';
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export declare const wrapIntoListStep: TransformStep;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.7",
+	"version": "5.2.9",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.13.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.14.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -40,16 +40,16 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/flag": "^17.6.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^15.9.0",
+		"@atlaskit/tmp-editor-statsig": "^15.10.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.41.0",
+		"@atlaskit/editor-common": "^110.42.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},