@atlaskit/editor-plugin-block-menu 1.0.3 → 1.0.5

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

@@ -1,10 +1,11 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 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 { transformToTaskList } from './list/transformToTaskList';
-import { isBlockNodeType, isContainerNodeType, isListNodeType } from './utils';
+import { getSupportedListTypesSet, isBulletOrOrderedList, isBlockNodeType, isContainerNodeType, isListNodeType, isTaskList } from './utils';
 
 /**
  * Transform selection to list type
@@ -22,7 +23,7 @@ export var transformBlockToList = function transformBlockToList(context) {
     return null;
   }
   var nodes = tr.doc.type.schema.nodes;
-  var isTargetTask = targetNodeType === nodes.taskList;
+  var isTargetTask = isTaskList(targetNodeType);
 
   // Handle task lists differently due to their structure
   if (isTargetTask) {
@@ -58,6 +59,60 @@ export var transformListToBlockNodes = function transformListToBlockNodes(contex
   }
 };
 
+/**
+ * Wraps bulletList, orderedList or taskList in node of container type
+ */
+export var transformListToContainer = function transformListToContainer(context) {
+  var tr = context.tr,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos,
+    targetNodeType = context.targetNodeType,
+    targetAttrs = context.targetAttrs;
+  if (sourcePos === null) {
+    return null;
+  }
+  var schema = tr.doc.type.schema;
+  var _schema$nodes = schema.nodes,
+    blockquote = _schema$nodes.blockquote,
+    taskList = _schema$nodes.taskList,
+    taskItem = _schema$nodes.taskItem,
+    paragraph = _schema$nodes.paragraph;
+
+  // Special case: Task list -> Blockquote
+  // Flattens the task list before wrapping by blockquote
+  if (sourceNode.type === taskList && targetNodeType === blockquote) {
+    var _extractParagraphsFromTaskList = function extractParagraphsFromTaskList(node) {
+      var paragraphs = [];
+      node.forEach(function (child) {
+        if (child.type === taskItem) {
+          if (child.content.size > 0) {
+            var paragraphNode = paragraph.createChecked({}, child.content.content);
+            paragraphs.push(paragraphNode);
+          }
+        } else if (child.type === taskList) {
+          paragraphs.push.apply(paragraphs, _toConsumableArray(_extractParagraphsFromTaskList(child)));
+        }
+      });
+      return paragraphs;
+    };
+    var liftedParagraphs = _extractParagraphsFromTaskList(sourceNode);
+    var _containerNode = targetNodeType.createAndFill(targetAttrs, Fragment.from(liftedParagraphs));
+    if (!_containerNode) {
+      return null;
+    }
+    tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, _containerNode);
+    return tr;
+  }
+
+  // Default case
+  var containerNode = targetNodeType.createAndFill(targetAttrs, [sourceNode]);
+  if (!containerNode) {
+    return null;
+  }
+  tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, containerNode);
+  return tr;
+};
+
 /**
  * Transform list nodes
  */
