@atlaskit/editor-plugin-block-menu 1.0.0 → 1.0.2

package/dist/esm/editor-commands/transforms/list/transformBetweenListTypes.js

@@ -0,0 +1,95 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/**
+ * Extract all inline content from a node
+ */
+var extractInlineContent = function extractInlineContent(node) {
+  var inlineContent = [];
+  for (var i = 0; i < node.childCount; i++) {
+    inlineContent.push(node.child(i));
+  }
+  return inlineContent;
+};
+
+/**
+ * Transform list structure
+ */
+export var transformListStructure = function transformListStructure(tr, listNode, targetNodeType, nodes) {
+  try {
+    var sourceList = listNode.node,
+      listPos = listNode.pos;
+    var bulletList = nodes.bulletList,
+      orderedList = nodes.orderedList,
+      taskList = nodes.taskList,
+      listItem = nodes.listItem,
+      taskItem = nodes.taskItem,
+      paragraph = nodes.paragraph;
+    var isSourceBulletOrOrdered = sourceList.type === bulletList || sourceList.type === orderedList;
+    var isTargetTask = targetNodeType === taskList;
+    var isSourceTask = sourceList.type === taskList;
+    var newListItems = [];
+    var listStart = listPos;
+    var listEnd = listPos + sourceList.nodeSize;
+
+    // Use nodesBetween to efficiently traverse the list structure
+    tr.doc.nodesBetween(listStart, listEnd, function (node, pos, parent) {
+      // Only process direct children of the list (depth 1)
+      if (parent !== sourceList) {
+        return true; // Continue traversal
+      }
+      if (isSourceBulletOrOrdered && isTargetTask) {
+        // Converting from bullet/ordered list to task list
+        // Extract inline content from all children within listItem
+        if (node.type === listItem) {
+          var inlineContent = [];
+
+          // Extract all inline content from all child nodes
+          for (var i = 0; i < node.childCount; i++) {
+            var child = node.child(i);
+            if (child.type === paragraph) {
+              // Extract inline content from paragraphs
+              inlineContent.push.apply(inlineContent, _toConsumableArray(extractInlineContent(child)));
+            } else if (child.isBlock) {
+              // For other block content types eg. codeBlock, extract their text content and create text nodes
+              var textContent = child.textContent;
+              if (textContent) {
+                var textNode = tr.doc.type.schema.text(textContent);
+                inlineContent.push(textNode);
+              }
+            } else {
+              // Already inline content, add directly
+              inlineContent.push(child);
+            }
+          }
+          if (inlineContent.length > 0) {
+            var newItem = taskItem.create(null, inlineContent);
+            newListItems.push(newItem);
+          }
+        }
+      } else if (isSourceTask && !isTargetTask) {
+        // Converting from task list to bullet/ordered list
+        // Structure: taskItem > inline content -> listItem > paragraph > inline content
+        if (node.type === taskItem) {
+          var _inlineContent = extractInlineContent(node);
+          if (_inlineContent.length > 0) {
+            var paragraphNode = paragraph.create(null, _inlineContent);
+            var newListItem = listItem.create(null, paragraphNode);
+            newListItems.push(newListItem);
+          }
+        }
+      }
+      return false; // Don't traverse into children of list items
+    });
+    if (newListItems.length === 0) {
+      return tr;
+    }
+
+    // Create new list with transformed items
+    var newList = targetNodeType.create(null, newListItems);
+
+    // Replace the entire list
+    tr.replaceWith(listStart, listEnd, newList);
+    return tr;
+  } catch (_unused) {
+    return tr;
+  }
+};

package/dist/esm/editor-commands/transforms/list/transformOrderedUnorderedListToBlockNodes.js

