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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.25
+
+### Patch Changes
+
+- [`9cb0ce7857313`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9cb0ce7857313) -
+  [ux] Fix contextual transform options for single node selections.
+
+## 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/blockMenuPlugin.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.blockMenuPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _editorActions = require("./editor-actions");
-var _isTrasformToTargetDisabled = require("./editor-actions/isTrasformToTargetDisabled");
+var _isTransformToTargetDisabled = require("./editor-actions/isTransformToTargetDisabled");
 var _formatNode2 = require("./editor-commands/formatNode");
 var _transformNode2 = require("./editor-commands/transformNode");
 var _main = require("./pm-plugins/main");
@@ -46,7 +46,7 @@ var blockMenuPlugin = exports.blockMenuPlugin = function blockMenuPlugin(_ref) {
         if (!currentSelection) {
           return true;
         }
-        return (0, _isTrasformToTargetDisabled.isTrasformToTargetDisabled)({
+        return (0, _isTransformToTargetDisabled.isTransformToTargetDisabled)({
           selection: currentSelection,
           targetNodeTypeName: optionNodeTypeName,
           targetNodeTypeAttrs: optionNodeTypeAttrs

package/dist/cjs/editor-actions/{isTrasformToTargetDisabled.js → isTransformToTargetDisabled.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTrasformToTargetDisabled = exports.canParentContainNodeType = void 0;
+exports.isTransformToTargetDisabled = exports.canParentContainNodeType = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("../editor-commands/transform-node-utils/transform");
@@ -43,7 +43,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   }
   return true;
 };
-var isTrasformToTargetDisabled = exports.isTrasformToTargetDisabled = function isTrasformToTargetDisabled(_ref) {
+var isTransformToTargetDisabled = exports.isTransformToTargetDisabled = function isTransformToTargetDisabled(_ref) {
   var selection = _ref.selection,
     targetNodeTypeName = _ref.targetNodeTypeName,
     targetNodeTypeAttrs = _ref.targetNodeTypeAttrs;
@@ -64,51 +64,4 @@ var isTrasformToTargetDisabled = exports.isTrasformToTargetDisabled = function i
     return isTransformEnabledForNode(node, supportedTargetNodeTypeName, targetNodeTypeAttrs, isNested, parent, schema);
   });
   return !isEnabledForAnyNode;
-};
-
-// export const isTrasformToTargetDisabled = ({
-// 	selection,
-// 	targetNodeTypeName,
-// 	targetNodeTypeAttrs,
-// }: TransformDisabledArgs) => {
-// 	const { range } = expandSelectionToBlockRange(selection);
-// 	if (!range) {
-// 		return false;
-// 	}
-
-// 	const selectedNodes = getBlockNodesInRange(range);
-// 	const parent = range.parent;
-// 	const isNested = range.depth >= 1;
-
-// 	const { schema } = selection.$from.doc.type;
-
-// 	const isTransformEnabledForAnySelectedNode = selectedNodes.some((node) => {
-// 		const selectedNodeTypeName = toNodeTypeValue(node.type.name);
-// 		const supportedTargetNodeTypeName = toNodeTypeValue(targetNodeTypeName);
-// 		if (!selectedNodeTypeName || !supportedTargetNodeTypeName) {
-// 			return false;
-// 		}
-
-// 		if (isTransformDisabledBasedOnStepsConfig(selectedNodeTypeName, supportedTargetNodeTypeName)) {
-// 			if (selectedNodeTypeName === 'heading' && supportedTargetNodeTypeName === 'heading') {
-// 				return isHeadingToHeadingTransformDisabled(node, targetNodeTypeAttrs);
-// 			}
-// 			return false;
-// 		}
-
-// 		if (
-// 			isNested &&
-// 			!canParentContainNodeType(schema, parent, supportedTargetNodeTypeName, targetNodeTypeAttrs)
-// 		) {
-// 			return false;
-// 		}
-
-// 		return true;
-// 	});
-
-// 	if (isTransformEnabledForAnySelectedNode) {
-// 		return false;
-// 	}
-
-// 	return true;
-// };
+};

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/transform.js

@@ -157,7 +157,9 @@ var TRANSFORM_STEPS_OVERRIDE = {
   },
   mediaGroup: {
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
-    codeBlock: null
+    codeBlock: null,
+    decisionList: null,
+    taskList: null
   },
   decisionList: {
     decisionList: null,
@@ -189,7 +191,9 @@ var TRANSFORM_STEPS_OVERRIDE = {
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
     codeBlock: null,
     decisionList: null,
-    taskList: null
+    taskList: null,
+    orderedList: null,
+    bulletList: null
   },
   bodiedExtension: {
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],

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/blockMenuPlugin.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createBlockMenuRegistry } from './editor-actions';
-import { isTrasformToTargetDisabled } from './editor-actions/isTrasformToTargetDisabled';
+import { isTransformToTargetDisabled } from './editor-actions/isTransformToTargetDisabled';
 import { formatNode } from './editor-commands/formatNode';
 import { transformNode } from './editor-commands/transformNode';
 import { blockMenuPluginKey, createPlugin } from './pm-plugins/main';
@@ -40,7 +40,7 @@ export const blockMenuPlugin = ({
         if (!currentSelection) {
           return true;
         }
-        return isTrasformToTargetDisabled({
+        return isTransformToTargetDisabled({
           selection: currentSelection,
           targetNodeTypeName: optionNodeTypeName,
           targetNodeTypeAttrs: optionNodeTypeAttrs

package/dist/es2019/editor-actions/{isTrasformToTargetDisabled.js → isTransformToTargetDisabled.js}

@@ -37,7 +37,7 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
   }
   return true;
 };
-export const isTrasformToTargetDisabled = ({
+export const isTransformToTargetDisabled = ({
   selection,
   targetNodeTypeName,
   targetNodeTypeAttrs
@@ -60,51 +60,4 @@ export const isTrasformToTargetDisabled = ({
   }
   const isEnabledForAnyNode = selectedNodes.some(node => isTransformEnabledForNode(node, supportedTargetNodeTypeName, targetNodeTypeAttrs, isNested, parent, schema));
   return !isEnabledForAnyNode;
-};
-
-// export const isTrasformToTargetDisabled = ({
-// 	selection,
-// 	targetNodeTypeName,
-// 	targetNodeTypeAttrs,
-// }: TransformDisabledArgs) => {
-// 	const { range } = expandSelectionToBlockRange(selection);
-// 	if (!range) {
-// 		return false;
-// 	}
-
-// 	const selectedNodes = getBlockNodesInRange(range);
-// 	const parent = range.parent;
-// 	const isNested = range.depth >= 1;
-
-// 	const { schema } = selection.$from.doc.type;
-
-// 	const isTransformEnabledForAnySelectedNode = selectedNodes.some((node) => {
-// 		const selectedNodeTypeName = toNodeTypeValue(node.type.name);
-// 		const supportedTargetNodeTypeName = toNodeTypeValue(targetNodeTypeName);
-// 		if (!selectedNodeTypeName || !supportedTargetNodeTypeName) {
-// 			return false;
-// 		}
-
-// 		if (isTransformDisabledBasedOnStepsConfig(selectedNodeTypeName, supportedTargetNodeTypeName)) {
-// 			if (selectedNodeTypeName === 'heading' && supportedTargetNodeTypeName === 'heading') {
-// 				return isHeadingToHeadingTransformDisabled(node, targetNodeTypeAttrs);
-// 			}
-// 			return false;
-// 		}
-
-// 		if (
-// 			isNested &&
-// 			!canParentContainNodeType(schema, parent, supportedTargetNodeTypeName, targetNodeTypeAttrs)
-// 		) {
-// 			return false;
-// 		}
-
-// 		return true;
-// 	});
-
-// 	if (isTransformEnabledForAnySelectedNode) {
-// 		return false;
-// 	}
-
-// 	return true;
-// };
+};

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/transform.js

@@ -152,7 +152,9 @@ const TRANSFORM_STEPS_OVERRIDE = {
   },
   mediaGroup: {
     layoutSection: [wrapIntoLayoutStep],
-    codeBlock: null
+    codeBlock: null,
+    decisionList: null,
+    taskList: null
   },
   decisionList: {
     decisionList: null,
@@ -184,7 +186,9 @@ const TRANSFORM_STEPS_OVERRIDE = {
     layoutSection: [wrapIntoLayoutStep],
     codeBlock: null,
     decisionList: null,
-    taskList: null
+    taskList: null,
+    orderedList: null,
+    bulletList: null
   },
   bodiedExtension: {
     layoutSection: [wrapIntoLayoutStep],

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/blockMenuPlugin.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createBlockMenuRegistry } from './editor-actions';
-import { isTrasformToTargetDisabled } from './editor-actions/isTrasformToTargetDisabled';
+import { isTransformToTargetDisabled } from './editor-actions/isTransformToTargetDisabled';
 import { formatNode as _formatNode } from './editor-commands/formatNode';
 import { transformNode as _transformNode } from './editor-commands/transformNode';
 import { blockMenuPluginKey, createPlugin } from './pm-plugins/main';
@@ -39,7 +39,7 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
         if (!currentSelection) {
           return true;
         }
-        return isTrasformToTargetDisabled({
+        return isTransformToTargetDisabled({
           selection: currentSelection,
           targetNodeTypeName: optionNodeTypeName,
           targetNodeTypeAttrs: optionNodeTypeAttrs

package/dist/esm/editor-actions/{isTrasformToTargetDisabled.js → isTransformToTargetDisabled.js}

@@ -37,7 +37,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   }
   return true;
 };
-export var isTrasformToTargetDisabled = function isTrasformToTargetDisabled(_ref) {
+export var isTransformToTargetDisabled = function isTransformToTargetDisabled(_ref) {
   var selection = _ref.selection,
     targetNodeTypeName = _ref.targetNodeTypeName,
     targetNodeTypeAttrs = _ref.targetNodeTypeAttrs;
@@ -58,51 +58,4 @@ export var isTrasformToTargetDisabled = function isTrasformToTargetDisabled(_ref
     return isTransformEnabledForNode(node, supportedTargetNodeTypeName, targetNodeTypeAttrs, isNested, parent, schema);
   });
   return !isEnabledForAnyNode;
-};
-
-// export const isTrasformToTargetDisabled = ({
-// 	selection,
-// 	targetNodeTypeName,
-// 	targetNodeTypeAttrs,
-// }: TransformDisabledArgs) => {
-// 	const { range } = expandSelectionToBlockRange(selection);
-// 	if (!range) {
-// 		return false;
-// 	}
-
-// 	const selectedNodes = getBlockNodesInRange(range);
-// 	const parent = range.parent;
-// 	const isNested = range.depth >= 1;
-
-// 	const { schema } = selection.$from.doc.type;
-
-// 	const isTransformEnabledForAnySelectedNode = selectedNodes.some((node) => {
-// 		const selectedNodeTypeName = toNodeTypeValue(node.type.name);
-// 		const supportedTargetNodeTypeName = toNodeTypeValue(targetNodeTypeName);
-// 		if (!selectedNodeTypeName || !supportedTargetNodeTypeName) {
-// 			return false;
-// 		}
-
-// 		if (isTransformDisabledBasedOnStepsConfig(selectedNodeTypeName, supportedTargetNodeTypeName)) {
-// 			if (selectedNodeTypeName === 'heading' && supportedTargetNodeTypeName === 'heading') {
-// 				return isHeadingToHeadingTransformDisabled(node, targetNodeTypeAttrs);
-// 			}
-// 			return false;
-// 		}
-
-// 		if (
-// 			isNested &&
-// 			!canParentContainNodeType(schema, parent, supportedTargetNodeTypeName, targetNodeTypeAttrs)
-// 		) {
-// 			return false;
-// 		}
-
-// 		return true;
-// 	});
-
-// 	if (isTransformEnabledForAnySelectedNode) {
-// 		return false;
-// 	}
-
-// 	return true;
-// };
+};

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/transform.js

@@ -152,7 +152,9 @@ var TRANSFORM_STEPS_OVERRIDE = {
   },
   mediaGroup: {
     layoutSection: [wrapIntoLayoutStep],
-    codeBlock: null
+    codeBlock: null,
+    decisionList: null,
+    taskList: null
   },
   decisionList: {
     decisionList: null,
@@ -184,7 +186,9 @@ var TRANSFORM_STEPS_OVERRIDE = {
     layoutSection: [wrapIntoLayoutStep],
     codeBlock: null,
     decisionList: null,
-    taskList: null
+    taskList: null,
+    orderedList: null,
+    bulletList: null
   },
   bodiedExtension: {
     layoutSection: [wrapIntoLayoutStep],

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-ts4.5/editor-actions/isTrasformToTargetDisabled.d.ts → types/editor-actions/isTransformToTargetDisabled.d.ts}

@@ -7,5 +7,5 @@ type TransformDisabledArgs = {
     targetNodeTypeName: string;
 };
 export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
-export declare const isTrasformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
+export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

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/editor-actions/isTrasformToTargetDisabled.d.ts → types-ts4.5/editor-actions/isTransformToTargetDisabled.d.ts}

@@ -7,5 +7,5 @@ type TransformDisabledArgs = {
     targetNodeTypeName: string;
 };
 export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
-export declare const isTrasformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
+export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

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.25",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",