@atlaskit/editor-plugin-block-menu 5.1.4 → 5.1.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.1.6
+
+### Patch Changes
+
+- [`a202e97c73f3a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a202e97c73f3a) -
+  Adds base transform cases for codeBlock, layout, blockquote.
+
+## 5.1.5
+
+### Patch Changes
+
+- [`f6905b2543ef1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f6905b2543ef1) -
+  [ux] Implements base steps for from container to other node categories transfroms.
+- Updated dependencies
+
 ## 5.1.4
 
 ### Patch Changes

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

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.flattenStep = void 0;
+var flattenStep = exports.flattenStep = function flattenStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+
+  // TODO: EDITOR-2920 - Implement flattening logic.
+  // This is a simplified preliminary approach. We might want to use prosemirror-markdown functions.
+  var codeBlockContent = nodes.map(function (node) {
+    return node.content.textBetween(0, node.content.size, '\n');
+  }).join('\n');
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, schema.text(codeBlockContent));
+  if (!outputNode) {
+    return nodes;
+  }
+  return [outputNode];
+};

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

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unwrapLayoutStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+var unwrapLayoutStep = exports.unwrapLayoutStep = function unwrapLayoutStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    var isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(function (column) {
+        var isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -4,10 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getOutputNodes = void 0;
+var _utils = require("../transform-node-utils/utils");
 var _flattenListStep = require("./flattenListStep");
+var _flattenStep = require("./flattenStep");
+var _unwrapLayoutStep = require("./steps/unwrapLayoutStep");
 var _stubStep = require("./stubStep");
 var _types = require("./types");
+var _unwrapExpandStep = require("./unwrapExpandStep");
 var _unwrapListStep = require("./unwrapListStep");
+var _unwrapStep = require("./unwrapStep");
+var _wrapIntoLayoutStep = require("./wrapIntoLayoutStep");
+var _wrapStep = require("./wrapStep");
 // Exampled step for overrides:
 // - open Block menu on a paragraph, click 'Panel' in the Turn into'
 // - expected to put paragraph into a panel
@@ -26,9 +33,9 @@ var TRANSFORM_STEPS = {
   },
   container: {
     atomic: undefined,
-    container: [_stubStep.stubStep],
+    container: [_unwrapStep.unwrapStep, _wrapStep.wrapStep],
     list: undefined,
-    text: undefined
+    text: [_unwrapStep.unwrapStep]
   },
   list: {
     atomic: undefined,
@@ -49,6 +56,43 @@ var TRANSFORM_STEPS = {
 var TRANSFORM_STEPS_OVERRIDE = {
   paragraph: {
     panel: [wrapIntoPanelStep]
+  },
+  panel: {
+    layoutSection: [_unwrapStep.unwrapStep, _wrapIntoLayoutStep.wrapIntoLayoutStep],
+    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  expand: {
+    panel: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
+    blockquote: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
+    layoutSection: [_unwrapExpandStep.unwrapExpandStep, _wrapIntoLayoutStep.wrapIntoLayoutStep],
+    paragraph: [_unwrapExpandStep.unwrapExpandStep],
+    codeBlock: [_unwrapExpandStep.unwrapExpandStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  nestedExpand: {
+    panel: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
+    blockquote: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
+    paragraph: [_unwrapExpandStep.unwrapExpandStep],
+    codeBlock: [_unwrapExpandStep.unwrapExpandStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  blockquote: {
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  layoutSection: {
+    blockquote: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    expand: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    panel: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    codeBlock: [_unwrapLayoutStep.unwrapLayoutStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
+    paragraph: [_unwrapLayoutStep.unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [_wrapStep.wrapStep],
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    panel: [_wrapStep.wrapStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -62,10 +106,12 @@ var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selec
 var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
   var sourceNode = _ref.sourceNode,
     targetNodeType = _ref.targetNodeType,
-    schema = _ref.schema;
+    schema = _ref.schema,
+    isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = (0, _types.toNodeTypeValue)(sourceNode.type.name);
-  var targetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
+  var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
+  var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -15,7 +15,7 @@ var NODE_CATEGORY_BY_TYPE = exports.NODE_CATEGORY_BY_TYPE = {
   expand: 'container',
   extension: 'atomic',
   heading: 'text',
-  layout: 'container',
+  layoutSection: 'container',
   media: 'atomic',
   mediaGroup: 'atomic',
   mediaSingle: 'atomic',

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

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unwrapExpandStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _unwrapStep = require("./unwrapStep");
+/**
+ * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
+ * and prepending it to the children.
+ *
+ * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ */
+var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(nodes, context) {
+  var schema = context.schema;
+  var outputNodes = [];
+  var _schema$nodes = schema.nodes,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
+  nodes.forEach(function (node) {
+    var isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
+    if (isExpand) {
+      var _node$attrs;
+      var title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
+
+      // Create a paragraph from the title if it exists
+      if (title) {
+        var titleParagraph = schema.nodes.paragraph.createAndFill({}, schema.text(title));
+        if (titleParagraph) {
+          outputNodes.push(titleParagraph);
+        }
+      }
+
+      // Add the children
+      outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
+    } else {
+      (0, _unwrapStep.unwrapStep)([node], context);
+    }
+  });
+  return outputNodes;
+};

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

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unwrapStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var unwrapStep = exports.unwrapStep = function unwrapStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    // we may want to just skip the original instead of using it
+    if (node.children.length === 0) {
+      outputNodes.push(node);
+    } else {
+      outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
+    }
+  });
+  return outputNodes;
+};

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSelectedNode = void 0;
+exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -48,4 +48,10 @@ var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selecti
     }
   }
   return undefined;
+};
+var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested) {
+  if (nodeTypeName === 'expand' && isNested) {
+    return 'nestedExpand';
+  }
+  return nodeTypeName;
 };

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

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapIntoLayoutStep = void 0;
+var _model = require("@atlaskit/editor-prosemirror/model");
+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 columnTwo = layoutColumn.createAndFill();
+  if (!columnOne || !columnTwo) {
+    return nodes;
+  }
+  var layout = layoutSection.createAndFill({}, _model.Fragment.fromArray([columnOne, columnTwo]));
+  if (!layout) {
+    return nodes;
+  }
+  return [layout];
+};

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

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapStep = void 0;
+var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.transformNode = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _isNestedNode = require("../ui/utils/isNestedNode");
 var _transform = require("./transform-node-utils/transform");
 var _utils = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
@@ -22,6 +23,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
         var _expandToBlockRange = (0, _selection.expandToBlockRange)(preservedSelection.$from, preservedSelection.$to),
           $from = _expandToBlockRange.$from,
           $to = _expandToBlockRange.$to;
+        var isNested = (0, _isNestedNode.isNestedNode)(preservedSelection, '');
         var selectedParent = $from.parent;
         var fragment = _model.Fragment.empty;
         var isList = (0, _utils.isListNode)(selectedParent);
@@ -30,7 +32,8 @@ var transformNode = exports.transformNode = function transformNode(api) {
           var outputNode = (0, _transform.getOutputNodes)({
             sourceNode: node,
             targetNodeType: targetType,
-            schema: tr.doc.type.schema
+            schema: tr.doc.type.schema,
+            isNested: isNested
           });
           if (outputNode) {
             fragment = fragment.append(_model.Fragment.fromArray(outputNode));

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

@@ -0,0 +1,15 @@
+export const flattenStep = (nodes, context) => {
+  const {
+    schema,
+    targetNodeTypeName
+  } = context;
+
+  // TODO: EDITOR-2920 - Implement flattening logic.
+  // This is a simplified preliminary approach. We might want to use prosemirror-markdown functions.
+  const codeBlockContent = nodes.map(node => node.content.textBetween(0, node.content.size, '\n')).join('\n');
+  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, schema.text(codeBlockContent));
+  if (!outputNode) {
+    return nodes;
+  }
+  return [outputNode];
+};

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

@@ -0,0 +1,30 @@
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export const unwrapLayoutStep = nodes => {
+  const outputNodes = [];
+  nodes.forEach(node => {
+    const isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(column => {
+        const isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push(...column.children);
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -1,7 +1,14 @@
+import { getTargetNodeTypeNameInContext } from '../transform-node-utils/utils';
 import { flattenListStep } from './flattenListStep';
+import { flattenStep } from './flattenStep';
+import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
+import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapListStep } from './unwrapListStep';
+import { unwrapStep } from './unwrapStep';
+import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
+import { wrapStep } from './wrapStep';
 
 // Exampled step for overrides:
 // - open Block menu on a paragraph, click 'Panel' in the Turn into'
@@ -21,9 +28,9 @@ const TRANSFORM_STEPS = {
   },
   container: {
     atomic: undefined,
-    container: [stubStep],
+    container: [unwrapStep, wrapStep],
     list: undefined,
-    text: undefined
+    text: [unwrapStep]
   },
   list: {
     atomic: undefined,
@@ -44,6 +51,43 @@ const TRANSFORM_STEPS = {
 const TRANSFORM_STEPS_OVERRIDE = {
   paragraph: {
     panel: [wrapIntoPanelStep]
+  },
+  panel: {
+    layoutSection: [unwrapStep, wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  expand: {
+    panel: [unwrapExpandStep, wrapStep],
+    blockquote: [unwrapExpandStep, wrapStep],
+    layoutSection: [unwrapExpandStep, wrapIntoLayoutStep],
+    paragraph: [unwrapExpandStep],
+    codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  nestedExpand: {
+    panel: [unwrapExpandStep, wrapStep],
+    blockquote: [unwrapExpandStep, wrapStep],
+    paragraph: [unwrapExpandStep],
+    codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  blockquote: {
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  layoutSection: {
+    blockquote: [unwrapLayoutStep, wrapStep],
+    expand: [unwrapLayoutStep, wrapStep],
+    panel: [unwrapLayoutStep, wrapStep],
+    codeBlock: [unwrapLayoutStep, flattenStep, wrapStep],
+    paragraph: [unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [wrapStep],
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    panel: [wrapStep]
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {
@@ -57,11 +101,13 @@ const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName)
 export const getOutputNodes = ({
   sourceNode,
   targetNodeType,
-  schema
+  schema,
+  isNested
 }) => {
   const nodesToReplace = [sourceNode];
   const selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  const targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  const initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -9,7 +9,7 @@ export const NODE_CATEGORY_BY_TYPE = {
   expand: 'container',
   extension: 'atomic',
   heading: 'text',
-  layout: 'container',
+  layoutSection: 'container',
   media: 'atomic',
   mediaGroup: 'atomic',
   mediaSingle: 'atomic',

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

@@ -0,0 +1,39 @@
+import { unwrapStep } from './unwrapStep';
+
+/**
+ * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
+ * and prepending it to the children.
+ *
+ * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ */
+export const unwrapExpandStep = (nodes, context) => {
+  const {
+    schema
+  } = context;
+  const outputNodes = [];
+  const {
+    expand,
+    nestedExpand
+  } = schema.nodes;
+  nodes.forEach(node => {
+    const isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
+    if (isExpand) {
+      var _node$attrs;
+      const title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
+
+      // Create a paragraph from the title if it exists
+      if (title) {
+        const titleParagraph = schema.nodes.paragraph.createAndFill({}, schema.text(title));
+        if (titleParagraph) {
+          outputNodes.push(titleParagraph);
+        }
+      }
+
+      // Add the children
+      outputNodes.push(...node.children);
+    } else {
+      unwrapStep([node], context);
+    }
+  });
+  return outputNodes;
+};

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

@@ -0,0 +1,12 @@
+export const unwrapStep = nodes => {
+  const outputNodes = [];
+  nodes.forEach(node => {
+    // we may want to just skip the original instead of using it
+    if (node.children.length === 0) {
+      outputNodes.push(node);
+    } else {
+      outputNodes.push(...node.children);
+    }
+  });
+  return outputNodes;
+};

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

@@ -43,4 +43,10 @@ export const getSelectedNode = selection => {
     }
   }
   return undefined;
+};
+export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested) => {
+  if (nodeTypeName === 'expand' && isNested) {
+    return 'nestedExpand';
+  }
+  return nodeTypeName;
 };

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

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

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

@@ -0,0 +1,11 @@
+export const wrapStep = (nodes, context) => {
+  const {
+    schema,
+    targetNodeTypeName
+  } = context;
+  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -1,5 +1,6 @@
 import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
 export const transformNode = api =>
@@ -17,6 +18,7 @@ export const transformNode = api =>
       $from,
       $to
     } = expandToBlockRange(preservedSelection.$from, preservedSelection.$to);
+    const isNested = isNestedNode(preservedSelection, '');
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;
     const isList = isListNode(selectedParent);
@@ -25,7 +27,8 @@ export const transformNode = api =>
       const outputNode = getOutputNodes({
         sourceNode: node,
         targetNodeType: targetType,
-        schema: tr.doc.type.schema
+        schema: tr.doc.type.schema,
+        isNested
       });
       if (outputNode) {
         fragment = fragment.append(Fragment.fromArray(outputNode));

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

@@ -0,0 +1,15 @@
+export var flattenStep = function flattenStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+
+  // TODO: EDITOR-2920 - Implement flattening logic.
+  // This is a simplified preliminary approach. We might want to use prosemirror-markdown functions.
+  var codeBlockContent = nodes.map(function (node) {
+    return node.content.textBetween(0, node.content.size, '\n');
+  }).join('\n');
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, schema.text(codeBlockContent));
+  if (!outputNode) {
+    return nodes;
+  }
+  return [outputNode];
+};

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

@@ -0,0 +1,31 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export var unwrapLayoutStep = function unwrapLayoutStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    var isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(function (column) {
+        var isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push.apply(outputNodes, _toConsumableArray(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -1,7 +1,14 @@
+import { getTargetNodeTypeNameInContext } from '../transform-node-utils/utils';
 import { flattenListStep } from './flattenListStep';
+import { flattenStep } from './flattenStep';
+import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
+import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapListStep } from './unwrapListStep';
+import { unwrapStep } from './unwrapStep';
+import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
+import { wrapStep } from './wrapStep';
 
 // Exampled step for overrides:
 // - open Block menu on a paragraph, click 'Panel' in the Turn into'
@@ -21,9 +28,9 @@ var TRANSFORM_STEPS = {
   },
   container: {
     atomic: undefined,
-    container: [stubStep],
+    container: [unwrapStep, wrapStep],
     list: undefined,
-    text: undefined
+    text: [unwrapStep]
   },
   list: {
     atomic: undefined,
@@ -44,6 +51,43 @@ var TRANSFORM_STEPS = {
 var TRANSFORM_STEPS_OVERRIDE = {
   paragraph: {
     panel: [wrapIntoPanelStep]
+  },
+  panel: {
+    layoutSection: [unwrapStep, wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  expand: {
+    panel: [unwrapExpandStep, wrapStep],
+    blockquote: [unwrapExpandStep, wrapStep],
+    layoutSection: [unwrapExpandStep, wrapIntoLayoutStep],
+    paragraph: [unwrapExpandStep],
+    codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  nestedExpand: {
+    panel: [unwrapExpandStep, wrapStep],
+    blockquote: [unwrapExpandStep, wrapStep],
+    paragraph: [unwrapExpandStep],
+    codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  blockquote: {
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  layoutSection: {
+    blockquote: [unwrapLayoutStep, wrapStep],
+    expand: [unwrapLayoutStep, wrapStep],
+    panel: [unwrapLayoutStep, wrapStep],
+    codeBlock: [unwrapLayoutStep, flattenStep, wrapStep],
+    paragraph: [unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [wrapStep],
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    panel: [wrapStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -57,10 +101,12 @@ var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selec
 export var getOutputNodes = function getOutputNodes(_ref) {
   var sourceNode = _ref.sourceNode,
     targetNodeType = _ref.targetNodeType,
-    schema = _ref.schema;
+    schema = _ref.schema,
+    isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  var targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  var initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -9,7 +9,7 @@ export var NODE_CATEGORY_BY_TYPE = {
   expand: 'container',
   extension: 'atomic',
   heading: 'text',
-  layout: 'container',
+  layoutSection: 'container',
   media: 'atomic',
   mediaGroup: 'atomic',
   mediaSingle: 'atomic',

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

@@ -0,0 +1,37 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { unwrapStep } from './unwrapStep';
+
+/**
+ * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
+ * and prepending it to the children.
+ *
+ * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ */
+export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
+  var schema = context.schema;
+  var outputNodes = [];
+  var _schema$nodes = schema.nodes,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
+  nodes.forEach(function (node) {
+    var isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
+    if (isExpand) {
+      var _node$attrs;
+      var title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
+
+      // Create a paragraph from the title if it exists
+      if (title) {
+        var titleParagraph = schema.nodes.paragraph.createAndFill({}, schema.text(title));
+        if (titleParagraph) {
+          outputNodes.push(titleParagraph);
+        }
+      }
+
+      // Add the children
+      outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
+    } else {
+      unwrapStep([node], context);
+    }
+  });
+  return outputNodes;
+};

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

@@ -0,0 +1,13 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+export var unwrapStep = function unwrapStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    // we may want to just skip the original instead of using it
+    if (node.children.length === 0) {
+      outputNodes.push(node);
+    } else {
+      outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
+    }
+  });
+  return outputNodes;
+};

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

@@ -42,4 +42,10 @@ export var getSelectedNode = function getSelectedNode(selection) {
     }
   }
   return undefined;
+};
+export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested) {
+  if (nodeTypeName === 'expand' && isNested) {
+    return 'nestedExpand';
+  }
+  return nodeTypeName;
 };

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

@@ -0,0 +1,17 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+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 columnTwo = layoutColumn.createAndFill();
+  if (!columnOne || !columnTwo) {
+    return nodes;
+  }
+  var layout = layoutSection.createAndFill({}, Fragment.fromArray([columnOne, columnTwo]));
+  if (!layout) {
+    return nodes;
+  }
+  return [layout];
+};

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

@@ -0,0 +1,9 @@
+export var wrapStep = function wrapStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -1,5 +1,6 @@
 import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
 export var transformNode = function transformNode(api) {
@@ -16,6 +17,7 @@ export var transformNode = function transformNode(api) {
         var _expandToBlockRange = expandToBlockRange(preservedSelection.$from, preservedSelection.$to),
           $from = _expandToBlockRange.$from,
           $to = _expandToBlockRange.$to;
+        var isNested = isNestedNode(preservedSelection, '');
         var selectedParent = $from.parent;
         var fragment = Fragment.empty;
         var isList = isListNode(selectedParent);
@@ -24,7 +26,8 @@ export var transformNode = function transformNode(api) {
           var outputNode = getOutputNodes({
             sourceNode: node,
             targetNodeType: targetType,
-            schema: tr.doc.type.schema
+            schema: tr.doc.type.schema,
+            isNested: isNested
           });
           if (outputNode) {
             fragment = fragment.append(Fragment.fromArray(outputNode));

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const flattenStep: TransformStep;

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

@@ -0,0 +1,14 @@
+import type { TransformStep } from '../types';
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export declare const unwrapLayoutStep: TransformStep;

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

@@ -1,8 +1,9 @@
 import { type Node as PMNode, type NodeType, type Schema } from '@atlaskit/editor-prosemirror/model';
 interface GetOutputNodesArgs {
+    isNested: boolean;
     schema: Schema;
     sourceNode: PMNode;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, isNested, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export {};

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

@@ -1,5 +1,5 @@
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layout' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table';
+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 declare const NODE_CATEGORY_BY_TYPE: Record<NodeTypeName, NodeCategory>;
 export declare const isNodeTypeName: (value: string) => value is NodeTypeName;

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

@@ -0,0 +1,8 @@
+import type { TransformStep } from './types';
+/**
+ * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
+ * and prepending it to the children.
+ *
+ * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ */
+export declare const unwrapExpandStep: TransformStep;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const unwrapStep: TransformStep;

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

@@ -1,3 +1,5 @@
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
+export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const wrapIntoLayoutStep: TransformStep;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const wrapStep: TransformStep;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const flattenStep: TransformStep;

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

@@ -0,0 +1,14 @@
+import type { TransformStep } from '../types';
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export declare const unwrapLayoutStep: TransformStep;

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

@@ -1,8 +1,9 @@
 import { type Node as PMNode, type NodeType, type Schema } from '@atlaskit/editor-prosemirror/model';
 interface GetOutputNodesArgs {
+    isNested: boolean;
     schema: Schema;
     sourceNode: PMNode;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNode, targetNodeType, schema, isNested, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export {};

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

@@ -1,5 +1,5 @@
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-export type NodeTypeName = 'blockquote' | 'blockCard' | 'bodiedExtension' | 'bulletList' | 'codeBlock' | 'decisionList' | 'embedCard' | 'expand' | 'extension' | 'heading' | 'layout' | 'media' | 'mediaGroup' | 'mediaSingle' | 'multiBodiedExtension' | 'orderedList' | 'panel' | 'paragraph' | 'nestedExpand' | 'taskList' | 'table';
+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 declare const NODE_CATEGORY_BY_TYPE: Record<NodeTypeName, NodeCategory>;
 export declare const isNodeTypeName: (value: string) => value is NodeTypeName;

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

@@ -0,0 +1,8 @@
+import type { TransformStep } from './types';
+/**
+ * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
+ * and prepending it to the children.
+ *
+ * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ */
+export declare const unwrapExpandStep: TransformStep;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const unwrapStep: TransformStep;

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

@@ -1,3 +1,5 @@
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
+export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const wrapIntoLayoutStep: TransformStep;

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

@@ -0,0 +1,2 @@
+import type { TransformStep } from './types';
+export declare const wrapStep: TransformStep;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.1.4",
+	"version": "5.1.6",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.11.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.12.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.5.0",
+		"@atlaskit/tmp-editor-statsig": "^14.7.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},