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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 1.0.12
+
+### Patch Changes
+
+- [`6e27819feadc7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e27819feadc7) -
+  ED-29183: Fixed aligned p and heading not able to convert to list
+- [`6a9265f5389db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6a9265f5389db) -
+  Fix container transform with blockquote containing list
+- [`24e0d952943aa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24e0d952943aa) -
+  ED-29206: Fixed conversion from code block to panel, expand text formatting issue
+- Updated dependencies
+
 ## 1.0.11
 
 ### Patch Changes

package/dist/cjs/editor-commands/transforms/container-transforms.js

@@ -20,19 +20,6 @@ var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeTy
   });
   return _model.Fragment.from(validTransformedContent);
 };
-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 _model.Fragment.from(withValidMarks);
-};
 
 /**
  * Transform selection to container type
@@ -47,7 +34,8 @@ var transformToContainer = exports.transformToContainer = function transformToCo
   var content = selection.content().content;
   var transformedContent = content;
   if (sourceNode.type === schema.nodes.codeBlock) {
-    transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.codeBlock, schema.nodes.paragraph);
+    var paragraphNodes = (0, _utils.convertCodeBlockContentToParagraphs)(sourceNode, schema);
+    transformedContent = _model.Fragment.fromArray(paragraphNodes);
   }
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
@@ -57,7 +45,7 @@ var transformToContainer = exports.transformToContainer = function transformToCo
   // e.g. blocks (heading/ paragraph) with alignment need to remove alignment
   // as panel/ blockQuote/ expands does not support alignment
   if (sourceNode.type === schema.nodes.paragraph || sourceNode.type === schema.nodes.heading) {
-    transformedContent = filterMarksForTargetNodeType(transformedContent, targetNodeType);
+    transformedContent = (0, _utils.filterMarksForTargetNodeType)(transformedContent, targetNodeType);
   }
   var newNode = targetNodeType.createAndFill(targetAttrs, transformedContent);
   if (!newNode) {
@@ -158,12 +146,7 @@ var unwrapAndConvertToBlockType = exports.unwrapAndConvertToBlockType = function
 
   // if the container is a code block, convert text content to multiple paragraphs
   if (sourceNode.type === codeBlock) {
-    var codeText = sourceNode.textContent;
-    var lines = codeText.split('\n');
-    var paragraphNodes = lines.map(function (line) {
-      return paragraph.create(null, line ? schema.text(line) : null);
-    });
-    sourceChildren = paragraphNodes;
+    sourceChildren = (0, _utils.convertCodeBlockContentToParagraphs)(sourceNode, schema);
   }
 
   // if target node is a paragraph, just do unwrap
@@ -400,15 +383,15 @@ var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupported
     if (isContentSupported(childNode)) {
       // Supported content - add to current container
       currentContainerContent.push(childNode);
-    } else if ((0, _utils.isBlockNodeForExtraction)(childNode)) {
-      // Unsupported block node - flush current container, add block, continue
-      flushCurrentContainer();
-      splits.push(childNode);
     } else if (childNode.type.name === targetNodeType.name) {
       // Same type of container merge contents
       childNode.content.forEach(function (child) {
         currentContainerContent.push(child);
       });
+    } else if (childNode.isBlock) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
     } else {
       // Unsupported inline content - convert to paragraph and add to container
       var inlineContent = (0, _utils.convertNodeToInlineContent)(childNode, schema);

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

@@ -24,6 +24,7 @@ var transformBlockToList = exports.transformBlockToList = function transformBloc
   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;
@@ -36,6 +37,12 @@ var transformBlockToList = exports.transformBlockToList = function transformBloc
     return (0, _transformToTaskList.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/cjs/editor-commands/transforms/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTaskList = exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isContainerNodeType = exports.isContainerNode = exports.isBulletOrOrderedList = exports.isBlockNodeType = exports.isBlockNodeForExtraction = exports.isBlockNode = exports.getTargetNodeInfo = exports.getSupportedListTypesSet = exports.getSupportedListTypes = exports.getContentSupportChecker = exports.convertNodeToInlineContent = void 0;
+exports.isTaskList = exports.isListNodeType = exports.isListNode = exports.isLayoutNodeType = exports.isContainerNodeType = exports.isContainerNode = exports.isBulletOrOrderedList = exports.isBlockNodeType = exports.isBlockNodeForExtraction = exports.isBlockNode = exports.getTargetNodeInfo = exports.getSupportedListTypesSet = exports.getSupportedListTypes = exports.getContentSupportChecker = exports.filterMarksForTargetNodeType = exports.convertNodeToInlineContent = exports.convertCodeBlockContentToParagraphs = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var getTargetNodeInfo = exports.getTargetNodeInfo = function getTargetNodeInfo(targetType, nodes) {
   switch (targetType) {
@@ -174,4 +174,37 @@ var convertNodeToInlineContent = exports.convertNodeToInlineContent = function c
     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
+ */
+var filterMarksForTargetNodeType = exports.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 _model.Fragment.from(withValidMarks);
+};
+
+/** * Convert content from a code block node into multiple paragraph nodes
+ */
+var convertCodeBlockContentToParagraphs = exports.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/es2019/editor-commands/transforms/container-transforms.js

@@ -1,5 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker } from './utils';
+import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType } from './utils';
 const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validNodeType, withMarks) => {
   const validTransformedContent = [];
   // Headings are not valid inside headings so convert heading nodes to paragraphs
@@ -12,19 +12,6 @@ const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validN
   });
   return Fragment.from(validTransformedContent);
 };
-const filterMarksForTargetNodeType = (content, targetNodeType) => {
-  const withValidMarks = [];
-  content.forEach(node => {
-    if (node.marks.length > 0) {
-      const allowedMarks = targetNodeType.allowedMarks(node.marks);
-      const updatedNode = node.mark(allowedMarks);
-      withValidMarks.push(updatedNode);
-    } else {
-      withValidMarks.push(node);
-    }
-  });
-  return Fragment.from(withValidMarks);
-};
 
 /**
  * Transform selection to container type
@@ -40,7 +27,8 @@ export const transformToContainer = ({
   const content = selection.content().content;
   let transformedContent = content;
   if (sourceNode.type === schema.nodes.codeBlock) {
-    transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.codeBlock, schema.nodes.paragraph);
+    const paragraphNodes = convertCodeBlockContentToParagraphs(sourceNode, schema);
+    transformedContent = Fragment.fromArray(paragraphNodes);
   }
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
@@ -157,10 +145,7 @@ export const unwrapAndConvertToBlockType = context => {
 
   // if the container is a code block, convert text content to multiple paragraphs
   if (sourceNode.type === codeBlock) {
-    const codeText = sourceNode.textContent;
-    const lines = codeText.split('\n');
-    const paragraphNodes = lines.map(line => paragraph.create(null, line ? schema.text(line) : null));
-    sourceChildren = paragraphNodes;
+    sourceChildren = convertCodeBlockContentToParagraphs(sourceNode, schema);
   }
 
   // if target node is a paragraph, just do unwrap
@@ -399,15 +384,15 @@ const splitContentAroundUnsupportedBlocks = (sourceNode, isContentSupported, tar
     if (isContentSupported(childNode)) {
       // Supported content - add to current container
       currentContainerContent.push(childNode);
-    } else if (isBlockNodeForExtraction(childNode)) {
-      // Unsupported block node - flush current container, add block, continue
-      flushCurrentContainer();
-      splits.push(childNode);
     } else if (childNode.type.name === targetNodeType.name) {
       // Same type of container merge contents
       childNode.content.forEach(child => {
         currentContainerContent.push(child);
       });
+    } else if (childNode.isBlock) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
     } else {
       // Unsupported inline content - convert to paragraph and add to container
       const inlineContent = convertNodeToInlineContent(childNode, schema);

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

@@ -20,6 +20,7 @@ export const transformBlockToList = context => {
     $from,
     $to
   } = tr.selection;
+  const schema = tr.doc.type.schema;
   const range = $from.blockRange($to);
   if (!range) {
     return null;
@@ -34,6 +35,12 @@ export const 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) {
+    const 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/es2019/editor-commands/transforms/utils.js

@@ -168,4 +168,37 @@ export const convertNodeToInlineContent = (node, schema) => {
     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 const filterMarksForTargetNodeType = (content, targetNodeType) => {
+  const withValidMarks = [];
+  content.forEach(node => {
+    if (node.marks.length > 0) {
+      const allowedMarks = targetNodeType.allowedMarks(node.marks);
+      const 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 const convertCodeBlockContentToParagraphs = (codeBlockNode, schema) => {
+  const paragraphNodes = [];
+  const codeText = codeBlockNode.textContent;
+  const lines = codeText.split('\n');
+  lines.forEach(line => {
+    const paragraphNode = schema.nodes.paragraph.create(null, line ? schema.text(line) : null);
+    paragraphNodes.push(paragraphNode);
+  });
+  return paragraphNodes;
 };

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker } from './utils';
+import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType } from './utils';
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
   var validTransformedContent = [];
   // Headings are not valid inside headings so convert heading nodes to paragraphs
@@ -13,19 +13,6 @@ var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeTy
   });
   return Fragment.from(validTransformedContent);
 };
-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);
-};
 
 /**
  * Transform selection to container type
@@ -40,7 +27,8 @@ export var transformToContainer = function transformToContainer(_ref) {
   var content = selection.content().content;
   var transformedContent = content;
   if (sourceNode.type === schema.nodes.codeBlock) {
-    transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.codeBlock, schema.nodes.paragraph);
+    var paragraphNodes = convertCodeBlockContentToParagraphs(sourceNode, schema);
+    transformedContent = Fragment.fromArray(paragraphNodes);
   }
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
@@ -151,12 +139,7 @@ export var unwrapAndConvertToBlockType = function unwrapAndConvertToBlockType(co
 
   // if the container is a code block, convert text content to multiple paragraphs
   if (sourceNode.type === codeBlock) {
-    var codeText = sourceNode.textContent;
-    var lines = codeText.split('\n');
-    var paragraphNodes = lines.map(function (line) {
-      return paragraph.create(null, line ? schema.text(line) : null);
-    });
-    sourceChildren = paragraphNodes;
+    sourceChildren = convertCodeBlockContentToParagraphs(sourceNode, schema);
   }
 
   // if target node is a paragraph, just do unwrap
@@ -393,15 +376,15 @@ var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupported
     if (isContentSupported(childNode)) {
       // Supported content - add to current container
       currentContainerContent.push(childNode);
-    } else if (isBlockNodeForExtraction(childNode)) {
-      // Unsupported block node - flush current container, add block, continue
-      flushCurrentContainer();
-      splits.push(childNode);
     } else if (childNode.type.name === targetNodeType.name) {
       // Same type of container merge contents
       childNode.content.forEach(function (child) {
         currentContainerContent.push(child);
       });
+    } else if (childNode.isBlock) {
+      // Unsupported block node - flush current container, add block, continue
+      flushCurrentContainer();
+      splits.push(childNode);
     } else {
       // Unsupported inline content - convert to paragraph and add to container
       var inlineContent = convertNodeToInlineContent(childNode, schema);

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

@@ -168,4 +168,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/utils.d.ts

@@ -1,4 +1,5 @@
 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>;
@@ -28,3 +29,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/utils.d.ts

@@ -1,4 +1,5 @@
 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>;
@@ -28,3 +29,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.12",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",