@@ -71,8 +126,8 @@ export var transformListNode = function transformListNode(context) {
 
   // Transform list to container type
   if (isContainerNodeType(targetNodeType)) {
-    // Lift list items out of the list and convert to container type
-    return null;
+    // Wrap list items into container type, where possible
+    return transformListToContainer(context);
   }
 
   // Transform between list types
@@ -93,37 +148,48 @@ export var liftListToBlockType = function liftListToBlockType() {
 /**
  * Transform between different list types
  */
-export var transformBetweenListTypes = function transformBetweenListTypes(_ref) {
-  var tr = _ref.tr,
-    targetNodeType = _ref.targetNodeType;
-  var _tr = tr,
-    selection = _tr.selection;
+export var transformBetweenListTypes = function transformBetweenListTypes(context) {
+  var tr = context.tr,
+    sourceNode = context.sourceNode,
+    sourcePos = context.sourcePos,
+    targetNodeType = context.targetNodeType;
   var nodes = tr.doc.type.schema.nodes;
-
-  // 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;
+  var sourceListType = sourceNode.type;
+  var isSourceBulletOrOrdered = isBulletOrOrderedList(sourceListType);
+  var isTargetTask = isTaskList(targetNodeType);
+  var isSourceTask = isTaskList(sourceListType);
+  var isTargetBulletOrOrdered = isBulletOrOrderedList(targetNodeType);
 
   // Check if we need structure transformation
   var needsStructureTransform = isSourceBulletOrOrdered && isTargetTask || isSourceTask && isTargetBulletOrOrdered;
   try {
     if (!needsStructureTransform) {
       // Simple type change for same structure lists (bullet <-> ordered)
-      tr.setNodeMarkup(listNode.pos, targetNodeType);
+      // Apply to the main list
+      tr.setNodeMarkup(sourcePos, targetNodeType);
+
+      // Apply to nested lists
+      var listStart = sourcePos;
+      var listEnd = sourcePos + sourceNode.nodeSize;
+      var supportedListTypesSet = getSupportedListTypesSet(nodes);
+      tr.doc.nodesBetween(listStart, listEnd, function (node, pos, parent) {
+        // Only process nested lists (not the root list we already handled)
+        if (supportedListTypesSet.has(node.type) && pos !== sourcePos) {
+          var isNestedList = parent && (supportedListTypesSet.has(parent.type) || parent.type === nodes.listItem);
+          if (isNestedList) {
+            var shouldTransformNode = node.type === sourceListType || isBulletOrOrderedList(node.type) && isTargetBulletOrOrdered;
+            if (shouldTransformNode) {
+              tr.setNodeMarkup(pos, targetNodeType);
+            }
+          }
+        }
+        return true; // Continue traversing
+      });
+      return tr;
     } else {
-      tr = transformListStructure(tr, listNode, targetNodeType, nodes);
+      return transformListStructure(context);
     }
   } catch (_unused) {
     return null;
   }
-  return tr;
 };

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

@@ -1,7 +1,8 @@
 import { transformBlockNode } from './block-transforms';
 import { transformContainerNode } from './container-transforms';
+import { convertToLayout } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode, isLayoutNodeType } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   var nodes = tr.doc.type.schema.nodes;
   var targetNodeInfo = getTargetNodeInfo(targetType, nodes);
@@ -37,6 +38,9 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
 
   // Route to appropriate transformation strategy based on source node type
   try {
+    if (isLayoutNodeType(targetNodeType)) {
+      return convertToLayout(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

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

@@ -77,6 +77,10 @@ export var getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
       return {
         nodeType: nodes.taskList
       };
+    case 'layoutSection':
+      return {
+        nodeType: nodes.layoutSection
+      };
     default:
       return null;
   }
@@ -87,7 +91,7 @@ export var isBlockNode = function isBlockNode(node) {
   return ['paragraph', 'heading', 'codeBlock'].includes(node.type.name);
 };
 export var isListNode = function isListNode(node) {
-  return ['bulletList', 'orderedList', 'taskList', 'listItem'].includes(node.type.name);
+  return ['bulletList', 'orderedList', 'taskList'].includes(node.type.name);
 };
 export var isContainerNode = function isContainerNode(node) {
   return ['panel', 'expand', 'blockquote'].includes(node.type.name);
@@ -100,4 +104,21 @@ export var isListNodeType = function isListNodeType(nodeType) {
 };
 export var isContainerNodeType = function isContainerNodeType(nodeType) {
   return ['panel', 'expand', 'blockquote'].includes(nodeType.name);
+};
+
+// List type utilities
+export var isBulletOrOrderedList = function isBulletOrOrderedList(nodeType) {
+  return nodeType.name === 'bulletList' || nodeType.name === 'orderedList';
+};
+export var isTaskList = function isTaskList(nodeType) {
+  return nodeType.name === 'taskList';
+};
+export var getSupportedListTypes = function getSupportedListTypes(nodes) {
+  return [nodes.bulletList, nodes.orderedList, nodes.taskList].filter(Boolean);
+};
+export var getSupportedListTypesSet = function getSupportedListTypesSet(nodes) {
+  return new Set(getSupportedListTypes(nodes));
+};
+export var isLayoutNodeType = function isLayoutNodeType(nodeType) {
+  return nodeType.name === 'layoutSection';
 };

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

@@ -59,7 +59,8 @@ var getFormatMenuComponents = function getFormatMenuComponents() {
         }),
         elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
           label: 'example nested menu'
-        })
+        }),
+        enableMaxHeight: true
       }, children);
     }
   }, {

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

@@ -0,0 +1,2 @@
+import type { TransformContext } from './types';
+export declare const convertToLayout: (context: TransformContext) => import("prosemirror-state").Transaction;

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

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

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

@@ -8,6 +8,10 @@ export declare const transformBlockToList: (context: TransformContext) => Transa
  * Transform list to block nodes
  */
 export declare const transformListToBlockNodes: (context: TransformContext) => Transaction | null;
+/**
+ * Wraps bulletList, orderedList or taskList in node of container type
+ */
+export declare const transformListToContainer: (context: TransformContext) => Transaction | null;
 /**
  * Transform list nodes
  */
@@ -19,4 +23,4 @@ export declare const liftListToBlockType: () => null;
 /**
  * Transform between different list types
  */
-export declare const transformBetweenListTypes: ({ tr, targetNodeType }: TransformContext) => Transaction | null;
+export declare const transformBetweenListTypes: (context: TransformContext) => Transaction | null;

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

@@ -1,4 +1,4 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { FormatNodeTargetType } from './types';
-export declare function transformNodeToTargetType(tr: Transaction, sourceNode: PMNode, sourcePos: number | null, targetType: FormatNodeTargetType): Transaction | null;
+export declare function transformNodeToTargetType(tr: Transaction, sourceNode: PMNode, sourcePos: number, targetType: FormatNodeTargetType): Transaction | null;

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

@@ -1,9 +1,9 @@
 import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export type FormatNodeTargetType = 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'blockquote' | 'expand' | 'layout' | 'panel' | 'codeBlock' | 'bulletList' | 'orderedList' | 'taskList';
+export type FormatNodeTargetType = 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'blockquote' | 'expand' | 'layoutSection' | 'panel' | 'codeBlock' | 'bulletList' | 'orderedList' | 'taskList';
 export interface TransformContext {
     sourceNode: PMNode;
-    sourcePos: number | null;
+    sourcePos: number;
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
     tr: Transaction;

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

@@ -10,3 +10,8 @@ export declare const isContainerNode: (node: PMNode) => boolean;
 export declare const isBlockNodeType: (nodeType: NodeType) => boolean;
 export declare const isListNodeType: (nodeType: NodeType) => boolean;
 export declare const isContainerNodeType: (nodeType: NodeType) => boolean;
+export declare const isBulletOrOrderedList: (nodeType: NodeType) => boolean;
+export declare const isTaskList: (nodeType: NodeType) => boolean;
+export declare const getSupportedListTypes: (nodes: Record<string, NodeType>) => NodeType[];
+export declare const getSupportedListTypesSet: (nodes: Record<string, NodeType>) => Set<NodeType>;
+export declare const isLayoutNodeType: (nodeType: NodeType) => boolean;

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

@@ -0,0 +1,2 @@
+import type { TransformContext } from './types';
+export declare const convertToLayout: (context: TransformContext) => import("prosemirror-state").Transaction;

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

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

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

@@ -8,6 +8,10 @@ export declare const transformBlockToList: (context: TransformContext) => Transa
  * Transform list to block nodes
  */
 export declare const transformListToBlockNodes: (context: TransformContext) => Transaction | null;
+/**
+ * Wraps bulletList, orderedList or taskList in node of container type
+ */
+export declare const transformListToContainer: (context: TransformContext) => Transaction | null;
 /**
  * Transform list nodes
  */
@@ -19,4 +23,4 @@ export declare const liftListToBlockType: () => null;
 /**
  * Transform between different list types
  */
-export declare const transformBetweenListTypes: ({ tr, targetNodeType }: TransformContext) => Transaction | null;
+export declare const transformBetweenListTypes: (context: TransformContext) => Transaction | null;

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

@@ -1,4 +1,4 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { FormatNodeTargetType } from './types';
-export declare function transformNodeToTargetType(tr: Transaction, sourceNode: PMNode, sourcePos: number | null, targetType: FormatNodeTargetType): Transaction | null;
+export declare function transformNodeToTargetType(tr: Transaction, sourceNode: PMNode, sourcePos: number, targetType: FormatNodeTargetType): Transaction | null;

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

@@ -1,9 +1,9 @@
 import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export type FormatNodeTargetType = 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'blockquote' | 'expand' | 'layout' | 'panel' | 'codeBlock' | 'bulletList' | 'orderedList' | 'taskList';
+export type FormatNodeTargetType = 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6' | 'paragraph' | 'blockquote' | 'expand' | 'layoutSection' | 'panel' | 'codeBlock' | 'bulletList' | 'orderedList' | 'taskList';
 export interface TransformContext {
     sourceNode: PMNode;
-    sourcePos: number | null;
+    sourcePos: number;
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
     tr: Transaction;

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

@@ -10,3 +10,8 @@ export declare const isContainerNode: (node: PMNode) => boolean;
 export declare const isBlockNodeType: (nodeType: NodeType) => boolean;
 export declare const isListNodeType: (nodeType: NodeType) => boolean;
 export declare const isContainerNodeType: (nodeType: NodeType) => boolean;
+export declare const isBulletOrOrderedList: (nodeType: NodeType) => boolean;
+export declare const isTaskList: (nodeType: NodeType) => boolean;
+export declare const getSupportedListTypes: (nodes: Record<string, NodeType>) => NodeType[];
+export declare const getSupportedListTypesSet: (nodes: Record<string, NodeType>) => Set<NodeType>;
+export declare const isLayoutNodeType: (nodeType: NodeType) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.3",
+	"version": "1.0.5",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/css": "^0.12.0",
+		"@atlaskit/css": "^0.13.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-block-controls": "^5.0.0",
 		"@atlaskit/editor-plugin-decorations": "^4.0.0",
@@ -37,16 +37,16 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.7.0",
+		"@atlaskit/editor-toolbar": "^0.8.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.12.0",
-		"@atlaskit/tokens": "^6.1.0",
+		"@atlaskit/primitives": "^14.13.0",
+		"@atlaskit/tokens": "^6.2.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.1.0",
+		"@atlaskit/editor-common": "^108.3.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},