@atlaskit/editor-plugin-block-menu 1.0.11 → 1.0.13

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

@@ -1,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { getSupportedListTypesSet, isBulletOrOrderedList, isTaskList } from '../utils';
 
 /**
@@ -15,10 +18,87 @@ var convertBlockToInlineContent = function convertBlockToInlineContent(node, sch
   }
   return [node];
 };
+var _transformListRecursively = function transformListRecursively(props) {
+  var transformedItems = [];
+  var listNode = props.listNode,
+    isSourceBulletOrOrdered = props.isSourceBulletOrOrdered,
+    isTargetBulletOrOrdered = props.isTargetBulletOrOrdered,
+    isSourceTask = props.isSourceTask,
+    isTargetTask = props.isTargetTask,
+    supportedListTypes = props.supportedListTypes,
+    schema = props.schema,
+    targetNodeType = props.targetNodeType;
+  var _schema$nodes = schema.nodes,
+    taskList = _schema$nodes.taskList,
+    listItem = _schema$nodes.listItem,
+    taskItem = _schema$nodes.taskItem,
+    paragraph = _schema$nodes.paragraph;
+  listNode.forEach(function (child) {
+    if (isSourceBulletOrOrdered && isTargetTask) {
+      // Convert bullet/ordered => task
+      if (child.type === listItem) {
+        var inlineContent = [];
+        var nestedTaskLists = [];
+        child.forEach(function (grandChild) {
+          if (supportedListTypes.has(grandChild.type) && grandChild.type !== taskList) {
+            nestedTaskLists.push(_transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
+              listNode: grandChild
+            })));
+          } else {
+            inlineContent.push.apply(inlineContent, _toConsumableArray(convertBlockToInlineContent(grandChild, schema)));
+          }
+        });
+        if (inlineContent.length > 0) {
+          transformedItems.push(taskItem.create(null, inlineContent));
+        }
+        transformedItems.push.apply(transformedItems, nestedTaskLists);
+      }
+    } else if (isSourceTask && isTargetBulletOrOrdered) {
+      // Convert task => bullet/ordered
+      if (child.type === taskItem) {
+        var _inlineContent = _toConsumableArray(child.content.content);
+        if (_inlineContent.length > 0) {
+          var paragraphNode = paragraph.create(null, _inlineContent);
+          transformedItems.push(listItem.create(null, [paragraphNode]));
+        }
+      } else if (child.type === taskList) {
+        var transformedNestedList = _transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
+          listNode: child
+        }));
+        var lastItem = transformedItems[transformedItems.length - 1];
+        if ((lastItem === null || lastItem === void 0 ? void 0 : lastItem.type) === listItem) {
+          // Attach nested list to previous item
+          var updatedContent = [].concat(_toConsumableArray(lastItem.content.content), [transformedNestedList]);
+          transformedItems[transformedItems.length - 1] = listItem.create(lastItem.attrs, updatedContent);
+        } else {
+          // No previous item, flatten nested items
+          transformedItems.push.apply(transformedItems, _toConsumableArray(transformedNestedList.content.content));
+        }
+      }
+    } else if (isSourceBulletOrOrdered && isTargetBulletOrOrdered) {
+      if (child.type === listItem) {
+        var convertedNestedLists = [];
+        child.forEach(function (grandChild) {
+          if (supportedListTypes.has(grandChild.type) && grandChild.type !== targetNodeType) {
+            var convertedNode = _transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
+              listNode: grandChild
+            }));
+            convertedNestedLists.push(convertedNode);
+          } else {
+            convertedNestedLists.push(grandChild);
+          }
+        });
+        transformedItems.push(listItem.create(null, convertedNestedLists));
+      }
+    }
+  });
+  return targetNodeType.create(null, transformedItems);
+};
 
 /**
  * Transform list structure between different list types
  */
