@atlaskit/editor-plugin-block-menu 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.1.1
+
+### Patch Changes
+
+- [`c30d1876a650a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c30d1876a650a) -
+  ED-29256 Transform content with indentation in layouts
+- Updated dependencies
+
 ## 3.1.0
 
 ### Minor Changes

package/dist/cjs/editor-commands/transforms/layout/utils.js

@@ -20,10 +20,16 @@ var unwrapLayoutNodesToTextNodes = exports.unwrapLayoutNodesToTextNodes = functi
   var isValid = (0, _utils2.getContentSupportChecker)(finalTargetNodeType);
   var createTextNode = function createTextNode(node) {
     var isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    var nodeToTransform = node;
+    if ((0, _utils2.isContainerNodeType)(finalTargetNodeType) || (0, _utils2.isListNodeType)(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(function (mark) {
+        return !['alignment', 'indentation'].includes(mark.type.name);
+      }));
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
+    }
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if ((0, _utils2.isBlockNode)(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -190,21 +196,17 @@ var transformToContainerNode = function transformToContainerNode(nodes, targetNo
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      var nodeWithValidAttrs = node.mark(node.marks.filter(function (mark) {
-        return mark.type.name !== 'alignment';
-      }));
       var isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      var _nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      var _nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: _nodes,
@@ -322,8 +324,20 @@ var transformToListNode = exports.transformToListNode = function transformToList
     }
   });
 };
-var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema) {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+var convertUnwrappedLayoutContent = exports.convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !(0, _utils2.isContainerNodeType)(targetNodeType)) {
+    if ((0, _utils2.isBlockNodeType)(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if ((0, _utils2.isListNodeType)(targetNodeType)) {
+      var listItem = (0, _transforms.isTaskList)(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if ((0, _utils2.isBlockNodeType)(targetNodeType)) {

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

@@ -60,7 +60,7 @@ var transformLayoutNode = exports.transformLayoutNode = function transformLayout
         var newContent = (0, _utils.unwrapLayoutNodesToTextNodes)(context, targetNodeType);
         unwrappedContent.push.apply(unwrappedContent, (0, _toConsumableArray2.default)(newContent));
       });
-      var newColumnContent = (0, _utils.convertUnwrappedLayoutContent)(unwrappedContent, targetNodeType, schema);
+      var newColumnContent = (0, _utils.convertUnwrappedLayoutContent)(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, _model.Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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

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

package/dist/es2019/editor-commands/transforms/layout/utils.js

@@ -14,10 +14,14 @@ export const unwrapLayoutNodesToTextNodes = (context, finalTargetNodeType) => {
   const isValid = getContentSupportChecker(finalTargetNodeType);
   const createTextNode = node => {
     const isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    let nodeToTransform = node;
+    if (isContainerNodeType(finalTargetNodeType) || isListNodeType(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(mark => !['alignment', 'indentation'].includes(mark.type.name)));
+    }
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if (isBlockNode(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -169,19 +173,17 @@ const transformToContainerNode = (nodes, targetNodeType) => {
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      const nodeWithValidAttrs = node.mark(node.marks.filter(mark => mark.type.name !== 'alignment'));
       const isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      const nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      const nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: nodes,
@@ -301,8 +303,20 @@ export const transformToListNode = (nodes, targetNodeType, schema) => {
     }
   });
 };
-export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema) => {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+export const convertUnwrappedLayoutContent = (nodes, targetNodeType, schema, targetAttrs) => {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {
+    if (isBlockNodeType(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if (isListNodeType(targetNodeType)) {
+      const listItem = isTaskList(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if (isBlockNodeType(targetNodeType)) {

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

@@ -56,7 +56,7 @@ export const transformLayoutNode = context => {
         const newContent = unwrapLayoutNodesToTextNodes(context, targetNodeType);
         unwrappedContent.push(...newContent);
       });
-      const newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema);
+      const newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* block-menu.tsx generated by @compiled/babel-plugin v0.38.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/layout/utils.js

@@ -13,10 +13,16 @@ export var unwrapLayoutNodesToTextNodes = function unwrapLayoutNodesToTextNodes(
   var isValid = getContentSupportChecker(finalTargetNodeType);
   var createTextNode = function createTextNode(node) {
     var isTextNode = node.type.name === 'text';
-    if (isValid(node) && !isTextNode) {
-      return node;
+    var nodeToTransform = node;
+    if (isContainerNodeType(finalTargetNodeType) || isListNodeType(finalTargetNodeType)) {
+      nodeToTransform = node.mark(node.marks.filter(function (mark) {
+        return !['alignment', 'indentation'].includes(mark.type.name);
+      }));
     }
-    return targetNodeType.createChecked(targetAttrs, isTextNode ? node : node.content, node.marks);
+    if (isValid(nodeToTransform) && !isTextNode) {
+      return nodeToTransform;
+    }
+    return targetNodeType.createChecked(targetAttrs, isTextNode ? nodeToTransform : nodeToTransform.content, nodeToTransform.marks);
   };
   if (isBlockNode(sourceNode)) {
     // code block acts like a container, we need to unwrap it
@@ -183,21 +189,17 @@ var transformToContainerNode = function transformToContainerNode(nodes, targetNo
         canBeTransformed: false
       });
     } else {
-      // Remove alignment marks as container nodes don't support them
-      var nodeWithValidAttrs = node.mark(node.marks.filter(function (mark) {
-        return mark.type.name !== 'alignment';
-      }));
       var isSameNodeType = node.type === targetNodeType;
 
       // If the node is not valid and not the same type, we cannot transform it
-      if (!isNodeValid(nodeWithValidAttrs) && !isSameNodeType) {
+      if (!isNodeValid(node) && !isSameNodeType) {
         newNodes.push({
           node: node,
           canBeTransformed: false
         });
         return;
       }
-      var _nodes = isSameNodeType ? node.content.content : [nodeWithValidAttrs];
+      var _nodes = isSameNodeType ? node.content.content : [node];
       if (newNodes.length === 0) {
         newNodes.push({
           node: _nodes,
@@ -315,8 +317,20 @@ export var transformToListNode = function transformToListNode(nodes, targetNodeT
     }
   });
 };
-export var convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema) {
-  if (nodes.length === 1 && nodes[0].content.size === 0) {
+export var convertUnwrappedLayoutContent = function convertUnwrappedLayoutContent(nodes, targetNodeType, schema, targetAttrs) {
+  if (nodes.length === 1 && nodes[0].content.size === 0 && !isContainerNodeType(targetNodeType)) {
+    if (isBlockNodeType(targetNodeType)) {
+      if (['heading', 'paragraph'].includes(targetNodeType.name)) {
+        return [targetNodeType.createChecked(targetAttrs)];
+      }
+      if (targetNodeType.name === 'codeBlock') {
+        return [targetNodeType.createChecked()];
+      }
+    }
+    if (isListNodeType(targetNodeType)) {
+      var listItem = isTaskList(targetNodeType) ? schema.nodes.taskItem.createChecked() : schema.nodes.listItem.createChecked(null, schema.nodes.paragraph.createChecked());
+      return [targetNodeType.createChecked(null, listItem)];
+    }
     return nodes;
   }
   if (isBlockNodeType(targetNodeType)) {

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

@@ -53,7 +53,7 @@ export var transformLayoutNode = function transformLayoutNode(context) {
         var newContent = unwrapLayoutNodesToTextNodes(context, targetNodeType);
         unwrappedContent.push.apply(unwrappedContent, _toConsumableArray(newContent));
       });
-      var newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema);
+      var newColumnContent = convertUnwrappedLayoutContent(unwrappedContent, targetNodeType, schema, targetAttrs);
       layoutColumnNodes.push(layoutColumn.createChecked(child.attrs, Fragment.fromArray(newColumnContent), child.marks));
     }
   });

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

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

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

@@ -2,4 +2,4 @@ import type { TransformContext } from '@atlaskit/editor-common/transforms';
 import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 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[];
+export declare const convertUnwrappedLayoutContent: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema, targetAttrs?: TransformContext["targetAttrs"]) => PMNode[];

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

@@ -2,4 +2,4 @@ import type { TransformContext } from '@atlaskit/editor-common/transforms';
 import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 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[];
+export declare const convertUnwrappedLayoutContent: (nodes: PMNode[], targetNodeType: NodeType, schema: Schema, targetAttrs?: TransformContext["targetAttrs"]) => PMNode[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 	"dependencies": {
 		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
-		"@atlaskit/editor-plugin-block-controls": "^6.1.0",
+		"@atlaskit/editor-plugin-block-controls": "^6.2.0",
 		"@atlaskit/editor-plugin-decorations": "^5.0.0",
 		"@atlaskit/editor-plugin-selection": "^5.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^3.0.0",
@@ -46,7 +46,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.4.0",
+		"@atlaskit/editor-common": "^109.5.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},