@atlaskit/editor-plugin-block-menu 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.1
+
+### Patch Changes
+
+- [`3ae29083b2189`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3ae29083b2189) -
+  Remove block marks when wrapping nodes (fixes multi-select codeblock)
+
 ## 6.0.0
 
 ### Patch Changes

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

@@ -3,16 +3,16 @@
 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));
+exports.removeDisallowedMarks = void 0;
+/**
+ * Removes all disallowed marks from a node based on the target node type.
+ *
+ * @param node - The node to remove marks from.
+ * @param targetNode - The target node type to check against.
+ * @returns The nodes with the marks removed.
+ */
+var removeDisallowedMarks = exports.removeDisallowedMarks = function removeDisallowedMarks(nodes, targetNode) {
+  return nodes.map(function (node) {
+    return node.mark(targetNode.allowedMarks(node.marks));
+  });
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrapMixedContentStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _marks = require("../marks");
 var _types = require("../types");
 var _utils = require("../utils");
 /**
@@ -19,7 +20,7 @@ var isTextNode = function isTextNode(node) {
 };
 
 /**
- * Determines if a node can be wrapped in the target container type.
+ * Determines if a node can be wrapped in the target container type, removes block marks from the node during check.
  * Uses the schema's validContent to check if the target container can hold this node.
  *
  * Note: What can be wrapped depends on the target container type - for example:
@@ -33,7 +34,7 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   }
 
   // Use the schema to determine if this node can be contained in the target
-  return targetNodeType.validContent(_model.Fragment.from(node));
+  return targetNodeType.validContent(_model.Fragment.from((0, _marks.removeDisallowedMarks)([node], targetNodeType)));
 };
 
 /**
@@ -110,8 +111,10 @@ var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedCont
   };
   nodes.forEach(function (node) {
     if (canWrapInTarget(node, targetNodeType, targetNodeTypeName)) {
+      var _currentContainerCont;
       // Node can be wrapped - add to current container content
-      currentContainerContent.push(node);
+      // remove marks from node as nested nodes don't usually support block marks
+      (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, (0, _toConsumableArray2.default)((0, _marks.removeDisallowedMarks)([node], targetNodeType)));
     } else if (node.type.name === targetNodeTypeName) {
       // Same-type container - breaks out as a separate container (preserved as-is)
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"

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

@@ -10,7 +10,7 @@ var wrapIntoLayoutStep = exports.wrapIntoLayoutStep = function wrapIntoLayoutSte
   var _ref = schema.nodes || {},
     layoutSection = _ref.layoutSection,
     layoutColumn = _ref.layoutColumn;
-  var columnOne = layoutColumn.createAndFill({}, (0, _marks.removeBlockMarks)(nodes, schema));
+  var columnOne = layoutColumn.createAndFill({}, (0, _marks.removeDisallowedMarks)(nodes, layoutColumn));
   var columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;

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

@@ -27,6 +27,6 @@ var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
       return node;
     });
   }
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, (0, _marks.removeBlockMarks)(processedNodes, schema));
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, (0, _marks.removeDisallowedMarks)(processedNodes, schema.nodes[targetNodeTypeName]));
   return outputNode ? [outputNode] : nodes;
 };

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

@@ -1,8 +1,10 @@
-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));
+/**
+ * Removes all disallowed marks from a node based on the target node type.
+ *
+ * @param node - The node to remove marks from.
+ * @param targetNode - The target node type to check against.
+ * @returns The nodes with the marks removed.
+ */
+export const removeDisallowedMarks = (nodes, targetNode) => {
+  return nodes.map(node => node.mark(targetNode.allowedMarks(node.marks)));
 };

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

@@ -1,4 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
 import { convertTextNodeToParagraph } from '../utils';
 
@@ -12,7 +13,7 @@ const isTextNode = node => {
 };
 
 /**
- * Determines if a node can be wrapped in the target container type.
+ * Determines if a node can be wrapped in the target container type, removes block marks from the node during check.
  * Uses the schema's validContent to check if the target container can hold this node.
  *
  * Note: What can be wrapped depends on the target container type - for example:
@@ -26,7 +27,7 @@ const canWrapInTarget = (node, targetNodeType, targetNodeTypeName) => {
   }
 
   // Use the schema to determine if this node can be contained in the target
-  return targetNodeType.validContent(Fragment.from(node));
+  return targetNodeType.validContent(Fragment.from(removeDisallowedMarks([node], targetNodeType)));
 };
 
 /**
@@ -106,7 +107,8 @@ export const wrapMixedContentStep = (nodes, context) => {
   nodes.forEach(node => {
     if (canWrapInTarget(node, targetNodeType, targetNodeTypeName)) {
       // Node can be wrapped - add to current container content
-      currentContainerContent.push(node);
+      // remove marks from node as nested nodes don't usually support block marks
+      currentContainerContent.push(...removeDisallowedMarks([node], targetNodeType));
     } else if (node.type.name === targetNodeTypeName) {
       // Same-type container - breaks out as a separate container (preserved as-is)
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"

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

@@ -1,4 +1,4 @@
-import { removeBlockMarks } from './marks';
+import { removeDisallowedMarks } from './marks';
 export const wrapIntoLayoutStep = (nodes, context) => {
   const {
     schema
@@ -7,7 +7,7 @@ export const wrapIntoLayoutStep = (nodes, context) => {
     layoutSection,
     layoutColumn
   } = schema.nodes || {};
-  const columnOne = layoutColumn.createAndFill({}, removeBlockMarks(nodes, schema));
+  const columnOne = layoutColumn.createAndFill({}, removeDisallowedMarks(nodes, layoutColumn));
   const columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;

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

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

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

@@ -1,12 +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));
+/**
+ * Removes all disallowed marks from a node based on the target node type.
+ *
+ * @param node - The node to remove marks from.
+ * @param targetNode - The target node type to check against.
+ * @returns The nodes with the marks removed.
+ */
+export var removeDisallowedMarks = function removeDisallowedMarks(nodes, targetNode) {
+  return nodes.map(function (node) {
+    return node.mark(targetNode.allowedMarks(node.marks));
+  });
 };

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

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
 import { convertTextNodeToParagraph } from '../utils';
 
@@ -13,7 +14,7 @@ var isTextNode = function isTextNode(node) {
 };
 
 /**
- * Determines if a node can be wrapped in the target container type.
+ * Determines if a node can be wrapped in the target container type, removes block marks from the node during check.
  * Uses the schema's validContent to check if the target container can hold this node.
  *
  * Note: What can be wrapped depends on the target container type - for example:
@@ -27,7 +28,7 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   }
 
   // Use the schema to determine if this node can be contained in the target
-  return targetNodeType.validContent(Fragment.from(node));
+  return targetNodeType.validContent(Fragment.from(removeDisallowedMarks([node], targetNodeType)));
 };
 
 /**
@@ -104,8 +105,10 @@ export var wrapMixedContentStep = function wrapMixedContentStep(nodes, context)
   };
   nodes.forEach(function (node) {
     if (canWrapInTarget(node, targetNodeType, targetNodeTypeName)) {
+      var _currentContainerCont;
       // Node can be wrapped - add to current container content
-      currentContainerContent.push(node);
+      // remove marks from node as nested nodes don't usually support block marks
+      (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, _toConsumableArray(removeDisallowedMarks([node], targetNodeType)));
     } else if (node.type.name === targetNodeTypeName) {
       // Same-type container - breaks out as a separate container (preserved as-is)
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"

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

@@ -1,10 +1,10 @@
-import { removeBlockMarks } from './marks';
+import { removeDisallowedMarks } 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({}, removeBlockMarks(nodes, schema));
+  var columnOne = layoutColumn.createAndFill({}, removeDisallowedMarks(nodes, layoutColumn));
   var columnTwo = layoutColumn.createAndFill();
   if (!columnOne || !columnTwo) {
     return nodes;

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

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

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

@@ -1,2 +1,9 @@
-import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const removeBlockMarks: (nodes: PMNode[], schema: Schema) => PMNode[];
+import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Removes all disallowed marks from a node based on the target node type.
+ *
+ * @param node - The node to remove marks from.
+ * @param targetNode - The target node type to check against.
+ * @returns The nodes with the marks removed.
+ */
+export declare const removeDisallowedMarks: (nodes: PMNode[], targetNode: NodeType) => PMNode[];

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

@@ -1,2 +1,9 @@
-import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const removeBlockMarks: (nodes: PMNode[], schema: Schema) => PMNode[];
+import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Removes all disallowed marks from a node based on the target node type.
+ *
+ * @param node - The node to remove marks from.
+ * @param targetNode - The target node type to check against.
+ * @returns The nodes with the marks removed.
+ */
+export declare const removeDisallowedMarks: (nodes: PMNode[], targetNode: NodeType) => PMNode[];

package/package.json

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