+export { _transformListRecursively as transformListRecursively };
 export var transformListStructure = function transformListStructure(context) {
   var tr = context.tr,
     sourceNode = context.sourceNode,
@@ -32,60 +112,23 @@ export var transformListStructure = function transformListStructure(context) {
     };
     var sourceList = listNode.node,
       listPos = listNode.pos;
-    var taskList = nodes.taskList,
-      listItem = nodes.listItem,
-      taskItem = nodes.taskItem,
-      paragraph = nodes.paragraph;
+    // const { taskList, listItem, taskItem, paragraph } = nodes;
+
     var isSourceBulletOrOrdered = isBulletOrOrderedList(sourceList.type);
     var isTargetTask = isTaskList(targetNodeType);
     var isSourceTask = isTaskList(sourceList.type);
     var isTargetBulletOrOrdered = isBulletOrOrderedList(targetNodeType);
     var supportedListTypes = getSupportedListTypesSet(nodes);
-    var _transformListRecursively = function transformListRecursively(listNode) {
-      var transformedItems = [];
-      listNode.forEach(function (child) {
-        if (isSourceBulletOrOrdered && isTargetTask) {
-          // Convert bullet/ordered => task
-          if (child.type === listItem) {
-            var inlineContent = [];
-            var nestedTaskLists = [];
-            child.forEach(function (grandChild) {
-              if (supportedListTypes.has(grandChild.type) && grandChild.type !== taskList) {
-                nestedTaskLists.push(_transformListRecursively(grandChild));
-              } else {
-                inlineContent.push.apply(inlineContent, _toConsumableArray(convertBlockToInlineContent(grandChild, tr.doc.type.schema)));
-              }
-            });
-            if (inlineContent.length > 0) {
-              transformedItems.push(taskItem.create(null, inlineContent));
-            }
-            transformedItems.push.apply(transformedItems, nestedTaskLists);
-          }
-        } else if (isSourceTask && isTargetBulletOrOrdered) {
-          // Convert task => bullet/ordered
-          if (child.type === taskItem) {
-            var _inlineContent = _toConsumableArray(child.content.content);
-            if (_inlineContent.length > 0) {
-              var paragraphNode = paragraph.create(null, _inlineContent);
-              transformedItems.push(listItem.create(null, [paragraphNode]));
-            }
-          } else if (child.type === taskList) {
-            var transformedNestedList = _transformListRecursively(child);
-            var lastItem = transformedItems[transformedItems.length - 1];
-            if ((lastItem === null || lastItem === void 0 ? void 0 : lastItem.type) === listItem) {
-              // Attach nested list to previous item
-              var updatedContent = [].concat(_toConsumableArray(lastItem.content.content), [transformedNestedList]);
-              transformedItems[transformedItems.length - 1] = listItem.create(lastItem.attrs, updatedContent);
-            } else {
-              // No previous item, flatten nested items
-              transformedItems.push.apply(transformedItems, _toConsumableArray(transformedNestedList.content.content));
-            }
-          }
-        }
-      });
-      return targetNodeType.create(null, transformedItems);
-    };
-    var newList = _transformListRecursively(sourceList);
+    var newList = _transformListRecursively({
+      isSourceBulletOrOrdered: isSourceBulletOrOrdered,
+      isSourceTask: isSourceTask,
+      isTargetBulletOrOrdered: isTargetBulletOrOrdered,
+      isTargetTask: isTargetTask,
+      listNode: sourceList,
+      schema: tr.doc.type.schema,
+      supportedListTypes: supportedListTypes,
+      targetNodeType: targetNodeType
+    });
     tr.replaceWith(listPos, listPos + sourceList.nodeSize, newList);
     return tr;
   } catch (_unused) {

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

@@ -18,6 +18,7 @@ export var transformBlockToList = function transformBlockToList(context) {
   var _tr$selection = tr.selection,
     $from = _tr$selection.$from,
     $to = _tr$selection.$to;
+  var schema = tr.doc.type.schema;
   var range = $from.blockRange($to);
   if (!range) {
     return null;
@@ -30,6 +31,12 @@ export var transformBlockToList = function transformBlockToList(context) {
     return transformToTaskList(tr, range, targetNodeType, targetAttrs, nodes);
   }
 
+  // filter marks that are not allowed in the target node type
+  if (sourceNode.type === schema.nodes.paragraph || sourceNode.type === schema.nodes.heading) {
+    var allowedMarks = targetNodeType.allowedMarks(sourceNode.marks);
+    tr.setNodeMarkup(range.start, null, null, allowedMarks);
+  }
+
   // For headings, convert to paragraph first since headings cannot be direct children of list items
   if (sourceNode && sourceNode.type.name.startsWith('heading')) {
     tr.setBlockType(range.start, range.end, nodes.paragraph);

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

@@ -1,8 +1,8 @@
 import { transformBlockNode } from './block-transforms';
 import { transformContainerNode, unwrapAndConvertToList } from './container-transforms';
-import { convertToLayout } from './layout-transforms';
+import { convertToLayout, transformLayoutNode } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType, isLayoutNode } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   var nodes = tr.doc.type.schema.nodes;
   var targetNodeInfo = getTargetNodeInfo(targetType, nodes);
@@ -46,6 +46,9 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
     if (sourceNode.type.name === 'codeBlock' && isListNodeType(targetNodeType)) {
       return unwrapAndConvertToList(transformationContext);
     }
+    if (isLayoutNode(sourceNode)) {
+      return transformLayoutNode(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

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

@@ -91,6 +91,9 @@ export var getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
 export var isBlockNode = function isBlockNode(node) {
   return ['paragraph', 'heading', 'codeBlock'].includes(node.type.name);
 };
+export var isHeadingOrParagraphNode = function isHeadingOrParagraphNode(node) {
+  return ['paragraph', 'heading'].includes(node.type.name);
+};
 export var isListNode = function isListNode(node) {
   return ['bulletList', 'orderedList', 'taskList'].includes(node.type.name);
 };
@@ -123,6 +126,9 @@ export var getSupportedListTypesSet = function getSupportedListTypesSet(nodes) {
 export var isLayoutNodeType = function isLayoutNodeType(nodeType) {
   return nodeType.name === 'layoutSection';
 };
+export var isLayoutNode = function isLayoutNode(node) {
+  return node.type.name === 'layoutSection';
+};
 
 /**
  * Check if a node should be extracted as a standalone block node
@@ -168,4 +174,37 @@ export var convertNodeToInlineContent = function convertNodeToInlineContent(node
     return [schema.text(node.textContent)];
   }
   return inlineNodes;
+};
+
+/**
+ * Filter marks from content based on the target node type
+ * @param content The content fragment to filter
+ * @param targetNodeType The target node type to check against
+ * @returns A new fragment with marks filtered for the target node type
+ */
+export var filterMarksForTargetNodeType = function filterMarksForTargetNodeType(content, targetNodeType) {
+  var withValidMarks = [];
+  content.forEach(function (node) {
+    if (node.marks.length > 0) {
+      var allowedMarks = targetNodeType.allowedMarks(node.marks);
+      var updatedNode = node.mark(allowedMarks);
+      withValidMarks.push(updatedNode);
+    } else {
+      withValidMarks.push(node);
+    }
+  });
+  return Fragment.from(withValidMarks);
+};
+
+/** * Convert content from a code block node into multiple paragraph nodes
+ */
+export var convertCodeBlockContentToParagraphs = function convertCodeBlockContentToParagraphs(codeBlockNode, schema) {
+  var paragraphNodes = [];
+  var codeText = codeBlockNode.textContent;
+  var lines = codeText.split('\n');
+  lines.forEach(function (line) {
+    var paragraphNode = schema.nodes.paragraph.create(null, line ? schema.text(line) : null);
+    paragraphNodes.push(paragraphNode);
+  });
+  return paragraphNodes;
 };

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

@@ -1,3 +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;
+import type { Fragment, Schema } from '@atlaskit/editor-prosemirror/model';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment) => string;
+export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => import("prosemirror-model").Node;

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

@@ -0,0 +1,5 @@
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TransformContext } from '../types';
+export declare const unwrapLayoutNodesToTextNodes: (context: TransformContext, finalTargetNodeType: NodeType) => PMNode[];
+export declare const transformToListNode: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema) => PMNode[];
+export declare const convertUnwrappedLayoutContent: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema) => PMNode[];

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

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

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

@@ -1,5 +1,18 @@
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { TransformContext } from '../types';
+type TransformListRecursivelyProps = {
+    isSourceBulletOrOrdered: boolean;
+    isSourceTask: boolean;
+    isTargetBulletOrOrdered: boolean;
+    isTargetTask: boolean;
+    listNode: PMNode;
+    schema: Schema;
+    supportedListTypes: Set<NodeType>;
+    targetNodeType: NodeType;
+};
+export declare const transformListRecursively: (props: TransformListRecursivelyProps) => PMNode;
 /**
  * Transform list structure between different list types
  */
 export declare const transformListStructure: (context: TransformContext) => import("prosemirror-state").Transaction;
+export {};

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

@@ -1,10 +1,12 @@
 import type { Node as PMNode, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import type { FormatNodeTargetType } from './types';
 export declare const getTargetNodeInfo: (targetType: FormatNodeTargetType, nodes: Record<string, NodeType>) => {
     attrs?: Record<string, unknown>;
     nodeType: NodeType;
 } | null;
 export declare const isBlockNode: (node: PMNode) => boolean;
+export declare const isHeadingOrParagraphNode: (node: PMNode) => boolean;
 export declare const isListNode: (node: PMNode) => boolean;
 export declare const isContainerNode: (node: PMNode) => boolean;
 export declare const isBlockNodeType: (nodeType: NodeType) => boolean;
@@ -15,6 +17,7 @@ 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;
+export declare const isLayoutNode: (node: PMNode) => boolean;
 /**
  * Check if a node should be extracted as a standalone block node
  * rather than converted to inline content
@@ -28,3 +31,13 @@ export declare const getContentSupportChecker: (targetNodeType: NodeType) => ((n
  * Convert a node to inline content that can be placed in a paragraph
  */
 export declare const convertNodeToInlineContent: (node: PMNode, schema: Schema) => PMNode[];
+/**
+ * Filter marks from content based on the target node type
+ * @param content The content fragment to filter
+ * @param targetNodeType The target node type to check against
+ * @returns A new fragment with marks filtered for the target node type
+ */
+export declare const filterMarksForTargetNodeType: (content: Fragment, targetNodeType: NodeType) => Fragment;
+/** * Convert content from a code block node into multiple paragraph nodes
+ */
+export declare const convertCodeBlockContentToParagraphs: (codeBlockNode: PMNode, schema: Schema) => PMNode[];

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

@@ -1,3 +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;
+import type { Fragment, Schema } from '@atlaskit/editor-prosemirror/model';
+export declare const getInlineNodeTextContent: (sourceContent: Fragment) => string;
+export declare const getInlineNodeTextNode: (sourceContent: Fragment, schema: Schema) => import("prosemirror-model").Node;

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

@@ -0,0 +1,5 @@
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TransformContext } from '../types';
+export declare const unwrapLayoutNodesToTextNodes: (context: TransformContext, finalTargetNodeType: NodeType) => PMNode[];
+export declare const transformToListNode: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema) => PMNode[];
+export declare const convertUnwrappedLayoutContent: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema) => PMNode[];

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

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

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