@@ -0,0 +1,48 @@
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+export var transformOrderedUnorderedListToBlockNodes = function transformOrderedUnorderedListToBlockNodes(context) {
+  var tr = context.tr,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos;
+  var selection = tr.selection;
+  var schema = selection.$from.doc.type.schema;
+  // find all paragraph nodes inside the list node
+  var paragraphs = findChildrenByType(sourceNode, schema.nodes.paragraph);
+  var paragraphNodes = paragraphs.map(function (paragraph) {
+    return paragraph.node;
+  });
+  var targetNodes = paragraphNodes;
+
+  // Convert paragraphs to headings if target is heading
+  if (targetNodeType === schema.nodes.heading && targetAttrs) {
+    var targetHeadingLevel = targetAttrs.level;
+    targetNodes = paragraphNodes.map(function (paragraphNode) {
+      return schema.nodes.heading.createChecked({
+        level: targetHeadingLevel
+      }, paragraphNode.content);
+    });
+  }
+
+  // Convert paragraphs to code block if target is code block
+  if (targetNodeType === schema.nodes.codeBlock) {
+    // convert the paragraphNodes to one code block
+    var listItemsResult = findChildrenByType(sourceNode, schema.nodes.listItem);
+    var listItems = listItemsResult.map(function (item) {
+      return item.node;
+    });
+    var listItemFragments = listItems.map(function (listItem) {
+      return listItem.content;
+    });
+    var codeBlockContent = listItemFragments.map(function (fragment) {
+      return fragment.textBetween(0, fragment.size, '\n');
+    }).join('\n');
+    targetNodes = [schema.nodes.codeBlock.createChecked({}, schema.text(codeBlockContent))];
+  }
+  var fragment = Fragment.fromArray(targetNodes);
+  var slice = new Slice(fragment, 0, 0);
+  var rangeStart = sourcePos !== null ? sourcePos : selection.from;
+  tr.replaceRange(rangeStart, rangeStart + sourceNode.nodeSize, slice);
+  return tr;
+};

package/dist/esm/editor-commands/transforms/list/transformTaskListToBlockNodes.js

@@ -0,0 +1,53 @@
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+export var transformTaskListToBlockNodes = function transformTaskListToBlockNodes(context) {
+  var tr = context.tr,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos;
+  var selection = tr.selection;
+  var schema = selection.$from.doc.type.schema;
+  var taskItemsResult = findChildrenByType(sourceNode, schema.nodes.taskItem);
+  var taskItems = taskItemsResult.map(function (item) {
+    return item.node;
+  });
+  var taskItemFragments = taskItems.map(function (taskItem) {
+    return taskItem.content;
+  });
+  var targetNodes = [];
+
+  // Convert fragments to headings if target is heading
+  if (targetNodeType === schema.nodes.heading && targetAttrs) {
+    // convert the fragments to headings
+    var targetHeadingLevel = targetAttrs.level;
+    targetNodes = taskItemFragments.map(function (fragment) {
+      return schema.nodes.heading.createChecked({
+        level: targetHeadingLevel
+      }, fragment.content);
+    });
+  }
+
+  // Convert fragments to paragraphs if target is paragraphs
+  if (targetNodeType === schema.nodes.paragraph) {
+    // convert the fragments to paragraphs
+    targetNodes = taskItemFragments.map(function (fragment) {
+      return schema.nodes.paragraph.createChecked({}, fragment.content);
+    });
+  }
+
+  // Convert fragments to code block if target is code block
+  if (targetNodeType === schema.nodes.codeBlock) {
+    // convert the fragments to one code block
+    var codeBlockContent = taskItemFragments.map(function (fragment) {
+      return fragment.textBetween(0, fragment.size, '\n');
+    }).join('\n');
+    targetNodes = [schema.nodes.codeBlock.createChecked({}, schema.text(codeBlockContent))];
+  }
+
+  // Replace the task list node with the new content in the transaction
+  var slice = new Slice(Fragment.fromArray(targetNodes), 0, 0);
+  var rangeStart = sourcePos !== null ? sourcePos : selection.from;
+  tr.replaceRange(rangeStart, rangeStart + sourceNode.nodeSize, slice);
+  return tr;
+};

package/dist/esm/editor-commands/transforms/list-transforms.js

