@atlaskit/editor-plugin-block-menu 5.2.23 → 5.2.24

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.24
+
+### Patch Changes
+
+- [`ec581339891b4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ec581339891b4) -
+  Fix code block transformation to remove block marks (breakout, alignment) when wrapping into
+  layout, blockquote, expand, or panel
+- Updated dependencies
+
 ## 5.2.23
 
 ### Patch Changes

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeBlockMarks = void 0;
+var removeMarks = function removeMarks(disallowedMarks) {
+  return function (node) {
+    var filteredMarks = node.marks.filter(function (mark) {
+      return !disallowedMarks.includes(mark.type);
+    });
+    return node.mark(filteredMarks);
+  };
+};
+var removeBlockMarks = exports.removeBlockMarks = function removeBlockMarks(nodes, schema) {
+  var disallowedMarks = [schema.marks.breakout, schema.marks.alignment];
+  return nodes.map(removeMarks(disallowedMarks));
+};

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

@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapIntoLayoutStep = void 0;
-var _model = require("@atlaskit/editor-prosemirror/model");
+var _marks = require("./marks");
 var wrapIntoLayoutStep = exports.wrapIntoLayoutStep = function wrapIntoLayoutStep(nodes, context) {
   var schema = context.schema;
   var _ref = schema.nodes || {},
     layoutSection = _ref.layoutSection,
     layoutColumn = _ref.layoutColumn;
-  var columnOne = layoutColumn.createAndFill({}, _model.Fragment.fromArray(nodes));
+  var columnOne = layoutColumn.createAndFill({}, (0, _marks.removeBlockMarks)(nodes, schema));
   var columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;
   }
-  var layout = layoutSection.createAndFill({}, _model.Fragment.fromArray([columnOne, columnTwo]));
-  if (!layout) {
-    return nodes;
-  }
-  return [layout];
+  var layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
+  return layout ? [layout] : nodes;
 };

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapStep = void 0;
+var _marks = require("./marks");
 var _utils = require("./utils");
 /**
  * Wraps nodes into the target container type.
@@ -26,9 +27,6 @@ var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
       return node;
     });
   }
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, processedNodes);
-  if (outputNode) {
-    return [outputNode];
-  }
-  return nodes;
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, (0, _marks.removeBlockMarks)(processedNodes, schema));
+  return outputNode ? [outputNode] : nodes;
 };

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

@@ -0,0 +1,8 @@
+const removeMarks = disallowedMarks => node => {
+  const filteredMarks = node.marks.filter(mark => !disallowedMarks.includes(mark.type));
+  return node.mark(filteredMarks);
+};
+export const removeBlockMarks = (nodes, schema) => {
+  const disallowedMarks = [schema.marks.breakout, schema.marks.alignment];
+  return nodes.map(removeMarks(disallowedMarks));
+};

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

@@ -1,4 +1,4 @@
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { removeBlockMarks } from './marks';
 export const wrapIntoLayoutStep = (nodes, context) => {
   const {
     schema
@@ -7,14 +7,11 @@ export const wrapIntoLayoutStep = (nodes, context) => {
     layoutSection,
     layoutColumn
   } = schema.nodes || {};
-  const columnOne = layoutColumn.createAndFill({}, Fragment.fromArray(nodes));
+  const columnOne = layoutColumn.createAndFill({}, removeBlockMarks(nodes, schema));
   const columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;
   }
-  const layout = layoutSection.createAndFill({}, Fragment.fromArray([columnOne, columnTwo]));
-  if (!layout) {
-    return nodes;
-  }
-  return [layout];
+  const layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
+  return layout ? [layout] : nodes;
 };

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

@@ -1,3 +1,4 @@
+import { removeBlockMarks } from './marks';
 import { convertExpandToNestedExpand } from './utils';
 
 /**
@@ -23,9 +24,6 @@ export const wrapStep = (nodes, context) => {
       return node;
     });
   }
-  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, processedNodes);
-  if (outputNode) {
-    return [outputNode];
-  }
-  return nodes;
+  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, removeBlockMarks(processedNodes, schema));
+  return outputNode ? [outputNode] : nodes;
 };

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

@@ -0,0 +1,12 @@
+var removeMarks = function removeMarks(disallowedMarks) {
+  return function (node) {
+    var filteredMarks = node.marks.filter(function (mark) {
+      return !disallowedMarks.includes(mark.type);
+    });
+    return node.mark(filteredMarks);
+  };
+};
+export var removeBlockMarks = function removeBlockMarks(nodes, schema) {
+  var disallowedMarks = [schema.marks.breakout, schema.marks.alignment];
+  return nodes.map(removeMarks(disallowedMarks));
+};

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

@@ -1,17 +1,14 @@
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { removeBlockMarks } from './marks';
 export var wrapIntoLayoutStep = function wrapIntoLayoutStep(nodes, context) {
   var schema = context.schema;
   var _ref = schema.nodes || {},
     layoutSection = _ref.layoutSection,
     layoutColumn = _ref.layoutColumn;
-  var columnOne = layoutColumn.createAndFill({}, Fragment.fromArray(nodes));
+  var columnOne = layoutColumn.createAndFill({}, removeBlockMarks(nodes, schema));
   var columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;
   }
-  var layout = layoutSection.createAndFill({}, Fragment.fromArray([columnOne, columnTwo]));
-  if (!layout) {
-    return nodes;
-  }
-  return [layout];
+  var layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
+  return layout ? [layout] : nodes;
 };

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

@@ -1,3 +1,4 @@
+import { removeBlockMarks } from './marks';
 import { convertExpandToNestedExpand } from './utils';
 
 /**
@@ -21,9 +22,6 @@ export var wrapStep = function wrapStep(nodes, context) {
       return node;
     });
   }
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, processedNodes);
-  if (outputNode) {
-    return [outputNode];
-  }
-  return nodes;
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, removeBlockMarks(processedNodes, schema));
+  return outputNode ? [outputNode] : nodes;
 };

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

@@ -0,0 +1,2 @@
+import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+export declare const removeBlockMarks: (nodes: PMNode[], schema: Schema) => PMNode[];

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

@@ -0,0 +1,2 @@
+import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+export declare const removeBlockMarks: (nodes: PMNode[], schema: Schema) => PMNode[];

package/package.json

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