@atlaskit/editor-plugin-block-menu 3.1.3 → 3.1.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.1.4
+
+### Patch Changes
+
+- [`f2000345dec2c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2000345dec2c) -
+  ED-29258 Break up list items into new lines when converted into codeblock
+
 ## 3.1.3
 
 ### Patch Changes

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

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.unwrapAndConvertToList = exports.unwrapAndConvertToBlockType = exports.transformToContainer = exports.transformContainerNode = exports.transformBetweenContainerTypes = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _utils = require("./utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _inlineNodeTransforms = require("./inline-node-transforms");
+var _utils2 = require("./utils");
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
   var validTransformedContent = [];
   // Headings are not valid inside headings so convert heading nodes to paragraphs
@@ -34,7 +36,7 @@ var transformToContainer = exports.transformToContainer = function transformToCo
   var content = selection.content().content;
   var transformedContent = content;
   if (sourceNode.type === schema.nodes.codeBlock) {
-    var paragraphNodes = (0, _utils.convertCodeBlockContentToParagraphs)(sourceNode, schema);
+    var paragraphNodes = (0, _utils2.convertCodeBlockContentToParagraphs)(sourceNode, schema);
     transformedContent = _model.Fragment.fromArray(paragraphNodes);
   }
   if (targetNodeType === schema.nodes.blockquote) {
@@ -45,7 +47,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 = (0, _utils.filterMarksForTargetNodeType)(transformedContent, targetNodeType);
+    transformedContent = (0, _utils2.filterMarksForTargetNodeType)(transformedContent, targetNodeType);
   }
   var newNode = targetNodeType.createAndFill(targetAttrs, transformedContent);
   if (!newNode) {
@@ -69,7 +71,7 @@ var transformContainerNode = exports.transformContainerNode = function transform
   }
 
   // Transform container to block type - unwrap and convert content
-  if ((0, _utils.isBlockNodeType)(targetNodeType)) {
+  if ((0, _utils2.isBlockNodeType)(targetNodeType)) {
     // special case container to codeblock
     if (targetNodeType.name === 'codeBlock') {
       return transformBetweenContainerTypes({
@@ -90,7 +92,7 @@ var transformContainerNode = exports.transformContainerNode = function transform
   }
 
   // Transform container to list type
-  if ((0, _utils.isListNodeType)(targetNodeType)) {
+  if ((0, _utils2.isListNodeType)(targetNodeType)) {
     return unwrapAndConvertToList({
       tr: tr,
       sourceNode: sourceNode,
@@ -101,7 +103,7 @@ var transformContainerNode = exports.transformContainerNode = function transform
   }
 
   // Transform between container types
-  if ((0, _utils.isContainerNodeType)(targetNodeType)) {
+  if ((0, _utils2.isContainerNodeType)(targetNodeType)) {
     return transformBetweenContainerTypes({
       tr: tr,
       sourceNode: sourceNode,
@@ -146,7 +148,7 @@ var unwrapAndConvertToBlockType = exports.unwrapAndConvertToBlockType = function
 
   // if the container is a code block, convert text content to multiple paragraphs
   if (sourceNode.type === codeBlock) {
-    sourceChildren = (0, _utils.convertCodeBlockContentToParagraphs)(sourceNode, schema);
+    sourceChildren = (0, _utils2.convertCodeBlockContentToParagraphs)(sourceNode, schema);
   }
 
   // if target node is a paragraph, just do unwrap
@@ -274,7 +276,7 @@ var transformBetweenContainerTypes = exports.transformBetweenContainerTypes = fu
   }
 
   // Get content validation for target container type
-  var isContentSupported = (0, _utils.getContentSupportChecker)(targetNodeType);
+  var isContentSupported = (0, _utils2.getContentSupportChecker)(targetNodeType);
 
   // Process content and collect splits
   var contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
@@ -334,15 +336,25 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        var text = childNode.textContent;
+        var text = (0, _inlineNodeTransforms.getInlineNodeTextContent)(_model.Fragment.from(childNode));
         if (text.trim()) {
           currentTextContent.push(text);
         }
       }
-    } else if ((0, _utils.isBlockNodeForExtraction)(childNode)) {
+    } else if ((0, _utils2.isBlockNodeForExtraction)(childNode)) {
       // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
       flushCurrentCodeBlock();
       splits.push(childNode);
+    } else if ((0, _utils2.isListNodeType)(childNode.type)) {
+      var isTaskList = childNode.type.name === 'taskList';
+      var listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
+      var listItems = (0, _utils.findChildrenByType)(childNode, listItemType);
+      listItems.forEach(function (listItem) {
+        var inlineContent = (0, _inlineNodeTransforms.getInlineNodeTextContent)(isTaskList ? _model.Fragment.from(listItem.node) : listItem.node.content);
+        if (inlineContent.trim()) {
+          currentTextContent.push(inlineContent);
+        }
+      });
     } else {
       // Other unsupported content - try to extract text if possible
       var _text = childNode.textContent;
@@ -394,7 +406,7 @@ var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupported
       splits.push(childNode);
     } else {
       // Unsupported inline content - convert to paragraph and add to container
-      var inlineContent = (0, _utils.convertNodeToInlineContent)(childNode, schema);
+      var inlineContent = (0, _utils2.convertNodeToInlineContent)(childNode, schema);
       if (inlineContent.length > 0) {
         var paragraph = schema.nodes.paragraph.create({}, _model.Fragment.fromArray(inlineContent));
         currentContainerContent.push(paragraph);

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

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

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

@@ -1,4 +1,6 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { getInlineNodeTextContent } from './inline-node-transforms';
 import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType } from './utils';
 const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validNodeType, withMarks) => {
   const validTransformedContent = [];
@@ -335,7 +337,7 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        const text = childNode.textContent;
+        const text = getInlineNodeTextContent(Fragment.from(childNode));
         if (text.trim()) {
           currentTextContent.push(text);
         }
@@ -344,6 +346,16 @@ const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schem
       // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
       flushCurrentCodeBlock();
       splits.push(childNode);
+    } else if (isListNodeType(childNode.type)) {
+      const isTaskList = childNode.type.name === 'taskList';
+      const listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
+      const listItems = findChildrenByType(childNode, listItemType);
+      listItems.forEach(listItem => {
+        const inlineContent = getInlineNodeTextContent(isTaskList ? Fragment.from(listItem.node) : listItem.node.content);
+        if (inlineContent.trim()) {
+          currentTextContent.push(inlineContent);
+        }
+      });
     } else {
       // Other unsupported content - try to extract text if possible
       const text = childNode.textContent;

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

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
 import "./block-menu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext, useEffect } from 'react';

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

@@ -1,5 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { getInlineNodeTextContent } from './inline-node-transforms';
 import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType } from './utils';
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
   var validTransformedContent = [];
@@ -327,7 +329,7 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
         currentTextContent.push(childNode.textContent);
       } else if (childNode.isTextblock) {
         // Extract text from text blocks (paragraphs, headings, etc.)
-        var text = childNode.textContent;
+        var text = getInlineNodeTextContent(Fragment.from(childNode));
         if (text.trim()) {
           currentTextContent.push(text);
         }
@@ -336,6 +338,16 @@ var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, tar
       // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
       flushCurrentCodeBlock();
       splits.push(childNode);
+    } else if (isListNodeType(childNode.type)) {
+      var isTaskList = childNode.type.name === 'taskList';
+      var listItemType = isTaskList ? childNode.type.schema.nodes.taskItem : childNode.type.schema.nodes.listItem;
+      var listItems = findChildrenByType(childNode, listItemType);
+      listItems.forEach(function (listItem) {
+        var inlineContent = getInlineNodeTextContent(isTaskList ? Fragment.from(listItem.node) : listItem.node.content);
+        if (inlineContent.trim()) {
+          currentTextContent.push(inlineContent);
+        }
+      });
     } else {
       // Other unsupported content - try to extract text if possible
       var _text = childNode.textContent;

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

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
 import "./block-menu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext, useEffect } from 'react';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "3.1.3",
+	"version": "3.1.4",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",