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

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

@@ -2,146 +2,119 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isListType } from '../utils';
 
 /**
- * Converts FROM taskList structure TO bulletList/orderedList structure.
- */
-const convertFromTaskListStructure = (node, targetListType, targetItemType) => {
-  const schema = node.type.schema;
-  const targetListNodeType = schema.nodes[targetListType];
-  const convertedItems = [];
-  node.content.forEach(child => {
-    if (isListType(child, schema)) {
-      // This is a nested list - it should become a child of the previous item
-      if (convertedItems.length > 0) {
-        const previousItem = convertedItems[convertedItems.length - 1];
-        // Convert the nested list and add it to the previous item's content
-        const convertedNestedList = transformList(child, targetListType, targetItemType);
-        const newContent = previousItem.content.append(Fragment.from([convertedNestedList]));
-        const updatedItem = previousItem.type.create(previousItem.attrs, newContent);
-        convertedItems[convertedItems.length - 1] = updatedItem;
-      }
-      // If there's no previous item, skip this nested list (orphaned)
-    } else {
-      const 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
  */
-const convertToTaskListStructure = (node, targetListType, targetItemType) => {
+const transformList = (node, targetListType, targetItemType, unsupportedContent) => {
   const schema = node.type.schema;
-  const targetListNodeType = schema.nodes[targetListType];
-  const transformedContent = [];
-  node.content.forEach(itemNode => {
-    const transformedItem = transformListItem(itemNode, targetItemType, targetListType, true);
-    if (transformedItem) {
-      transformedContent.push(transformedItem);
-    }
-    itemNode.content.forEach(child => {
+  const taskListType = schema.nodes.taskList;
+  const isSourceTaskList = node.type === taskListType;
+  const isTargetTaskList = targetListType === 'taskList';
+  const convertFromTaskListStructure = (node, targetListType, targetItemType) => {
+    const schema = node.type.schema;
+    const targetListNodeType = schema.nodes[targetListType];
+    const transformedContent = [];
+    node.forEach(child => {
       if (isListType(child, schema)) {
-        const 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) {
+          const previousItem = transformedContent[transformedContent.length - 1];
+          // Convert the nested list and add it to the previous item's content
+          const transformedNestedList = transformList(child, targetListType, targetItemType, unsupportedContent);
+          const newContent = previousItem.content.append(Fragment.from([transformedNestedList]));
+          const updatedItem = previousItem.type.create(previousItem.attrs, newContent);
+          transformedContent[transformedContent.length - 1] = updatedItem;
+        }
+        // If there's no previous item, skip this nested list (orphaned)
+      } else {
+        const 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)
- */
-const transformListItem = (itemNode, targetItemType, targetListType, excludeNestedLists = false) => {
-  const schema = itemNode.type.schema;
-  const targetItemNodeType = schema.nodes[targetItemType];
-  const isTargetTaskItem = targetItemType === 'taskItem';
-  const isSourceTaskItem = itemNode.type.name === 'taskItem';
-  const paragraphType = schema.nodes.paragraph;
-  if (!targetItemNodeType) {
-    return null;
-  }
-  if (isTargetTaskItem) {
-    const inlineContent = [];
-    itemNode.content.forEach(child => {
-      if (child.type === paragraphType) {
-        child.content.forEach(inline => {
-          inlineContent.push(inline);
-        });
-      }
-      if (child.isText) {
-        inlineContent.push(child);
+    return targetListNodeType.create(node.attrs, transformedContent);
+  };
+  const convertToTaskListStructure = (node, targetListType, targetItemType) => {
+    const schema = node.type.schema;
+    const targetListNodeType = schema.nodes[targetListType];
+    const transformedContent = [];
+    node.forEach(itemNode => {
+      const 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(child => {
+        if (isListType(child, schema)) {
+          transformedContent.push(transformList(child, targetListType, targetItemType, unsupportedContent));
+        }
+      });
     });
-    return targetItemNodeType.create({}, Fragment.from(inlineContent));
-  } else {
-    const newContent = [];
+    return targetListNodeType.create(node.attrs, transformedContent);
+  };
+  const transformListItem = (itemNode, targetItemType, targetListType, excludeNestedLists = false) => {
+    const schema = itemNode.type.schema;
+    const targetItemNodeType = schema.nodes[targetItemType];
+    const isTargetTaskItem = targetItemType === 'taskItem';
+    const isSourceTaskItem = itemNode.type.name === 'taskItem';
+    const paragraphType = schema.nodes.paragraph;
+    if (isTargetTaskItem) {
+      const inlineContent = [];
+      itemNode.forEach(child => {
+        if (child.type === paragraphType) {
+          inlineContent.push(...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);
+    }
+    const transformedContent = [];
     if (isSourceTaskItem) {
-      newContent.push(paragraphType.create(null, itemNode.content));
+      transformedContent.push(paragraphType.create(null, itemNode.content));
     } else {
-      itemNode.content.forEach(child => {
+      itemNode.forEach(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
- */
-const transformList = (node, targetListType, targetItemType) => {
-  const schema = node.type.schema;
-  const targetListNodeType = schema.nodes[targetListType];
-  const targetItemNodeType = schema.nodes[targetItemType];
-  const taskListType = schema.nodes.taskList;
-  if (!targetListNodeType || !targetItemNodeType) {
-    return node;
-  }
-  const isSourceTaskList = node.type === taskListType;
-  const isTargetTaskList = targetListType === 'taskList';
+    return targetItemNodeType.create({}, transformedContent);
+  };
+  const convertList = (node, schema, targetListType, targetItemType) => {
+    const targetListNodeType = schema.nodes[targetListType];
+    const transformedContent = [];
+    node.forEach(childNode => {
+      const 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 {
-    const transformedItems = [];
-    node.content.forEach(childNode => {
-      const 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);
 };
 
 /**
@@ -212,11 +185,13 @@ export const listToListStep = (nodes, context) => {
     schema,
     targetNodeTypeName
   } = context;
-  return nodes.map(node => {
+  const unsupportedContent = [];
+  const transformedNodes = nodes.map(node => {
     if (isListType(node, schema)) {
       const targetItemType = targetNodeTypeName === 'taskList' ? 'taskItem' : 'listItem';
-      return transformList(node, targetNodeTypeName, targetItemType);
+      return transformList(node, targetNodeTypeName, targetItemType, unsupportedContent);
     }
     return node;
   });
+  return [...transformedNodes, ...unsupportedContent];
 };

package/dist/es2019/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 @@ const TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
     container: [wrapStep],
-    list: undefined,
+    list: [wrapIntoListStep],
     text: undefined
   },
   container: {
@@ -116,7 +117,12 @@ const TRANSFORM_STEPS_OVERRIDE = {
     decisionList: [flattenListStep, listToDecisionListStep]
   },
   table: {
-    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaSingle: {
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaGroup: {
     layoutSection: [wrapIntoLayoutStep]
   },
   decisionList: {

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

@@ -73,13 +73,29 @@ export const expandSelectionToBlockRange = (selection, schema) => {
     const table = findTable(selection);
     if (table) {
       const $from = selection.$from.doc.resolve(table.pos);
-      const $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
+      const $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize);
       return {
         $from,
         $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) {
+      const mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
+      if (mediaGroup) {
+        const $from = selection.$from.doc.resolve(mediaGroup.pos);
+        const $to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
+        return {
+          $from,
+          $to
+        };
+      }
+    }
+  }
   return expandToBlockRange(selection.$from, selection.$to, node => {
     if (nodesNeedToExpandRange.includes(node.type)) {
       return false;

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

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

package/dist/es2019/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,10 +15,14 @@ export const transformNode = api =>
     if (!preservedSelection) {
       return tr;
     }
+    const schema = tr.doc.type.schema;
+    const {
+      nodes
+    } = schema;
     const {
       $from,
       $to
-    } = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema);
+    } = expandSelectionToBlockRange(preservedSelection, schema);
     const isNested = isNestedNode(preservedSelection, '');
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;
@@ -34,9 +39,15 @@ export const 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);
+    const 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/esm/editor-actions/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 /**
  * Create a simple registry for block menu components.
  *
@@ -48,19 +49,7 @@
 export var createBlockMenuRegistry = function createBlockMenuRegistry() {
   var components = [];
   var register = function register(blockMenuComponents) {
-    blockMenuComponents.forEach(function (newComponent) {
-      // Find if a component with the same key already exists
-      var existingIndex = components.findIndex(function (comp) {
-        return comp.key === newComponent.key;
-      });
-      if (existingIndex !== -1) {
-        // Replace the existing component
-        components[existingIndex] = newComponent;
-      } else {
-        // Add new component
-        components.push(newComponent);
-      }
-    });
+    components.push.apply(components, _toConsumableArray(blockMenuComponents));
   };
   return {
     register: register,

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

@@ -1,4 +1,4 @@
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { isListType } from '../utils';
 
 /**
@@ -27,7 +27,8 @@ import { isListType } from '../utils';
 export var listToDecisionListStep = function listToDecisionListStep(nodes, context) {
   var schema = context.schema;
   var paragraphType = schema.nodes.paragraph;
-  return nodes.map(function (node) {
+  var unsupportedContent = [];
+  var transformedNodes = nodes.map(function (node) {
     if (!isListType(node, schema)) {
       return node;
     }
@@ -37,20 +38,18 @@ export var listToDecisionListStep = function listToDecisionListStep(nodes, conte
       item.forEach(function (child) {
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
-          child.content.forEach(function (inline) {
-            itemContent.push(inline);
-          });
-        } else {
+          itemContent.push.apply(itemContent, _toConsumableArray(child.children));
+        } else if (child.isText) {
           itemContent.push(child);
+        } else if (!isListType(child, schema)) {
+          unsupportedContent.push(child);
         }
-        // TODO: EDITOR-3887 - Skip mediaSingle, codeBlock, and nested lists
       });
-      var decisionItem = schema.nodes.decisionItem.create({}, Fragment.from(itemContent));
-      if (decisionItem) {
-        decisionItems.push(decisionItem);
-      }
+      var decisionItem = schema.nodes.decisionItem.create({}, itemContent);
+      decisionItems.push(decisionItem);
     });
-    var decisionList = schema.nodes.decisionList.create({}, Fragment.from(decisionItems));
+    var decisionList = schema.nodes.decisionList.create({}, decisionItems);
     return decisionList || node;
   });
+  return [].concat(_toConsumableArray(transformedNodes), unsupportedContent);
 };