@atlaskit/editor-plugin-block-menu 5.2.26 → 5.2.28

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.28
+
+### Patch Changes
+
+- [`8c62a0141a5fa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8c62a0141a5fa) -
+  [ux] Fixes contextual transform options for direct children of top level nodes.
+- Updated dependencies
+
+## 5.2.27
+
+### Patch Changes
+
+- [`6eba84d34e1a5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6eba84d34e1a5) -
+  Add a new multi node type which supports multi-selected content
+- Updated dependencies
+
 ## 5.2.26
 
 ### Patch Changes

package/dist/cjs/editor-actions/isTransformToTargetDisabled.js

@@ -9,13 +9,19 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("../editor-commands/transform-node-utils/transform");
 var _types = require("../editor-commands/transform-node-utils/types");
 var _utils = require("../editor-commands/transform-node-utils/utils");
-var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
+var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -38,7 +44,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tranformContent = void 0;
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _transform = require("./transform");
+var tranformContent = exports.tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs) {
+  var outputNodes = (0, _transform.getOutputNodes)({
+    sourceNodes: Array.from(content.content),
+    targetNodeType: targetNodeType,
+    schema: schema,
+    isNested: isNested,
+    targetAttrs: targetAttrs
+  });
+  return outputNodes ? _model.Fragment.fromArray(outputNodes) : content;
+};

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

@@ -28,25 +28,38 @@ var TRANSFORM_STEPS = {
     atomic: undefined,
     container: [_wrapStep.wrapStep],
     list: [_wrapIntoListStep.wrapIntoListStep],
-    text: undefined
+    text: undefined,
+    multi: undefined
   },
   container: {
     atomic: undefined,
     container: [_unwrapStep.unwrapStep, _wrapStep.wrapStep],
     list: undefined,
-    text: [_unwrapStep.unwrapStep, _applyTargetTextTypeStep.applyTargetTextTypeStep]
+    text: [_unwrapStep.unwrapStep, _applyTargetTextTypeStep.applyTargetTextTypeStep],
+    multi: undefined
   },
   list: {
     atomic: undefined,
     container: [_wrapStep.wrapStep],
     list: [_listToListStep.listToListStep],
-    text: [_flattenListStep.flattenListStep, _unwrapListStep.unwrapListStep, _applyTargetTextTypeStep.applyTargetTextTypeStep]
+    text: [_flattenListStep.flattenListStep, _unwrapListStep.unwrapListStep, _applyTargetTextTypeStep.applyTargetTextTypeStep],
+    multi: undefined
   },
   text: {
     atomic: undefined,
     container: [_wrapMixedContentStep.wrapMixedContentStep],
     list: [_wrapIntoListStep.wrapIntoListStep],
-    text: [_flattenStep.flattenStep, _applyTargetTextTypeStep.applyTargetTextTypeStep]
+    text: [_flattenStep.flattenStep, _applyTargetTextTypeStep.applyTargetTextTypeStep],
+    multi: undefined
+  },
+  multi: {
+    atomic: undefined,
+    container: [_wrapMixedContentStep.wrapMixedContentStep],
+    // TODO: EDITOR-4137 - Implement multi list transform
+    list: undefined,
+    // TODO: EDITOR-4140 - Implement multi text transform
+    text: undefined,
+    multi: undefined
   }
 };
 
@@ -205,6 +218,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: null,
     taskList: null,
     decisionList: null
+  },
+  multi: {
+    // TODO: EDITOR-4138 - Implement multi content to layout transform
+    layoutSection: undefined
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -218,15 +235,17 @@ var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selec
   var steps = overrideSteps !== null && overrideSteps !== void 0 ? overrideSteps : TRANSFORM_STEPS[fromCategory][toCategory];
   return steps;
 };
-// Note: Currently works only for single node in the selection
 var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
-  var sourceNode = _ref.sourceNode,
+  var sourceNodes = _ref.sourceNodes,
     targetNodeType = _ref.targetNodeType,
     schema = _ref.schema,
     isNested = _ref.isNested,
     targetAttrs = _ref.targetAttrs;
