@atlaskit/editor-plugin-block-menu 6.0.6 → 6.0.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.7
+
+### Patch Changes
+
+- [`65223704a60e0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65223704a60e0) -
+  Fix hard breaks being lost in nested task lists during transformation
+- Updated dependencies
+
 ## 6.0.6
 
 ### Patch Changes

package/dist/cjs/editor-commands/transform-node-utils/steps/decisionListToListStep.js

@@ -73,11 +73,7 @@ var decisionListToListStep = exports.decisionListToListStep = function decisionL
     }
     var newItems = [];
     node.forEach(function (decisionItem) {
-      var itemContent = [];
-      decisionItem.forEach(function (child) {
-        itemContent.push(child);
-      });
-      var newItem = targetItemType === schema.nodes.listItem ? targetItemType.create({}, paragraphType.create({}, itemContent)) : targetItemType.create({}, itemContent);
+      var newItem = targetItemType.inlineContent ? targetItemType.create({}, decisionItem.children) : targetItemType.create({}, paragraphType.create({}, decisionItem.children));
       if (newItem) {
         newItems.push(newItem);
       }

package/dist/cjs/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -24,7 +24,7 @@ var extractNestedLists = function extractNestedLists(node, schema) {
         child.forEach(function (grandChild) {
           if ((0, _nodeChecks.isListWithIndentation)(grandChild.type.name, schema)) {
             nestedLists.push(grandChild);
-          } else if (grandChild.isText) {
+          } else if (grandChild.isInline) {
             // For taskItem/decisionItem, keep text as-is (they support inline content)
             // For listItem, wrap text in paragraph (they require block content)
             if (isInlineItem) {
@@ -75,8 +75,6 @@ var extractNestedLists = function extractNestedLists(node, schema) {
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 var flattenListStep = exports.flattenListStep = function flattenListStep(nodes, context) {
   return nodes.map(function (node) {

package/dist/cjs/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -45,7 +45,7 @@ var listToDecisionListStep = exports.listToDecisionListStep = function listToDec
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push.apply(itemContent, (0, _toConsumableArray2.default)(child.children));
-        } else if (child.isText || child.isInline) {
+        } else if (child.isInline) {
           itemContent.push(child);
         } else if (!(0, _nodeChecks.isListWithIndentation)(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/cjs/editor-commands/transform-node-utils/steps/listToListStep.js

@@ -76,7 +76,7 @@ var _transformList = function transformList(node, targetListType, targetItemType
       itemNode.forEach(function (child) {
         if (child.type === paragraphType) {
           inlineContent.push.apply(inlineContent, (0, _toConsumableArray2.default)(child.children));
-        } else if (child.isText) {
+        } else if (child.isInline) {
           inlineContent.push(child);
           // Nested lists will be extracted and placed as siblings in the taskList
         } else if (!(0, _nodeChecks.isListWithIndentation)(child.type.name, schema)) {

package/dist/es2019/editor-commands/transform-node-utils/steps/decisionListToListStep.js

@@ -70,11 +70,7 @@ export const decisionListToListStep = (nodes, context) => {
     }
     const newItems = [];
     node.forEach(decisionItem => {
-      const itemContent = [];
-      decisionItem.forEach(child => {
-        itemContent.push(child);
-      });
-      const newItem = targetItemType === schema.nodes.listItem ? targetItemType.create({}, paragraphType.create({}, itemContent)) : targetItemType.create({}, itemContent);
+      const newItem = targetItemType.inlineContent ? targetItemType.create({}, decisionItem.children) : targetItemType.create({}, paragraphType.create({}, decisionItem.children));
       if (newItem) {
         newItems.push(newItem);
       }

package/dist/es2019/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -16,7 +16,7 @@ const extractNestedLists = (node, schema) => {
         child.forEach(grandChild => {
           if (isListWithIndentation(grandChild.type.name, schema)) {
             nestedLists.push(grandChild);
-          } else if (grandChild.isText) {
+          } else if (grandChild.isInline) {
             // For taskItem/decisionItem, keep text as-is (they support inline content)
             // For listItem, wrap text in paragraph (they require block content)
             if (isInlineItem) {
@@ -67,8 +67,6 @@ const extractNestedLists = (node, schema) => {
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export const flattenListStep = (nodes, context) => {
   return nodes.map(node => {

package/dist/es2019/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -39,7 +39,7 @@ export const listToDecisionListStep = (nodes, context) => {
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push(...child.children);
-        } else if (child.isText || child.isInline) {
+        } else if (child.isInline) {
           itemContent.push(child);
         } else if (!isListWithIndentation(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/es2019/editor-commands/transform-node-utils/steps/listToListStep.js

@@ -67,7 +67,7 @@ const transformList = (node, targetListType, targetItemType, unsupportedContent)
       itemNode.forEach(child => {
         if (child.type === paragraphType) {
           inlineContent.push(...child.children);
-        } else if (child.isText) {
+        } else if (child.isInline) {
           inlineContent.push(child);
           // Nested lists will be extracted and placed as siblings in the taskList
         } else if (!isListWithIndentation(child.type.name, schema)) {

package/dist/esm/editor-commands/transform-node-utils/steps/decisionListToListStep.js

@@ -67,11 +67,7 @@ export var decisionListToListStep = function decisionListToListStep(nodes, conte
     }
     var newItems = [];
     node.forEach(function (decisionItem) {
-      var itemContent = [];
-      decisionItem.forEach(function (child) {
-        itemContent.push(child);
-      });
-      var newItem = targetItemType === schema.nodes.listItem ? targetItemType.create({}, paragraphType.create({}, itemContent)) : targetItemType.create({}, itemContent);
+      var newItem = targetItemType.inlineContent ? targetItemType.create({}, decisionItem.children) : targetItemType.create({}, paragraphType.create({}, decisionItem.children));
       if (newItem) {
         newItems.push(newItem);
       }

package/dist/esm/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -18,7 +18,7 @@ var extractNestedLists = function extractNestedLists(node, schema) {
         child.forEach(function (grandChild) {
           if (isListWithIndentation(grandChild.type.name, schema)) {
             nestedLists.push(grandChild);
-          } else if (grandChild.isText) {
+          } else if (grandChild.isInline) {
             // For taskItem/decisionItem, keep text as-is (they support inline content)
             // For listItem, wrap text in paragraph (they require block content)
             if (isInlineItem) {
@@ -69,8 +69,6 @@ var extractNestedLists = function extractNestedLists(node, schema) {
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export var flattenListStep = function flattenListStep(nodes, context) {
   return nodes.map(function (node) {

package/dist/esm/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -38,7 +38,7 @@ export var listToDecisionListStep = function listToDecisionListStep(nodes, conte
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push.apply(itemContent, _toConsumableArray(child.children));
-        } else if (child.isText || child.isInline) {
+        } else if (child.isInline) {
           itemContent.push(child);
         } else if (!isListWithIndentation(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/esm/editor-commands/transform-node-utils/steps/listToListStep.js

@@ -69,7 +69,7 @@ var _transformList = function transformList(node, targetListType, targetItemType
       itemNode.forEach(function (child) {
         if (child.type === paragraphType) {
           inlineContent.push.apply(inlineContent, _toConsumableArray(child.children));
-        } else if (child.isText) {
+        } else if (child.isInline) {
           inlineContent.push(child);
           // Nested lists will be extracted and placed as siblings in the taskList
         } else if (!isListWithIndentation(child.type.name, schema)) {

package/dist/types/editor-commands/transform-node-utils/steps/flattenListStep.d.ts

@@ -25,7 +25,5 @@ import type { TransformStep } from '../types';
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export declare const flattenListStep: TransformStep;

package/dist/types-ts4.5/editor-commands/transform-node-utils/steps/flattenListStep.d.ts

@@ -25,7 +25,5 @@ import type { TransformStep } from '../types';
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export declare const flattenListStep: TransformStep;

package/package.json

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