@@ -1,15 +1,17 @@
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { transformListStructure } from './list/transformBetweenListTypes';
+import { transformOrderedUnorderedListToBlockNodes } from './list/transformOrderedUnorderedListToBlockNodes';
+import { transformTaskListToBlockNodes } from './list/transformTaskListToBlockNodes';
 import { isBlockNodeType, isContainerNodeType, isListNodeType } from './utils';
 
 /**
  * Transform selection to list type
  */
-export var transformToList = function transformToList(_ref) {
-  var tr = _ref.tr,
-    targetNodeType = _ref.targetNodeType,
-    targetAttrs = _ref.targetAttrs;
-  // Wrap selection in list of target type
+export var transformBlockToList = function transformBlockToList(context) {
+  var tr = context.tr,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs;
   var _tr$selection = tr.selection,
     $from = _tr$selection.$from,
     $to = _tr$selection.$to;
@@ -17,16 +19,45 @@ export var transformToList = function transformToList(_ref) {
   if (!range) {
     return null;
   }
+  var nodes = tr.doc.type.schema.nodes;
+  var isTargetTask = targetNodeType === nodes.taskList;
+
+  // Handle task lists differently due to their structure
+  // TODO: ED-29152 - Implement task list transformation
+  if (isTargetTask) {
+    return null;
+  }
 
-  // Find if we can wrap the selection in the target list type
-  var wrapping = findWrapping(range, targetNodeType, targetAttrs);
+  // For headings, convert to paragraph first since headings cannot be direct children of list items
+  var sourceNode = tr.doc.nodeAt(range.start);
+  if (sourceNode && sourceNode.type.name.startsWith('heading')) {
+    tr.setBlockType(range.start, range.end, nodes.paragraph);
+  }
+
+  // Get the current range (updated if we converted from heading)
+  var currentRange = tr.selection.$from.blockRange(tr.selection.$to) || range;
+
+  // Wrap in the target list type
+  var wrapping = findWrapping(currentRange, targetNodeType, targetAttrs);
   if (!wrapping) {
     return null;
   }
-  tr.wrap(range, wrapping);
+  tr.wrap(currentRange, wrapping);
   return tr;
 };
 
+/**
+ * Transform list to block nodes
+ */
+export var transformListToBlockNodes = function transformListToBlockNodes(context) {
+  var sourceNode = context.sourceNode;
+  if (sourceNode.type.name === 'taskList') {
+    return transformTaskListToBlockNodes(context);
+  } else {
+    return transformOrderedUnorderedListToBlockNodes(context);
+  }
+};
+
 /**
  * Transform list nodes
  */
@@ -35,7 +66,7 @@ export var transformListNode = function transformListNode(context) {
   // Transform list to block type
   if (isBlockNodeType(targetNodeType)) {
     // Lift list items out of the list and convert to target block type
-    return null;
+    return transformListToBlockNodes(context);
   }
 
   // Transform list to container type
@@ -62,22 +93,37 @@ export var liftListToBlockType = function liftListToBlockType() {
 /**
  * Transform between different list types
  */
-export var transformBetweenListTypes = function transformBetweenListTypes(_ref2) {
-  var tr = _ref2.tr,
-    targetNodeType = _ref2.targetNodeType;
-  var selection = tr.selection;
+export var transformBetweenListTypes = function transformBetweenListTypes(_ref) {
+  var tr = _ref.tr,
+    targetNodeType = _ref.targetNodeType;
+  var _tr = tr,
+    selection = _tr.selection;
   var nodes = tr.doc.type.schema.nodes;
 
-  // Find the list node
-  var listNode = findParentNodeOfType([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
+  // Find the list node - support bullet lists, ordered lists, and task lists
+  var supportedListTypes = [nodes.bulletList, nodes.orderedList, nodes.taskList].filter(Boolean); // Filter out undefined nodes in case some schemas don't have all types
+
+  var listNode = findParentNodeOfType(supportedListTypes)(selection);
   if (!listNode) {
     return null;
   }
+  var sourceListType = listNode.node.type;
+  var isSourceBulletOrOrdered = sourceListType === nodes.bulletList || sourceListType === nodes.orderedList;
+  var isTargetTask = targetNodeType === nodes.taskList;
+  var isSourceTask = sourceListType === nodes.taskList;
+  var isTargetBulletOrOrdered = targetNodeType === nodes.bulletList || targetNodeType === nodes.orderedList;
+
+  // Check if we need structure transformation
+  var needsStructureTransform = isSourceBulletOrOrdered && isTargetTask || isSourceTask && isTargetBulletOrOrdered;
   try {
-    // Change the list type while preserving content
-    tr.setNodeMarkup(listNode.pos, targetNodeType);
-    return tr;
-  } catch (e) {
+    if (!needsStructureTransform) {
+      // Simple type change for same structure lists (bullet <-> ordered)
+      tr.setNodeMarkup(listNode.pos, targetNodeType);
+    } else {
+      tr = transformListStructure(tr, listNode, targetNodeType, nodes);
+    }
+  } catch (_unused) {
     return null;
   }
+  return tr;
 };

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

@@ -4,7 +4,6 @@ import { MOVE_UP_MENU_ITEM, MOVE_UP_DOWN_MENU_SECTION, MOVE_DOWN_MENU_ITEM, MOVE
 import { ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
-import { fg } from '@atlaskit/platform-feature-flags';
 import CopyBlockMenuItem from './copy-block';
 import { CopyLinkDropdownItem } from './copy-link';
 import { DeleteDropdownItem } from './delete-button';
@@ -91,7 +90,7 @@ var getFormatMenuComponents = function getFormatMenuComponents() {
 export var getBlockMenuComponents = function getBlockMenuComponents(_ref4) {
   var api = _ref4.api,
     config = _ref4.config;
-  return [].concat(_toConsumableArray(fg('platform_editor_block_menu_format') ? getFormatMenuComponents() : []), [{
+  return [].concat(_toConsumableArray(getFormatMenuComponents()), [{
     type: 'block-menu-section',
     key: COPY_MENU_SECTION.key,
     rank: BLOCK_MENU_SECTION_RANK[COPY_MENU_SECTION.key],

package/dist/esm/ui/block-menu.compiled.css

@@ -1,3 +1,3 @@
 
-._2rkoglpi{border-radius:var(--ds-border-radius,4px)}._16qs1cd0{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #091e4226,0 0 1px #091e424f)}
+._2rko12b0{border-radius:var(--ds-radius-small,4px)}._16qs1cd0{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #091e4226,0 0 1px #091e424f)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}

package/dist/esm/ui/block-menu.js

@@ -13,7 +13,7 @@ import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownM
 import { Box } from '@atlaskit/primitives/compiled';
 import { BlockMenuRenderer } from './block-menu-renderer';
 var styles = {
-  base: "_2rkoglpi _bfhk1bhr _16qs1cd0"
+  base: "_2rko12b0 _bfhk1bhr _16qs1cd0"
 };
 var DEFAULT_MENU_WIDTH = 230;
 var DRAG_HANDLE_OFFSET_PADDING = 5;

package/dist/types/editor-commands/transforms/container-transforms.d.ts

@@ -1,8 +1,8 @@
-import type { TransformFunction } from './types';
+import type { TransformContext, TransformFunction } from './types';
 /**
  * Transform selection to container type
  */
-export declare const transformToContainer: () => null;
+export declare const transformToContainer: ({ tr, sourceNode, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;
 /**
  * Transform container nodes (panel, expand, blockquote)
  */

package/dist/types/editor-commands/transforms/inline-node-transforms.d.ts

@@ -0,0 +1,3 @@
+import type { Fragment } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment, tr: Transaction) => import("prosemirror-model").Node | undefined;

package/dist/types/editor-commands/transforms/list/transformBetweenListTypes.d.ts

@@ -0,0 +1,9 @@
+import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Transform list structure
+ */
+export declare const transformListStructure: (tr: Transaction, listNode: {
+    node: PMNode;
+    pos: number;
+}, targetNodeType: NodeType, nodes: Record<string, NodeType>) => Transaction;

package/dist/types/editor-commands/transforms/list/transformOrderedUnorderedListToBlockNodes.d.ts

@@ -0,0 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TransformContext } from '.././types';
+export declare const transformOrderedUnorderedListToBlockNodes: (context: TransformContext) => Transaction | null;

package/dist/types/editor-commands/transforms/list/transformTaskListToBlockNodes.d.ts

@@ -0,0 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TransformContext } from '.././types';
+export declare const transformTaskListToBlockNodes: (context: TransformContext) => Transaction | null;

package/dist/types/editor-commands/transforms/list-transforms.d.ts

@@ -1,14 +1,13 @@
-import type { NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { TransformContext, TransformFunction } from './types';
 /**
  * Transform selection to list type
  */
-export declare const transformToList: ({ tr, targetNodeType, targetAttrs, }: {
-    targetAttrs?: Record<string, unknown>;
-    targetNodeType: NodeType;
-    tr: Transaction;
-}) => Transaction | null;
+export declare const transformBlockToList: (context: TransformContext) => Transaction | null;
+/**
+ * Transform list to block nodes
+ */
+export declare const transformListToBlockNodes: (context: TransformContext) => Transaction | null;
 /**
  * Transform list nodes
  */

package/dist/types-ts4.5/editor-commands/transforms/container-transforms.d.ts

@@ -1,8 +1,8 @@
-import type { TransformFunction } from './types';
+import type { TransformContext, TransformFunction } from './types';
 /**
  * Transform selection to container type
  */
-export declare const transformToContainer: () => null;
+export declare const transformToContainer: ({ tr, sourceNode, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;
 /**
  * Transform container nodes (panel, expand, blockquote)
  */

package/dist/types-ts4.5/editor-commands/transforms/inline-node-transforms.d.ts

@@ -0,0 +1,3 @@
+import type { Fragment } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment, tr: Transaction) => import("prosemirror-model").Node | undefined;

package/dist/types-ts4.5/editor-commands/transforms/list/transformBetweenListTypes.d.ts

@@ -0,0 +1,9 @@
+import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Transform list structure
+ */
+export declare const transformListStructure: (tr: Transaction, listNode: {
+    node: PMNode;
+    pos: number;
+}, targetNodeType: NodeType, nodes: Record<string, NodeType>) => Transaction;

package/dist/types-ts4.5/editor-commands/transforms/list/transformOrderedUnorderedListToBlockNodes.d.ts

@@ -0,0 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TransformContext } from '.././types';
+export declare const transformOrderedUnorderedListToBlockNodes: (context: TransformContext) => Transaction | null;

package/dist/types-ts4.5/editor-commands/transforms/list/transformTaskListToBlockNodes.d.ts

@@ -0,0 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TransformContext } from '.././types';
+export declare const transformTaskListToBlockNodes: (context: TransformContext) => Transaction | null;

package/dist/types-ts4.5/editor-commands/transforms/list-transforms.d.ts

@@ -1,14 +1,13 @@
-import type { NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { TransformContext, TransformFunction } from './types';
 /**
  * Transform selection to list type
  */
-export declare const transformToList: ({ tr, targetNodeType, targetAttrs, }: {
-    targetAttrs?: Record<string, unknown>;
-    targetNodeType: NodeType;
-    tr: Transaction;
-}) => Transaction | null;
+export declare const transformBlockToList: (context: TransformContext) => Transaction | null;
+/**
+ * Transform list to block nodes
+ */
+export declare const transformListToBlockNodes: (context: TransformContext) => Transaction | null;
 /**
  * Transform list nodes
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.6.0",
+		"@atlaskit/editor-toolbar": "^0.7.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -46,7 +46,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.0.0",
+		"@atlaskit/editor-common": "^108.1.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -85,10 +85,5 @@
 				"import-no-extraneous-disable-for-examples-and-docs"
 			]
 		}
-	},
-	"platform-feature-flags": {
-		"platform_editor_block_menu_format": {
-			"type": "boolean"
-		}
 	}
 }