-  var nodesToReplace = [sourceNode];
-  var selectedNodeTypeName = (0, _types.toNodeTypeValue)(sourceNode.type.name);
+  var sourceNode = sourceNodes.at(0);
+  if (!sourceNode) {
+    return;
+  }
+  var selectedNodeTypeName = (0, _types.toNodeTypeValue)((0, _types.getNodeName)(sourceNodes));
   var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
   var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
@@ -235,6 +254,7 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
   }
   var steps = getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName);
   var context = {
+    // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
     targetNodeTypeName: targetNodeTypeName,
     schema: schema,
@@ -245,7 +265,7 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
   }
   return steps.reduce(function (nodes, step) {
     return step(nodes, context);
-  }, nodesToReplace);
+  }, sourceNodes);
 };
 var isTransformDisabledBasedOnStepsConfig = exports.isTransformDisabledBasedOnStepsConfig = function isTransformDisabledBasedOnStepsConfig(selectedNodeType, targetNodeType) {
   var steps = getTransformStepsForNodeTypes(selectedNodeType, targetNodeType);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toNodeTypeValue = exports.isNodeTypeName = exports.NODE_CATEGORY_BY_TYPE = void 0;
+exports.toNodeTypeValue = exports.isNodeTypeName = exports.getNodeName = exports.NODE_CATEGORY_BY_TYPE = void 0;
 var NODE_CATEGORY_BY_TYPE = exports.NODE_CATEGORY_BY_TYPE = {
   blockquote: 'container',
   blockCard: 'atomic',
@@ -25,7 +25,8 @@ var NODE_CATEGORY_BY_TYPE = exports.NODE_CATEGORY_BY_TYPE = {
   paragraph: 'text',
   nestedExpand: 'container',
   taskList: 'list',
-  table: 'atomic'
+  table: 'atomic',
+  multi: 'multi'
 };
 var isNodeTypeName = exports.isNodeTypeName = function isNodeTypeName(value) {
   return value in NODE_CATEGORY_BY_TYPE;
@@ -33,5 +34,9 @@ var isNodeTypeName = exports.isNodeTypeName = function isNodeTypeName(value) {
 var toNodeTypeValue = exports.toNodeTypeValue = function toNodeTypeValue(value) {
   return value && isNodeTypeName(value) ? value : null;
 };
+var getNodeName = exports.getNodeName = function getNodeName(nodes) {
+  var _nodes$at;
+  return nodes.length > 1 ? 'multi' : (_nodes$at = nodes.at(0)) === null || _nodes$at === void 0 ? void 0 : _nodes$at.type.name;
+};
 
 // Note: We are still deciding what should be in the context.

package/dist/cjs/editor-commands/transformNode.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformNode = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
-var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isNestedNode = require("../ui/utils/isNestedNode");
-var _transform = require("./transform-node-utils/transform");
+var _tranformContent = require("./transform-node-utils/tranformContent");
 var _utils = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
   return (
@@ -29,29 +28,16 @@ var transformNode = exports.transformNode = function transformNode(api) {
         var selectedParent = $from.parent;
         var isParentLayout = selectedParent.type === nodes.layoutColumn;
         var isNestedExceptLayout = (0, _isNestedNode.isNestedNode)(preservedSelection, '') && !isParentLayout;
-        var fragment = _model.Fragment.empty;
         var isList = (0, _utils.isListNode)(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
-        slice.content.forEach(function (node) {
-          var outputNode = (0, _transform.getOutputNodes)({
-            sourceNode: node,
-            targetNodeType: targetType,
-            schema: tr.doc.type.schema,
-            isNested: isNestedExceptLayout,
-            targetAttrs: metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs
-          });
-          if (outputNode) {
-            fragment = fragment.append(_model.Fragment.fromArray(outputNode));
-          }
-        });
+        var transformedNodes = (0, _tranformContent.tranformContent)(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
         var nodesToDeleteAndInsert = [nodes.mediaSingle];
         if (preservedSelection instanceof _state.NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
           // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
           tr.deleteRange($from.pos, $to.pos);
-          tr.insert($from.pos, fragment);
+          tr.insert($from.pos, transformedNodes);
         } else {
-          // TODO: ED-12345 - selection is broken post transaction, to fix.
-          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, transformedNodes);
         }
         return tr;
       };

package/dist/es2019/editor-actions/isTransformToTargetDisabled.js

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
-export const canParentContainNodeType = (schema, parentNode, nodeTypeName, nodeTypeAttrs) => {
-  const adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) => {
+  const adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   const nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  let content = null;
+  const nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    const table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 const isHeadingToHeadingTransformEnabled = (selectedNode, targetNodeTypeAttrs) => {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

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

@@ -0,0 +1,12 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { getOutputNodes } from './transform';
+export const tranformContent = (content, targetNodeType, schema, isNested, targetAttrs) => {
+  const outputNodes = getOutputNodes({
+    sourceNodes: Array.from(content.content),
+    targetNodeType,
+    schema,
+    isNested,
+    targetAttrs
+  });
+  return outputNodes ? Fragment.fromArray(outputNodes) : content;
+};

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

@@ -10,7 +10,7 @@ import { unwrapListStep } from './steps/unwrapListStep';
 import { wrapBlockquoteToDecisionListStep } from './steps/wrapBlockquoteToDecisionListStep';
 import { wrapMixedContentStep } from './steps/wrapMixedContentStep';
 import { wrapTextToCodeblockStep } from './steps/wrapTextToCodeblock';
-import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
+import { getNodeName, NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapStep } from './unwrapStep';
 import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
@@ -23,25 +23,38 @@ const TRANSFORM_STEPS = {
     atomic: undefined,
     container: [wrapStep],
     list: [wrapIntoListStep],
-    text: undefined
+    text: undefined,
+    multi: undefined
   },
   container: {
     atomic: undefined,
     container: [unwrapStep, wrapStep],
     list: undefined,
-    text: [unwrapStep, applyTargetTextTypeStep]
+    text: [unwrapStep, applyTargetTextTypeStep],
+    multi: undefined
   },
   list: {
     atomic: undefined,
     container: [wrapStep],
     list: [listToListStep],
-    text: [flattenListStep, unwrapListStep, applyTargetTextTypeStep]
+    text: [flattenListStep, unwrapListStep, applyTargetTextTypeStep],
+    multi: undefined
   },
   text: {
     atomic: undefined,
     container: [wrapMixedContentStep],
     list: [wrapIntoListStep],
-    text: [flattenStep, applyTargetTextTypeStep]
+    text: [flattenStep, applyTargetTextTypeStep],
+    multi: undefined
+  },
+  multi: {
+    atomic: undefined,
+    container: [wrapMixedContentStep],
+    // TODO: EDITOR-4137 - Implement multi list transform
+    list: undefined,
+    // TODO: EDITOR-4140 - Implement multi text transform
+    text: undefined,
+    multi: undefined
   }
 };
 
@@ -200,6 +213,10 @@ const TRANSFORM_STEPS_OVERRIDE = {
     bulletList: null,
     taskList: null,
     decisionList: null
+  },
+  multi: {
+    // TODO: EDITOR-4138 - Implement multi content to layout transform
+    layoutSection: undefined
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {
@@ -213,16 +230,18 @@ const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName)
   const steps = overrideSteps !== null && overrideSteps !== void 0 ? overrideSteps : TRANSFORM_STEPS[fromCategory][toCategory];
   return steps;
 };
-// Note: Currently works only for single node in the selection
 export const getOutputNodes = ({
-  sourceNode,
+  sourceNodes,
   targetNodeType,
   schema,
   isNested,
   targetAttrs
 }) => {
-  const nodesToReplace = [sourceNode];
-  const selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
+  const sourceNode = sourceNodes.at(0);
+  if (!sourceNode) {
+    return;
+  }
+  const selectedNodeTypeName = toNodeTypeValue(getNodeName(sourceNodes));
   const initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
   const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
@@ -231,6 +250,7 @@ export const getOutputNodes = ({
   }
   const steps = getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName);
   const context = {
+    // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
     targetNodeTypeName,
     schema,
@@ -241,7 +261,7 @@ export const getOutputNodes = ({
   }
   return steps.reduce((nodes, step) => {
     return step(nodes, context);
-  }, nodesToReplace);
+  }, sourceNodes);
 };
 export const isTransformDisabledBasedOnStepsConfig = (selectedNodeType, targetNodeType) => {
   const steps = getTransformStepsForNodeTypes(selectedNodeType, targetNodeType);

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

@@ -19,9 +19,14 @@ export const NODE_CATEGORY_BY_TYPE = {
   paragraph: 'text',
   nestedExpand: 'container',
   taskList: 'list',
-  table: 'atomic'
+  table: 'atomic',
+  multi: 'multi'
 };
 export const isNodeTypeName = value => value in NODE_CATEGORY_BY_TYPE;
 export const toNodeTypeValue = value => value && isNodeTypeName(value) ? value : null;
+export const getNodeName = nodes => {
+  var _nodes$at;
+  return nodes.length > 1 ? 'multi' : (_nodes$at = nodes.at(0)) === null || _nodes$at === void 0 ? void 0 : _nodes$at.type.name;
+};
 
 // Note: We are still deciding what should be in the context.

package/dist/es2019/editor-commands/transformNode.js

@@ -1,8 +1,7 @@
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
-import { getOutputNodes } from './transform-node-utils/transform';
+import { tranformContent } from './transform-node-utils/tranformContent';
 import { isListNode } from './transforms/utils';
 export const transformNode = api =>
 // eslint-disable-next-line no-unused-vars
@@ -26,29 +25,16 @@ export const transformNode = api =>
     const selectedParent = $from.parent;
     const isParentLayout = selectedParent.type === nodes.layoutColumn;
     const isNestedExceptLayout = isNestedNode(preservedSelection, '') && !isParentLayout;
-    let fragment = Fragment.empty;
     const isList = isListNode(selectedParent);
     const slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
-    slice.content.forEach(node => {
-      const outputNode = getOutputNodes({
-        sourceNode: node,
-        targetNodeType: targetType,
-        schema: tr.doc.type.schema,
-        isNested: isNestedExceptLayout,
-        targetAttrs: metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs
-      });
-      if (outputNode) {
-        fragment = fragment.append(Fragment.fromArray(outputNode));
-      }
-    });
+    const transformedNodes = tranformContent(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
     const nodesToDeleteAndInsert = [nodes.mediaSingle];
     if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
       // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
       tr.deleteRange($from.pos, $to.pos);
-      tr.insert($from.pos, fragment);
+      tr.insert($from.pos, transformedNodes);
     } else {
-      // TODO: ED-12345 - selection is broken post transaction, to fix.
-      tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+      tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, transformedNodes);
     }
     return tr;
   };

package/dist/esm/editor-actions/isTransformToTargetDisabled.js

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
-export var canParentContainNodeType = function canParentContainNodeType(schema, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

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

@@ -0,0 +1,12 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { getOutputNodes } from './transform';
+export var tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs) {
+  var outputNodes = getOutputNodes({
+    sourceNodes: Array.from(content.content),
+    targetNodeType: targetNodeType,
+    schema: schema,
+    isNested: isNested,
+    targetAttrs: targetAttrs
+  });
+  return outputNodes ? Fragment.fromArray(outputNodes) : content;
+};

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

@@ -10,7 +10,7 @@ import { unwrapListStep } from './steps/unwrapListStep';
 import { wrapBlockquoteToDecisionListStep } from './steps/wrapBlockquoteToDecisionListStep';
 import { wrapMixedContentStep } from './steps/wrapMixedContentStep';
 import { wrapTextToCodeblockStep } from './steps/wrapTextToCodeblock';
-import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
+import { getNodeName, NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapStep } from './unwrapStep';
 import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
@@ -23,25 +23,38 @@ var TRANSFORM_STEPS = {
     atomic: undefined,
     container: [wrapStep],
     list: [wrapIntoListStep],
-    text: undefined
+    text: undefined,
+    multi: undefined
   },
   container: {
     atomic: undefined,
     container: [unwrapStep, wrapStep],
     list: undefined,
-    text: [unwrapStep, applyTargetTextTypeStep]
+    text: [unwrapStep, applyTargetTextTypeStep],
+    multi: undefined
   },
   list: {
     atomic: undefined,
     container: [wrapStep],
     list: [listToListStep],
-    text: [flattenListStep, unwrapListStep, applyTargetTextTypeStep]
+    text: [flattenListStep, unwrapListStep, applyTargetTextTypeStep],
+    multi: undefined
   },
   text: {
     atomic: undefined,
     container: [wrapMixedContentStep],
     list: [wrapIntoListStep],
-    text: [flattenStep, applyTargetTextTypeStep]
+    text: [flattenStep, applyTargetTextTypeStep],
+    multi: undefined
+  },
+  multi: {
+    atomic: undefined,
+    container: [wrapMixedContentStep],
+    // TODO: EDITOR-4137 - Implement multi list transform
+    list: undefined,
+    // TODO: EDITOR-4140 - Implement multi text transform
+    text: undefined,
+    multi: undefined
   }
 };
 
@@ -200,6 +213,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: null,
     taskList: null,
     decisionList: null
+  },
+  multi: {
+    // TODO: EDITOR-4138 - Implement multi content to layout transform
+    layoutSection: undefined
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -213,15 +230,17 @@ var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selec
   var steps = overrideSteps !== null && overrideSteps !== void 0 ? overrideSteps : TRANSFORM_STEPS[fromCategory][toCategory];
   return steps;
 };
-// Note: Currently works only for single node in the selection
 export var getOutputNodes = function getOutputNodes(_ref) {
-  var sourceNode = _ref.sourceNode,
+  var sourceNodes = _ref.sourceNodes,
     targetNodeType = _ref.targetNodeType,
     schema = _ref.schema,
     isNested = _ref.isNested,
     targetAttrs = _ref.targetAttrs;
-  var nodesToReplace = [sourceNode];
-  var selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
+  var sourceNode = sourceNodes.at(0);
+  if (!sourceNode) {
+    return;
+  }
+  var selectedNodeTypeName = toNodeTypeValue(getNodeName(sourceNodes));
   var initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
   var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
@@ -230,6 +249,7 @@ export var getOutputNodes = function getOutputNodes(_ref) {
   }
   var steps = getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName);
   var context = {
+    // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
     targetNodeTypeName: targetNodeTypeName,
     schema: schema,
@@ -240,7 +260,7 @@ export var getOutputNodes = function getOutputNodes(_ref) {
   }
   return steps.reduce(function (nodes, step) {
     return step(nodes, context);
-  }, nodesToReplace);
+  }, sourceNodes);
 };
 export var isTransformDisabledBasedOnStepsConfig = function isTransformDisabledBasedOnStepsConfig(selectedNodeType, targetNodeType) {
   var steps = getTransformStepsForNodeTypes(selectedNodeType, targetNodeType);

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

@@ -19,7 +19,8 @@ export var NODE_CATEGORY_BY_TYPE = {
   paragraph: 'text',
   nestedExpand: 'container',
   taskList: 'list',
-  table: 'atomic'
+  table: 'atomic',
+  multi: 'multi'
 };
 export var isNodeTypeName = function isNodeTypeName(value) {
   return value in NODE_CATEGORY_BY_TYPE;
@@ -27,5 +28,9 @@ export var isNodeTypeName = function isNodeTypeName(value) {
 export var toNodeTypeValue = function toNodeTypeValue(value) {
   return value && isNodeTypeName(value) ? value : null;
 };
+export var getNodeName = function getNodeName(nodes) {
+  var _nodes$at;
+  return nodes.length > 1 ? 'multi' : (_nodes$at = nodes.at(0)) === null || _nodes$at === void 0 ? void 0 : _nodes$at.type.name;
+};
 
 // Note: We are still deciding what should be in the context.

package/dist/esm/editor-commands/transformNode.js

@@ -1,8 +1,7 @@
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
-import { getOutputNodes } from './transform-node-utils/transform';
+import { tranformContent } from './transform-node-utils/tranformContent';
 import { isListNode } from './transforms/utils';
 export var transformNode = function transformNode(api) {
   return (
@@ -23,29 +22,16 @@ export var transformNode = function transformNode(api) {
         var selectedParent = $from.parent;
         var isParentLayout = selectedParent.type === nodes.layoutColumn;
         var isNestedExceptLayout = isNestedNode(preservedSelection, '') && !isParentLayout;
-        var fragment = Fragment.empty;
         var isList = isListNode(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
-        slice.content.forEach(function (node) {
-          var outputNode = getOutputNodes({
-            sourceNode: node,
-            targetNodeType: targetType,
-            schema: tr.doc.type.schema,
-            isNested: isNestedExceptLayout,
-            targetAttrs: metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs
-          });
-          if (outputNode) {
-            fragment = fragment.append(Fragment.fromArray(outputNode));
-          }
-        });
+        var transformedNodes = tranformContent(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
         var nodesToDeleteAndInsert = [nodes.mediaSingle];
         if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
           // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
           tr.deleteRange($from.pos, $to.pos);
-          tr.insert($from.pos, fragment);
+          tr.insert($from.pos, transformedNodes);
         } else {
-          // TODO: ED-12345 - selection is broken post transaction, to fix.
-          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, transformedNodes);
         }
         return tr;
       };

package/dist/types/editor-actions/isTransformToTargetDisabled.d.ts

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

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

@@ -0,0 +1,3 @@
+import type { NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>) => Fragment;

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

@@ -3,10 +3,10 @@ import type { NodeTypeName } from './types';
 interface GetOutputNodesArgs {
     isNested: boolean;
     schema: Schema;
-    sourceNode: PMNode;
+    sourceNodes: PMNode[];
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export declare const isTransformDisabledBasedOnStepsConfig: (selectedNodeType: NodeTypeName, targetNodeType: NodeTypeName) => boolean;
 export {};

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

@@ -1,9 +1,10 @@
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layoutSection' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table';
-export type NodeCategory = 'atomic' | 'container' | 'list' | 'text';
+export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layoutSection' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table' | 'multi';
+export type NodeCategory = 'atomic' | 'container' | 'list' | 'text' | 'multi';
 export declare const NODE_CATEGORY_BY_TYPE: Record<NodeTypeName, NodeCategory>;
 export declare const isNodeTypeName: (value: string) => value is NodeTypeName;
 export declare const toNodeTypeValue: (value?: string | null) => NodeTypeName | null;
+export declare const getNodeName: (nodes: PMNode[]) => string | undefined;
 export type TransformStep = (nodes: PMNode[], context: TransformStepContext) => PMNode[];
 export interface TransformStepContext {
     fromNode: PMNode;

package/dist/types-ts4.5/editor-actions/isTransformToTargetDisabled.d.ts

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

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

@@ -0,0 +1,3 @@
+import type { NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>) => Fragment;

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

@@ -3,10 +3,10 @@ import type { NodeTypeName } from './types';
 interface GetOutputNodesArgs {
     isNested: boolean;
     schema: Schema;
-    sourceNode: PMNode;
+    sourceNodes: PMNode[];
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export declare const isTransformDisabledBasedOnStepsConfig: (selectedNodeType: NodeTypeName, targetNodeType: NodeTypeName) => boolean;
 export {};

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

@@ -1,9 +1,10 @@
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layoutSection' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table';
-export type NodeCategory = 'atomic' | 'container' | 'list' | 'text';
+export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layoutSection' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table' | 'multi';
+export type NodeCategory = 'atomic' | 'container' | 'list' | 'text' | 'multi';
 export declare const NODE_CATEGORY_BY_TYPE: Record<NodeTypeName, NodeCategory>;
 export declare const isNodeTypeName: (value: string) => value is NodeTypeName;
 export declare const toNodeTypeValue: (value?: string | null) => NodeTypeName | null;
+export declare const getNodeName: (nodes: PMNode[]) => string | undefined;
 export type TransformStep = (nodes: PMNode[], context: TransformStepContext) => PMNode[];
 export interface TransformStepContext {
     fromNode: PMNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.26",
+	"version": "5.2.28",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.18.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.19.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -44,12 +44,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.2.0",
+		"@atlaskit/tmp-editor-statsig": "^16.3.0",
 		"@atlaskit/tokens": "^9.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.49.0",
+		"@atlaskit/editor-common": "^110.50.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},