@@ -1,5 +1,18 @@
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { TransformContext } from '../types';
+type TransformListRecursivelyProps = {
+    isSourceBulletOrOrdered: boolean;
+    isSourceTask: boolean;
+    isTargetBulletOrOrdered: boolean;
+    isTargetTask: boolean;
+    listNode: PMNode;
+    schema: Schema;
+    supportedListTypes: Set<NodeType>;
+    targetNodeType: NodeType;
+};
+export declare const transformListRecursively: (props: TransformListRecursivelyProps) => PMNode;
 /**
  * Transform list structure between different list types
  */
 export declare const transformListStructure: (context: TransformContext) => import("prosemirror-state").Transaction;
+export {};

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

@@ -1,10 +1,12 @@
 import type { Node as PMNode, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import type { FormatNodeTargetType } from './types';
 export declare const getTargetNodeInfo: (targetType: FormatNodeTargetType, nodes: Record<string, NodeType>) => {
     attrs?: Record<string, unknown>;
     nodeType: NodeType;
 } | null;
 export declare const isBlockNode: (node: PMNode) => boolean;
+export declare const isHeadingOrParagraphNode: (node: PMNode) => boolean;
 export declare const isListNode: (node: PMNode) => boolean;
 export declare const isContainerNode: (node: PMNode) => boolean;
 export declare const isBlockNodeType: (nodeType: NodeType) => boolean;
@@ -15,6 +17,7 @@ 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;
+export declare const isLayoutNode: (node: PMNode) => boolean;
 /**
  * Check if a node should be extracted as a standalone block node
  * rather than converted to inline content
@@ -28,3 +31,13 @@ export declare const getContentSupportChecker: (targetNodeType: NodeType) => ((n
  * Convert a node to inline content that can be placed in a paragraph
  */
 export declare const convertNodeToInlineContent: (node: PMNode, schema: Schema) => PMNode[];
+/**
+ * Filter marks from content based on the target node type
+ * @param content The content fragment to filter
+ * @param targetNodeType The target node type to check against
+ * @returns A new fragment with marks filtered for the target node type
+ */
+export declare const filterMarksForTargetNodeType: (content: Fragment, targetNodeType: NodeType) => Fragment;
+/** * Convert content from a code block node into multiple paragraph nodes
+ */
+export declare const convertCodeBlockContentToParagraphs: (codeBlockNode: PMNode, schema: Schema) => PMNode[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.11",
+	"version": "1.0.13",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.6.0",
+		"@atlaskit/editor-common": "^108.7.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},